diff -Nru gwyddion-2.62/app/data-browser-aux.c gwyddion-2.63/app/data-browser-aux.c --- gwyddion-2.62/app/data-browser-aux.c 2022-08-08 15:38:38.000000000 +0000 +++ gwyddion-2.63/app/data-browser-aux.c 2023-03-08 15:56:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: data-browser-aux.c 24863 2022-08-08 15:38:38Z yeti-dn $ + * $Id: data-browser-aux.c 25263 2023-03-08 15:56:06Z yeti-dn $ * Copyright (C) 2006-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -43,28 +43,6 @@ CACHED_IDS = 24, }; -/* TODO: These probably should be public along with the corresponding sync functions. */ -typedef enum { - GWY_BRICK_ITEM_PREVIEW, - GWY_BRICK_ITEM_GRADIENT, - GWY_BRICK_ITEM_META, - GWY_BRICK_ITEM_TITLE, -} GwyBrickItem; - -typedef enum { - GWY_SURFACE_ITEM_PREVIEW, - GWY_SURFACE_ITEM_GRADIENT, - GWY_SURFACE_ITEM_META, - GWY_SURFACE_ITEM_TITLE, -} GwySurfaceItem; - -typedef enum { - GWY_LAWN_ITEM_PREVIEW, - GWY_LAWN_ITEM_GRADIENT, - GWY_LAWN_ITEM_META, - GWY_LAWN_ITEM_TITLE, -} GwyLawnItem; - typedef GQuark (*GetKeyFunc)(gint id); typedef struct { @@ -1787,6 +1765,8 @@ * @...: 0-terminated list of #GwyDataItem values defining the items to copy. * * Synchronizes auxiliary image data items between data containers. + * + * All items except %GWY_DATA_ITEM_PREVIEW are valid for image data. **/ void gwy_app_sync_data_items(GwyContainer *source, @@ -1824,6 +1804,8 @@ * * Synchronizes auxiliary image data items between data containers. * + * All items except %GWY_DATA_ITEM_PREVIEW are valid for image data. + * * Since: 2.48 **/ void diff -Nru gwyddion-2.62/app/data-browser.c gwyddion-2.63/app/data-browser.c --- gwyddion-2.62/app/data-browser.c 2022-08-08 15:36:51.000000000 +0000 +++ gwyddion-2.63/app/data-browser.c 2023-03-08 15:56:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: data-browser.c 24709 2022-03-21 17:31:45Z yeti-dn $ + * $Id: data-browser.c 25263 2023-03-08 15:56:06Z yeti-dn $ * Copyright (C) 2006-2021 David Necas (Yeti), Petr Klapetek, Chris Anderson * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, sidewinderasu@gmail.com. * @@ -8924,9 +8924,12 @@ * @GWY_DATA_ITEM_SELECTIONS: Data selections. * @GWY_DATA_ITEM_META: Metadata. * @GWY_DATA_ITEM_CALDATA: Calibration and uncertainty data. (Since 2.23) - * @GWY_DATA_ITEM_PREVIEW: Volume data preview. (Since 2.51) + * @GWY_DATA_ITEM_PREVIEW: Volume, XYZ or curve map data preview. (Since 2.51) * * Type of auxiliary channel data. + * + * Not all auxiliary data types are valid for all primary data types. See individual functions such as + * gwy_app_sync_data_items() or gwy_app_sync_volume_items() for specification which items can be used with them. **/ /* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/app/dialog.c gwyddion-2.63/app/dialog.c --- gwyddion-2.62/app/dialog.c 2022-08-31 11:48:50.000000000 +0000 +++ gwyddion-2.63/app/dialog.c 2023-06-09 14:28:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dialog.c 24974 2022-08-31 11:48:49Z yeti-dn $ + * $Id: dialog.c 25412 2023-06-06 09:35:49Z yeti-dn $ * Copyright (C) 2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -175,7 +175,7 @@ * %GTK_RESPONSE_OK or %GTK_RESPONSE_ACCEPT creates an OK button which finishes the dialog with result * %GWY_DIALOG_PROCEED (or %GWY_DIALOG_HAVE_RESULT if result has been calculated). * - * %GTK_RESPONSE_CANCEL or %GTK_RESPONSE_REJECT creates a Cancelbutton which finishes the dialog with result + * %GTK_RESPONSE_CANCEL or %GTK_RESPONSE_REJECT creates a Cancel button which finishes the dialog with result * %GWY_DIALOG_CANCEL. * * Since: 2.59 diff -Nru gwyddion-2.62/app/gwyapptypes.c gwyddion-2.63/app/gwyapptypes.c --- gwyddion-2.62/app/gwyapptypes.c 2022-10-19 15:29:57.000000000 +0000 +++ gwyddion-2.63/app/gwyapptypes.c 2023-02-23 15:12:06.000000000 +0000 @@ -306,6 +306,22 @@ } return etype; } +GType +gwy_hold_selection_flags_get_type(void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GFlagsValue values[] = { + { GWY_HOLD_SELECTION_HOLD, "GWY_HOLD_SELECTION_HOLD", "hold" }, + { GWY_HOLD_SELECTION_OVERWRITE, "GWY_HOLD_SELECTION_OVERWRITE", "overwrite" }, + { GWY_HOLD_SELECTION_CLEAR, "GWY_HOLD_SELECTION_CLEAR", "clear" }, + { 0, NULL, NULL } + }; + etype = g_flags_register_static("GwyHoldSelectionFlags", values); + } + return etype; +} #include "./gwyresultsexport.h" GType gwy_results_export_style_get_type(void) diff -Nru gwyddion-2.62/app/gwyapptypes.h gwyddion-2.63/app/gwyapptypes.h --- gwyddion-2.62/app/gwyapptypes.h 2021-05-16 20:25:41.000000000 +0000 +++ gwyddion-2.63/app/gwyapptypes.h 2022-12-14 16:21:02.000000000 +0000 @@ -37,6 +37,8 @@ #define GWY_TYPE_PREVIEW_SURFACE_FLAGS (gwy_preview_surface_flags_get_type()) GType gwy_plain_tool_changed_get_type(void) G_GNUC_CONST; #define GWY_TYPE_PLAIN_TOOL_CHANGED (gwy_plain_tool_changed_get_type()) +GType gwy_hold_selection_flags_get_type(void) G_GNUC_CONST; +#define GWY_TYPE_HOLD_SELECTION_FLAGS (gwy_hold_selection_flags_get_type()) GType gwy_results_export_style_get_type(void) G_GNUC_CONST; #define GWY_TYPE_RESULTS_EXPORT_STYLE (gwy_results_export_style_get_type()) GType gwy_tool_response_type_get_type(void) G_GNUC_CONST; diff -Nru gwyddion-2.62/app/gwymoduleutils.c gwyddion-2.63/app/gwymoduleutils.c --- gwyddion-2.62/app/gwymoduleutils.c 2022-09-22 12:25:33.000000000 +0000 +++ gwyddion-2.63/app/gwymoduleutils.c 2023-02-21 17:35:53.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: gwymoduleutils.c 25037 2022-09-22 12:25:33Z yeti-dn $ - * Copyright (C) 2007-2022 David Necas (Yeti), Petr Klapetek. + * $Id: gwymoduleutils.c 25224 2023-02-21 17:35:52Z yeti-dn $ + * Copyright (C) 2007-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -41,6 +41,23 @@ gssize len; } GwySaveAuxiliaryData; +typedef struct { + GwySelection *selection; + GwyParamTable *table; + gdouble min; + gdouble max; + gulong selection_id; + gulong param_id; + gint id_from; + gint id_to; + gboolean in_update; +} GraphRangeData; + +static void graph_range_selection_destroyed(gpointer user_data, + GObject *selection); +static void graph_range_table_destroyed (gpointer user_data, + GObject *selection); + static gchar* gwy_save_auxiliary_data_create(gpointer user_data, gssize *data_len) @@ -1245,6 +1262,158 @@ return expander; } +static void +graph_range_param_changed(GraphRangeData *grdata, gint id) +{ + GwyParams *params; + gdouble range[2]; + + if (grdata->in_update || (id != grdata->id_from && id != grdata->id_to)) + return; + + params = gwy_param_table_params(grdata->table); + range[0] = gwy_params_get_double(params, grdata->id_from); + range[1] = gwy_params_get_double(params, grdata->id_to); + if (range[0] <= grdata->min && range[1] >= grdata->max) + gwy_selection_clear(grdata->selection); + else + gwy_selection_set_object(grdata->selection, 0, range); +} + +static void +graph_range_selection_changed(GwySelection* selection, gint i, GraphRangeData *grdata) +{ + gdouble range[2]; + gdouble xfrom, xto; + gboolean have_range = TRUE; + + g_return_if_fail(i <= 0); + + if (gwy_selection_get_data(selection, NULL) <= 0) + have_range = FALSE; + else { + gwy_selection_get_object(selection, 0, range); + if (range[0] == range[1]) + have_range = FALSE; + } + if (have_range) { + xfrom = MIN(range[0], range[1]); + xto = MAX(range[0], range[1]); + } + else { + xfrom = grdata->min; + xto = grdata->max; + } + + _gwy_param_table_in_update(grdata->table, TRUE); + gwy_param_table_set_double(grdata->table, grdata->id_from, xfrom); + gwy_param_table_set_double(grdata->table, grdata->id_to, xto); + _gwy_param_table_in_update(grdata->table, FALSE); + + grdata->in_update = TRUE; + gwy_param_table_param_changed(grdata->table, grdata->id_from); + gwy_param_table_param_changed(grdata->table, grdata->id_to); + grdata->in_update = FALSE; +} + +/** + * gwy_create_graph_xrange_with_params: + * @partable: Set of parameter value controls. + * @id_from: Parameter identifier for the beginning. + * @id_to: Parameter identifier for the end. + * @graph: Graph widget where the @x-range will be selected. + * @gmodel: Graph model used for determining the @x range. May be %NULL to use @graph's model, although this is not + * usually useful. + * + * Sets up a parameter table range row for horizontal graph selection. + * + * A row with the two parameters is added to the table. The graph is set up for %GWY_GRAPH_STATUS_XSEL. + * Synchronisation between the parameters and selection is set up. + * + * The caller still needs to run gwy_dialog_invalidate() or use a similar mechanism when the parameter changes. + * Usually, any change to the selection will result in two updates, one for each parameter. + * + * Since: 2.63 + **/ +void +gwy_create_graph_xrange_with_params(GwyParamTable *partable, + gint id_from, + gint id_to, + GwyGraph *graph, + GwyGraphModel *gmodel) +{ + GraphRangeData *grdata; + GwyParams *params; + GwySIValueFormat *vf; + GwySelection *selection; + GwySIUnit *unit; + gdouble min, max, range; + + g_return_if_fail(GWY_IS_PARAM_TABLE(partable)); + g_return_if_fail(GWY_IS_GRAPH(graph)); + + params = gwy_param_table_params(partable); + gmodel = (gmodel ? gmodel : gwy_graph_get_model(graph)); + g_return_if_fail(GWY_IS_GRAPH_MODEL(gmodel)); + + gwy_graph_model_get_x_range(gmodel, &min, &max); + gwy_params_set_double(params, id_from, min); + gwy_params_set_double(params, id_to, max); + + g_object_get(gmodel, "si-unit-x", &unit, NULL); + range = MAX(fabs(min), fabs(max)); + vf = gwy_si_unit_get_format_with_digits(unit, GWY_SI_UNIT_FORMAT_VFMARKUP, range, 3, NULL); + + gwy_graph_set_status(GWY_GRAPH(graph), GWY_GRAPH_STATUS_XSEL); + selection = gwy_graph_area_get_selection(GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(graph))), + GWY_GRAPH_STATUS_XSEL); + gwy_selection_set_max_objects(selection, 1); + + gwy_param_table_append_range(partable, id_from, id_to); + gwy_param_table_entry_set_value_format(partable, id_from, vf); + + g_object_unref(unit); + gwy_si_unit_value_format_free(vf); + + grdata = g_new0(GraphRangeData, 1); + grdata->min = min; + grdata->max = max; + grdata->selection = selection; + grdata->table = partable; + grdata->id_from = id_from; + grdata->id_to = id_to; + g_object_weak_ref(G_OBJECT(selection), graph_range_selection_destroyed, grdata); + g_object_weak_ref(G_OBJECT(partable), graph_range_table_destroyed, grdata); + + grdata->param_id = g_signal_connect_swapped(partable, "param-changed", + G_CALLBACK(graph_range_param_changed), grdata); + grdata->selection_id = g_signal_connect(selection, "changed", G_CALLBACK(graph_range_selection_changed), grdata); +} + +static void +graph_range_selection_destroyed(gpointer user_data, G_GNUC_UNUSED GObject *selection) +{ + GraphRangeData *grdata = (GraphRangeData*)user_data; + + /* Selection has been destroyed; cross-destroy anything table-related. */ + g_signal_handler_disconnect(grdata->table, grdata->param_id); + g_object_weak_unref(G_OBJECT(grdata->table), graph_range_table_destroyed, grdata); + gwy_clear(grdata, 1); + g_free(grdata); +} + +static void +graph_range_table_destroyed(gpointer user_data, G_GNUC_UNUSED GObject *partable) +{ + GraphRangeData *grdata = (GraphRangeData*)user_data; + + /* Param table has been destroyed; cross-destroy anything selection-related. */ + g_signal_handler_disconnect(grdata->selection, grdata->selection_id); + g_object_weak_unref(G_OBJECT(grdata->selection), graph_range_selection_destroyed, grdata); + gwy_clear(grdata, 1); + g_free(grdata); +} + static gboolean item_is_visible(GtkTreeModel *model, GtkTreeIter *iter, gpointer default_item) { diff -Nru gwyddion-2.62/app/gwymoduleutils-file.c gwyddion-2.63/app/gwymoduleutils-file.c --- gwyddion-2.62/app/gwymoduleutils-file.c 2021-08-13 14:48:02.000000000 +0000 +++ gwyddion-2.63/app/gwymoduleutils-file.c 2023-02-23 15:20:14.000000000 +0000 @@ -1,22 +1,18 @@ /* * $Id: gwymoduleutils-file.c 23978 2021-08-13 14:48:02Z yeti-dn $ - * Copyright (C) 2007-2016 David Necas (Yeti), Petr Klapetek. + * Copyright (C) 2007-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -60,12 +56,11 @@ * * Sets `realsquare' for a channel highly non-square pixels. * - * The threshold for highly non-square is somewhat arbitrary. - * Fortunately, most files encoutered in practice have the measure ratio either - * very close to 1, larger or equal than 2. + * The threshold for highly non-square is somewhat arbitrary. Fortunately, most files encoutered in practice have the + * measure ratio either very close to 1, larger or equal than 2. * - * Returns: %TRUE if the channel was found to have highly non-square pixels - * and `realsquare' was set (otherwise it was unset). + * Returns: %TRUE if the channel was found to have highly non-square pixels and `realsquare' was set (otherwise it was + * unset). * * Since: 2.3 **/ @@ -141,9 +136,8 @@ * * Adds a channel title based on data field units. * - * The guess is very simple, but probably better than `Unknown channel' in - * most cases. If there already is a title it is left intact, making use of - * this function as a fall-back easier. + * The guess is very simple, but probably better than `Unknown channel' in most cases. If there already is a title it + * is left intact, making use of this function as a fall-back easier. * * Returns: %TRUE if the title was set (either by this function or before). * @@ -181,9 +175,8 @@ * * Adds a XYZ data title based on surface value units. * - * The guess is very simple, but probably better than `Unknown channel' in - * most cases. If there already is a title it is left intact, making use of - * this function as a fall-back easier. + * The guess is very simple, but probably better than `Unknown channel' in most cases. If there already is a title it + * is left intact, making use of this function as a fall-back easier. * * Returns: %TRUE if the title was set (either by this function or before). * @@ -216,21 +209,18 @@ /** * gwy_app_channel_remove_bad_data: - * @dfield: A data field. The values of bad data points are ignored and might - * be even left uninitialized. - * @mfield: A mask field containing 1.0 in place of good data points, 0.0 in - * place of bad points. It will be inverted to become the mask of - * bad points. + * @dfield: A data field. The values of bad data points are ignored and might be even left uninitialized. + * @mfield: A mask field containing 1.0 in place of good data points, 0.0 in place of bad points. It will be inverted + * to become the mask of bad points. * * Replaces bad data points with some neutral values. * - * Since Gwyddion has no concept of bad data points, they are usually marked - * with a mask and replaced with some neutral values upon import, leaving the - * user to decide how to proceed further. This helper function performs such + * Since Gwyddion has no concept of bad data points, they are usually marked with a mask and replaced with some + * neutral values upon import, leaving the user to decide how to proceed further. This helper function performs such * replacement. * - * Returns: The number of bad data points replaced. If zero is returned, all - * points are good and there is no need for masking. + * Returns: The number of bad data points replaced. If zero is returned, all points are good and there is no need for + * masking. * * Since: 2.14 **/ @@ -269,19 +259,15 @@ * @dfield: A data field possibly containing NaNs and infinities. * @removebad: Automatically remove the invalid values. * - * Creates a mask corresponding to not-a-number and infinite values in a data - * field. + * Creates a mask corresponding to not-a-number and infinite values in a data field. + * + * NaNs and infinities are not normally allowed in Gwyddion so this function should be used upon import if the source + * file format can represent such values. * - * NaNs and infinities are not normally allowed in Gwyddion so this function - * should be used upon import if the source file format can represent such - * values. - * - * The invalid values can be automatically removed using the same method as - * gwy_app_channel_remove_bad_data(). - * - * Returns: A newly created data field with 1.0 in pixels corresponding to a - * NaN or infinity in @dfield. If no such pixels are present, %NULL - * is returned. + * The invalid values can be automatically removed using the same method as gwy_app_channel_remove_bad_data(). + * + * Returns: A newly created data field with 1.0 in pixels corresponding to a NaN or infinity in @dfield. If no such + * pixels are present, %NULL is returned. * * Since: 2.38 **/ @@ -298,8 +284,7 @@ if (G_UNLIKELY(!mask)) { mask = gwy_data_field_new_alike(dfield, TRUE); m = gwy_data_field_get_data(mask); - gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(mask), - NULL); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(mask), NULL); } m[k] = 1.0; } @@ -362,8 +347,7 @@ static void check_fatal_error(GwyTextHeaderContext *context) { - if (!context->parser->error - || !context->parser->error(context, context->error, context->user_data)) + if (!context->parser->error || !context->parser->error(context, context->error, context->user_data)) g_clear_error(&context->error); } @@ -389,10 +373,8 @@ /** * gwy_text_header_parse: - * @header: Text header to parse. It must be %NULL-terminated and writable. - * Its contents will be modified to directly embed the hash keys - * and/or values. It must not be freed while the returned hash - * table is in use. + * @header: Text header to parse. It must be %NULL-terminated and writable. Its contents will be modified to directly + * embed the hash keys and/or values. It must not be freed while the returned hash table is in use. * @parser: Parser specification. * @user_data: User data passed to parser callbacks. * @error: Error to set on fatal errors. @@ -403,8 +385,7 @@ * * Lines consisting only of whitespace are ignored. * - * Returns: A newly created hash table with values indexed by they keys found - * in the header. + * Returns: A newly created hash table with values indexed by they keys found in the header. * * Since: 2.18 **/ @@ -416,11 +397,9 @@ { GwyTextHeaderContext context; gchar *line, *header_start; - const gchar *section_prefix = NULL, *section_suffix = NULL, - *endsect_prefix = NULL, *endsect_suffix = NULL, + const gchar *section_prefix = NULL, *section_suffix = NULL, *endsect_prefix = NULL, *endsect_suffix = NULL, **comments = NULL; - guint section_prefix_len = 0, section_suffix_len = 0, - endsect_prefix_len = 0, endsect_suffix_len = 0, + guint section_prefix_len = 0, section_suffix_len = 0, endsect_prefix_len = 0, endsect_suffix_len = 0, comment_prefix_len = 0, line_prefix_len = 0; gchar equal_sign_char = 0; guint j, ncomments = 0; @@ -428,11 +407,8 @@ g_return_val_if_fail(header, NULL); g_return_val_if_fail(parser, NULL); - g_return_val_if_fail(parser->section_template - || !parser->endsection_template, - NULL); - g_return_val_if_fail(!parser->section_template == !parser->section_accessor, - NULL); + g_return_val_if_fail(parser->section_template || !parser->endsection_template, NULL); + g_return_val_if_fail(!parser->section_template == !parser->section_accessor, NULL); g_return_val_if_fail(parser->item || !parser->destroy_key, NULL); g_return_val_if_fail(parser->item || !parser->destroy_value, NULL); @@ -467,9 +443,7 @@ if (strchr(parser->comment_prefix, '\n')) { const gchar *p; - for (j = 0, p = parser->comment_prefix-1; - p; - p = strchr(p+1, '\n'), j++) + for (j = 0, p = parser->comment_prefix-1; p; p = strchr(p+1, '\n'), j++) ; ncomments = j; comments = g_new(const gchar*, j+1); @@ -495,12 +469,8 @@ context.parser = parser; context.user_data = user_data; context.hash = g_hash_table_new_full(g_str_hash, g_str_equal, - parser->destroy_key - ? parser->destroy_key - : (free_keys ? g_free : NULL), - parser->destroy_value - ? parser->destroy_value : NULL); - + parser->destroy_key ? parser->destroy_key : (free_keys ? g_free : NULL), + parser->destroy_value ? parser->destroy_value : NULL); for (line = gwy_str_next_line(&header); line && !context.error; line = gwy_str_next_line(&header), context.lineno++) { @@ -516,8 +486,7 @@ && gwy_strequal(line, parser->terminator)) break; - /* Section ends -- before section starts beause they might look - * similar. */ + /* Section ends -- before section starts beause they might look similar. */ if (endsect_prefix && len > endsect_prefix_len + endsect_suffix_len && strncmp(line, endsect_prefix, endsect_prefix_len) == 0 @@ -526,14 +495,11 @@ len -= endsect_suffix_len; line[len] = '\0'; - endsection = strip(line + endsect_prefix_len, - len - endsect_prefix_len); + endsection = strip(line + endsect_prefix_len, len - endsect_prefix_len); if (!context.section) { make_noise(&context, GWY_TEXT_HEADER_ERROR_SECTION_END, - _("Section %s ended at line %u but it has " - "never started."), - endsection, context.lineno); + _("Section %s ended at line %u but it has never started."), endsection, context.lineno); continue; } @@ -544,19 +510,14 @@ continue; } - if (parser->endsection - && !parser->endsection(&context, context.section, user_data, - &context.error)) + if (parser->endsection && !parser->endsection(&context, context.section, user_data, &context.error)) check_fatal_error(&context); context.section = NULL; continue; } - else if (parser->endsection_template - && gwy_strequal(line, parser->endsection_template)) { - if (parser->endsection - && !parser->endsection(&context, context.section, user_data, - &context.error)) + else if (parser->endsection_template && gwy_strequal(line, parser->endsection_template)) { + if (parser->endsection && !parser->endsection(&context, context.section, user_data, &context.error)) check_fatal_error(&context); context.section = NULL; continue; @@ -571,8 +532,7 @@ len -= section_suffix_len; line[len] = '\0'; - newsection = strip(line + section_prefix_len, - len - section_prefix_len); + newsection = strip(line + section_prefix_len, len - section_prefix_len); if (parser->endsection_template && context.section) { make_noise(&context, GWY_TEXT_HEADER_ERROR_SECTION_START, @@ -582,31 +542,25 @@ if (!*newsection) { make_noise(&context, GWY_TEXT_HEADER_ERROR_SECTION_NAME, - _("Empty section name at header line %u."), - context.lineno); + _("Empty section name at header line %u."), context.lineno); continue; } context.section = newsection; - if (parser->section - && !parser->section(&context, context.section, user_data, - &context.error)) + if (parser->section && !parser->section(&context, context.section, user_data, &context.error)) check_fatal_error(&context); continue; } /* Comments */ if (comments) { for (j = 0; j < ncomments; j++) { - if (strncmp(line, comments[j], - comments[j+1] - comments[j] - 1) == 0) + if (strncmp(line, comments[j], comments[j+1] - comments[j] - 1) == 0) break; } if (j < ncomments) continue; } - else if (parser->comment_prefix - && strncmp(line, parser->comment_prefix, - comment_prefix_len) == 0) + else if (parser->comment_prefix && strncmp(line, parser->comment_prefix, comment_prefix_len) == 0) continue; /* Line prefixes */ @@ -617,8 +571,7 @@ } else { make_noise(&context, GWY_TEXT_HEADER_ERROR_PREFIX, - _("Header line %u lacks prefix %s."), - context.lineno, parser->line_prefix); + _("Header line %u lacks prefix %s."), context.lineno, parser->line_prefix); continue; } } @@ -642,8 +595,7 @@ } if (!value) { make_noise(&context, GWY_TEXT_HEADER_ERROR_GARBAGE, - _("Header line %u lacks key-value separator."), - context.lineno); + _("Header line %u lacks key-value separator."), context.lineno); continue; } @@ -658,15 +610,13 @@ if (parser->section_template) { if (context.section) - key = g_strconcat(context.section, parser->section_accessor, - key, NULL); + key = g_strconcat(context.section, parser->section_accessor, key, NULL); else key = g_strdup(key); } if (parser->item) { - if (!parser->item(&context, context.hash, key, value, - context.user_data, &context.error)) + if (!parser->item(&context, context.hash, key, value, context.user_data, &context.error)) check_fatal_error(&context); } else @@ -675,11 +625,10 @@ g_free(comments); - if (parser->terminator && !line && !context.error) + if (parser->terminator && !line && !context.error) { make_noise(&context, GWY_TEXT_HEADER_ERROR_TERMINATOR, - _("Header suddenly ended at line %u; end of header marker " - "is missing"), - context.lineno); + _("Header suddenly ended at line %u; end of header marker is missing"), context.lineno); + } if (context.error) { g_propagate_error(error, context.error); @@ -699,8 +648,7 @@ * * Gets the currently open section. * - * This function may be called if no sectioning is defined. It simply - * returns %NULL then. + * This function may be called if no sectioning is defined. It simply returns %NULL then. * * Returns: The name of the currently open section, %NULL if there is none. * @@ -732,18 +680,15 @@ * gwy_file_channel_import_log_add: * @data: A data container. * @id: Data channel id. - * @filetype: File type, i.e. the name of the function importing the data - * (without any "file::" prefix). Since 2.38 it is possible to - * pass %NULL to fill the name of the currently running file type - * function automatically. - * @filename: Name of the imported file. If it is not valid UTF-8, it will be - * converted to UTF-8 using g_filename_to_utf8(). Failing even - * that, non-ASCII characters will be escaped. + * @filetype: File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 + * it is possible to pass %NULL to fill the name of the currently running file type function automatically. + * @filename: Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using + * g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped. * * Logs the import of a channel from third-party file. * - * This is a convenience wrapper for gwy_app_channel_log_add(). The source id - * will be set to -1. The file name will be added to function arguments. + * This is a convenience wrapper for gwy_app_channel_log_add(). The source id will be set to -1. The file name will + * be added to function arguments. * * Since: 2.35 **/ @@ -760,18 +705,15 @@ * gwy_file_volume_import_log_add: * @data: A data container. * @id: Volume data id. - * @filetype: File type, i.e. the name of the function importing the data - * (without any "file::" prefix). Since 2.38 it is possible to - * pass %NULL to fill the name of the currently running file type - * function automatically. - * @filename: Name of the imported file. If it is not valid UTF-8, it will be - * converted to UTF-8 using g_filename_to_utf8(). Failing even - * that, non-ASCII characters will be escaped. + * @filetype: File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 + * it is possible to pass %NULL to fill the name of the currently running file type function automatically. + * @filename: Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using + * g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped. * * Logs the import of volume data from third-party file. * - * This is a convenience wrapper for gwy_app_volume_log_add(). The source id - * will be set to -1. The file name will be added to function arguments. + * This is a convenience wrapper for gwy_app_volume_log_add(). The source id will be set to -1. The file name will + * be added to function arguments. * * Since: 2.35 **/ @@ -788,18 +730,15 @@ * gwy_file_xyz_import_log_add: * @data: A data container. * @id: XYZ surface data id. - * @filetype: File type, i.e. the name of the function importing the data - * (without any "file::" prefix). It is possible to - * pass %NULL to fill the name of the currently running file type - * function automatically. - * @filename: Name of the imported file. If it is not valid UTF-8, it will be - * converted to UTF-8 using g_filename_to_utf8(). Failing even - * that, non-ASCII characters will be escaped. + * @filetype: File type, i.e. the name of the function importing the data (without any "file::" prefix). It is + * possible to pass %NULL to fill the name of the currently running file type function automatically. + * @filename: Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using + * g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped. * * Logs the import of xyz data from third-party file. * - * This is a convenience wrapper for gwy_app_xyz_log_add(). The source id - * will be set to -1. The file name will be added to function arguments. + * This is a convenience wrapper for gwy_app_xyz_log_add(). The source id will be set to -1. The file name will be + * added to function arguments. * * Since: 2.45 **/ @@ -816,18 +755,15 @@ * gwy_file_curve_map_import_log_add: * @data: A data container. * @id: Volume data id. - * @filetype: File type, i.e. the name of the function importing the data - * (without any "file::" prefix). Since 2.38 it is possible to - * pass %NULL to fill the name of the currently running file type - * function automatically. - * @filename: Name of the imported file. If it is not valid UTF-8, it will be - * converted to UTF-8 using g_filename_to_utf8(). Failing even - * that, non-ASCII characters will be escaped. + * @filetype: File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 + * it is possible to pass %NULL to fill the name of the currently running file type function automatically. + * @filename: Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using + * g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped. * * Logs the import of volume data from third-party file. * - * This is a convenience wrapper for gwy_app_curve_map_log_add(). The source id - * will be set to -1. The file name will be added to function arguments. + * This is a convenience wrapper for gwy_app_curve_map_log_add(). The source id will be set to -1. The file name + * will be added to function arguments. * * Since: 2.60 **/ @@ -901,25 +837,19 @@ * @short_description: Utility functions for file modules * @include: app/gwymoduleutils-file.h * - * Functions gwy_app_channel_check_nonsquare() and - * gwy_app_channel_title_fall_back() perform common tasks improving the - * imported of channels from foreign data files. Typically one calls them on - * all imported channel ids after storing the data fields the the container, - * if they are useful for a given file type. - * - * The group of functions gwy_get_gint16_le(), gwy_get_gint16_be(), etc. - * is intended to portably read packed binary data structures that are commonly - * found in SPM files. They all work identically: the binary data value is - * read from the buffer, converted if necessary, and the provided - * buffer pointer is moved to point after the value to faciliate sequential - * reading. - * - * As no buffer size is passed, obviously no buffer size checking is performed. - * The caller has to ensure the buffer is large enough -- it is expected the - * caller checks the total buffer size before starting to parse it. + * Functions gwy_app_channel_check_nonsquare() and gwy_app_channel_title_fall_back() perform common tasks improving + * the imported of channels from foreign data files. Typically one calls them on all imported channel ids after + * storing the data fields the the container, if they are useful for a given file type. + * + * The group of functions gwy_get_gint16_le(), gwy_get_gint16_be(), etc. is intended to portably read packed binary + * data structures that are commonly found in SPM files. They all work identically: the binary data value is read + * from the buffer, converted if necessary, and the provided buffer pointer is moved to point after the value to + * faciliate sequential reading. + * + * As no buffer size is passed, obviously no buffer size checking is performed. The caller has to ensure the buffer is + * large enough -- it is expected the caller checks the total buffer size before starting to parse it. * - * For example to portably read the following packed struct stored - * in big-endian byte order: + * For example to portably read the following packed struct stored in big-endian byte order: * * struct { * guint16 xres; @@ -936,10 +866,9 @@ * * and @p will point after @measure in @buffer after this snippet is finished. * - * The data types used in @header do not matter (provided they are large - * enough to hold the values), the exact types are determined by the functions - * used. Therefore the reading would work identically if @header was defined - * using common types: + * The data types used in @header do not matter (provided they are large enough to hold the values), the exact types + * are determined by the functions used. Therefore the reading would work identically if @header was defined using + * common types: * * struct { * gint xres; @@ -951,11 +880,10 @@ /** * gwy_get_gboolean8: - * @ppv: Pointer to a pointer to boolean (stored as a signle byte) - * in a memory buffer. + * @ppv: Pointer to a pointer to boolean (stored as a signle byte) in a memory buffer. * - * Reads a boolean value stored as a signle byte from a - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a boolean value stored as a signle byte from a binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gboolean value read from the buffer. * @@ -964,11 +892,10 @@ /** * gwy_get_gint16_le: - * @ppv: Pointer to a pointer to a little-endian signed 16bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian signed 16bit integer in a memory buffer. * - * Reads a signed 16bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 16bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint16 value read from the buffer. * @@ -977,11 +904,10 @@ /** * gwy_get_gint16_be: - * @ppv: Pointer to a pointer to a big-endian signed 16bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian signed 16bit integer in a memory buffer. * - * Reads a signed 16bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 16bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint16 value read from the buffer. * @@ -990,11 +916,10 @@ /** * gwy_get_guint16_le: - * @ppv: Pointer to a pointer to a little-endian unsigned 16bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian unsigned 16bit integer in a memory buffer. * - * Reads an unsigned 16bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 16bit integer value from a little-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The #guint16 value read from the buffer. * @@ -1003,11 +928,10 @@ /** * gwy_get_guint16_be: - * @ppv: Pointer to a pointer to a big-endian unsigned 16bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian unsigned 16bit integer in a memory buffer. * - * Reads an unsigned 16bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 16bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #guint16 value read from the buffer. * @@ -1016,11 +940,10 @@ /** * gwy_get_gint32_le: - * @ppv: Pointer to a pointer to a little-endian signed 32bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian signed 32bit integer in a memory buffer. * - * Reads a signed 32bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 32bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint32 value read from the buffer. * @@ -1029,11 +952,10 @@ /** * gwy_get_gint32_be: - * @ppv: Pointer to a pointer to a big-endian signed 32bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian signed 32bit integer in a memory buffer. * - * Reads a signed 32bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 32bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint32 value read from the buffer. * @@ -1042,11 +964,10 @@ /** * gwy_get_guint32_le: - * @ppv: Pointer to a pointer to a little-endian unsigned 32bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian unsigned 32bit integer in a memory buffer. * - * Reads an unsigned 32bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 32bit integer value from a little-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The #guint32 value read from the buffer. * @@ -1055,11 +976,10 @@ /** * gwy_get_guint32_be: - * @ppv: Pointer to a pointer to a big-endian unsigned 32bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian unsigned 32bit integer in a memory buffer. * - * Reads an unsigned 32bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 32bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #guint32 value read from the buffer. * @@ -1068,11 +988,10 @@ /** * gwy_get_gint64_le: - * @ppv: Pointer to a pointer to a little-endian signed 64bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian signed 64bit integer in a memory buffer. * - * Reads a signed 64bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 64bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint64 value read from the buffer. * @@ -1081,11 +1000,10 @@ /** * gwy_get_gint64_be: - * @ppv: Pointer to a pointer to a big-endian signed 64bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian signed 64bit integer in a memory buffer. * - * Reads a signed 64bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a signed 64bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #gint64 value read from the buffer. * @@ -1094,11 +1012,10 @@ /** * gwy_get_guint64_le: - * @ppv: Pointer to a pointer to a little-endian unsigned 64bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian unsigned 64bit integer in a memory buffer. * - * Reads an unsigned 64bit integer value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 64bit integer value from a little-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The #guint64 value read from the buffer. * @@ -1107,11 +1024,10 @@ /** * gwy_get_guint64_be: - * @ppv: Pointer to a pointer to a big-endian unsigned 64bit integer - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian unsigned 64bit integer in a memory buffer. * - * Reads an unsigned 64bit integer value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads an unsigned 64bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The #guint64 value read from the buffer. * @@ -1120,11 +1036,10 @@ /** * gwy_get_gfloat_le: - * @ppv: Pointer to a pointer to a little-endian single-precision IEEE float - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian single-precision IEEE float in a memory buffer. * - * Reads a single-precision IEEE float value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a single-precision IEEE float value from a little-endian binary data buffer, moving the buffer pointer to + * point just after the value. * * Returns: The #gfloat value read from the buffer. * @@ -1133,11 +1048,10 @@ /** * gwy_get_gfloat_be: - * @ppv: Pointer to a pointer to a big-endian single-precision IEEE float - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian single-precision IEEE float in a memory buffer. * - * Reads a single-precision IEEE float value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a single-precision IEEE float value from a big-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The #gfloat value read from the buffer. * @@ -1146,11 +1060,10 @@ /** * gwy_get_gdouble_le: - * @ppv: Pointer to a pointer to a little-endian double-precision IEEE float - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian double-precision IEEE float in a memory buffer. * - * Reads a double-precision IEEE float value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a double-precision IEEE float value from a little-endian binary data buffer, moving the buffer pointer to + * point just after the value. * * Returns: The #gdouble value read from the buffer. * @@ -1159,11 +1072,10 @@ /** * gwy_get_gdouble_be: - * @ppv: Pointer to a pointer to a big-endian double-precision IEEE float - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian double-precision IEEE float in a memory buffer. * - * Reads a double-precision IEEE float value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a double-precision IEEE float value from a big-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The #gdouble value read from the buffer. * @@ -1172,11 +1084,10 @@ /** * gwy_get_pascal_real_le: - * @ppv: Pointer to a pointer to a little-endian six-byte Pascal Real - * in a memory buffer. + * @ppv: Pointer to a pointer to a little-endian six-byte Pascal Real in a memory buffer. * - * Reads a six-byte Pascale Real value from a little-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a six-byte Pascale Real value from a little-endian binary data buffer, moving the buffer pointer to point + * just after the value. * * Returns: The floating point value read from the buffer as a #gdouble. * @@ -1185,11 +1096,10 @@ /** * gwy_get_pascal_real_be: - * @ppv: Pointer to a pointer to a big-endian six-byte Pascal Real - * in a memory buffer. + * @ppv: Pointer to a pointer to a big-endian six-byte Pascal Real in a memory buffer. * - * Reads a six-byte Pascale Real value from a big-endian - * binary data buffer, moving the buffer pointer to point just after the value. + * Reads a six-byte Pascale Real value from a big-endian binary data buffer, moving the buffer pointer to point just + * after the value. * * Returns: The floating point value read from the buffer as a #gdouble. * @@ -1199,39 +1109,31 @@ /** * GWY_TEXT_HEADER_ERROR: * - * Error domain for text header parsing. Errors in this domain will be from the - * #GwyTextHeaderError enumeration. See #GError for information on error - * domains. + * Error domain for text header parsing. Errors in this domain will be from the #GwyTextHeaderError enumeration. See + * #GError for information on error domains. * * Since: 2.18 **/ /** * GwyTextHeaderError: - * @GWY_TEXT_HEADER_ERROR_SECTION_NAME: Section name is invalid. It is raised - * by the parser only for an empty section + * @GWY_TEXT_HEADER_ERROR_SECTION_NAME: Section name is invalid. It is raised by the parser only for an empty section * name. - * @GWY_TEXT_HEADER_ERROR_SECTION_END: Section ended when a different section - * or no section was open. Note that - * gwy_text_header_context_get_section() - * returns the section being closed at the + * @GWY_TEXT_HEADER_ERROR_SECTION_END: Section ended when a different section or no section was open. Note that + * gwy_text_header_context_get_section() returns the section being closed at the * time this error is raised. - * @GWY_TEXT_HEADER_ERROR_SECTION_START: Section started before the previous - * ended. This is raised only if + * @GWY_TEXT_HEADER_ERROR_SECTION_START: Section started before the previous ended. This is raised only if * @endsection_template is set. * @GWY_TEXT_HEADER_ERROR_PREFIX: Line lacks the mandatory prefix. * @GWY_TEXT_HEADER_ERROR_GARBAGE: Line cannot be parsed into a key-value pair. * @GWY_TEXT_HEADER_ERROR_KEY: Key name is invalid, namely empty. - * @GWY_TEXT_HEADER_ERROR_VALUE: Value is invalid. This is never raised by - * the parser. - * @GWY_TEXT_HEADER_ERROR_TERMINATOR: The text header has ended without being - * terminated by specified terminator. + * @GWY_TEXT_HEADER_ERROR_VALUE: Value is invalid. This is never raised by the parser. + * @GWY_TEXT_HEADER_ERROR_TERMINATOR: The text header has ended without being terminated by specified terminator. * * Error codes returned by text header parsing. * - * Some errors, in particular %GWY_TEXT_HEADER_ERROR_KEY and - * %GWY_TEXT_HEADER_ERROR_VALUE are expected to be raised by user callbacks - * (they are not restricted to these codes though). + * Some errors, in particular %GWY_TEXT_HEADER_ERROR_KEY and %GWY_TEXT_HEADER_ERROR_VALUE are expected to be raised by + * user callbacks (they are not restricted to these codes though). * * Since: 2.18 **/ @@ -1239,73 +1141,54 @@ /** * GwyTextHeaderContext: * - * #GwyTextHeaderContext represents the parsing state. It is an opaque data - * structure and should be only manipulated with the functions below. + * #GwyTextHeaderContext represents the parsing state. It is an opaque data structure and should be only manipulated + * with the functions below. * * Since: 2.18 **/ /** * GwyTextHeaderParser: - * @comment_prefix: Prefix denoting comment lines. It is possible to specify - * multiple prefixes by separating them with newline ("\n"). - * @section_template: Section start template. It must contain the character - * "\x1a" in the place where the section name apprears. - * For example, "[Section \x1a]". - * @endsection_template: Section end template. It may or may not contain the - * substitute character "\x1a" depending on whether the - * section end markers contain the section name. It is - * invalid to set @endsection_template without setting - * @section_template. Example: "[Section \x1a End]". - * @section_accessor: Glue to put between the section name and key when - * constructing hash table keys. It is invalid to set - * @section_accessor without setting @section_template. - * Typically, "::" is used. - * @line_prefix: Mandatory prefix of each line. Note this applies only to - * key-value lines. The templates, such comments, sections and - * terminators, must still include @line_prefix if they start - * with it. - * @key_value_separator: The string separating keys and values on each line. - * Typically, "=" or ":" is used. When left %NULL, - * whitespace plays the role of the separator. Of - * course, keys cannot contain whitespace then. - * @terminator: Line that marks end of the header. It is mandatory if - * specified, @GWY_TEXT_HEADER_ERROR_TERMINATOR is raised when - * the header ends sooner than @terminator is found. - * @item: Callback called when a key-value pair is found. If set it is - * responsible for inserting the pair to the hash table with - * g_hash_table_replace(). It is free to insert a different pair or - * nothing. It must return %FALSE if it raises an error. - * @section: Callback called when a section starts. It must return %FALSE if - * it raises an error. - * @endsection: Callback called when a section end. It must return %FALSE if - * it raises an error. - * @end: Callback called when the parsing finishes successfully, @length - * contains the length of parsed text in bytes. - * @error: Callback called when an error occurs, including errors raised by - * other user callbacks. If it returns %TRUE the error is considered - * fatal and the parsing terminates immediately. If it is left unset - * no errors are fatal hence no errors are reported to the caller. - * @destroy_key: Function to destroy keys, passed to g_hash_table_new_full(). - * It is invalid to set @destroy_key if @item callback is not - * set. - * @destroy_value: Function to destroy values, passed to - * g_hash_table_new_full(). It is invalid to set - * @destroy_value if @item callback is not set. + * @comment_prefix: Prefix denoting comment lines. It is possible to specify multiple prefixes by separating them + * with newline ("\n"). + * @section_template: Section start template. It must contain the character "\x1a" in the place where the section + * name apprears. For example, "[Section \x1a]". + * @endsection_template: Section end template. It may or may not contain the substitute character "\x1a" depending on + * whether the section end markers contain the section name. It is invalid to set + * @endsection_template without setting @section_template. Example: "[Section \x1a End]". + * @section_accessor: Glue to put between the section name and key when constructing hash table keys. It is invalid + * to set @section_accessor without setting @section_template. Typically, "::" is used. + * @line_prefix: Mandatory prefix of each line. Note this applies only to key-value lines. The templates, such + * comments, sections and terminators, must still include @line_prefix if they start with it. + * @key_value_separator: The string separating keys and values on each line. Typically, "=" or ":" is used. When left + * %NULL, whitespace plays the role of the separator. Of course, keys cannot contain whitespace + * then. + * @terminator: Line that marks end of the header. It is mandatory if specified, @GWY_TEXT_HEADER_ERROR_TERMINATOR is + * raised when the header ends sooner than @terminator is found. + * @item: Callback called when a key-value pair is found. If set it is responsible for inserting the pair to the hash + * table with g_hash_table_replace(). It is free to insert a different pair or nothing. It must return %FALSE + * if it raises an error. + * @section: Callback called when a section starts. It must return %FALSE if it raises an error. + * @endsection: Callback called when a section end. It must return %FALSE if it raises an error. + * @end: Callback called when the parsing finishes successfully, @length contains the length of parsed text in bytes. + * @error: Callback called when an error occurs, including errors raised by other user callbacks. If it returns %TRUE + * the error is considered fatal and the parsing terminates immediately. If it is left unset no errors are + * fatal hence no errors are reported to the caller. + * @destroy_key: Function to destroy keys, passed to g_hash_table_new_full(). It is invalid to set @destroy_key if + * @item callback is not set. + * @destroy_value: Function to destroy values, passed to g_hash_table_new_full(). It is invalid to set @destroy_value + * if @item callback is not set. * * Text header parser specification. * - * Memory considerations: In general, the parser attempts to reuse the contents - * of @header directly for the hash keys and values. There are two cases when - * it cannot: sectioning implies that keys must be constructed dynamically - * and the use of @item callback means the parser has no control on what is - * inserted into the hash table. - * - * This means that the @item callback must free @key if sectioning is used and - * it is not going to actually use it as the hash table key. And, of course, - * suitable @destroy_key and @destroy_value functions must be set. + * Memory considerations: In general, the parser attempts to reuse the contents of @header directly for the hash keys + * and values. There are two cases when it cannot: sectioning implies that keys must be constructed dynamically and + * the use of @item callback means the parser has no control on what is inserted into the hash table. + * + * This means that the @item callback must free @key if sectioning is used and it is not going to actually use it as + * the hash table key. And, of course, suitable @destroy_key and @destroy_value functions must be set. * * Since: 2.18 **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/app/gwymoduleutils-file.h gwyddion-2.63/app/gwymoduleutils-file.h --- gwyddion-2.62/app/gwymoduleutils-file.h 2021-08-13 14:48:02.000000000 +0000 +++ gwyddion-2.63/app/gwymoduleutils-file.h 2023-02-23 15:08:49.000000000 +0000 @@ -1,22 +1,18 @@ /* * $Id: gwymoduleutils-file.h 23978 2021-08-13 14:48:02Z yeti-dn $ - * Copyright (C) 2007-2019 David Necas (Yeti), Petr Klapetek. + * Copyright (C) 2007-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __GWY_MODULEUTILS_FILE_H__ @@ -257,8 +253,7 @@ *ppv += 6; return 0.0; } - x = 1.0 + (((((*ppv)[1]/256.0 + (*ppv)[2])/256.0 + (*ppv)[3])/256.0 - + (*ppv)[4])/256.0 + ((*ppv)[5] & 0x7f))/128.0; + x = 1.0 + (((((*ppv)[1]/256.0 + (*ppv)[2])/256.0 + (*ppv)[3])/256.0 + (*ppv)[4])/256.0 + ((*ppv)[5] & 0x7f))/128.0; if ((*ppv)[5] & 0x80) x = -x; @@ -287,8 +282,7 @@ *ppv += 6; return 0.0; } - x = 1.0 + (((((*ppv)[4]/256.0 + (*ppv)[3])/256.0 + (*ppv)[2])/256.0 - + (*ppv)[1])/256.0 + ((*ppv)[0] & 0x7f))/128.0; + x = 1.0 + (((((*ppv)[4]/256.0 + (*ppv)[3])/256.0 + (*ppv)[2])/256.0 + (*ppv)[1])/256.0 + ((*ppv)[0] & 0x7f))/128.0; if ((*ppv)[0] & 0x80) x = -x; @@ -365,14 +359,13 @@ GDestroyNotify destroy_value; } GwyTextHeaderParser; -GQuark gwy_text_header_error_quark(void); -GHashTable* gwy_text_header_parse (gchar *header, - const GwyTextHeaderParser *parser, - gpointer user_data, - GError **error); - +GQuark gwy_text_header_error_quark (void); +GHashTable* gwy_text_header_parse (gchar *header, + const GwyTextHeaderParser *parser, + gpointer user_data, + GError **error); const gchar* gwy_text_header_context_get_section(const GwyTextHeaderContext *context); -guint gwy_text_header_context_get_lineno(const GwyTextHeaderContext *context); +guint gwy_text_header_context_get_lineno (const GwyTextHeaderContext *context); void gwy_file_channel_import_log_add (GwyContainer *data, gint id, @@ -395,4 +388,4 @@ #endif /* __GWY_MODULEUTILS_FILE_H__ */ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/app/gwymoduleutils.h gwyddion-2.63/app/gwymoduleutils.h --- gwyddion-2.62/app/gwymoduleutils.h 2022-09-02 14:40:28.000000000 +0000 +++ gwyddion-2.63/app/gwymoduleutils.h 2023-02-21 17:35:53.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: gwymoduleutils.h 24994 2022-09-02 14:40:28Z yeti-dn $ - * Copyright (C) 2007-2022 David Necas (Yeti), Petr Klapetek. + * $Id: gwymoduleutils.h 25224 2023-02-21 17:35:52Z yeti-dn $ + * Copyright (C) 2007-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -26,7 +26,7 @@ #include #include #include -#include +#include G_BEGIN_DECLS @@ -91,6 +91,11 @@ GtkWidget* gwy_create_expander_with_param (const gchar *label, GwyParams *params, gint id); +void gwy_create_graph_xrange_with_params (GwyParamTable *partable, + gint id_from, + gint id_to, + GwyGraph *graph, + GwyGraphModel *gmodel); GtkTreeModel* gwy_create_inventory_model_without_default(GwyInventoryStore *store); void gwy_select_in_filtered_inventory_treeeview(GtkTreeView *treeview, const gchar *name); diff -Nru gwyddion-2.62/app/gwyplaintool.c gwyddion-2.63/app/gwyplaintool.c --- gwyddion-2.62/app/gwyplaintool.c 2022-08-26 15:24:57.000000000 +0000 +++ gwyddion-2.63/app/gwyplaintool.c 2022-12-15 10:19:55.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyplaintool.c 24952 2022-08-26 15:24:56Z yeti-dn $ + * $Id: gwyplaintool.c 25165 2022-12-15 10:19:55Z yeti-dn $ * Copyright (C) 2006-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -50,38 +50,46 @@ gpointer cbdata; }; +struct _GwyToolHeldSelection { + GwySelection *selection; + gdouble xreal; + gdouble yreal; + gboolean is_switching_data; +}; + static void gwy_plain_tool_finalize (GObject *object); static void gwy_plain_tool_show (GwyTool *tool); static void gwy_plain_tool_hide (GwyTool *tool); static void gwy_plain_tool_data_switched (GwyTool *tool, GwyDataView *data_view); -static void gwy_plain_tool_reconnect_container (GwyPlainTool *plain_tool, +static void reconnect_container (GwyPlainTool *plain_tool, GwyDataView *data_view); -static void gwy_plain_tool_data_item_changed (GwyContainer *container, +static void data_item_changed (GwyContainer *container, GQuark quark, GwyPlainTool *plain_tool); -static void gwy_plain_tool_mask_item_changed (GwyContainer *container, +static void mask_item_changed (GwyContainer *container, GQuark quark, GwyPlainTool *plain_tool); -static void gwy_plain_tool_show_item_changed (GwyContainer *container, +static void show_item_changed (GwyContainer *container, GQuark quark, GwyPlainTool *plain_tool); -static void gwy_plain_tool_selection_item_changed (GwyContainer *container, +static void selection_item_changed (GwyContainer *container, GQuark quark, GwyPlainTool *plain_tool); -static void gwy_plain_tool_data_changed (GwyPlainTool *plain_tool); -static void gwy_plain_tool_mask_changed (GwyPlainTool *plain_tool); -static void gwy_plain_tool_show_changed (GwyPlainTool *plain_tool); -static void gwy_plain_tool_selection_disconnect (GwyPlainTool *plain_tool); -static void gwy_plain_tool_selection_reconnect (GwyPlainTool *plain_tool); -static void gwy_plain_tool_selection_changed (GwySelection *selection, +static void data_changed (GwyPlainTool *plain_tool); +static void mask_changed (GwyPlainTool *plain_tool); +static void show_changed (GwyPlainTool *plain_tool); +static void selection_disconnect (GwyPlainTool *plain_tool); +static void selection_reconnect (GwyPlainTool *plain_tool); +static void selection_changed (GwySelection *selection, gint hint, GwyPlainTool *plain_tool); -static void gwy_plain_tool_selection_finished (GwySelection *selection, +static void selection_finished (GwySelection *selection, GwyPlainTool *plain_tool); -static void gwy_plain_tool_update_units (GwyPlainTool *plain_tool); +static void update_units (GwyPlainTool *plain_tool); static void gwy_plain_tool_response (GwyTool *tool, gint response_id); +static void remember_selection (GwyPlainTool *plain_tool); static void gwy_rect_selection_labels_spinned (GtkSpinButton *spin, GwyRectSelectionLabels *rlabels); static void gwy_rect_selection_labels_set_sensitive(GwyRectSelectionLabels *rlabels, @@ -109,12 +117,15 @@ static void gwy_plain_tool_finalize(GObject *object) { - GwyPlainTool *plain_tool; + GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(object); - plain_tool = GWY_PLAIN_TOOL(object); - gwy_plain_tool_selection_disconnect(plain_tool); + selection_disconnect(plain_tool); GWY_OBJECT_UNREF(plain_tool->layer); - gwy_plain_tool_reconnect_container(plain_tool, NULL); + if (plain_tool->held_selection) { + GWY_OBJECT_UNREF(plain_tool->held_selection->selection); + g_free(plain_tool->held_selection); + } + reconnect_container(plain_tool, NULL); g_free(plain_tool->selection_bname); GWY_SI_VALUE_FORMAT_FREE(plain_tool->coord_format); @@ -155,7 +166,7 @@ * least odd effects. If a tool has problems with it, it can simply look at @pending_updates in its show() * method, update self and clear @pending_updates before calling parent's show(). */ if (plain_tool->pending_updates & GWY_PLAIN_TOOL_CHANGED_DATA) { - gwy_plain_tool_update_units(plain_tool); + update_units(plain_tool); if (klass->data_changed) klass->data_changed(plain_tool); plain_tool->pending_updates &= ~GWY_PLAIN_TOOL_CHANGED_DATA; @@ -217,21 +228,25 @@ if (data_view == plain_tool->data_view) return; - gwy_plain_tool_selection_disconnect(plain_tool); - gwy_plain_tool_reconnect_container(plain_tool, data_view); - gwy_plain_tool_update_units(plain_tool); + if (plain_tool->held_selection) + plain_tool->held_selection->is_switching_data = TRUE; + selection_disconnect(plain_tool); + reconnect_container(plain_tool, data_view); + update_units(plain_tool); if (data_view && plain_tool->layer_type) { gwy_plain_tool_ensure_layer(plain_tool, plain_tool->layer_type); - gwy_plain_tool_selection_reconnect(plain_tool); + selection_reconnect(plain_tool); } else { GWY_OBJECT_UNREF(plain_tool->layer); - gwy_plain_tool_selection_changed(NULL, -1, plain_tool); + selection_changed(NULL, -1, plain_tool); } + if (plain_tool->held_selection) + plain_tool->held_selection->is_switching_data = FALSE; } /** - * gwy_plain_tool_reconnect_container: + * reconnect_container: * @plain_tool: A plain tool. * @data_view: A new data view to switch the tool to. * @@ -241,8 +256,7 @@ * objects (or be %NULL). **/ static void -gwy_plain_tool_reconnect_container(GwyPlainTool *plain_tool, - GwyDataView *data_view) +reconnect_container(GwyPlainTool *plain_tool, GwyDataView *data_view) { GwyPixmapLayer *layer; const gchar *data_key; @@ -286,38 +300,38 @@ strcpy(sigdetail, ITEM_CHANGED); strcpy(sigdetail + sizeof(ITEM_CHANGED)-1, data_key); plain_tool->data_item_id = g_signal_connect(plain_tool->container, sigdetail, - G_CALLBACK(gwy_plain_tool_data_item_changed), plain_tool); + G_CALLBACK(data_item_changed), plain_tool); if (gwy_container_gis_object_by_name(plain_tool->container, key, &plain_tool->data_field)) { g_object_ref(plain_tool->data_field); plain_tool->data_id = g_signal_connect_swapped(plain_tool->data_field, "data-changed", - G_CALLBACK(gwy_plain_tool_data_changed), plain_tool); + G_CALLBACK(data_changed), plain_tool); } strcpy(sigdetail + len-4, "mask"); plain_tool->mask_item_id = g_signal_connect(plain_tool->container, sigdetail, - G_CALLBACK(gwy_plain_tool_mask_item_changed), plain_tool); + G_CALLBACK(mask_item_changed), plain_tool); if (gwy_container_gis_object_by_name(plain_tool->container, key, &plain_tool->mask_field)) { g_object_ref(plain_tool->mask_field); plain_tool->mask_id = g_signal_connect_swapped(plain_tool->mask_field, "data-changed", - G_CALLBACK(gwy_plain_tool_mask_changed), plain_tool); + G_CALLBACK(mask_changed), plain_tool); } strcpy(sigdetail + len-4, "show"); plain_tool->show_item_id = g_signal_connect(plain_tool->container, sigdetail, - G_CALLBACK(gwy_plain_tool_show_item_changed), plain_tool); + G_CALLBACK(show_item_changed), plain_tool); if (gwy_container_gis_object_by_name(plain_tool->container, key, &plain_tool->show_field)) { g_object_ref(plain_tool->show_field); plain_tool->show_id = g_signal_connect_swapped(plain_tool->show_field, "data-changed", - G_CALLBACK(gwy_plain_tool_show_changed), plain_tool); + G_CALLBACK(show_changed), plain_tool); } g_free(sigdetail); } static void -gwy_plain_tool_data_item_changed(GwyContainer *container, - GQuark quark, - GwyPlainTool *plain_tool) +data_item_changed(GwyContainer *container, + GQuark quark, + GwyPlainTool *plain_tool) { GWY_SIGNAL_HANDLER_DISCONNECT(plain_tool->data_field, plain_tool->data_id); GWY_OBJECT_UNREF(plain_tool->data_field); @@ -325,8 +339,8 @@ if (gwy_container_gis_object(container, quark, &plain_tool->data_field)) { g_object_ref(plain_tool->data_field); plain_tool->data_id = g_signal_connect_swapped(plain_tool->data_field, "data-changed", - G_CALLBACK(gwy_plain_tool_data_changed), plain_tool); - gwy_plain_tool_data_changed(plain_tool); + G_CALLBACK(data_changed), plain_tool); + data_changed(plain_tool); } else { /* No data field means we disconnect completely. */ @@ -335,9 +349,9 @@ } static void -gwy_plain_tool_mask_item_changed(GwyContainer *container, - GQuark quark, - GwyPlainTool *plain_tool) +mask_item_changed(GwyContainer *container, + GQuark quark, + GwyPlainTool *plain_tool) { GWY_SIGNAL_HANDLER_DISCONNECT(plain_tool->mask_field, plain_tool->mask_id); GWY_OBJECT_UNREF(plain_tool->mask_field); @@ -345,16 +359,16 @@ if (gwy_container_gis_object(container, quark, &plain_tool->mask_field)) { g_object_ref(plain_tool->mask_field); plain_tool->mask_id = g_signal_connect_swapped(plain_tool->mask_field, "data-changed", - G_CALLBACK(gwy_plain_tool_mask_changed), plain_tool); + G_CALLBACK(mask_changed), plain_tool); } - gwy_plain_tool_mask_changed(plain_tool); + mask_changed(plain_tool); } static void -gwy_plain_tool_show_item_changed(GwyContainer *container, - GQuark quark, - GwyPlainTool *plain_tool) +show_item_changed(GwyContainer *container, + GQuark quark, + GwyPlainTool *plain_tool) { GWY_SIGNAL_HANDLER_DISCONNECT(plain_tool->show_field, plain_tool->show_id); GWY_OBJECT_UNREF(plain_tool->show_field); @@ -362,16 +376,16 @@ if (gwy_container_gis_object(container, quark, &plain_tool->show_field)) { g_object_ref(plain_tool->show_field); plain_tool->show_id = g_signal_connect_swapped(plain_tool->show_field, "data-changed", - G_CALLBACK(gwy_plain_tool_show_changed), plain_tool); + G_CALLBACK(show_changed), plain_tool); } - gwy_plain_tool_show_changed(plain_tool); + show_changed(plain_tool); } static void -gwy_plain_tool_selection_item_changed(GwyContainer *container, - GQuark quark, - GwyPlainTool *plain_tool) +selection_item_changed(GwyContainer *container, + GQuark quark, + GwyPlainTool *plain_tool) { GWY_SIGNAL_HANDLER_DISCONNECT(plain_tool->selection, plain_tool->selection_cid); GWY_SIGNAL_HANDLER_DISCONNECT(plain_tool->selection, plain_tool->selection_fid); @@ -380,16 +394,16 @@ if (gwy_container_gis_object(container, quark, &plain_tool->selection)) { g_object_ref(plain_tool->selection); plain_tool->selection_cid = g_signal_connect(plain_tool->selection, "changed", - G_CALLBACK(gwy_plain_tool_selection_changed), plain_tool); + G_CALLBACK(selection_changed), plain_tool); plain_tool->selection_fid = g_signal_connect(plain_tool->selection, "finished", - G_CALLBACK(gwy_plain_tool_selection_finished), plain_tool); + G_CALLBACK(selection_finished), plain_tool); } - gwy_plain_tool_selection_changed(plain_tool->selection, -1, plain_tool); + selection_changed(plain_tool->selection, -1, plain_tool); } static void -gwy_plain_tool_data_changed(GwyPlainTool *plain_tool) +data_changed(GwyPlainTool *plain_tool) { GwyPlainToolClass *klass; @@ -397,14 +411,14 @@ if (plain_tool->lazy_updates && !gwy_tool_is_visible(GWY_TOOL(plain_tool))) plain_tool->pending_updates |= GWY_PLAIN_TOOL_CHANGED_DATA; else { - gwy_plain_tool_update_units(plain_tool); + update_units(plain_tool); if (klass->data_changed) klass->data_changed(plain_tool); } } static void -gwy_plain_tool_mask_changed(GwyPlainTool *plain_tool) +mask_changed(GwyPlainTool *plain_tool) { GwyPlainToolClass *klass; @@ -416,7 +430,7 @@ } static void -gwy_plain_tool_show_changed(GwyPlainTool *plain_tool) +show_changed(GwyPlainTool *plain_tool) { GwyPlainToolClass *klass; @@ -428,9 +442,9 @@ } static void -gwy_plain_tool_selection_changed(GwySelection *selection, - gint hint, - GwyPlainTool *plain_tool) +selection_changed(GwySelection *selection, + gint hint, + GwyPlainTool *plain_tool) { GwyPlainToolClass *klass; @@ -442,11 +456,12 @@ plain_tool->pending_updates |= GWY_PLAIN_TOOL_CHANGED_SELECTION; else if (klass->selection_changed) klass->selection_changed(plain_tool, hint); + remember_selection(plain_tool); } static void -gwy_plain_tool_selection_finished(G_GNUC_UNUSED GwySelection *selection, - GwyPlainTool *plain_tool) +selection_finished(G_GNUC_UNUSED GwySelection *selection, + GwyPlainTool *plain_tool) { GwyPlainToolClass *klass; @@ -457,8 +472,31 @@ klass->selection_finished(plain_tool); } +static void +remember_selection(GwyPlainTool *plain_tool) +{ + GwyToolHeldSelection *held_sel = plain_tool->held_selection; + GwySelection *selection = plain_tool->selection; + + if (!held_sel || held_sel->is_switching_data) + return; + + if (selection) { + if (held_sel->selection) + gwy_selection_assign(held_sel->selection, selection); + else + held_sel->selection = gwy_selection_duplicate(selection); + + g_return_if_fail(GWY_IS_DATA_FIELD(plain_tool->data_field)); + held_sel->xreal = gwy_data_field_get_xreal(plain_tool->data_field); + held_sel->yreal = gwy_data_field_get_yreal(plain_tool->data_field); + } + else if (held_sel->selection) + gwy_selection_clear(held_sel->selection); +} + /** - * gwy_plain_tool_update_units: + * update_units: * @plain_tool: A plain tool. * * Updates plain tool's unit formats. @@ -467,7 +505,7 @@ * If @unit_style is %GWY_SI_UNIT_FORMAT_NONE existing formats are destroyed and set to %NULL. **/ static void -gwy_plain_tool_update_units(GwyPlainTool *plain_tool) +update_units(GwyPlainTool *plain_tool) { if (plain_tool->data_field && plain_tool->unit_style) { plain_tool->coord_format = gwy_data_field_get_value_format_xy(plain_tool->data_field, @@ -574,7 +612,7 @@ g_return_if_fail(bname); } - gwy_plain_tool_selection_disconnect(plain_tool); + selection_disconnect(plain_tool); gwy_assign_string(&plain_tool->selection_bname, bname); plain_tool->layer_type = layer_type; @@ -582,11 +620,11 @@ return; gwy_plain_tool_ensure_layer(plain_tool, layer_type); - gwy_plain_tool_selection_reconnect(plain_tool); + selection_reconnect(plain_tool); } static void -gwy_plain_tool_selection_disconnect(GwyPlainTool *plain_tool) +selection_disconnect(GwyPlainTool *plain_tool) { gwy_debug(""); @@ -597,7 +635,7 @@ } static void -gwy_plain_tool_selection_reconnect(GwyPlainTool *plain_tool) +selection_reconnect(GwyPlainTool *plain_tool) { const gchar *key; gchar *sigdetail; @@ -611,18 +649,18 @@ sigdetail = g_strconcat(ITEM_CHANGED, key, NULL); plain_tool->selection_item_id = g_signal_connect(plain_tool->container, sigdetail, - G_CALLBACK(gwy_plain_tool_selection_item_changed), plain_tool); + G_CALLBACK(selection_item_changed), plain_tool); if (gwy_container_gis_object_by_name(plain_tool->container, key, &plain_tool->selection)) { g_object_ref(plain_tool->selection); plain_tool->selection_cid = g_signal_connect(plain_tool->selection, "changed", - G_CALLBACK(gwy_plain_tool_selection_changed), plain_tool); + G_CALLBACK(selection_changed), plain_tool); plain_tool->selection_fid = g_signal_connect(plain_tool->selection, "finished", - G_CALLBACK(gwy_plain_tool_selection_finished), plain_tool); + G_CALLBACK(selection_finished), plain_tool); } g_free(sigdetail); - gwy_plain_tool_selection_changed(plain_tool->selection, -1, plain_tool); + selection_changed(plain_tool->selection, -1, plain_tool); } /** @@ -786,9 +824,9 @@ } static gboolean -gwy_plain_tool_delete_selection_object(GtkTreeView *treeview, - GdkEventKey *event, - GwyPlainTool *plain_tool) +delete_selection_object(GtkTreeView *treeview, + GdkEventKey *event, + GwyPlainTool *plain_tool) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -816,8 +854,7 @@ * @plain_tool: A plain tool. * @treeview: A tree view that displays selection objects in order, each row corresponding to one selection object. * - * Enables deletion of selection objects by presssing Delete in a tree view - * diplaying them. + * Enables deletion of selection objects by presssing Delete in a tree view diplaying them. * * Since: 2.7 **/ @@ -828,7 +865,86 @@ g_return_if_fail(GTK_IS_TREE_VIEW(treeview)); g_return_if_fail(GWY_IS_PLAIN_TOOL(plain_tool)); - g_signal_connect(treeview, "key-press-event", G_CALLBACK(gwy_plain_tool_delete_selection_object), plain_tool); + g_signal_connect(treeview, "key-press-event", G_CALLBACK(delete_selection_object), plain_tool); +} + +/** + * gwy_plain_tool_hold_selection: + * @plain_tool: A plain tool. + * @hold_flags: Flags controlling when the selection is held (transferred to another image). + * + * Possibly transfers the selection to a new image upon plain tool data switch. + * + * This function should be called from data_switched() class method in a tool after setting up the layer and + * selection. If the selection should be transferred to the new image according to @hold_flags the previous (held) + * selection will replace whatever selection might be there currently. Otherwise the new image's selection is + * preserved (and in fact held itself). + * + * Selection holding must be enabled in tool instance init function using gwy_plain_tool_enable_selection_holding(). + * + * Since: 2.63 + **/ +void +gwy_plain_tool_hold_selection(GwyPlainTool *plain_tool, + GwyHoldSelectionFlags hold_flags) +{ + GwyDataField *field; + GwyToolHeldSelection *held_sel; + GwySelection *selection; + gboolean is_compatible, sel_is_empty, held_is_empty; + gboolean hold = (hold_flags & GWY_HOLD_SELECTION_HOLD); + gboolean overwrite = (hold_flags & GWY_HOLD_SELECTION_OVERWRITE); + gboolean clear = (hold_flags & GWY_HOLD_SELECTION_CLEAR); + + g_return_if_fail(GWY_IS_PLAIN_TOOL(plain_tool)); + if (!(field = plain_tool->data_field)) + return; + + g_return_if_fail(plain_tool->held_selection); + held_sel = plain_tool->held_selection; + selection = plain_tool->selection; + is_compatible = (gwy_data_field_get_xreal(field) == held_sel->xreal + && gwy_data_field_get_yreal(field) == held_sel->yreal); + + if (selection) { + if (!held_sel->selection) + held_sel->selection = gwy_selection_duplicate(plain_tool->selection); + else { + sel_is_empty = !gwy_selection_get_data(selection, NULL); + held_is_empty = !gwy_selection_get_data(held_sel->selection, NULL); + if (hold && is_compatible && (sel_is_empty || (overwrite && (clear || !held_is_empty)))) + gwy_selection_assign(selection, held_sel->selection); + else + remember_selection(plain_tool); + } + } + else if (held_sel->selection) { + g_warning("The tool is holding a selection but the image cannot have any?"); + } +} + +/** + * gwy_plain_tool_enable_selection_holding: + * @plain_tool: A plain tool. + * + * Enables selection holding for a plain tool. + * + * Selection holding means that, if certain conditions are satisfied, upon data switch the tool transfers the current + * selection to the new image, replacing whatever selection might be there. + * + * This function should be called from the instance init function. + * + * Holding is currently unsupported for tools which use multiple selection types. + * + * Since: 2.63 + **/ +void +gwy_plain_tool_enable_selection_holding(GwyPlainTool *plain_tool) +{ + g_return_if_fail(GWY_IS_PLAIN_TOOL(plain_tool)); + + /* This should be a sufficient initialisation. */ + plain_tool->held_selection = g_new0(GwyToolHeldSelection, 1); } static GtkLabel* @@ -1296,4 +1412,20 @@ * The type of pending changes that accumulated during tool inactivity. **/ +/** + * GwyHoldSelectionFlags: + * @GWY_HOLD_SELECTION_HOLD: Selections are held (transferred to the new image). + * @GWY_HOLD_SELECTION_OVERWRITE: Existing selections on the new image is replaced. + * @GWY_HOLD_SELECTION_CLEAR: If the current image has no selection the selection on the new image is cleared. + * + * Flags controlling the selection holding behaviour of tools. + * + * Although any combination of flags is valid, this is mainly so that user's choice is not reset. For any holding to + * be done at all the %GWY_HOLD_SELECTION_HOLD flag must be set. If it is unset then %GWY_HOLD_SELECTION_OVERWRITE + * and %GWY_HOLD_SELECTION_CLEAR do not matter. Similarly, for %GWY_HOLD_SELECTION_CLEAR has any effect only if + * overwriting is enabled by setting %GWY_HOLD_SELECTION_OVERWRITE. + * + * Since: 2.63 + **/ + /* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/app/gwyplaintool.h gwyddion-2.63/app/gwyplaintool.h --- gwyddion-2.62/app/gwyplaintool.h 2022-07-15 15:09:53.000000000 +0000 +++ gwyddion-2.63/app/gwyplaintool.h 2022-12-14 16:24:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyplaintool.h 24858 2022-07-15 15:09:53Z yeti-dn $ + * $Id: gwyplaintool.h 25161 2022-12-14 16:24:42Z yeti-dn $ * Copyright (C) 2006-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -26,6 +26,9 @@ G_BEGIN_DECLS +typedef struct _GwyRectSelectionLabels GwyRectSelectionLabels; +typedef struct _GwyToolHeldSelection GwyToolHeldSelection; + #define GWY_TYPE_PLAIN_TOOL (gwy_plain_tool_get_type()) #define GWY_PLAIN_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GWY_TYPE_PLAIN_TOOL, GwyPlainTool)) #define GWY_PLAIN_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GWY_TYPE_PLAIN_TOOL, GwyPlainToolClass)) @@ -44,6 +47,12 @@ GWY_PLAIN_TOOL_FINISHED_SELECTION = 1 << 4, } GwyPlainToolChanged; +typedef enum { + GWY_HOLD_SELECTION_HOLD = (1 << 0), + GWY_HOLD_SELECTION_OVERWRITE = (1 << 1), + GWY_HOLD_SELECTION_CLEAR = (1 << 2), +} GwyHoldSelectionFlags; + struct _GwyPlainTool { GwyTool parent_instance; @@ -85,7 +94,7 @@ GtkWidget *clear; GPtrArray *param_tables; - gpointer reserved2; + GwyToolHeldSelection *held_selection; gpointer reserved3; gint int1; }; @@ -105,39 +114,40 @@ void (*reserved3)(void); }; -typedef struct _GwyRectSelectionLabels GwyRectSelectionLabels; - -GType gwy_plain_tool_get_type (void) G_GNUC_CONST; -GType gwy_plain_tool_check_layer_type (GwyPlainTool *plain_tool, - const gchar *name); -void gwy_plain_tool_connect_selection (GwyPlainTool *plain_tool, - GType layer_type, - const gchar *bname); -void gwy_plain_tool_ensure_layer (GwyPlainTool *plain_tool, - GType layer_type); -const gchar* gwy_plain_tool_set_selection_key (GwyPlainTool *plain_tool, - const gchar *bname); -GtkWidget* gwy_plain_tool_add_clear_button (GwyPlainTool *plain_tool); -gdouble gwy_plain_tool_get_z_average (GwyDataField *data_field, - const gdouble *point, - gint radius); -void gwy_plain_tool_enable_object_deletion(GwyPlainTool *plain_tool, - GtkTreeView *treeview); -GwyRectSelectionLabels* gwy_rect_selection_labels_new (gboolean none_is_full, - GCallback callback, - gpointer cbdata); -GtkWidget* gwy_rect_selection_labels_get_table (GwyRectSelectionLabels *rlabels); -void gwy_rect_selection_labels_select (GwyRectSelectionLabels *rlabels, - GwySelection *selection, - GwyDataField *dfield); -gboolean gwy_rect_selection_labels_fill (GwyRectSelectionLabels *rlabels, - GwySelection *selection, - GwyDataField *dfield, - gdouble *selreal, - gint *selpix); -void gwy_plain_tool_log_add (GwyPlainTool *plain_tool); -void gwy_plain_tool_add_param_table (GwyPlainTool *plain_tool, - GwyParamTable *partable); +GType gwy_plain_tool_get_type (void) G_GNUC_CONST; +GType gwy_plain_tool_check_layer_type (GwyPlainTool *plain_tool, + const gchar *name); +void gwy_plain_tool_connect_selection (GwyPlainTool *plain_tool, + GType layer_type, + const gchar *bname); +void gwy_plain_tool_ensure_layer (GwyPlainTool *plain_tool, + GType layer_type); +const gchar* gwy_plain_tool_set_selection_key (GwyPlainTool *plain_tool, + const gchar *bname); +GtkWidget* gwy_plain_tool_add_clear_button (GwyPlainTool *plain_tool); +gdouble gwy_plain_tool_get_z_average (GwyDataField *data_field, + const gdouble *point, + gint radius); +void gwy_plain_tool_enable_object_deletion (GwyPlainTool *plain_tool, + GtkTreeView *treeview); +void gwy_plain_tool_hold_selection (GwyPlainTool *plain_tool, + GwyHoldSelectionFlags hold_flags); +void gwy_plain_tool_enable_selection_holding(GwyPlainTool *plain_tool); +GwyRectSelectionLabels* gwy_rect_selection_labels_new (gboolean none_is_full, + GCallback callback, + gpointer cbdata); +GtkWidget* gwy_rect_selection_labels_get_table (GwyRectSelectionLabels *rlabels); +void gwy_rect_selection_labels_select (GwyRectSelectionLabels *rlabels, + GwySelection *selection, + GwyDataField *dfield); +gboolean gwy_rect_selection_labels_fill (GwyRectSelectionLabels *rlabels, + GwySelection *selection, + GwyDataField *dfield, + gdouble *selreal, + gint *selpix); +void gwy_plain_tool_log_add (GwyPlainTool *plain_tool); +void gwy_plain_tool_add_param_table (GwyPlainTool *plain_tool, + GwyParamTable *partable); G_END_DECLS diff -Nru gwyddion-2.62/app/help.c gwyddion-2.63/app/help.c --- gwyddion-2.62/app/help.c 2021-11-07 21:44:51.000000000 +0000 +++ gwyddion-2.63/app/help.c 2023-05-25 12:21:24.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: help.c 24485 2021-11-07 21:02:59Z yeti-dn $ + * $Id: help.c 25361 2023-05-25 12:21:24Z yeti-dn $ * Copyright (C) 2014-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -535,8 +535,10 @@ gchar *uri, GwyHelpFlags flags) { - if (!any_backend_available()) + if (!any_backend_available()) { + g_free(uri); return; + } if (!check_local_file_uri(uri)) { g_free(uri); diff -Nru gwyddion-2.62/app/logging.c gwyddion-2.63/app/logging.c --- gwyddion-2.62/app/logging.c 2019-08-19 11:00:59.000000000 +0000 +++ gwyddion-2.63/app/logging.c 2023-06-07 14:14:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: logging.c 22396 2019-08-18 06:38:30Z yeti-dn $ + * $Id: logging.c 25416 2023-06-07 14:14:42Z yeti-dn $ * Copyright (C) 2016-2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -251,10 +251,10 @@ } static void -logger(const gchar *log_domain_str, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data) +logger_impl(const gchar *log_domain_str, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) { LoggingSetup *setup = (LoggingSetup*)user_data; GLogLevelFlags just_log_level = (log_level & G_LOG_LEVEL_MASK); @@ -286,6 +286,18 @@ } static void +logger(const gchar *log_domain_str, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) +{ +#ifdef _OPENMP +#pragma omp critical +#endif + logger_impl(log_domain_str, log_level, message, user_data); +} + +static void emit_log_message(LoggingSetup *setup, GQuark log_domain, GLogLevelFlags log_level) { diff -Nru gwyddion-2.62/app/Makefile.am gwyddion-2.63/app/Makefile.am --- gwyddion-2.62/app/Makefile.am 2022-11-02 13:59:27.000000000 +0000 +++ gwyddion-2.63/app/Makefile.am 2023-06-12 11:56:31.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la libgwymodule = $(top_builddir)/libgwymodule/libgwymodule2.la @@ -106,11 +106,11 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 28:0:28 +libversion = -version-info 29:0:29 #libversion = -release @LIBRARY_RELEASE@ -AM_CFLAGS = @COMMON_CFLAGS@ @GIO_CFLAGS@ +AM_CFLAGS = @COMMON_CFLAGS@ @GIO_CFLAGS@ @OPENMP_CFLAGS@ AM_LDFLAGS = @GTKGLEXT_LIBS@ @GIO_LIBS@ @BASIC_LIBS@ $(win32_libs) -export-dynamic $(no_undefined) $(export_symbols) $(libversion) $(libgwyapp_libadd) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GwyApp\" -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GwyApp\" @OPENMP_CFLAGS@ libgwyapp2_la_SOURCES = \ app.c \ diff -Nru gwyddion-2.62/app/Makefile.in gwyddion-2.63/app/Makefile.in --- gwyddion-2.62/app/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/app/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ # Generic glib-mkenum rules. # $Id: mkenum.mk 20681 2017-12-18 18:37:24Z yeti-dn $ @@ -449,6 +449,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -607,11 +609,11 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 28:0:28 +libversion = -version-info 29:0:29 #libversion = -release @LIBRARY_RELEASE@ -AM_CFLAGS = @COMMON_CFLAGS@ @GIO_CFLAGS@ +AM_CFLAGS = @COMMON_CFLAGS@ @GIO_CFLAGS@ @OPENMP_CFLAGS@ AM_LDFLAGS = @GTKGLEXT_LIBS@ @GIO_LIBS@ @BASIC_LIBS@ $(win32_libs) -export-dynamic $(no_undefined) $(export_symbols) $(libversion) $(libgwyapp_libadd) -AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GwyApp\" -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GwyApp\" @OPENMP_CFLAGS@ libgwyapp2_la_SOURCES = \ app.c \ data-browser.c \ diff -Nru gwyddion-2.62/app/param-def.c gwyddion-2.63/app/param-def.c --- gwyddion-2.62/app/param-def.c 2022-10-11 13:47:20.000000000 +0000 +++ gwyddion-2.63/app/param-def.c 2023-01-30 14:13:24.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: param-def.c 25075 2022-10-11 13:47:20Z yeti-dn $ + * $Id: param-def.c 25214 2023-01-30 14:13:23Z yeti-dn $ * Copyright (C) 2021-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -19,6 +19,7 @@ #include "libgwyddion/gwymacros.h" #include "libprocess/gwyprocesstypes.h" #include "libprocess/gwyprocessenums.h" +#include "gwyapptypes.h" #include "param-def.h" #include "param-internal.h" @@ -1188,6 +1189,37 @@ } /** + * gwy_param_def_add_hold_selection: + * @pardef: A set of parameter definitions. + * @id: Parameter identifier. + * @name: Parameter name for settings. It can be %NULL for derived parameters not stored in settings. + * @desc: Parameter description which will be used for a label in GUI. Normally pass %NULL for the default label. + * + * Defines a new flags parameter with values that are selection holding flags. + * + * The values are flags from #GwyHoldSelectionFlags. The default is zero. + * + * Since: 2.63 + **/ +void +gwy_param_def_add_hold_selection(GwyParamDef *pardef, + gint id, + const gchar *name, + const gchar *desc) +{ + static const GwyEnum hold_flags[] = { + { N_("Hold selection"), GWY_HOLD_SELECTION_HOLD, }, + { N_("Replace existing selection"), GWY_HOLD_SELECTION_OVERWRITE, }, + { N_("Replace even with empty (clear selection)"), GWY_HOLD_SELECTION_CLEAR, }, + }; + + if (!desc) + desc = _("_Hold selection"); + gwy_param_def_append_flags(pardef, id, name, desc, GWY_TYPE_HOLD_SELECTION_FLAGS, + hold_flags, G_N_ELEMENTS(hold_flags), 0); +} + +/** * gwy_param_def_add_seed: * @pardef: A set of parameter definitions. * @id: Parameter identifier. @@ -1324,7 +1356,7 @@ GwyParamDefItem item; GwyParamDefResource *res = &item.def.res; - item.type = GWY_PARAM_RESOURCE; + item.type = GWY_PARAM_RESOURCE_NAME; g_assert(GWY_IS_INVENTORY(inventory)); res->inventory = inventory; res->default_value = g_intern_string(default_value); @@ -1473,8 +1505,11 @@ /* When presets are implemented using GwyParams then multiple GwyParams instances created for one GwyParamDef * are common. Keep enabled this check during development but we may want a mechanism to exclude presets. */ if (!g_slist_find(priv->users, params)) { - /* XXX: Hardcoded warning suppression for known modules with GwyParamResource presets. */ - if (priv->users && !gwy_stramong(priv->function_name, "rawfile", NULL)) { + /* XXX: Hardcoded warning suppression for known modules with GwyParamResource presets and internal + * parameter set duplication. */ + if (priv->users && !gwy_stramong(priv->function_name, + "rawfile", "terracefit", "graph_terraces", "logistic", + NULL)) { g_warning("Parameter definitions for %s are used multiple times. " "Check module function %s; it is probably leaking GwyParams objects!", priv->function_name, priv->function_name); @@ -1681,8 +1716,8 @@ const GwyParamDefResource *res; gpointer item; - if (!def || def->type != GWY_PARAM_RESOURCE) { - g_assert(def && def->type == GWY_PARAM_RESOURCE); + if (!def || def->type != GWY_PARAM_RESOURCE_NAME) { + g_assert(def && def->type == GWY_PARAM_RESOURCE_NAME); return NULL; } res = &def->def.res; diff -Nru gwyddion-2.62/app/param-def.h gwyddion-2.63/app/param-def.h --- gwyddion-2.62/app/param-def.h 2022-06-03 11:43:26.000000000 +0000 +++ gwyddion-2.63/app/param-def.h 2022-12-15 10:14:22.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: param-def.h 24840 2022-06-03 11:43:26Z yeti-dn $ + * $Id: param-def.h 25164 2022-12-15 10:14:22Z yeti-dn $ * Copyright (C) 2021-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -173,6 +173,10 @@ const gchar *desc, GwyResultsExportStyle style, GwyResultsReportType default_value); +void gwy_param_def_add_hold_selection (GwyParamDef *pardef, + gint id, + const gchar *name, + const gchar *desc); void gwy_param_def_add_seed (GwyParamDef *pardef, gint id, const gchar *name, diff -Nru gwyddion-2.62/app/param-internal.h gwyddion-2.63/app/param-internal.h --- gwyddion-2.62/app/param-internal.h 2022-08-25 18:51:02.000000000 +0000 +++ gwyddion-2.63/app/param-internal.h 2023-04-24 18:36:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: param-internal.h 24941 2022-08-25 18:51:02Z yeti-dn $ + * $Id: param-internal.h 25305 2023-04-21 13:15:07Z yeti-dn $ * Copyright (C) 2021-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -48,7 +48,7 @@ GWY_PARAM_LAWN_CURVE, GWY_PARAM_LAWN_SEGMENT, GWY_PARAM_UNIT, - GWY_PARAM_RESOURCE, + GWY_PARAM_RESOURCE_NAME, } GwyParamType; typedef struct { @@ -265,4 +265,4 @@ #endif -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/app/params.c gwyddion-2.63/app/params.c --- gwyddion-2.62/app/params.c 2022-09-22 12:26:41.000000000 +0000 +++ gwyddion-2.63/app/params.c 2022-12-15 10:05:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: params.c 25038 2022-09-22 12:26:38Z yeti-dn $ + * $Id: params.c 25163 2022-12-15 10:05:36Z yeti-dn $ * Copyright (C) 2021-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -161,7 +161,7 @@ for (i = 0; i < n; i++) { GwyParamType type = _gwy_param_def_item(priv->def, i)->type; - if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE) + if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE_NAME) g_free(values[i].s); else if (param_type_is_curve_no(type)) g_free(values[i].cu.s); @@ -230,7 +230,7 @@ for (i = 0; i < n; i++) { GwyParamType type = _gwy_param_def_item(priv->def, i)->type; - if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE) + if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE_NAME) values[i].s = g_strdup(values[i].s); else if (param_type_is_curve_no(type)) values[i].cu.s = g_strdup(values[i].cu.s); @@ -550,7 +550,7 @@ if (gwy_container_gis_string(settings, quark, &v)) set_unit_value(value, def, v); } - else if (type == GWY_PARAM_RESOURCE) { + else if (type == GWY_PARAM_RESOURCE_NAME) { const guchar *v; if (gwy_container_gis_string(settings, quark, &v)) set_resource_value(value, def, v); @@ -670,7 +670,7 @@ gwy_container_set_const_string(settings, quark, value->cu.s ? value->cu.s : ""); else if (type == GWY_PARAM_UNIT) gwy_container_set_const_string(settings, quark, value->si.s ? value->si.s : ""); - else if (type == GWY_PARAM_RESOURCE) { + else if (type == GWY_PARAM_RESOURCE_NAME) { if (value->s) gwy_container_set_const_string(settings, quark, value->s); else @@ -1139,7 +1139,7 @@ if (!param_find_common(params, id, &i, &def, GWY_PARAM_NONE)) return ""; - if (def->type == GWY_PARAM_STRING || def->type == GWY_PARAM_RESOURCE) + if (def->type == GWY_PARAM_STRING || def->type == GWY_PARAM_RESOURCE_NAME) return params->priv->values[i].s; if (def->type == GWY_PARAM_UNIT) return params->priv->values[i].si.s; @@ -1700,7 +1700,7 @@ const GwyParamDefItem *def; gint i; - if (!param_find_common(params, id, &i, &def, GWY_PARAM_RESOURCE)) + if (!param_find_common(params, id, &i, &def, GWY_PARAM_RESOURCE_NAME)) return FALSE; return set_resource_value(params->priv->values + i, def, value); } @@ -1727,7 +1727,7 @@ gpointer item; gint i; - if (!param_find_common(params, id, &i, &def, GWY_PARAM_RESOURCE)) + if (!param_find_common(params, id, &i, &def, GWY_PARAM_RESOURCE_NAME)) return NULL; /* Fall back first to the parameter default, then to rhe resource default. */ if (!(item = gwy_inventory_get_item(def->def.res.inventory, params->priv->values[i].s))) @@ -2001,7 +2001,7 @@ return set_string_value(value, def, def->def.s.default_value); if (type == GWY_PARAM_UNIT) return set_unit_value(value, def, def->def.si.default_value); - if (type == GWY_PARAM_RESOURCE) + if (type == GWY_PARAM_RESOURCE_NAME) return set_resource_value(value, def, def->def.res.default_value); if (type == GWY_PARAM_COLOR) return set_color_value(value, def, def->def.c.default_value); @@ -2037,7 +2037,7 @@ return set_string_value(value, def, src->s); if (type == GWY_PARAM_UNIT) return set_unit_value(value, def, src->si.s); - if (type == GWY_PARAM_RESOURCE) + if (type == GWY_PARAM_RESOURCE_NAME) return set_resource_value(value, def, src->s); if (type == GWY_PARAM_COLOR) return set_color_value(value, def, src->c); @@ -2196,7 +2196,7 @@ } else if (type == GWY_PARAM_DOUBLE) append_double(str, value->d); - else if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE) + else if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE_NAME) append_escaped_string(str, value->s); else if (type == GWY_PARAM_UNIT) append_escaped_string(str, value->si.s); @@ -2323,11 +2323,11 @@ } else if (type == GWY_PARAM_DOUBLE) set_double_value(parvalue, def, g_ascii_strtod(val, NULL)); - else if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE || type == GWY_PARAM_UNIT) { + else if (type == GWY_PARAM_STRING || type == GWY_PARAM_RESOURCE_NAME || type == GWY_PARAM_UNIT) { if (unescape_string(val, &ustr)) { if (type == GWY_PARAM_STRING) set_string_value(parvalue, def, ustr); - else if (type == GWY_PARAM_RESOURCE) + else if (type == GWY_PARAM_RESOURCE_NAME) set_resource_value(parvalue, def, ustr); else if (type == GWY_PARAM_UNIT) set_unit_value(parvalue, def, ustr); diff -Nru gwyddion-2.62/app/param-table.c gwyddion-2.63/app/param-table.c --- gwyddion-2.62/app/param-table.c 2022-10-14 15:46:44.000000000 +0000 +++ gwyddion-2.63/app/param-table.c 2023-06-07 15:59:52.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: param-table.c 25093 2022-10-14 15:46:44Z yeti-dn $ - * Copyright (C) 2021-2022 David Necas (Yeti). + * $Id: param-table.c 25417 2023-06-07 15:59:52Z yeti-dn $ + * Copyright (C) 2021-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -24,6 +24,7 @@ #include "libprocess/gwyprocessenums.h" #include "libprocess/stats.h" #include "libprocess/linestats.h" +#include "gwyapptypes.h" #include "data-browser.h" #include "menu.h" #include "gwymoduleutils.h" @@ -33,7 +34,6 @@ /* TODO: Missing common controls: * - entries with history - * - graph range entries * * We also want presets to work more or less automatically (in GwyParams), which is partially implemented by * GwyParamResource, but so far only one module has been converted. @@ -84,7 +84,10 @@ GWY_PARAM_CONTROL_MASK_COLOR, GWY_PARAM_CONTROL_RESULTS, GWY_PARAM_CONTROL_REPORT, + GWY_PARAM_CONTROL_HOLD_SELECTION, GWY_PARAM_CONTROL_RANDOM_SEED, + GWY_PARAM_CONTROL_RANGE_FROM, + GWY_PARAM_CONTROL_RANGE_TO, GWY_PARAM_CONTROL_BUTTON, GWY_PARAM_CONTROL_MESSAGE, GWY_PARAM_CONTROL_INFO, @@ -190,6 +193,11 @@ } GwyParamControlReport; typedef struct { + GtkWidget *overwrite; + GtkWidget *clear; +} GwyParamControlHoldSelection; + +typedef struct { GtkAdjustment *adj; GtkWidget *new_button; } GwyParamControlRandomSeed; @@ -263,6 +271,11 @@ } GwyParamControlEntry; typedef struct { + GString *str; /* Shorthand for table->priv->str. */ + GwySIValueFormat *vf; +} GwyParamControlRangeFrom; + +typedef struct { gint id; gint row : 8; /* The first row where it is attached. */ gint nrows : 8; /* How many table rows it takes. In split radio buttons, it is for this particular piece. */ @@ -285,6 +298,7 @@ GwyPlainTool *parent_tool; GwyParamControl *controls; GwyParamControlAssocTable enabler; + GwyParamControlAssocTable range; GwyToggleListInfo *toggles_info; GString *str; GwySIValueFormat *vf; @@ -299,342 +313,352 @@ gulong destroy_sid; }; -static void gwy_param_table_finalize (GObject *gobject); -static GwyParamControl* find_first_control (GwyParamTable *partable, - gint id); -static gboolean find_def_common (GwyParamTable *partable, - gint id, - GwyParams **pparams, - const GwyParamDefItem **def); -static GwyParamControl* append_control (GwyParamTable *partable, - GwyParamControlType type, - gint id, - gint nrows); -static void add_aux_assoc (GwyParamControlAssocTable *assoc_table, - gint aux_id, - gint other_id); -static void add_toggles_info (GwyParamTable *partable, - gint id, - gboolean must_not_exist); -static GtkWidget* ensure_widget (GwyParamTable *partable); -static void update_control_sensitivity (GwyParamTable *partable, - gint i); -static void header_make_control (GwyParamTable *partable, - guint i); -static void checkbox_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void enabler_make_control (GwyParamTable *partable, - guint i, - guint iother, - GwyParams *params); -static void combo_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void radio_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void radio_header_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void radio_item_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void radio_row_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void radio_buttons_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void construct_radio_widgets (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void checkboxes_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void construct_checkbox_widgets (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void data_id_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void curve_no_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void slider_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void alt_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void entry_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void mask_color_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void report_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void unit_chooser_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void random_seed_make_control (GwyParamTable *partable, - guint i, - GwyParams *params, - const GwyParamDefItem *def); -static void button_make_control (GwyParamTable *partable, - guint i); -static void results_make_control (GwyParamTable *partable, - guint i); -static void message_make_control (GwyParamTable *partable, - guint i); -static void info_make_control (GwyParamTable *partable, - guint i); -static void foreign_make_control (GwyParamTable *partable, - guint i); -static void checkbox_toggled (GtkToggleButton *toggle, - GwyParamTable *partable); -static void enabler_toggled (GtkToggleButton *toggle, - GwyParamTable *partable); -static void togglebutton_set_value (GwyParamControl *control, - GwyParamTable *partable, - gboolean value, - gboolean use_default_instead); -static void combo_changed (GtkComboBox *combo, - GwyParamTable *partable); -static void unit_chosen (GtkComboBox *combo, - GwyParamTable *partable); -static void unit_chooser_change (GtkButton *button, - GwyParamTable *partable); -static gchar* unit_change_dialog_run (GtkWindow *parent, - const gchar *unitstr); -static void enum_combo_set_value (GwyParamControl *control, - GwyParamTable *partable, - gint value, - gboolean use_default_instead); -static void unit_chooser_set_value (GwyParamControl *control, - GwyParamTable *partable, - const gchar *value, - gboolean use_default_instead); -static void resource_combo_set_value (GwyParamControl *control, - GwyParamTable *partable, - const gchar *value, - gboolean use_default_instead); -static void radio_changed (GtkRadioButton *radio, - GwyParamTable *partable); -static void radio_set_value (GwyParamControl *control, - GwyParamTable *partable, - gint value, - gboolean use_default_instead); -static void checkbox_changed (GtkToggleButton *toggle, - GwyParamTable *partable); -static void checkboxes_set_value (GwyParamControl *control, - GwyParamTable *partable, - guint value, - gboolean use_default_instead); -static void graph_id_changed (GwyDataChooser *chooser, - GwyParamTable *partable); -static void image_id_changed (GwyDataChooser *chooser, - GwyParamTable *partable); -static void volume_id_changed (GwyDataChooser *chooser, - GwyParamTable *partable); -static void xyz_id_changed (GwyDataChooser *chooser, - GwyParamTable *partable); -static void curve_map_id_changed (GwyDataChooser *chooser, - GwyParamTable *partable); -static void data_id_set_value (GwyParamControl *control, - GwyParamTable *partable, - GwyAppDataId value, - gboolean use_default_instead); -static void graph_curve_changed (GtkComboBox *combo, - GwyParamTable *partable); -static void lawn_curve_changed (GtkComboBox *combo, - GwyParamTable *partable); -static void lawn_segment_changed (GtkComboBox *combo, - GwyParamTable *partable); -static void curve_no_set_value (GwyParamControl *control, - GwyParamTable *partable, - gint value, - gboolean use_default_instead); -static gint curve_no_get_ncurves (GwyParamControl *control); -static void random_seed_changed (GtkAdjustment *adj, - GwyParamTable *partable); -static void random_seed_new (GtkButton *button, - GwyParamTable *partable); -static void button_clicked (GtkButton *button, - GwyParamTable *partable); -static void mask_color_set_value (GwyParamControl *control, - GwyParamTable *partable, - GwyRGBA color, - gboolean use_default_instead); -static void report_format_changed (GwyResultsExport *rexport, - GwyParamTable *partable); -static void report_copy (GwyResultsExport *rexport, - GwyParamTable *partable); -static void report_save (GwyResultsExport *rexport, - GwyParamTable *partable); -static void report_set_formatter (GwyParamControl *control, - GwyCreateTextFunc format_report, - gpointer user_data, - GDestroyNotify destroy); -static void report_ensure_actions (GwyParamControl *control, - GwyParamTable *partable); -static void report_set_value (GwyParamControl *control, - GwyParamTable *partable, - GwyResultsReportType report_type, - gboolean use_default_instead); -static void slider_value_changed (GtkAdjustment *adj, - GwyParamTable *partable); -static gint slider_spin_input (GtkSpinButton *spin, - gdouble *new_value, - GwyParamTable *partable); -static gboolean slider_spin_output (GtkSpinButton *spin, - GwyParamTable *partable); -static void slider_set_value (GwyParamControl *control, - GwyParamTable *partable, - gdouble value, - gboolean use_default_instead); -static void slider_make_angle (GwyParamTable *partable, - guint i); -static void slider_make_percentage (GwyParamTable *partable, - guint i); -static void slider_auto_configure (GwyParamControl *control, - const GwyParamDefItem *def); -static void slider_reconfigure_adjustment (GwyParamControl *control, - GwyParamTable *partable); -static void slider_reconfigure_alt (GwyParamControl *control, - GwyParamTable *partable); -static void slider_set_transformation (GwyParamTable *partable, - guint i, - GwyRealFunc value_to_gui, - GwyRealFunc gui_to_value, - gpointer user_data, - GDestroyNotify destroy); -static void slider_set_width_chars (GwyParamTable *partable, - guint i); -static void alt_set_width_chars (GwyParamTable *partable, - guint i); -static void alt_set_from_value_format (GwyParamTable *partable, - gint id, - const gchar *unitstr, - gdouble raw_q, - gdouble raw_offset); -static void entry_activated (GtkEntry *gtkentry, - GwyParamTable *partable); -static void entry_changed (GtkEntry *gtkentry, - GwyParamTable *partable); -static void entry_input (GtkEntry *gtkentry, - GwyParamTable *partable, - gboolean is_instant_edit); -static void entry_output (GwyParamTable *partable, - GwyParamControl *control); -static gdouble entry_parse_double_vf (const gchar *text, - gchar **end, - gpointer user_data); -static const gchar* entry_format_double_vf (gdouble value, - gpointer user_data); -static void string_entry_set_value (GwyParamControl *control, - GwyParamTable *partable, - const gchar *value, - gboolean use_default_instead); -static void int_entry_set_value (GwyParamControl *control, - GwyParamTable *partable, - gint value, - gboolean use_default_instead); -static void double_entry_set_value (GwyParamControl *control, - GwyParamTable *partable, - gdouble value, - gboolean use_default_instead); -static void update_control_unit_label (GwyParamControl *control, - GwyParamTable *partable); -static void mask_color_run_selector (GwyColorButton *color_button, - GwyParamTable *partable); -static void message_update_type (GwyParamControl *control); -static gboolean filter_graph_model (GwyContainer *data, - gint id, - gpointer user_data); -static GwyParamControl* find_button_box_end (GwyParamTable *partable, - GwyParamControl *control, - gboolean forward); -static gboolean button_box_has_any_sensitive (GwyParamTable *partable, - GwyParamControl *control); -static void widget_dispose (GtkWidget *widget, - GwyParamTable *partable); -static void make_control_common (GwyParamTable *partable, - guint i); -static void add_separator_as_needed (GwyParamTable *partable, - guint i); -static void attach_hbox_row (GwyParamTable *partable, - gint row, - GwyParamControl *control, - const gchar *dest); -static GtkWidget* add_left_padding (GtkWidget *widget, - gint left_pad); -static GtkWidget* add_right_padding (GtkWidget *widget, - gint right_pad); -static void expand_table (GwyParamTable *partable); -static gint find_control_for_aux (GwyParamTable *partable, - const GwyParamControlAssocTable *assoc_table, - gint id); -static gint find_aux_for_control (GwyParamTable *partable, - const GwyParamControlAssocTable *assoc_table, - gint id); -static GwyToggleListInfo* find_toggles_info (GwyParamTable *partable, - gint id); -static GwyEnum* modify_enum_labels (GwyParamTable *partable, - const GwyEnum *values, - guint nvalues, - gboolean end_with_colon, - gboolean remove_underline); -static const gchar* modify_label (GwyParamTable *partable, - const gchar *label, - gboolean end_with_colon, - gboolean remove_underline); -static GtkWindow* get_parent_window (GwyParamTable *partable, - gboolean must_be_dialog); -static void format_numerical_value (GString *str, - gdouble value, - gint digits); -static guint32 bit_mask_for_enum_value (const GwyParamDefItem *def, - gint value); -static void compute_calibration_steps (GwyDataLine *calibration, - gdouble *mean_step, - gdouble *min_step); -static gdouble calibration_transform_to_gui (GwyDataLine *calibration, - gdouble v); -static gdouble calibration_transform_from_gui (GwyDataLine *calibration, - gdouble v); -static const GwyEnum* guess_standard_stock_ids (const GwyParamDefItem *def); -static gboolean control_has_no_parameter (GwyParamControlType type); -static gboolean control_is_some_kind_of_radio (GwyParamControlType type); -static gboolean control_is_some_kind_of_data_id (GwyParamControlType type); -static gboolean control_is_some_kind_of_curve_no(GwyParamControlType type); -static gboolean control_can_integrate_enabler (GwyParamControlType type); -static gboolean control_can_integrate_unitstr (GwyParamControlType type); -static gboolean control_has_hbox (GwyParamControlType type); -static gdouble multiply_by_constant (gdouble v, - gpointer user_data); -static gdouble divide_by_constant (gdouble v, - gpointer user_data); +static void gwy_param_table_finalize (GObject *gobject); +static GwyParamControl* find_first_control (GwyParamTable *partable, + gint id); +static gboolean find_def_common (GwyParamTable *partable, + gint id, + GwyParams **pparams, + const GwyParamDefItem **def); +static GwyParamControl* append_control (GwyParamTable *partable, + GwyParamControlType type, + gint id, + gint nrows); +static void add_aux_assoc (GwyParamControlAssocTable *assoc_table, + gint aux_id, + gint other_id); +static void add_toggles_info (GwyParamTable *partable, + gint id, + gboolean must_not_exist); +static GtkWidget* ensure_widget (GwyParamTable *partable); +static void update_control_sensitivity (GwyParamTable *partable, + gint i); +static void header_make_control (GwyParamTable *partable, + guint i); +static void checkbox_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void enabler_make_control (GwyParamTable *partable, + guint i, + guint iother); +static void combo_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void radio_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void radio_header_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void radio_item_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void radio_row_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void radio_buttons_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void construct_radio_widgets (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void checkboxes_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void construct_checkbox_widgets (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void data_id_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void curve_no_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void slider_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void alt_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void entry_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void range_from_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void range_to_make_control (GwyParamTable *partable, + guint i, + guint ifrom); +static void mask_color_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void report_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void hold_selection_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void unit_chooser_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void random_seed_make_control (GwyParamTable *partable, + guint i, + const GwyParamDefItem *def); +static void button_make_control (GwyParamTable *partable, + guint i); +static void results_make_control (GwyParamTable *partable, + guint i); +static void message_make_control (GwyParamTable *partable, + guint i); +static void info_make_control (GwyParamTable *partable, + guint i); +static void foreign_make_control (GwyParamTable *partable, + guint i); +static void checkbox_toggled (GtkToggleButton *toggle, + GwyParamTable *partable); +static void enabler_toggled (GtkToggleButton *toggle, + GwyParamTable *partable); +static void togglebutton_set_value (GwyParamControl *control, + GwyParamTable *partable, + gboolean value, + gboolean use_default_instead); +static void combo_changed (GtkComboBox *combo, + GwyParamTable *partable); +static void unit_chosen (GtkComboBox *combo, + GwyParamTable *partable); +static void unit_chooser_change (GtkButton *button, + GwyParamTable *partable); +static gchar* unit_change_dialog_run (GtkWindow *parent, + const gchar *unitstr); +static void enum_combo_set_value (GwyParamControl *control, + GwyParamTable *partable, + gint value, + gboolean use_default_instead); +static void unit_chooser_set_value (GwyParamControl *control, + GwyParamTable *partable, + const gchar *value, + gboolean use_default_instead); +static void resource_combo_set_value (GwyParamControl *control, + GwyParamTable *partable, + const gchar *value, + gboolean use_default_instead); +static void radio_changed (GtkRadioButton *radio, + GwyParamTable *partable); +static void radio_set_value (GwyParamControl *control, + GwyParamTable *partable, + gint value, + gboolean use_default_instead); +static void checkbox_changed (GtkToggleButton *toggle, + GwyParamTable *partable); +static void checkboxes_set_value (GwyParamControl *control, + GwyParamTable *partable, + guint value, + gboolean use_default_instead); +static void graph_id_changed (GwyDataChooser *chooser, + GwyParamTable *partable); +static void image_id_changed (GwyDataChooser *chooser, + GwyParamTable *partable); +static void volume_id_changed (GwyDataChooser *chooser, + GwyParamTable *partable); +static void xyz_id_changed (GwyDataChooser *chooser, + GwyParamTable *partable); +static void curve_map_id_changed (GwyDataChooser *chooser, + GwyParamTable *partable); +static void data_id_set_value (GwyParamControl *control, + GwyParamTable *partable, + GwyAppDataId value, + gboolean use_default_instead); +static void graph_curve_changed (GtkComboBox *combo, + GwyParamTable *partable); +static void lawn_curve_changed (GtkComboBox *combo, + GwyParamTable *partable); +static void lawn_segment_changed (GtkComboBox *combo, + GwyParamTable *partable); +static void curve_no_set_value (GwyParamControl *control, + GwyParamTable *partable, + gint value, + gboolean use_default_instead); +static gint curve_no_get_ncurves (GwyParamControl *control); +static void random_seed_changed (GtkAdjustment *adj, + GwyParamTable *partable); +static void random_seed_new (GtkButton *button, + GwyParamTable *partable); +static void button_clicked (GtkButton *button, + GwyParamTable *partable); +static void mask_color_set_value (GwyParamControl *control, + GwyParamTable *partable, + GwyRGBA color, + gboolean use_default_instead); +static void report_format_changed (GwyResultsExport *rexport, + GwyParamTable *partable); +static void report_copy (GwyResultsExport *rexport, + GwyParamTable *partable); +static void report_save (GwyResultsExport *rexport, + GwyParamTable *partable); +static void report_set_formatter (GwyParamControl *control, + GwyCreateTextFunc format_report, + gpointer user_data, + GDestroyNotify destroy); +static void report_ensure_actions (GwyParamControl *control, + GwyParamTable *partable); +static void report_set_value (GwyParamControl *control, + GwyParamTable *partable, + GwyResultsReportType report_type, + gboolean use_default_instead); +static void hold_selection_set_value (GwyParamControl *control, + GwyParamTable *partable, + GwyHoldSelectionFlags value, + gboolean use_default_instead); +static void hold_selection_changed (GtkWidget *button, + GwyParamTable *partable); +static void slider_value_changed (GtkAdjustment *adj, + GwyParamTable *partable); +static gint slider_spin_input (GtkSpinButton *spin, + gdouble *new_value, + GwyParamTable *partable); +static gboolean slider_spin_output (GtkSpinButton *spin, + GwyParamTable *partable); +static void slider_set_value (GwyParamControl *control, + GwyParamTable *partable, + gdouble value, + gboolean use_default_instead); +static void slider_make_angle (GwyParamTable *partable, + guint i); +static void slider_make_percentage (GwyParamTable *partable, + guint i); +static void slider_auto_configure (GwyParamControl *control, + const GwyParamDefItem *def); +static void slider_reconfigure_adjustment (GwyParamControl *control, + GwyParamTable *partable); +static void slider_reconfigure_alt (GwyParamControl *control, + GwyParamTable *partable); +static void slider_set_transformation (GwyParamTable *partable, + guint i, + GwyRealFunc value_to_gui, + GwyRealFunc gui_to_value, + gpointer user_data, + GDestroyNotify destroy); +static void slider_set_width_chars (GwyParamTable *partable, + guint i); +static void alt_set_width_chars (GwyParamTable *partable, + guint i); +static void alt_set_from_value_format (GwyParamTable *partable, + gint id, + const gchar *unitstr, + gdouble raw_q, + gdouble raw_offset); +static void entry_activated (GtkEntry *gtkentry, + GwyParamTable *partable); +static void entry_changed (GtkEntry *gtkentry, + GwyParamTable *partable); +static void entry_input (GtkEntry *gtkentry, + GwyParamTable *partable, + gboolean is_instant_edit); +static void entry_output (GwyParamTable *partable, + GwyParamControl *control); +static gdouble entry_parse_double_vf (const gchar *text, + gchar **end, + gpointer user_data); +static const gchar* entry_format_double_vf (gdouble value, + gpointer user_data); +static void string_entry_set_value (GwyParamControl *control, + GwyParamTable *partable, + const gchar *value, + gboolean use_default_instead); +static void int_entry_set_value (GwyParamControl *control, + GwyParamTable *partable, + gint value, + gboolean use_default_instead); +static void double_entry_set_value (GwyParamControl *control, + GwyParamTable *partable, + gdouble value, + gboolean use_default_instead); +static void range_set_value (GwyParamControl *control, + GwyParamTable *partable, + gdouble value, + gboolean use_default_instead); +static void range_input (GtkEntry *gtkentry, + GwyParamTable *partable); +static void range_output (GwyParamTable *partable, + GwyParamControl *control); +static void range_activated (GtkEntry *gtkentry, + GwyParamTable *partable); +static GwyParamControlRangeFrom* range_get_impl (GwyParamControl *control, + GwyParamTable *partable); +static void update_control_unit_label (GwyParamControl *control, + GwyParamTable *partable); +static void mask_color_run_selector (GwyColorButton *color_button, + GwyParamTable *partable); +static void message_update_type (GwyParamControl *control); +static gboolean filter_graph_model (GwyContainer *data, + gint id, + gpointer user_data); +static GwyParamControl* find_button_box_end (GwyParamTable *partable, + GwyParamControl *control, + gboolean forward); +static gboolean button_box_has_any_sensitive (GwyParamTable *partable, + GwyParamControl *control); +static void widget_dispose (GtkWidget *widget, + GwyParamTable *partable); +static void make_control_common (GwyParamTable *partable, + guint i); +static void add_separator_as_needed (GwyParamTable *partable, + guint i); +static void attach_hbox_row (GwyParamTable *partable, + gint row, + GwyParamControl *control, + const gchar *dest); +static GtkWidget* add_left_padding (GtkWidget *widget, + gint left_pad); +static GtkWidget* add_right_padding (GtkWidget *widget, + gint right_pad); +static void expand_table (GwyParamTable *partable); +static gint find_control_for_aux (GwyParamTable *partable, + const GwyParamControlAssocTable *assoc_table, + gint id); +static gint find_aux_for_control (GwyParamTable *partable, + const GwyParamControlAssocTable *assoc_table, + gint id); +static GwyToggleListInfo* find_toggles_info (GwyParamTable *partable, + gint id); +static GwyEnum* modify_enum_labels (GwyParamTable *partable, + const GwyEnum *values, + guint nvalues, + gboolean end_with_colon, + gboolean remove_underline); +static const gchar* modify_label (GwyParamTable *partable, + const gchar *label, + gboolean end_with_colon, + gboolean remove_underline); +static GtkWindow* get_parent_window (GwyParamTable *partable, + gboolean must_be_dialog); +static const gchar* format_double_vf_common (gdouble value, + GwySIValueFormat *vf, + GString *str); +static void format_numerical_value (GString *str, + gdouble value, + gint digits); +static guint32 bit_mask_for_enum_value (const GwyParamDefItem *def, + gint value); +static void compute_calibration_steps (GwyDataLine *calibration, + gdouble *mean_step, + gdouble *min_step); +static gdouble calibration_transform_to_gui (GwyDataLine *calibration, + gdouble v); +static gdouble calibration_transform_from_gui (GwyDataLine *calibration, + gdouble v); +static const GwyEnum* guess_standard_stock_ids (const GwyParamDefItem *def); +static gboolean control_has_no_parameter (GwyParamControlType type); +static gboolean control_is_some_kind_of_radio (GwyParamControlType type); +static gboolean control_is_some_kind_of_data_id (GwyParamControlType type); +static gboolean control_is_some_kind_of_curve_no(GwyParamControlType type); +static gboolean control_can_integrate_enabler (GwyParamControlType type); +static gboolean control_can_integrate_unitstr (GwyParamControlType type); +static gboolean control_has_hbox (GwyParamControlType type); +static gdouble multiply_by_constant (gdouble v, + gpointer user_data); +static gdouble divide_by_constant (gdouble v, + gpointer user_data); static guint signals[N_SIGNALS]; @@ -738,6 +762,12 @@ GWY_SI_VALUE_FORMAT_FREE(entry->vf); g_slice_free(GwyParamControlEntry, entry); } + else if (type == GWY_PARAM_CONTROL_RANGE_FROM) { + GwyParamControlRangeFrom *range = (GwyParamControlRangeFrom*)control->impl; + if (range->vf) + GWY_SI_VALUE_FORMAT_FREE(range->vf); + g_slice_free(GwyParamControlRangeFrom, range); + } else if (type == GWY_PARAM_CONTROL_MASK_COLOR) { GwyParamControlMaskColor *maskcolor = (GwyParamControlMaskColor*)control->impl; gwy_debug("sync back mask color to %p, %d? %d", maskcolor->data, maskcolor->i, priv->proceed); @@ -796,6 +826,7 @@ } g_free(priv->controls); g_free(priv->enabler.assoc); + g_free(priv->range.assoc); g_free(priv->toggles_info); g_string_free(priv->str, TRUE); GWY_SI_VALUE_FORMAT_FREE(priv->vf); @@ -957,6 +988,8 @@ } else if (type == GWY_PARAM_CONTROL_REPORT) report_set_value(control, partable, 0, TRUE); + else if (type == GWY_PARAM_CONTROL_HOLD_SELECTION) + hold_selection_set_value(control, partable, 0, TRUE); else { g_critical("Unhandled control type %d.", type); } @@ -1058,6 +1091,10 @@ else string_entry_set_value(control, partable, gwy_params_get_string(params, id), FALSE); } + else if (type == GWY_PARAM_CONTROL_RANGE_FROM) + range_set_value(control, partable, gwy_params_get_double(params, id), FALSE); + else if (type == GWY_PARAM_CONTROL_RANGE_TO) + range_set_value(control, partable, gwy_params_get_double(params, id), FALSE); else if (control_is_some_kind_of_data_id(control->type)) { data_id_set_value(control, partable, gwy_params_get_data_id(params, id), FALSE); } @@ -1067,6 +1104,8 @@ mask_color_set_value(control, partable, gwy_params_get_color(params, id), FALSE); else if (type == GWY_PARAM_CONTROL_REPORT) report_set_value(control, partable, gwy_params_get_report_type(params, id), FALSE); + else if (type == GWY_PARAM_CONTROL_HOLD_SELECTION) + hold_selection_set_value(control, partable, gwy_params_get_flags(params, id), FALSE); else { g_critical("Unhandled control type %d.", type); } @@ -1159,7 +1198,7 @@ * response handler either. This can be useful for parameters that do not have static default values and need special * treatment during the reset. * - * Some parameters are no-reset by default: data ids and mask colour. + * Some parameters are no-reset by default: for instance data ids or mask colour. * * Since: 2.59 **/ @@ -1340,6 +1379,9 @@ slider_set_value(control, partable, value, FALSE); else if (control->type == GWY_PARAM_CONTROL_ENTRY) double_entry_set_value(control, partable, value, FALSE); + else if (control->type == GWY_PARAM_CONTROL_RANGE_FROM + || control->type == GWY_PARAM_CONTROL_RANGE_TO) + range_set_value(control, partable, value, FALSE); else { g_assert_not_reached(); } @@ -1392,8 +1434,18 @@ gint id, guint value) { + GwyParamControl *control; + g_return_if_fail(GWY_IS_PARAM_TABLE(partable)); - checkboxes_set_value(find_first_control(partable, id), partable, value, FALSE); + control = find_first_control(partable, id); + g_return_if_fail(control); + if (control->type == GWY_PARAM_CONTROL_CHECKBOXES) + checkboxes_set_value(control, partable, value, FALSE); + else if (control->type == GWY_PARAM_CONTROL_HOLD_SELECTION) + hold_selection_set_value(control, partable, value, FALSE); + else { + g_assert_not_reached(); + } } /** @@ -1581,7 +1633,7 @@ g_return_if_fail(def->type == GWY_PARAM_BOOLEAN); append_control(partable, GWY_PARAM_CONTROL_CHECKBOX, id, 1); if (partable->priv->widget) - checkbox_make_control(partable, partable->priv->ncontrols-1, params, def); + checkbox_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1595,7 +1647,7 @@ * The parameter identified by @id must be a boolean defined by gwy_param_def_add_boolean() or a predefined boolean. * * The parameter identified by @other_id must be added as combo box, data chooser, slider or radio button row (text - * or image buttons). The check box will the be integrated in the control of that parameter. If you have a generic + * or image buttons). The check box will then be integrated in the control of that parameter. If you have a generic * enable/disable parameter with its own standalone checkbox use gwy_param_table_append_checkbox() instead (and set * widget sensitivity using gwy_param_table_set_sensitive() in the #GwyParamTable::param-changed signal handler). * @@ -1628,7 +1680,7 @@ control->impl = enabler = g_slice_new0(GwyParamControlEnabler); add_aux_assoc(&priv->enabler, id, other_id); if (priv->widget && other_control && other_control->widget) { - enabler_make_control(partable, priv->ncontrols-1, other_control - priv->controls, params); + enabler_make_control(partable, priv->ncontrols-1, other_control - priv->controls); update_control_sensitivity(partable, priv->ncontrols-1); } } @@ -1657,7 +1709,7 @@ if (!find_def_common(partable, id, ¶ms, &def)) return; - g_return_if_fail(def->type == GWY_PARAM_ENUM || def->type == GWY_PARAM_RESOURCE); + g_return_if_fail(def->type == GWY_PARAM_ENUM || def->type == GWY_PARAM_RESOURCE_NAME); control = append_control(partable, GWY_PARAM_CONTROL_COMBO, id, 1); control->impl = combo = g_slice_new0(GwyParamControlCombo); if (def->type == GWY_PARAM_ENUM) { @@ -1670,7 +1722,7 @@ combo->is_resource = TRUE; } if (partable->priv->widget) - combo_make_control(partable, partable->priv->ncontrols-1, params, def); + combo_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1814,7 +1866,7 @@ append_control(partable, GWY_PARAM_CONTROL_RADIO, id, (def->desc ? 1 : 0) + def->def.e.nvalues); add_toggles_info(partable, id, TRUE); if (partable->priv->widget) - radio_make_control(partable, partable->priv->ncontrols-1, params, def); + radio_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1848,7 +1900,7 @@ append_control(partable, GWY_PARAM_CONTROL_RADIO_HEADER, id, 1); add_toggles_info(partable, id, TRUE); if (partable->priv->widget) - radio_header_make_control(partable, partable->priv->ncontrols-1, params, def); + radio_header_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1886,7 +1938,7 @@ radioitem->value = value; add_toggles_info(partable, id, FALSE); if (partable->priv->widget) - radio_item_make_control(partable, partable->priv->ncontrols-1, params, def); + radio_item_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1920,7 +1972,7 @@ append_control(partable, GWY_PARAM_CONTROL_RADIO_ROW, id, 1); add_toggles_info(partable, id, TRUE); if (partable->priv->widget) - radio_row_make_control(partable, partable->priv->ncontrols-1, params, def); + radio_row_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -1966,7 +2018,7 @@ radiobuttons->stock_ids = stock_ids; add_toggles_info(partable, id, TRUE); if (partable->priv->widget) - radio_buttons_make_control(partable, partable->priv->ncontrols-1, params, def); + radio_buttons_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2043,7 +2095,7 @@ append_control(partable, GWY_PARAM_CONTROL_CHECKBOXES, id, (def->desc ? 1 : 0) + def->def.f.nvalues); add_toggles_info(partable, id, TRUE); if (partable->priv->widget) - checkboxes_make_control(partable, partable->priv->ncontrols-1, params, def); + checkboxes_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2140,7 +2192,7 @@ datachooser->none = _("New graph"); } if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2172,7 +2224,7 @@ control->do_not_reset = TRUE; control->impl = datachooser = g_slice_new0(GwyParamControlDataChooser); if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2203,7 +2255,7 @@ control->do_not_reset = TRUE; control->impl = datachooser = g_slice_new0(GwyParamControlDataChooser); if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2234,7 +2286,7 @@ control->do_not_reset = TRUE; control->impl = datachooser = g_slice_new0(GwyParamControlDataChooser); if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2265,7 +2317,7 @@ control->do_not_reset = TRUE; control->impl = datachooser = g_slice_new0(GwyParamControlDataChooser); if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2296,7 +2348,7 @@ control->do_not_reset = TRUE; control->impl = datachooser = g_slice_new0(GwyParamControlDataChooser); if (partable->priv->widget) - data_id_make_control(partable, partable->priv->ncontrols-1, params, def); + data_id_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2413,7 +2465,7 @@ control->impl = curvechooser = g_slice_new0(GwyParamControlCurveChooser); gwy_set_member_object(partable, gmodel, GWY_TYPE_GRAPH_MODEL, &curvechooser->parent, NULL); if (partable->priv->widget) - curve_no_make_control(partable, partable->priv->ncontrols-1, params, def); + curve_no_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2438,6 +2490,7 @@ GwyParamTablePrivate *priv; GwyGraphCurveModel *gcmodel; GtkWidget *hbox; + const gchar *prevdescription; gint n, curveno = 0; guint i; @@ -2451,7 +2504,8 @@ return; priv = partable->priv; - if ((gcmodel = gwy_graph_model_get_curve_by_description(gmodel, gwy_params_get_string(priv->params, id)))) + if ((prevdescription = gwy_params_get_string(priv->params, id)) + && (gcmodel = gwy_graph_model_get_curve_by_description(gmodel, prevdescription))) curveno = gwy_graph_model_get_curve_index(gmodel, gcmodel); n = gwy_graph_model_get_n_curves(gmodel); @@ -2522,7 +2576,7 @@ control->impl = curvechooser = g_slice_new0(GwyParamControlCurveChooser); gwy_set_member_object(partable, lawn, GWY_TYPE_LAWN, &curvechooser->parent, NULL); if (partable->priv->widget) - curve_no_make_control(partable, partable->priv->ncontrols-1, params, def); + curve_no_make_control(partable, partable->priv->ncontrols-1, def); } /* XXX: This is complicated and apparently not needed. Avoid exposing it as a public API until we need it. */ @@ -2642,7 +2696,7 @@ control->impl = curvechooser = g_slice_new0(GwyParamControlCurveChooser); gwy_set_member_object(partable, lawn, GWY_TYPE_LAWN, &curvechooser->parent, NULL); if (partable->priv->widget) - curve_no_make_control(partable, partable->priv->ncontrols-1, params, def); + curve_no_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -2684,7 +2738,7 @@ slider_make_percentage(partable, i); } if (partable->priv->widget) - slider_make_control(partable, i, params, def); + slider_make_control(partable, i, def); } /** @@ -3038,7 +3092,6 @@ GwyParamControl *control; const GwyParamDefItem *def; GwyParamControlSlider *slider; - GwyParams *params; guint i; g_return_if_fail(GWY_IS_PARAM_TABLE(partable)); @@ -3054,7 +3107,7 @@ slider->alt_offset_to_gui = 0.0; i = control - priv->controls; if (priv->widget && control->widget) { - alt_make_control(partable, i, params, def); + alt_make_control(partable, i, def); update_control_sensitivity(partable, i); } } @@ -3408,7 +3461,7 @@ entry->is_numeric = (def->type == GWY_PARAM_INT || def->type == GWY_PARAM_DOUBLE); entry->is_int = (def->type == GWY_PARAM_INT); if (partable->priv->widget) - entry_make_control(partable, partable->priv->ncontrols-1, params, def); + entry_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -3466,35 +3519,62 @@ const GwyParamDefItem *def; GwyParams *params; GwyParamControl *control; - GwyParamControlEntry *entry; g_return_if_fail(GWY_IS_PARAM_TABLE(partable)); control = find_first_control(partable, id); - g_return_if_fail(control && control->type == GWY_PARAM_CONTROL_ENTRY); + g_return_if_fail(control && (control->type == GWY_PARAM_CONTROL_ENTRY + || control->type == GWY_PARAM_CONTROL_RANGE_FROM + || control->type == GWY_PARAM_CONTROL_RANGE_TO)); if (!find_def_common(partable, id, ¶ms, &def)) return; g_return_if_fail(def->type == GWY_PARAM_DOUBLE); - entry = (GwyParamControlEntry*)control->impl; - if (entry->transform_destroy) { - entry->transform_destroy(entry->transform_data); - entry->transform_destroy = NULL; - } - if (vf) { - entry->vf = gwy_si_unit_value_format_clone(vf, entry->vf); - entry->transform_data = entry; - entry->parse = entry_parse_double_vf; - entry->format = entry_format_double_vf; + if (control->type == GWY_PARAM_CONTROL_ENTRY) { + GwyParamControlEntry *entry = (GwyParamControlEntry*)control->impl; + if (entry->transform_destroy) { + entry->transform_destroy(entry->transform_data); + entry->transform_destroy = NULL; + } + if (vf) { + entry->vf = gwy_si_unit_value_format_clone(vf, entry->vf); + entry->transform_data = entry; + entry->parse = entry_parse_double_vf; + entry->format = entry_format_double_vf; + } + else { + GWY_SI_VALUE_FORMAT_FREE(entry->vf); + entry->transform_data = NULL; + entry->parse = NULL; + entry->format = NULL; + } + gwy_param_table_set_unitstr(partable, control->id, entry->vf ? entry->vf->units : NULL); + if (control->widget) + entry_output(partable, control); } else { - GWY_SI_VALUE_FORMAT_FREE(entry->vf); - entry->transform_data = NULL; - entry->parse = NULL; - entry->format = NULL; - } + GwyParamControlRangeFrom *range = range_get_impl(control, partable); + GwyParamTablePrivate *priv = partable->priv; + GwyParamControl *control_from, *control_to; + + g_return_if_fail(range); + if (vf) + range->vf = gwy_si_unit_value_format_clone(vf, range->vf); + else + GWY_SI_VALUE_FORMAT_FREE(range->vf); + gwy_param_table_set_unitstr(partable, control->id, range->vf ? range->vf->units : NULL); - gwy_param_table_set_unitstr(partable, control->id, entry->vf ? entry->vf->units : NULL); - if (control->widget) - entry_output(partable, control); + if (control->type == GWY_PARAM_CONTROL_RANGE_FROM) { + control_from = control; + control_to = priv->controls + find_aux_for_control(partable, &priv->range, id); + } + else { + control_from = priv->controls + find_control_for_aux(partable, &priv->range, id); + control_to = control; + } + if (control_from->widget) + range_output(partable, control_from); + if (control_to->widget) + range_output(partable, control_to); + } } /** @@ -3539,6 +3619,58 @@ } /** + * gwy_param_table_append_range: + * @partable: Set of parameter value controls. + * @id_from: Parameter identifier for the beginning. + * @id_to: Parameter identifier for the end. + * + * Adds a pair of numerical entries representing a range to a parameter table. + * + * This is mostly useful for entering graph ranges numerically. For image ranges separate controls are preferred as + * they allow pixel plus alternative real values. + * + * The two parameters identified by @id_from and @id_to must be doubles and distinct. Parameter @id_from is considered + * primary and should be used for referring to the control as a whole (for instance to make it insensitive), even + * though for convenience both are passed directly to this function. + * + * Use gwy_param_table_entry_set_value_format() to set the value format. + * + * Since: 2.63 + **/ +void +gwy_param_table_append_range(GwyParamTable *partable, + gint id_from, + gint id_to) +{ + GwyParamControl *control; + GwyParamControlRangeFrom *range; + GwyParams *params; + const GwyParamDefItem *def_from, *def_to; + GwyParamTablePrivate *priv; + + g_return_if_fail(id_to != id_from); + if (!find_def_common(partable, id_from, ¶ms, &def_from) + || !find_def_common(partable, id_to, ¶ms, &def_to)) + return; + g_return_if_fail(def_from->type == GWY_PARAM_DOUBLE); + g_return_if_fail(def_to->type == GWY_PARAM_DOUBLE); + + /* This one is a bit odd. We construct the range as a main ‘from’ control and add the ‘to’ control as an + * associated auxiliary control, similarly to enablers. It should not matter to the caller much. */ + priv = partable->priv; + control = append_control(partable, GWY_PARAM_CONTROL_RANGE_FROM, id_from, 1); + control->do_not_reset = TRUE; + control->impl = range = g_slice_new0(GwyParamControlRangeFrom); + range->str = priv->str; + append_control(partable, GWY_PARAM_CONTROL_RANGE_TO, id_to, 0); + + add_aux_assoc(&priv->range, id_to, id_from); + /* This will chain-construct both, similarly to enablers. */ + if (priv->widget) + range_from_make_control(partable, priv->ncontrols-2, def_from); +} + +/** * gwy_param_table_append_unit_chooser: * @partable: Set of parameter value controls. * @id: Parameter identifier. @@ -3564,7 +3696,7 @@ control = append_control(partable, GWY_PARAM_CONTROL_UNIT_CHOOSER, id, 1); control->impl = unit = g_slice_new0(GwyParamControlUnitChooser); if (partable->priv->widget) - unit_chooser_make_control(partable, partable->priv->ncontrols-1, params, def); + unit_chooser_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -3632,7 +3764,7 @@ gwy_rgba_store_to_container(&color, preview_data, key); } if (partable->priv->widget) - mask_color_make_control(partable, partable->priv->ncontrols-1, params, def); + mask_color_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -3899,7 +4031,7 @@ control->do_not_reset = TRUE; control->impl = report = g_slice_new0(GwyParamControlReport); if (partable->priv->widget) - report_make_control(partable, partable->priv->ncontrols-1, params, def); + report_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -4012,7 +4144,38 @@ control->do_not_reset = TRUE; control->impl = randomseed = g_slice_new0(GwyParamControlRandomSeed); if (partable->priv->widget) - random_seed_make_control(partable, partable->priv->ncontrols-1, params, def); + random_seed_make_control(partable, partable->priv->ncontrols-1, def); +} + +/** + * gwy_param_table_append_hold_selection: + * @partable: Set of parameter value controls. + * @id: Parameter identifier. + * + * Adds a selection holding parameter to a parameter table. + * + * The parameter identified by @id must be a selection holding flags parameter defined by + * gwy_param_def_add_hold_selection(). + * + * Since: 2.63 + **/ +void +gwy_param_table_append_hold_selection(GwyParamTable *partable, + gint id) +{ + GwyParamControl *control; + GwyParamControlHoldSelection *holdsel; + GwyParams *params; + const GwyParamDefItem *def; + + if (!find_def_common(partable, id, ¶ms, &def)) + return; + g_return_if_fail(def->type == GWY_PARAM_FLAGS && def->def.f.gtype == GWY_TYPE_HOLD_SELECTION_FLAGS); + control = append_control(partable, GWY_PARAM_CONTROL_HOLD_SELECTION, id, 1); + control->do_not_reset = TRUE; + control->impl = holdsel = g_slice_new0(GwyParamControlHoldSelection); + if (partable->priv->widget) + hold_selection_make_control(partable, partable->priv->ncontrols-1, def); } /** @@ -4168,7 +4331,10 @@ gtk_button_set_label(GTK_BUTTON(control->widget), new_label); else if (type == GWY_PARAM_CONTROL_SLIDER) gtk_label_set_markup(GTK_LABEL(gwy_adjust_bar_get_label(GWY_ADJUST_BAR(control->widget))), new_label); - else if (type == GWY_PARAM_CONTROL_RANDOM_SEED || type == GWY_PARAM_CONTROL_ENTRY) + else if (type == GWY_PARAM_CONTROL_RANDOM_SEED + || type == GWY_PARAM_CONTROL_ENTRY + || type == GWY_PARAM_CONTROL_RANGE_FROM /* FIXME FIXME FIXME: correct? */ + || type == GWY_PARAM_CONTROL_RANGE_TO) gtk_label_set_markup(GTK_LABEL(control->label), new_label); else if (type == GWY_PARAM_CONTROL_COMBO || type == GWY_PARAM_CONTROL_IMAGE_ID_COMBO @@ -4556,7 +4722,7 @@ row += controls[k].nrows; if (type == GWY_PARAM_CONTROL_SEPARATOR) continue; - if (type == GWY_PARAM_CONTROL_ENABLER) + if (type == GWY_PARAM_CONTROL_ENABLER || type == GWY_PARAM_CONTROL_RANGE_TO) continue; if (type == GWY_PARAM_CONTROL_HEADER) header_make_control(partable, k); @@ -4573,37 +4739,41 @@ else { def = _gwy_param_def_item(pardef, _gwy_param_def_index(pardef, controls[k].id)); if (type == GWY_PARAM_CONTROL_CHECKBOX) - checkbox_make_control(partable, k, params, def); + checkbox_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_COMBO) - combo_make_control(partable, k, params, def); + combo_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RADIO) - radio_make_control(partable, k, params, def); + radio_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_CHECKBOXES) - checkboxes_make_control(partable, k, params, def); + checkboxes_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RADIO_HEADER) - radio_header_make_control(partable, k, params, def); + radio_header_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RADIO_ITEM) - radio_item_make_control(partable, k, params, def); + radio_item_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RADIO_ROW) - radio_row_make_control(partable, k, params, def); + radio_row_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RADIO_BUTTONS) - radio_buttons_make_control(partable, k, params, def); + radio_buttons_make_control(partable, k, def); else if (control_is_some_kind_of_data_id(type)) - data_id_make_control(partable, k, params, def); + data_id_make_control(partable, k, def); else if (control_is_some_kind_of_curve_no(type)) - curve_no_make_control(partable, k, params, def); + curve_no_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_SLIDER) - slider_make_control(partable, k, params, def); + slider_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_ENTRY) - entry_make_control(partable, k, params, def); + entry_make_control(partable, k, def); + else if (type == GWY_PARAM_CONTROL_RANGE_FROM) + range_from_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_MASK_COLOR) - mask_color_make_control(partable, k, params, def); + mask_color_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_UNIT_CHOOSER) - unit_chooser_make_control(partable, k, params, def); + unit_chooser_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_REPORT) - report_make_control(partable, k, params, def); + report_make_control(partable, k, def); + else if (type == GWY_PARAM_CONTROL_HOLD_SELECTION) + hold_selection_make_control(partable, k, def); else if (type == GWY_PARAM_CONTROL_RANDOM_SEED) - random_seed_make_control(partable, k, params, def); + random_seed_make_control(partable, k, def); else { g_assert_not_reached(); } @@ -4763,8 +4933,8 @@ hbox = gtk_widget_get_ancestor(control->widget, GTK_TYPE_HBOX); gwy_debug("hbox: %p", hbox); - /* HBoxes without enablers are easy; we can just set the sensitivity of the box. - * XXX: Some of these, like combos, might have unitstr? */ + g_return_if_fail(hbox); + /* HBoxes without enablers are easy; we can just set the sensitivity of the box. And possibly the units. */ if (!sensitive) { gwy_debug("making entire hbox insensitive"); gtk_widget_set_sensitive(hbox, FALSE); @@ -4792,6 +4962,18 @@ } if (control->unitlabel) gtk_widget_set_sensitive(control->unitlabel, TRUE); + + /* Selection holding flags buttons have a specific cascading logic. */ + if (type == GWY_PARAM_CONTROL_HOLD_SELECTION) { + GwyParamControlHoldSelection *holdsel = (GwyParamControlHoldSelection*)control->impl; + GwyHoldSelectionFlags flags = gwy_params_get_flags(priv->params, id); + gboolean hold_enabled = flags & GWY_HOLD_SELECTION_HOLD; + gboolean overwrite_enabled = flags & GWY_HOLD_SELECTION_OVERWRITE; + + gtk_widget_set_sensitive(holdsel->overwrite, hold_enabled); + gtk_widget_set_sensitive(holdsel->clear, hold_enabled && overwrite_enabled); + } + /* If the row contains lists of radio buttons and it is sensitive, we must check also individual buttons. */ if (type != GWY_PARAM_CONTROL_RADIO_ROW && type != GWY_PARAM_CONTROL_RADIO_BUTTONS) return; @@ -4872,8 +5054,7 @@ } static void -checkbox_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +checkbox_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -4885,7 +5066,8 @@ label = (control->label_text ? control->label_text : def->desc); control->widget = gtk_check_button_new_with_mnemonic(label); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(control->widget), gwy_params_get_boolean(params, control->id)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(control->widget), + gwy_params_get_boolean(priv->params, control->id)); gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->widget)), row, row+1); gtk_table_attach(GTK_TABLE(priv->widget), control->widget, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); gtk_widget_show(control->widget); @@ -4896,10 +5078,10 @@ } static void -enabler_make_control(GwyParamTable *partable, guint i, guint iother, - GwyParams *params) +enabler_make_control(GwyParamTable *partable, guint i, guint iother) { GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; GwyParamControl *control = priv->controls + i, *other_control = priv->controls + iother; const GwyParamDefItem *otherdef; @@ -5030,10 +5212,10 @@ } static void -combo_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +combo_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; GwyParamControl *control = priv->controls + i; GwyParamControlCombo *combo = (GwyParamControlCombo*)control->impl; GwyInventoryStore *store; @@ -5094,13 +5276,12 @@ attach_hbox_row(partable, row, control, (control->label_text ? control->label_text : def->desc)); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); } static void -radio_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +radio_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5111,7 +5292,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_RADIO); make_control_common(partable, i); - construct_radio_widgets(partable, i, params, def); + construct_radio_widgets(partable, i, def); table = GTK_TABLE(priv->widget); if (control->label) { gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->label)), row, row+1); @@ -5129,8 +5310,7 @@ } static void -radio_header_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +radio_header_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5140,7 +5320,7 @@ g_return_if_fail(def->desc); make_control_common(partable, i); - construct_radio_widgets(partable, i, params, def); + construct_radio_widgets(partable, i, def); gtk_table_attach(GTK_TABLE(priv->widget), control->label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); gtk_widget_show(control->label); gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->label)), row, row+1); @@ -5148,8 +5328,7 @@ } static void -radio_item_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +radio_item_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5160,7 +5339,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_RADIO_ITEM); make_control_common(partable, i); - construct_radio_widgets(partable, i, params, def); + construct_radio_widgets(partable, i, def); for (list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(control->widget)); list; list = g_slist_next(list)) { gint buttonvalue = gwy_radio_button_get_value(GTK_WIDGET(list->data)); if (buttonvalue == radioitem->value) { @@ -5175,8 +5354,7 @@ } static void -radio_row_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +radio_row_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5190,7 +5368,7 @@ hbox = gwy_hbox_new(GWY_PARAM_TABLE_COLSEP); gtk_table_attach(GTK_TABLE(priv->widget), hbox, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - construct_radio_widgets(partable, i, params, def); + construct_radio_widgets(partable, i, def); /* We are attaching from the end so the order needs to be reversed. */ list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(control->widget)); list = g_slist_reverse(g_slist_copy(list)); @@ -5202,13 +5380,12 @@ gtk_box_pack_start(GTK_BOX(hbox), control->label, FALSE, FALSE, 0); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); } static void -radio_buttons_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +radio_buttons_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5241,7 +5418,7 @@ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); } list = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); - gwy_radio_buttons_set_current(list, gwy_params_get_enum(params, id)); + gwy_radio_buttons_set_current(list, gwy_params_get_enum(priv->params, id)); gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(list->data)), row, row+1); control->widget = GTK_WIDGET(list->data); while (list) { @@ -5256,13 +5433,12 @@ } update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); } static void -construct_radio_widgets(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +construct_radio_widgets(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *controls = priv->controls, *control = controls + i; @@ -5288,7 +5464,7 @@ gtk_misc_set_alignment(GTK_MISC(control->label), 0.0, 0.5); } list = gwy_radio_buttons_create(def->def.e.table, def->def.e.nvalues, G_CALLBACK(radio_changed), partable, - gwy_params_get_enum(params, id)); + gwy_params_get_enum(priv->params, id)); control->widget = GTK_WIDGET(list->data); while (list) { g_object_set_qdata(G_OBJECT(list->data), param_control_quark, GUINT_TO_POINTER(i)); @@ -5299,8 +5475,7 @@ } static void -checkboxes_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +checkboxes_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5311,7 +5486,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_CHECKBOXES); make_control_common(partable, i); - construct_checkbox_widgets(partable, i, params, def); + construct_checkbox_widgets(partable, i, def); table = GTK_TABLE(priv->widget); if (control->label) { gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->label)), row, row+1); @@ -5329,8 +5504,7 @@ } static void -construct_checkbox_widgets(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +construct_checkbox_widgets(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *controls = priv->controls, *control = controls + i; @@ -5356,7 +5530,7 @@ gtk_misc_set_alignment(GTK_MISC(control->label), 0.0, 0.5); } list = gwy_check_boxes_create(def->def.f.table, def->def.f.nvalues, G_CALLBACK(checkbox_changed), partable, - gwy_params_get_flags(params, id)); + gwy_params_get_flags(priv->params, id)); control->widget = GTK_WIDGET(list->data); while (list) { g_object_set_qdata(G_OBJECT(list->data), param_control_quark, GUINT_TO_POINTER(i)); @@ -5366,10 +5540,10 @@ } static void -data_id_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +data_id_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; GwyParamControl *control = priv->controls + i; GwyParamControlType type = control->type; GwyParamControlDataChooser *datachooser = (GwyParamControlDataChooser*)control->impl; @@ -5423,7 +5597,7 @@ attach_hbox_row(partable, row, control, (control->label_text ? control->label_text : def->desc)); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); if (type == GWY_PARAM_CONTROL_GRAPH_ID_COMBO) @@ -5444,10 +5618,10 @@ } static void -curve_no_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +curve_no_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; GwyParamControl *control = priv->controls + i; GwyParamControlType type = control->type; GwyParamControlCurveChooser *curvechooser = (GwyParamControlCurveChooser*)control->impl; @@ -5479,7 +5653,7 @@ attach_hbox_row(partable, row, control, (control->label_text ? control->label_text : def->desc)); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); } @@ -5491,10 +5665,10 @@ } static void -slider_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +slider_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; GwyParamControl *control = priv->controls + i; GwyParamControlSlider *slider = (GwyParamControlSlider*)control->impl; gint row = control->row, id = control->id, ienabler; @@ -5535,11 +5709,11 @@ gtk_table_attach(GTK_TABLE(priv->widget), slider->spin, 1, 2, row, row+1, GTK_FILL, 0, 0, 0); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); gtk_widget_show(control->widget); gtk_widget_show(slider->spin); if (slider->has_alt) - alt_make_control(partable, i, params, def); + alt_make_control(partable, i, def); update_control_sensitivity(partable, i); g_signal_connect(slider->adj, "value-changed", G_CALLBACK(slider_value_changed), partable); g_signal_connect(slider->spin, "input", G_CALLBACK(slider_spin_input), partable); @@ -5547,8 +5721,7 @@ } static void -alt_make_control(GwyParamTable *partable, guint i, - G_GNUC_UNUSED GwyParams *params, G_GNUC_UNUSED const GwyParamDefItem *def) +alt_make_control(GwyParamTable *partable, guint i, G_GNUC_UNUSED const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5585,8 +5758,7 @@ } static void -entry_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +entry_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5617,7 +5789,7 @@ update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); gtk_widget_show(control->widget); if (control->label) gtk_widget_show(control->label); @@ -5630,8 +5802,63 @@ } static void -mask_color_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +range_from_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) +{ + GwyParamTablePrivate *priv = partable->priv; + GwyParamControl *control = priv->controls + i; + gint row = control->row, ito; + + g_return_if_fail(control->type == GWY_PARAM_CONTROL_RANGE_FROM); + make_control_common(partable, i); + + control->widget = gtk_entry_new(); + g_object_set_qdata(G_OBJECT(control->widget), param_control_quark, GUINT_TO_POINTER(i)); + gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->widget)), row, row+1); + gtk_entry_set_width_chars(GTK_ENTRY(control->widget), 9); + attach_hbox_row(partable, row, control, (control->label_text ? control->label_text : def->desc)); + update_control_unit_label(control, partable); + range_output(partable, control); + + ito = find_aux_for_control(partable, &priv->range, control->id); + g_assert(ito >= 0.0); + range_to_make_control(partable, ito, i); + + gwy_widget_set_activate_on_unfocus(control->widget, TRUE); + g_signal_connect(control->widget, "activate", G_CALLBACK(range_activated), partable); +} + +static void +range_to_make_control(GwyParamTable *partable, guint i, guint ifrom) +{ + GwyParamTablePrivate *priv = partable->priv; + GwyParamControl *control = priv->controls + i, *control_from = priv->controls + ifrom; + const gchar *label; + GtkWidget *hbox; + + g_return_if_fail(control->type == GWY_PARAM_CONTROL_RANGE_TO); + hbox = gtk_widget_get_ancestor(control_from->widget, GTK_TYPE_HBOX); + g_return_if_fail(hbox); + + control->widget = gtk_entry_new(); + g_object_set_qdata(G_OBJECT(control->widget), param_control_quark, GUINT_TO_POINTER(i)); + gwy_debug("attach %s to hbox", g_type_name(G_TYPE_FROM_INSTANCE(control->widget))); + gtk_entry_set_width_chars(GTK_ENTRY(control->widget), 9); + gtk_box_pack_end(GTK_BOX(hbox), control->widget, FALSE, FALSE, 0); + + /* TODO: Perhaps make modifiable. */ + label = gwy_sgettext("range|to"); + gtk_box_pack_end(GTK_BOX(hbox), gtk_label_new(label), FALSE, FALSE, GWY_PARAM_TABLE_COLSEP); + + gtk_box_reorder_child(GTK_BOX(hbox), control_from->widget, -1); + + range_output(partable, control); + + gwy_widget_set_activate_on_unfocus(control->widget, TRUE); + g_signal_connect(control->widget, "activate", G_CALLBACK(range_activated), partable); +} + +static void +mask_color_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5644,20 +5871,19 @@ control->widget = gwy_color_button_new(); gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->widget)), row, row+1); gwy_color_button_set_use_alpha(GWY_COLOR_BUTTON(control->widget), TRUE); - color = gwy_params_get_color(params, control->id); + color = gwy_params_get_color(priv->params, control->id); gwy_color_button_set_color(GWY_COLOR_BUTTON(control->widget), &color); g_object_set_qdata(G_OBJECT(control->widget), param_control_quark, GUINT_TO_POINTER(i)); attach_hbox_row(partable, row, control, (control->label_text ? control->label_text : def->desc)); update_control_unit_label(control, partable); if ((ienabler = find_aux_for_control(partable, &priv->enabler, control->id)) >= 0) - enabler_make_control(partable, ienabler, i, params); + enabler_make_control(partable, ienabler, i); update_control_sensitivity(partable, i); g_signal_connect(control->widget, "clicked", G_CALLBACK(mask_color_run_selector), partable); } static void -report_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +report_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5669,7 +5895,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_REPORT); make_control_common(partable, i); - report_type = gwy_params_get_report_type(params, control->id); + report_type = gwy_params_get_report_type(priv->params, control->id); control->widget = gwy_results_export_new(report_type); g_object_set_qdata(G_OBJECT(control->widget), param_control_quark, GUINT_TO_POINTER(i)); gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->widget)), row, row+1); @@ -5685,9 +5911,78 @@ report_ensure_actions(control, partable); } +static GtkWidget* +hold_selection_make_toggle(GwyHoldSelectionFlags value, + const gchar *stock_id, + const GwyParamDefItem *def, + GtkWidget *hbox, + GtkSizeGroup *sizegroup) +{ + GtkWidget *button; + + button = gtk_toggle_button_new(); + gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text(button, + gwy_sgettext(gwy_enum_to_string(value, def->def.f.table, def->def.f.nvalues))); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_size_group_add_widget(sizegroup, button); + + return button; +} + +static void +hold_selection_set_up_button(GtkWidget *button, + GwyHoldSelectionFlags value, GwyHoldSelectionFlags flags, + guint i, GwyParamTable *partable) +{ + g_object_set_qdata(G_OBJECT(button), param_control_quark, GUINT_TO_POINTER(i)); + g_object_set_data(G_OBJECT(button), "gwy-checkboxes-key", GUINT_TO_POINTER(value)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), flags & value); + g_signal_connect(button, "toggled", G_CALLBACK(hold_selection_changed), partable); +} + static void -unit_chooser_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +hold_selection_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) +{ + GwyParamTablePrivate *priv = partable->priv; + GwyParamControl *control = priv->controls + i; + GwyParamControlHoldSelection *holdsel = (GwyParamControlHoldSelection*)control->impl; + gint row = control->row; + GwyHoldSelectionFlags flags = gwy_params_get_flags(priv->params, control->id); + GtkSizeGroup *sizegroup; + GtkWidget *hbox; + const gchar *label; + + g_return_if_fail(control->type == GWY_PARAM_CONTROL_HOLD_SELECTION); + make_control_common(partable, i); + + label = (control->label_text ? control->label_text : def->desc); + control->widget = gtk_check_button_new_with_mnemonic(label); + gwy_debug("attach %s at %d..%d", g_type_name(G_TYPE_FROM_INSTANCE(control->widget)), row, row+1); + + hbox = gwy_hbox_new(0); + gtk_table_attach(GTK_TABLE(partable->priv->widget), hbox, 0, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_box_pack_start(GTK_BOX(hbox), control->widget, TRUE, TRUE, 0); + + sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); + /* Pack in reverse order since we pack-end. */ + holdsel->clear = hold_selection_make_toggle(GWY_HOLD_SELECTION_CLEAR, GWY_STOCK_HOLD_SELECTION_CLEAR, + def, hbox, sizegroup); + holdsel->overwrite = hold_selection_make_toggle(GWY_HOLD_SELECTION_OVERWRITE, GWY_STOCK_HOLD_SELECTION_REPLACE, + def, hbox, sizegroup); + g_object_unref(sizegroup); + gtk_widget_show_all(hbox); + + hold_selection_set_up_button(control->widget, GWY_HOLD_SELECTION_HOLD, flags, i, partable); + hold_selection_set_up_button(holdsel->overwrite, GWY_HOLD_SELECTION_OVERWRITE, flags, i, partable); + hold_selection_set_up_button(holdsel->clear, GWY_HOLD_SELECTION_CLEAR, flags, i, partable); + + update_control_sensitivity(partable, i); +} + +static void +unit_chooser_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5700,7 +5995,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_UNIT_CHOOSER); make_control_common(partable, i); - siunit = gwy_params_get_unit(params, control->id, &power10); + siunit = gwy_params_get_unit(priv->params, control->id, &power10); control->widget = gwy_combo_box_metric_unit_new(G_CALLBACK(unit_chosen), partable, power10 - 6, power10 + 6, siunit, power10); g_object_set_qdata(G_OBJECT(control->widget), param_control_quark, GUINT_TO_POINTER(i)); @@ -5719,8 +6014,7 @@ } static void -random_seed_make_control(GwyParamTable *partable, guint i, - GwyParams *params, const GwyParamDefItem *def) +random_seed_make_control(GwyParamTable *partable, guint i, const GwyParamDefItem *def) { GwyParamTablePrivate *priv = partable->priv; GwyParamControl *control = priv->controls + i; @@ -5733,7 +6027,7 @@ g_return_if_fail(control->type == GWY_PARAM_CONTROL_RANDOM_SEED); make_control_common(partable, i); - value = gwy_params_get_int(params, control->id); + value = gwy_params_get_int(priv->params, control->id); randomseed->adj = GTK_ADJUSTMENT(gtk_adjustment_new(value, 1, 0x7fffffff, 1, 10, 0)); g_object_set_qdata(G_OBJECT(randomseed->adj), param_control_quark, GUINT_TO_POINTER(i)); control->widget = gtk_spin_button_new(randomseed->adj, 0, 0); @@ -6646,6 +6940,46 @@ } static void +hold_selection_changed(GtkWidget *button, GwyParamTable *partable) +{ + guint i = GPOINTER_TO_UINT(g_object_get_qdata(G_OBJECT(button), param_control_quark)); + GwyParamControl *control = partable->priv->controls + i; + gboolean is_set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)); + GwyHoldSelectionFlags flag_to_set = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(button), "gwy-checkboxes-key")); + gint id = control->id; + + g_return_if_fail(control->type == GWY_PARAM_CONTROL_HOLD_SELECTION); + if (gwy_params_set_flag(partable->priv->params, id, flag_to_set, is_set)) { + gwy_param_table_param_changed(partable, id); + update_control_sensitivity(partable, i); + } +} + +static void +hold_selection_set_value(GwyParamControl *control, GwyParamTable *partable, + GwyHoldSelectionFlags value, gboolean use_default_instead) +{ + GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; + guint i = control - priv->controls; + gboolean changed; + gint id; + + g_return_if_fail(control && control->type == GWY_PARAM_CONTROL_HOLD_SELECTION); + id = control->id; + if (use_default_instead) + changed = gwy_params_reset(params, id); + else + changed = gwy_params_set_flags(params, id, value); + + if (changed) { + if (control->widget) + update_control_sensitivity(partable, i); + gwy_param_table_param_changed(partable, id); + } +} + +static void slider_value_changed(GtkAdjustment *adj, GwyParamTable *partable) { guint i = GPOINTER_TO_UINT(g_object_get_qdata(G_OBJECT(adj), param_control_quark)); @@ -6844,9 +7178,12 @@ spin_max = fabs(spin_max); gwy_debug("digits not set, using spinner range [%g..%g]", spin_min, spin_max); if (spin_min > 0.0) { - /* For all-positive range the minimum value should allow guessing a good precision. Allow slightly - * more precise numbers than the minimum. */ - slider->digits = (gint)ceil(-log10(spin_min) + 0.5); + /* For all-positive range the minimum value should allow guessing a good precision, except when the range + * is small like [0.5, 1]. Allow slightly more precise numbers than the minimum. */ + if (spin_max > 0.0) + slider->digits = (gint)ceil(fmax(-log10(spin_min) + 0.5, -log10(spin_max) + 3.5)); + else + slider->digits = (gint)ceil(-log10(spin_min) + 0.5); } else { /* About 4 decimal places is a good rule of thumb. For range [0..1] we usually like 0.xxx. */ @@ -7127,15 +7464,15 @@ GwyParamControlEntry *entry; gint id = control->id; gboolean changed = FALSE; - const gchar *text; - gchar *end; + gchar *text, *end; g_return_if_fail(control->type == GWY_PARAM_CONTROL_ENTRY); entry = (GwyParamControlEntry*)control->impl; - text = gtk_entry_get_text(gtkentry); if (entry->is_numeric) { if (!find_def_common(partable, id, NULL, &def)) return; + /* Strip whitespace to make the if(!*end) check more friendly. */ + text = g_strstrip(gtk_editable_get_chars(GTK_EDITABLE(gtkentry), 0, -1)); if (entry->is_int) { gint value = strtol(text, &end, 10); if (!*end) { @@ -7150,9 +7487,11 @@ changed = gwy_params_set_double(params, id, value); } } + g_free(text); + } + else { + changed = gwy_params_set_string(params, id, gtk_entry_get_text(gtkentry)); } - else - changed = gwy_params_set_string(params, id, text); /* Do not fight the user on instant edits. It is a bit odd. Any behaviour mixing instant updates with rectifiers * is odd. This one seems to be the least bad one. */ @@ -7180,8 +7519,10 @@ else g_string_printf(entry->str, "%.6g", gwy_params_get_double(params, id)); } - else - g_string_assign(entry->str, gwy_params_get_string(params, id)); + else { + const gchar *s = gwy_params_get_string(params, id); + g_string_assign(entry->str, s ? s : ""); + } gtk_entry_set_text(GTK_ENTRY(control->widget), entry->str->str); } @@ -7199,41 +7540,8 @@ entry_format_double_vf(gdouble value, gpointer user_data) { GwyParamControlEntry *entry = (GwyParamControlEntry*)user_data; - GwySIValueFormat *vf = entry->vf; - GString *str = entry->str; - gdouble v, ldiff; - guint i; - - v = value/vf->magnitude; - if (v == 0.0) - return "0"; - - /* If we have a value too far from vf->magnitude fall back to scientific number notation. */ - ldiff = log10(fabs(v)); - if (ldiff > 3.5 || ldiff < 2.0) { - g_string_printf(str, "%.6g", v); - return str->str; - } - - format_numerical_value(str, v, vf->precision); - /* Remove trailing zeros, but only after a decimal separator. Keep anything with 'e' in it intact. */ - if (strchr(str->str, 'e')) - return str->str; - for (i = str->len; i; i--) { - if (!g_ascii_isdigit(str->str[i-1])) - break; - } - if (i) { - i = str->len; - while (i && str->str[i-1] == '0') - i--; - while (i && !g_ascii_isdigit(str->str[i-1])) - i--; - if (i) - g_string_truncate(str, i); - } - return str->str; + return format_double_vf_common(value, entry->vf, entry->str); } static void @@ -7321,6 +7629,111 @@ } static void +range_input(GtkEntry *gtkentry, GwyParamTable *partable) +{ + guint i = GPOINTER_TO_UINT(g_object_get_qdata(G_OBJECT(gtkentry), param_control_quark)); + GwyParamTablePrivate *priv = partable->priv; + GwyParamControl *control = priv->controls + i; + GwyParams *params = priv->params; + const GwyParamDefItem *def; + GwyParamControlRangeFrom *range; + gint id = control->id; + gboolean changed = FALSE; + gdouble value; + gchar *text, *end; + + g_return_if_fail(control->type == GWY_PARAM_CONTROL_RANGE_FROM + || control->type == GWY_PARAM_CONTROL_RANGE_TO); + if (!find_def_common(partable, id, NULL, &def)) + return; + + range = range_get_impl(control, partable); + /* Strip whitespace to make the if(!*end) check more friendly. */ + text = g_strstrip(gtk_editable_get_chars(GTK_EDITABLE(gtkentry), 0, -1)); + value = g_strtod(text, &end); + if (!*end) { + if (range->vf) + value *= range->vf->magnitude; + value = _gwy_param_def_rectify_double(def, value); + changed = gwy_params_set_double(params, id, value); + } + + range_output(partable, control); + if (changed) + gwy_param_table_param_changed(partable, id); + + g_free(text); +} + +static void +range_output(GwyParamTable *partable, GwyParamControl *control) +{ + GwyParamTablePrivate *priv = partable->priv; + GwyParams *params = priv->params; + GwyParamControlRangeFrom *range; + gint id = control->id; + + range = range_get_impl(control, partable); + if (range->vf) + g_string_assign(range->str, format_double_vf_common(gwy_params_get_double(params, id), range->vf, range->str)); + else + g_string_printf(range->str, "%.6g", gwy_params_get_double(params, id)); + + gtk_entry_set_text(GTK_ENTRY(control->widget), range->str->str); +} + +static void +range_set_value(GwyParamControl *control, GwyParamTable *partable, + gdouble value, gboolean use_default_instead) +{ + GwyParams *params = partable->priv->params; + GwyParamControlRangeFrom *range; + gboolean changed = FALSE; + gint id; + + g_return_if_fail(control); + id = control->id; + range = range_get_impl(control, partable); + g_return_if_fail(range); + + if (use_default_instead) + changed = gwy_params_reset(params, id); + else + changed = gwy_params_set_double(params, id, value); + + /* Update the controls. Make sure the signal is emitted at the very end. */ + if (changed && control->widget) { + _gwy_param_table_in_update(partable, TRUE); + range_output(partable, control); + _gwy_param_table_in_update(partable, FALSE); + } + if (changed) + gwy_param_table_param_changed(partable, id); +} + +static void +range_activated(GtkEntry *gtkentry, GwyParamTable *partable) +{ + range_input(gtkentry, partable); +} + +static GwyParamControlRangeFrom* +range_get_impl(GwyParamControl *control, GwyParamTable *partable) +{ + GwyParamTablePrivate *priv = partable->priv; + gint ifrom; + + if (control->type == GWY_PARAM_CONTROL_RANGE_FROM) + return (GwyParamControlRangeFrom*)control->impl; + + g_return_val_if_fail(control->type == GWY_PARAM_CONTROL_RANGE_TO, NULL); + ifrom = find_control_for_aux(partable, &priv->range, control->id); + g_return_val_if_fail(ifrom >= 0, NULL); + + return (GwyParamControlRangeFrom*)(priv->controls[ifrom].impl); +} + +static void update_control_unit_label(GwyParamControl *control, GwyParamTable *partable) { GwyParamTablePrivate *priv = partable->priv; @@ -7479,6 +7892,10 @@ GwyParamControlUnitChooser *unit = (GwyParamControlUnitChooser*)control->impl; unit->change_button = NULL; } + else if (type == GWY_PARAM_CONTROL_HOLD_SELECTION) { + GwyParamControlHoldSelection *holdsel = (GwyParamControlHoldSelection*)control->impl; + holdsel->overwrite = holdsel->clear = NULL; + } else if (type == GWY_PARAM_CONTROL_RANDOM_SEED) { GwyParamControlRandomSeed *randomseed = (GwyParamControlRandomSeed*)control->impl; randomseed->adj = NULL; @@ -7536,7 +7953,7 @@ gboolean has_mnemonic = FALSE; hbox = gwy_hbox_new(0); - gtk_table_attach(GTK_TABLE(partable->priv->widget), hbox, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(partable->priv->widget), hbox, 0, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); if (control->label_text) desc = control->label_text; @@ -7760,6 +8177,44 @@ return NULL; } +static const gchar* +format_double_vf_common(gdouble value, GwySIValueFormat *vf, GString *str) +{ + gdouble v, ldiff; + guint i; + + v = value/vf->magnitude; + if (v == 0.0) + return "0"; + + /* If we have a value too far from vf->magnitude fall back to scientific number notation. */ + ldiff = log10(fabs(v)); + if (ldiff > 3.5 || ldiff < 2.0) { + g_string_printf(str, "%.6g", v); + return str->str; + } + + format_numerical_value(str, v, vf->precision); + /* Remove trailing zeros, but only after a decimal separator. Keep anything with 'e' in it intact. */ + if (strchr(str->str, 'e')) + return str->str; + + for (i = str->len; i; i--) { + if (!g_ascii_isdigit(str->str[i-1])) + break; + } + if (i) { + i = str->len; + while (i && str->str[i-1] == '0') + i--; + while (i && !g_ascii_isdigit(str->str[i-1])) + i--; + if (i) + g_string_truncate(str, i); + } + return str->str; +} + /* NB: value is the value to display, after any transformations. */ static void format_numerical_value(GString *str, gdouble value, gint digits) @@ -7941,7 +8396,7 @@ control_can_integrate_enabler(GwyParamControlType type) { return (type == GWY_PARAM_CONTROL_SLIDER - || type == GWY_PARAM_CONTROL_ENTRY /* TODO: But it is not implemented yet! */ + || type == GWY_PARAM_CONTROL_ENTRY || type == GWY_PARAM_CONTROL_COMBO || type == GWY_PARAM_CONTROL_IMAGE_ID_COMBO || type == GWY_PARAM_CONTROL_GRAPH_ID_COMBO @@ -7963,6 +8418,7 @@ || type == GWY_PARAM_CONTROL_CHECKBOX || type == GWY_PARAM_CONTROL_SLIDER || type == GWY_PARAM_CONTROL_ENTRY + || type == GWY_PARAM_CONTROL_RANGE_FROM || type == GWY_PARAM_CONTROL_COMBO || type == GWY_PARAM_CONTROL_IMAGE_ID_COMBO || type == GWY_PARAM_CONTROL_GRAPH_ID_COMBO @@ -7993,6 +8449,7 @@ || type == GWY_PARAM_CONTROL_LAWN_CURVE_COMBO || type == GWY_PARAM_CONTROL_LAWN_SEGMENT_COMBO || type == GWY_PARAM_CONTROL_UNIT_CHOOSER + || type == GWY_PARAM_CONTROL_HOLD_SELECTION || type == GWY_PARAM_CONTROL_RADIO_ROW || type == GWY_PARAM_CONTROL_RADIO_BUTTONS || type == GWY_PARAM_CONTROL_MASK_COLOR diff -Nru gwyddion-2.62/app/param-table.h gwyddion-2.63/app/param-table.h --- gwyddion-2.62/app/param-table.h 2022-10-14 14:50:08.000000000 +0000 +++ gwyddion-2.63/app/param-table.h 2023-02-21 17:35:20.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: param-table.h 25090 2022-10-14 14:50:06Z yeti-dn $ - * Copyright (C) 2021-2022 David Necas (Yeti). + * $Id: param-table.h 25223 2023-02-21 17:35:20Z yeti-dn $ + * Copyright (C) 2021-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -251,6 +251,9 @@ void gwy_param_table_entry_set_instant_changes(GwyParamTable *partable, gint id, gboolean setting); +void gwy_param_table_append_range (GwyParamTable *partable, + gint id_from, + gint id_to); void gwy_param_table_append_unit_chooser (GwyParamTable *partable, gint id); void gwy_param_table_append_mask_color (GwyParamTable *partable, @@ -291,6 +294,8 @@ GwyCreateTextFunc format_report, gpointer user_data, GDestroyNotify destroy); +void gwy_param_table_append_hold_selection (GwyParamTable *partable, + gint id); void gwy_param_table_append_seed (GwyParamTable *partable, gint id); void gwy_param_table_append_message (GwyParamTable *partable, diff -Nru gwyddion-2.62/app/settings.c gwyddion-2.63/app/settings.c --- gwyddion-2.62/app/settings.c 2021-11-26 10:44:03.000000000 +0000 +++ gwyddion-2.63/app/settings.c 2023-01-25 15:03:59.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: settings.c 24546 2021-11-26 10:44:01Z yeti-dn $ + * $Id: settings.c 25204 2023-01-25 15:03:59Z yeti-dn $ * Copyright (C) 2003-2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -150,7 +150,9 @@ * @filename: A filename to read settings from. * @error: Location to store loading error to, or %NULL. * - * Loads settings file. + * Initialises settings by loading a settings file. + * + * Any existing settings are discarded. Consider gwy_app_settings_merge_string() for piecewise settings creation. * * Returns: Whether it succeeded. In either case you can call gwy_app_settings_get() then to obtain either the loaded * settings or the old ones (if failed), or an empty #GwyContainer. @@ -173,8 +175,7 @@ } if (!size || !buffer) { - g_set_error(error, GWY_APP_SETTINGS_ERROR, GWY_APP_SETTINGS_ERROR_EMPTY, - _("File is empty.")); + g_set_error(error, GWY_APP_SETTINGS_ERROR, GWY_APP_SETTINGS_ERROR_EMPTY, _("File is empty.")); g_free(buffer); return FALSE; } @@ -189,8 +190,7 @@ } new_settings = gwy_container_deserialize_from_text(buffer + strlen(magic_header)); g_free(buffer); - if (!GWY_IS_CONTAINER(new_settings)) { - GWY_OBJECT_UNREF(new_settings); + if (!new_settings) { g_set_error(error, GWY_APP_SETTINGS_ERROR, GWY_APP_SETTINGS_ERROR_CORRUPT, _("File is corrupted, deserialization failed.")); return FALSE; @@ -208,13 +208,60 @@ } /** + * gwy_app_settings_merge_string: + * @s: String contaning a part of Gwyddion settings file. + * @overwrite: %TRUE to replace existing settings; %FALSE to only set values which do not exist. + * @error: Location to store loading error to, or %NULL. + * + * Loads settings from a string and adds them to the global settings. + * + * The contents of string @s should look like a Gwyddion settings file, including the header line "Gwyddion Settings + * 1.0", even though it is optional. + * + * If no settings exist when this function is called, they are initialised like calling gwy_app_settings_get(). + * + * Returns: Whether it succeeded. + * + * Since: 2.63 + **/ +gboolean +gwy_app_settings_merge_string(const gchar *s, + gboolean overwrite, + GError **error) +{ + GwyContainer *settings, *new_settings; + const gchar *s_to_parse; + gchar *buffer = NULL; + + /* Do it first for determinisic behaviour. */ + settings = gwy_app_settings_get(); + + if (!s || !*s) + return TRUE; + + buffer = gwy_strkill(g_strdup(s), "\r"); + s_to_parse = (g_str_has_prefix(buffer, magic_header) ? buffer + strlen(magic_header) : buffer); + new_settings = gwy_container_deserialize_from_text(s_to_parse); + g_free(buffer); + if (!new_settings) { + g_set_error(error, GWY_APP_SETTINGS_ERROR, GWY_APP_SETTINGS_ERROR_CORRUPT, + _("File is corrupted, deserialization failed.")); + return FALSE; + } + + gwy_container_transfer(new_settings, settings, "/", "/", overwrite); + g_object_unref(new_settings); + + return TRUE; +} + +/** * gwy_app_settings_create_config_dir: * @error: Location to store loading error to, or %NULL. * * Create gwyddion config directory. * - * Returns: Whether it succeeded (also returns %TRUE if the directory already - * exists). + * Returns: Whether it succeeded (also returns %TRUE if the directory already exists). **/ gboolean gwy_app_settings_create_config_dir(GError **error) @@ -319,11 +366,9 @@ gwy_container_set_double_by_name(settings, "/mask/alpha", default_mask_color.a); } if (!gwy_container_contains_by_name(settings, "/app/gradients/preferred")) - gwy_container_set_string_by_name(settings, "/app/gradients/preferred", g_strdup(default_preferred_gradients)); - if (!gwy_container_contains_by_name(settings, "/app/glmaterials/preferred")) { - gwy_container_set_string_by_name(settings, "/app/glmaterials/preferred", - g_strdup(default_preferred_gl_materials)); - } + gwy_container_set_const_string_by_name(settings, "/app/gradients/preferred", default_preferred_gradients); + if (!gwy_container_contains_by_name(settings, "/app/glmaterials/preferred")) + gwy_container_set_const_string_by_name(settings, "/app/glmaterials/preferred", default_preferred_gl_materials); if (!gwy_container_contains_by_name(settings, "/app/toolbox/visible/graph")) gwy_container_set_boolean_by_name(settings, "/app/toolbox/visible/graph", TRUE); if (!gwy_container_contains_by_name(settings, "/app/toolbox/visible/proc")) diff -Nru gwyddion-2.62/app/settings.h gwyddion-2.63/app/settings.h --- gwyddion-2.62/app/settings.h 2021-11-26 10:44:03.000000000 +0000 +++ gwyddion-2.63/app/settings.h 2023-01-25 15:03:59.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: settings.h 24546 2021-11-26 10:44:01Z yeti-dn $ + * $Id: settings.h 25204 2023-01-25 15:03:59Z yeti-dn $ * Copyright (C) 2003-2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -39,6 +39,9 @@ GError **error); gboolean gwy_app_settings_load (const gchar *filename, GError **error); +gboolean gwy_app_settings_merge_string (const gchar *s, + gboolean overwrite, + GError **error); gboolean gwy_app_settings_create_config_dir (GError **error); gchar** gwy_app_settings_get_module_dirs (void); gchar* gwy_app_settings_get_settings_filename (void); diff -Nru gwyddion-2.62/config.h.in gwyddion-2.63/config.h.in --- gwyddion-2.62/config.h.in 2022-11-03 09:46:05.000000000 +0000 +++ gwyddion-2.63/config.h.in 2023-06-13 13:11:23.000000000 +0000 @@ -169,6 +169,9 @@ /* Define if we have the ZLIB library. */ #undef HAVE_ZLIB +/* Define if we have the Zzip package. */ +#undef HAVE_ZZIP + /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -Nru gwyddion-2.62/config.rpath gwyddion-2.63/config.rpath --- gwyddion-2.62/config.rpath 2018-04-11 13:13:53.000000000 +0000 +++ gwyddion-2.63/config.rpath 2022-10-17 15:17:21.000000000 +0000 @@ -1,8 +1,8 @@ -#! /bin/sh +#!/usr/bin/sh # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2016 Free Software Foundation, Inc. +# Copyright 1996-2020 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # diff -Nru gwyddion-2.62/configure gwyddion-2.63/configure --- gwyddion-2.62/configure 2022-11-03 09:45:41.000000000 +0000 +++ gwyddion-2.63/configure 2023-06-13 13:11:20.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Gwyddion 2.62. +# Generated by GNU Autoconf 2.71 for Gwyddion 2.63. # # Report bugs to . # @@ -681,8 +681,8 @@ # Identity of this package. PACKAGE_NAME='Gwyddion' PACKAGE_TARNAME='gwyddion' -PACKAGE_VERSION='2.62' -PACKAGE_STRING='Gwyddion 2.62' +PACKAGE_VERSION='2.63' +PACKAGE_STRING='Gwyddion 2.63' PACKAGE_BUGREPORT='klapetek@gwyddion.net' PACKAGE_URL='' @@ -795,12 +795,16 @@ PNG_CFLAGS HAVE_ANY_ZIP_FALSE HAVE_ANY_ZIP_TRUE +HAVE_ZZIP_FALSE +HAVE_ZZIP_TRUE HAVE_LIBZIP_FALSE HAVE_LIBZIP_TRUE HAVE_MINIZIP2_FALSE HAVE_MINIZIP2_TRUE HAVE_MINIZIP1_FALSE HAVE_MINIZIP1_TRUE +ZZIP_LIBS +ZZIP_CFLAGS MINIZIP2_LIBS MINIZIP2_CFLAGS LIBZIP_LIBS @@ -1127,6 +1131,8 @@ LIBZIP_LIBS MINIZIP2_CFLAGS MINIZIP2_LIBS +ZZIP_CFLAGS +ZZIP_LIBS PNG_CFLAGS PNG_LIBS WEBP_CFLAGS @@ -1690,7 +1696,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Gwyddion 2.62 to adapt to many kinds of systems. +\`configure' configures Gwyddion 2.63 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1765,7 +1771,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Gwyddion 2.62:";; + short | recursive ) echo "Configuration of Gwyddion 2.63:";; esac cat <<\_ACEOF @@ -1832,8 +1838,8 @@ --with-gl OpenGL 3D view widgets [default=yes] --with-zlib build with zlib support [default=yes] --with-bzip2 build with bzip2 support [default=yes] - --with-zip=ZIPLIB ZIP support library (minizip1, minizip2, libzip or - auto) + --with-zip=ZIPLIB ZIP support library (minizip1, minizip2, libzip, + zzip or auto) --with-hdf5=yes/no/PATH location of h5cc for HDF5 configuration --with-libxml2 build with libxml2 support [default=yes] --with-jansson build with jansson support [default=yes] @@ -1912,6 +1918,8 @@ C compiler flags for MINIZIP2, overriding pkg-config MINIZIP2_LIBS linker flags for MINIZIP2, overriding pkg-config + ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config + ZZIP_LIBS linker flags for ZZIP, overriding pkg-config PNG_CFLAGS C compiler flags for PNG, overriding pkg-config PNG_LIBS linker flags for PNG, overriding pkg-config WEBP_CFLAGS C compiler flags for WEBP, overriding pkg-config @@ -2000,7 +2008,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Gwyddion configure 2.62 +Gwyddion configure 2.63 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2645,7 +2653,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Gwyddion $as_me 2.62, which was +It was created by Gwyddion $as_me 2.63, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4220,7 +4228,7 @@ # Define the identity of the package. PACKAGE='gwyddion' - VERSION='2.62' + VERSION='2.63' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4390,8 +4398,8 @@ GWY_VERSION_MAJOR=2 -GWY_VERSION_MINOR=62 -GWY_VERSION_STRING='"2.62"' +GWY_VERSION_MINOR=63 +GWY_VERSION_STRING='"2.63"' @@ -20939,6 +20947,46 @@ fi + # Until we switch to C99 or newer, we want diagnostics for C99+ code. + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC knows -std=gnu90" >&5 +printf %s "checking whether $CC knows -std=gnu90... " >&6; } +if test ${ac_cv_prog_cc_option_STDGNU90+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ye_PROG_CC_OPTION_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Werror `echo x-std=gnu90 | sed 's/^x-Wno-/x-W/' | sed 's/^x//'`" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_option_STDGNU90=yes +else $as_nop + ac_cv_prog_cc_option_STDGNU90=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS="$ye_PROG_CC_OPTION_cflags" +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_option_STDGNU90" >&5 +printf "%s\n" "$ac_cv_prog_cc_option_STDGNU90" >&6; } +if test "$ac_cv_prog_cc_option_STDGNU90" = "yes"; then + PROG_CC_STDGNU90="-std=gnu90" + +else + PROG_CC_STDGNU90= + +fi + # Flags we can't use: # -Wstrict-protoypes makes gtkitemfactory.h noisy, but they have a # comment there they can't fix it due to compatibility @@ -23222,19 +23270,23 @@ # It used to be preferred over libzip and is well tested, but is now obsolete. # # libzip -# Alternative to minizip. +# Alternative to minizip. Perhaps a better one. # # minizip 2.x or 3.x or whatever # The new branch that broke everything and seems to be under heavy development. # Not sure since which version it is actually usable. They happily break API # often; 3.x seems compatible but who knows what the future will bring. +# +# Zzip +# A simple fallback library, not good for sequential scanning of archives (see +# notes in gwyzip.h). enable_zip=auto # Check whether --with-zip was given. if test ${with_zip+y} then : withval=$with_zip; case "$withval" in - minizip1|minizip2|libzip|auto|no) enable_zip="$withval";; + minizip1|minizip2|libzip|zzip|auto|no) enable_zip="$withval";; yes) enable_zip=auto;; *) as_fn_error $? "bad balue \"$withval\" for --with-zip" "$LINENO" 5 ;; esac @@ -23245,6 +23297,7 @@ enable_minizip1=no enable_minizip2=no enable_libzip=no +enable_zzip=no if test "x$found_zip" = xno && test "x$enable_zip" = xminizip1 -o "x$enable_zip" = xauto; then pkg_failed=no @@ -23494,6 +23547,83 @@ CPPFLAGS="$MINIZIP2_ORIG_CPPFLAGS" fi +if test "x$found_zip" = xno && test "x$enable_zip" = xzzip -o "x$enable_zip" = xauto; then + +pkg_failed=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5 +printf %s "checking for ZZIP... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$ZZIP_CFLAGS"; then + pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "zziplib") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$ZZIP_LIBS"; then + pkg_cv_ZZIP_LIBS="$ZZIP_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "zziplib") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib"` + else + ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ZZIP_PKG_ERRORS" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS + ZZIP_LIBS=$pkg_cv_ZZIP_LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_ZZIP 1" >>confdefs.h + + found_zip=yes + enable_zzip=yes +fi +fi if test "x$enable_minizip1" != xno; then HAVE_MINIZIP1_TRUE= HAVE_MINIZIP1_FALSE='#' @@ -23518,6 +23648,14 @@ HAVE_LIBZIP_FALSE= fi + if test "x$enable_zzip" != xno; then + HAVE_ZZIP_TRUE= + HAVE_ZZIP_FALSE='#' +else + HAVE_ZZIP_TRUE='#' + HAVE_ZZIP_FALSE= +fi + if test "x$found_zip" != xno; then HAVE_ANY_ZIP_TRUE= HAVE_ANY_ZIP_FALSE='#' @@ -27637,7 +27775,7 @@ COMMON_LDFLAGS="$HOST_LDFLAGS" -COMMON_CFLAGS="$HOST_CFLAGS $WARNING_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" +COMMON_CFLAGS="$HOST_CFLAGS $PROG_CC_STDGNU90 $WARNING_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" COMMON_CXXFLAGS="$HOST_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" @@ -27952,6 +28090,10 @@ as_fn_error $? "conditional \"HAVE_LIBZIP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_ZZIP_TRUE}" && test -z "${HAVE_ZZIP_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ZZIP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_ANY_ZIP_TRUE}" && test -z "${HAVE_ANY_ZIP_FALSE}"; then as_fn_error $? "conditional \"HAVE_ANY_ZIP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -28386,7 +28528,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Gwyddion $as_me 2.62, which was +This file was extended by Gwyddion $as_me 2.63, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28454,7 +28596,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Gwyddion config.status 2.62 +Gwyddion config.status 2.63 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru gwyddion-2.62/configure.ac gwyddion-2.63/configure.ac --- gwyddion-2.62/configure.ac 2022-11-03 09:43:27.000000000 +0000 +++ gwyddion-2.63/configure.ac 2023-06-13 13:08:24.000000000 +0000 @@ -1,7 +1,7 @@ -# $Id: configure.ac 25136 2022-11-03 09:43:26Z yeti-dn $ +# $Id: configure.ac 25425 2023-06-13 13:08:23Z yeti-dn $ dnl Process this file with autoconf to produce a configure script. m4_define([gwy_version_major],[2]) -m4_define([gwy_version_minor],[62]) +m4_define([gwy_version_minor],[63]) m4_define([gwy_version_string],[gwy_version_major.gwy_version_minor]) AC_INIT([Gwyddion],[gwy_version_string],[klapetek@gwyddion.net]) # Use -release for unstable version libs instead of -version-info, because @@ -366,6 +366,8 @@ # This we need to Python code because macros from Python.h produce lots of # warnings. GWY_PROG_CC_OPTION([FNO_STRICT_ALIASING],[-fno-strict-aliasing],,) + # Until we switch to C99 or newer, we want diagnostics for C99+ code. + GWY_PROG_CC_OPTION([STDGNU90],[-std=gnu90],,) # Flags we can't use: # -Wstrict-protoypes makes gtkitemfactory.h noisy, but they have a # comment there they can't fix it due to compatibility @@ -571,18 +573,22 @@ # It used to be preferred over libzip and is well tested, but is now obsolete. # # libzip -# Alternative to minizip. +# Alternative to minizip. Perhaps a better one. # # minizip 2.x or 3.x or whatever # The new branch that broke everything and seems to be under heavy development. # Not sure since which version it is actually usable. They happily break API # often; 3.x seems compatible but who knows what the future will bring. +# +# Zzip +# A simple fallback library, not good for sequential scanning of archives (see +# notes in gwyzip.h). enable_zip=auto AC_ARG_WITH([zip], AS_HELP_STRING([--with-zip=ZIPLIB], - [ZIP support library (minizip1, minizip2, libzip or auto)]), + [ZIP support library (minizip1, minizip2, libzip, zzip or auto)]), [case "$withval" in - minizip1|minizip2|libzip|auto|no) enable_zip="$withval";; + minizip1|minizip2|libzip|zzip|auto|no) enable_zip="$withval";; yes) enable_zip=auto;; *) AC_MSG_ERROR([bad balue "$withval" for --with-zip]) ;; esac] @@ -591,6 +597,7 @@ enable_minizip1=no enable_minizip2=no enable_libzip=no +enable_zzip=no if test "x$found_zip" = xno && test "x$enable_zip" = xminizip1 -o "x$enable_zip" = xauto; then PKG_CHECK_MODULES(MINIZIP1, [minizip < 2.0], [AC_DEFINE(HAVE_MINIZIP1,1, @@ -618,9 +625,17 @@ AC_CHECK_HEADERS([minizip/mz.h mz.h],[],[],[]) CPPFLAGS="$MINIZIP2_ORIG_CPPFLAGS" fi +if test "x$found_zip" = xno && test "x$enable_zip" = xzzip -o "x$enable_zip" = xauto; then + PKG_CHECK_MODULES(ZZIP, [zziplib], + [AC_DEFINE(HAVE_ZZIP,1, + [Define if we have the Zzip package.]) + found_zip=yes + enable_zzip=yes],[:]) +fi AM_CONDITIONAL([HAVE_MINIZIP1],[test "x$enable_minizip1" != xno]) AM_CONDITIONAL([HAVE_MINIZIP2],[test "x$enable_minizip2" != xno]) AM_CONDITIONAL([HAVE_LIBZIP],[test "x$enable_libzip" != xno]) +AM_CONDITIONAL([HAVE_ZZIP],[test "x$enable_zzip" != xno]) AM_CONDITIONAL([HAVE_ANY_ZIP],[test "x$found_zip" != xno]) ############################################################################# @@ -847,7 +862,7 @@ COMMON_LDFLAGS="$HOST_LDFLAGS" AC_SUBST(COMMON_LDFLAGS) -COMMON_CFLAGS="$HOST_CFLAGS $WARNING_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" +COMMON_CFLAGS="$HOST_CFLAGS $PROG_CC_STDGNU90 $WARNING_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" AC_SUBST(COMMON_CFLAGS) COMMON_CXXFLAGS="$HOST_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS $GTKGLEXT_CFLAGS $PREMISE_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" AC_SUBST(COMMON_CXXFLAGS) diff -Nru gwyddion-2.62/data/glmaterials/Makefile.in gwyddion-2.63/data/glmaterials/Makefile.in --- gwyddion-2.62/data/glmaterials/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/data/glmaterials/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -357,6 +357,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/data/gradients/Makefile.in gwyddion-2.63/data/gradients/Makefile.in --- gwyddion-2.62/data/gradients/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/data/gradients/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -357,6 +357,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/data/gwyddion.vim gwyddion-2.63/data/gwyddion.vim --- gwyddion-2.62/data/gwyddion.vim 2022-11-03 10:00:34.000000000 +0000 +++ gwyddion-2.63/data/gwyddion.vim 2023-06-13 13:20:09.000000000 +0000 @@ -1,7 +1,7 @@ " Vim syntax file " Language: C gwyddion extension " Maintainer: David Nečas (Yeti) -" Last Change: 2022-11-03 +" Last Change: 2023-06-13 " URL: http://gwyddion.net/download/test/gwyddion.vim " Generated By: vim-syn-gen.py " Options: @@ -11,15 +11,15 @@ " let gwyddion_deprecated_errors = 1 " highlights deprecated declarations as Errors -syn keyword gwyddionFunction gwy_2d_cwt_wavelet_type_get_enum gwy_2d_cwt_wavelet_type_get_type gwy_3d_label_expand_text gwy_3d_label_get_text gwy_3d_label_get_type gwy_3d_label_new gwy_3d_label_reset gwy_3d_label_reset_text gwy_3d_label_set_text gwy_3d_label_user_size gwy_3d_movement_get_type gwy_3d_projection_get_type gwy_3d_setup_get_type gwy_3d_setup_new gwy_3d_view_class_disable_axis_drawing gwy_3d_view_get_data gwy_3d_view_get_data_key gwy_3d_view_get_gradient_key gwy_3d_view_get_label gwy_3d_view_get_mask_key gwy_3d_view_get_material_key gwy_3d_view_get_movement_type gwy_3d_view_get_pixbuf gwy_3d_view_get_pixbuf_with_alpha gwy_3d_view_get_reduced_size gwy_3d_view_get_scale_range gwy_3d_view_get_setup gwy_3d_view_get_setup_prefix gwy_3d_view_get_type gwy_3d_view_label_get_type gwy_3d_view_new gwy_3d_view_set_data_key gwy_3d_view_set_gradient_key gwy_3d_view_set_mask_key gwy_3d_view_set_material_key gwy_3d_view_set_movement_type gwy_3d_view_set_ovlay gwy_3d_view_set_reduced_size gwy_3d_view_set_scale_range gwy_3d_view_set_setup_prefix gwy_3d_visualization_get_type gwy_3d_window_add_action_widget gwy_3d_window_add_small_toolbar_button gwy_3d_window_get_3d_view gwy_3d_window_get_type gwy_3d_window_new gwy_3d_window_set_overlay_chooser gwy_adjust_bar_get_adjustment gwy_adjust_bar_get_bar_sensitive gwy_adjust_bar_get_check_button gwy_adjust_bar_get_has_check_button gwy_adjust_bar_get_label gwy_adjust_bar_get_mapping gwy_adjust_bar_get_snap_to_ticks gwy_adjust_bar_get_type gwy_adjust_bar_new gwy_adjust_bar_set_adjustment gwy_adjust_bar_set_bar_sensitive gwy_adjust_bar_set_has_check_button gwy_adjust_bar_set_mapping gwy_adjust_bar_set_snap_to_ticks gwy_affine_scaling_type_get_type gwy_app_add_graph_or_curves gwy_app_add_main_accel_group gwy_app_build_curve_map_menu gwy_app_build_graph_menu gwy_app_build_process_menu gwy_app_build_volume_menu gwy_app_build_xyz_menu gwy_app_channel_check_nonsquare gwy_app_channel_log_add gwy_app_channel_log_add_proc gwy_app_channel_mask_of_nans gwy_app_channel_remove_bad_data gwy_app_channel_title_fall_back gwy_app_current_tool gwy_app_current_tool_name gwy_app_curve_map_log_add gwy_app_curve_map_log_add_curve_map gwy_app_data_browser_add gwy_app_data_browser_add_brick gwy_app_data_browser_add_channel_watch gwy_app_data_browser_add_curve_map_watch gwy_app_data_browser_add_data_field gwy_app_data_browser_add_graph_model gwy_app_data_browser_add_graph_watch gwy_app_data_browser_add_lawn gwy_app_data_browser_add_spectra gwy_app_data_browser_add_surface gwy_app_data_browser_add_volume_watch gwy_app_data_browser_add_xyz_watch gwy_app_data_browser_copy_channel gwy_app_data_browser_copy_curve_map gwy_app_data_browser_copy_volume gwy_app_data_browser_copy_xyz gwy_app_data_browser_find_curve_map_by_title gwy_app_data_browser_find_data_by_title gwy_app_data_browser_find_graphs_by_title gwy_app_data_browser_find_spectra_by_title gwy_app_data_browser_find_volume_by_title gwy_app_data_browser_find_xyz_by_title gwy_app_data_browser_foreach gwy_app_data_browser_get gwy_app_data_browser_get_current gwy_app_data_browser_get_curve_map_ids gwy_app_data_browser_get_data_ids gwy_app_data_browser_get_graph_ids gwy_app_data_browser_get_gui_enabled gwy_app_data_browser_get_keep_invisible gwy_app_data_browser_get_number gwy_app_data_browser_get_spectra_ids gwy_app_data_browser_get_volume_ids gwy_app_data_browser_get_xyz_ids gwy_app_data_browser_merge gwy_app_data_browser_remove gwy_app_data_browser_remove_channel_watch gwy_app_data_browser_remove_curve_map_watch gwy_app_data_browser_remove_graph_watch gwy_app_data_browser_remove_volume_watch gwy_app_data_browser_remove_xyz_watch gwy_app_data_browser_reset_visibility gwy_app_data_browser_restore gwy_app_data_browser_select_brick gwy_app_data_browser_select_curve_map gwy_app_data_browser_select_data_field gwy_app_data_browser_select_data_view gwy_app_data_browser_select_graph gwy_app_data_browser_select_graph_model gwy_app_data_browser_select_lawn gwy_app_data_browser_select_spectra gwy_app_data_browser_select_surface gwy_app_data_browser_select_volume gwy_app_data_browser_select_xyz gwy_app_data_browser_set_gui_enabled gwy_app_data_browser_set_keep_invisible gwy_app_data_browser_show gwy_app_data_browser_show_3d gwy_app_data_browser_shut_down gwy_app_data_clear_selections gwy_app_data_id_copy gwy_app_data_id_free gwy_app_data_id_get_type gwy_app_data_id_new gwy_app_data_id_verify_channel gwy_app_data_id_verify_curve_map gwy_app_data_id_verify_graph gwy_app_data_id_verify_spectra gwy_app_data_id_verify_volume gwy_app_data_id_verify_xyz gwy_app_data_view_change_mask_color gwy_app_file_close gwy_app_file_confirm_overwrite gwy_app_file_load gwy_app_file_merge gwy_app_file_open gwy_app_file_save gwy_app_file_save_as gwy_app_file_write gwy_app_find_window_for_channel gwy_app_find_window_for_curve_map gwy_app_find_window_for_graph gwy_app_find_window_for_volume gwy_app_find_window_for_xyz gwy_app_get_brick_key_for_id gwy_app_get_brick_meta_key_for_id gwy_app_get_brick_palette_key_for_id gwy_app_get_brick_preview_key_for_id gwy_app_get_brick_title gwy_app_get_brick_title_key_for_id gwy_app_get_channel_thumbnail gwy_app_get_current_directory gwy_app_get_curve_map_thumbnail gwy_app_get_data_base_key_for_id gwy_app_get_data_field_title gwy_app_get_data_key_for_id gwy_app_get_data_meta_key_for_id gwy_app_get_data_palette_key_for_id gwy_app_get_data_range_max_key_for_id gwy_app_get_data_range_min_key_for_id gwy_app_get_data_range_type_key_for_id gwy_app_get_data_real_square_key_for_id gwy_app_get_data_title_key_for_id gwy_app_get_graph_key_for_id gwy_app_get_graph_thumbnail gwy_app_get_lawn_key_for_id gwy_app_get_lawn_meta_key_for_id gwy_app_get_lawn_palette_key_for_id gwy_app_get_lawn_preview_key_for_id gwy_app_get_lawn_real_square_key_for_id gwy_app_get_lawn_title gwy_app_get_lawn_title_key_for_id gwy_app_get_log_text_buffer gwy_app_get_mask_key_for_id gwy_app_get_show_key_for_id gwy_app_get_spectra_key_for_id gwy_app_get_surface_key_for_id gwy_app_get_surface_meta_key_for_id gwy_app_get_surface_palette_key_for_id gwy_app_get_surface_preview_key_for_id gwy_app_get_surface_title gwy_app_get_surface_title_key_for_id gwy_app_get_volume_thumbnail gwy_app_get_xyz_thumbnail gwy_app_gl_init gwy_app_gl_is_ok gwy_app_gl_material_editor gwy_app_gradient_editor gwy_app_init_common gwy_app_init_i18n gwy_app_init_nongui gwy_app_init_widget_styles gwy_app_log_browser_for_channel gwy_app_log_browser_for_curve_map gwy_app_log_browser_for_volume gwy_app_log_browser_for_xyz gwy_app_logging_flags_get_type gwy_app_main_window_get gwy_app_main_window_set gwy_app_menu_recent_files_get gwy_app_menu_recent_files_update gwy_app_metadata_browser_for_channel gwy_app_metadata_browser_for_curve_map gwy_app_metadata_browser_for_volume gwy_app_metadata_browser_for_xyz gwy_app_page_get_type gwy_app_process_func_get_use gwy_app_process_func_save_use gwy_app_process_menu_add_run_last gwy_app_quit gwy_app_recent_file_get_thumbnail gwy_app_recent_file_list_free gwy_app_recent_file_list_load gwy_app_recent_file_list_new gwy_app_recent_file_list_save gwy_app_recent_file_list_update gwy_app_restore_window_position gwy_app_run_curve_map_func gwy_app_run_curve_map_func_in_mode gwy_app_run_graph_func gwy_app_run_process_func gwy_app_run_process_func_in_mode gwy_app_run_volume_func gwy_app_run_volume_func_in_mode gwy_app_run_xyz_func gwy_app_run_xyz_func_in_mode gwy_app_save_window_position gwy_app_sensitivity_add_widget gwy_app_sensitivity_get_group gwy_app_sensitivity_set_state gwy_app_set_brick_title gwy_app_set_current_directory gwy_app_set_data_field_title gwy_app_set_lawn_title gwy_app_set_surface_title gwy_app_settings_create_config_dir gwy_app_settings_error_get_type gwy_app_settings_error_quark gwy_app_settings_free gwy_app_settings_get gwy_app_settings_get_log_filename gwy_app_settings_get_module_dirs gwy_app_settings_get_recent_file_list_filename gwy_app_settings_get_settings_filename gwy_app_settings_load gwy_app_settings_save gwy_app_setup_logging gwy_app_switch_tool gwy_app_sync_curve_map_items gwy_app_sync_curve_map_itemsv gwy_app_sync_data_items gwy_app_sync_data_itemsv gwy_app_sync_volume_items gwy_app_sync_volume_itemsv gwy_app_sync_xyz_items gwy_app_sync_xyz_itemsv gwy_app_undo_checkpoint gwy_app_undo_checkpointv gwy_app_undo_container_remove gwy_app_undo_qcheckpoint gwy_app_undo_qcheckpointv gwy_app_undo_redo_container gwy_app_undo_undo_container gwy_app_volume_log_add gwy_app_volume_log_add_volume gwy_app_wait_cursor_finish gwy_app_wait_cursor_start gwy_app_wait_finish gwy_app_wait_get_enabled gwy_app_wait_preview_data_field gwy_app_wait_set_enabled gwy_app_wait_set_fraction gwy_app_wait_set_message gwy_app_wait_set_message_prefix gwy_app_wait_set_preview_widget gwy_app_wait_start gwy_app_wait_was_canceled gwy_app_what_get_type gwy_app_xyz_log_add gwy_app_xyz_log_add_xyz gwy_app_xyz_title_fall_back gwy_ascii_strcase_equal gwy_ascii_strcase_hash gwy_assign_string gwy_axis_draw_on_drawable gwy_axis_enable_label_edit gwy_axis_export_vector gwy_axis_get_label gwy_axis_get_magnification gwy_axis_get_magnification_string gwy_axis_get_major_ticks gwy_axis_get_orientation gwy_axis_get_range gwy_axis_get_requested_range gwy_axis_get_type gwy_axis_is_logarithmic gwy_axis_is_visible gwy_axis_new gwy_axis_request_range gwy_axis_scale_format_get_type gwy_axis_set_auto gwy_axis_set_label gwy_axis_set_logarithmic gwy_axis_set_si_unit gwy_axis_set_visible gwy_brick_add gwy_brick_add_to_xy_planes gwy_brick_add_to_z_lines gwy_brick_check_compatibility gwy_brick_clear gwy_brick_copy gwy_brick_copy_units gwy_brick_copy_zcalibration gwy_brick_data_changed gwy_brick_extract_line gwy_brick_extract_plane gwy_brick_extract_xy_plane gwy_brick_extract_z_line gwy_brick_fill gwy_brick_get_data gwy_brick_get_data_const gwy_brick_get_dval gwy_brick_get_dval_real gwy_brick_get_dx gwy_brick_get_dy gwy_brick_get_dz gwy_brick_get_max gwy_brick_get_min gwy_brick_get_si_unit_w gwy_brick_get_si_unit_x gwy_brick_get_si_unit_y gwy_brick_get_si_unit_z gwy_brick_get_type gwy_brick_get_val gwy_brick_get_val_real gwy_brick_get_value_format_w gwy_brick_get_value_format_x gwy_brick_get_value_format_y gwy_brick_get_value_format_z gwy_brick_get_xoffset gwy_brick_get_xreal gwy_brick_get_xres gwy_brick_get_yoffset gwy_brick_get_yreal gwy_brick_get_yres gwy_brick_get_zcalibration gwy_brick_get_zoffset gwy_brick_get_zreal gwy_brick_get_zres gwy_brick_invert gwy_brick_itor gwy_brick_jtor gwy_brick_ktor gwy_brick_ktor_cal gwy_brick_max_plane gwy_brick_max_xy_plane gwy_brick_maxpos_plane gwy_brick_maxpos_xy_plane gwy_brick_mean_plane gwy_brick_mean_xy_plane gwy_brick_min_plane gwy_brick_min_xy_plane gwy_brick_minpos_plane gwy_brick_minpos_xy_plane gwy_brick_multiply gwy_brick_new gwy_brick_new_alike gwy_brick_new_part gwy_brick_resample gwy_brick_rms_plane gwy_brick_rms_xy_plane gwy_brick_rtoi gwy_brick_rtoj gwy_brick_rtok gwy_brick_rtok_cal gwy_brick_set_plane gwy_brick_set_si_unit_w gwy_brick_set_si_unit_x gwy_brick_set_si_unit_y gwy_brick_set_si_unit_z gwy_brick_set_val gwy_brick_set_val_real gwy_brick_set_xoffset gwy_brick_set_xreal gwy_brick_set_xy_plane gwy_brick_set_yoffset gwy_brick_set_yreal gwy_brick_set_zcalibration gwy_brick_set_zoffset gwy_brick_set_zreal gwy_brick_sum_plane gwy_brick_sum_xy_plane gwy_brick_transpose gwy_brick_transpose_type_get_type gwy_byte_order_get_type gwy_caldata_append gwy_caldata_get_ndata gwy_caldata_get_range gwy_caldata_get_si_unit_x gwy_caldata_get_si_unit_y gwy_caldata_get_si_unit_z gwy_caldata_get_type gwy_caldata_get_x gwy_caldata_get_xerr gwy_caldata_get_xunc gwy_caldata_get_y gwy_caldata_get_yerr gwy_caldata_get_yunc gwy_caldata_get_z gwy_caldata_get_zerr gwy_caldata_get_zunc gwy_caldata_inside gwy_caldata_interpolate gwy_caldata_new gwy_caldata_resize gwy_caldata_save_data gwy_caldata_set_range gwy_caldata_set_si_unit_x gwy_caldata_set_si_unit_y gwy_caldata_set_si_unit_z gwy_caldata_setup_interpolation gwy_calibration_get_data gwy_calibration_get_filename gwy_calibration_get_ndata gwy_calibration_get_type gwy_calibration_new gwy_calibrations gwy_calibrations_get_calibration gwy_canonicalize_angle gwy_canonicalize_path gwy_cdline_fit gwy_cdline_fit_with_caldata gwy_cdline_get_definition gwy_cdline_get_name gwy_cdline_get_nparams gwy_cdline_get_param_name gwy_cdline_get_param_units gwy_cdline_get_type gwy_cdline_get_value gwy_cdlines gwy_check_box_get_group gwy_check_box_get_value gwy_check_boxes_attach_to_table gwy_check_boxes_create gwy_check_boxes_createl gwy_check_boxes_find gwy_check_boxes_get_selected gwy_check_boxes_set_selected gwy_check_boxes_set_sensitive gwy_check_regular_2d_grid gwy_color_axis_get_gradient gwy_color_axis_get_labels_visible gwy_color_axis_get_range gwy_color_axis_get_si_unit gwy_color_axis_get_ticks_style gwy_color_axis_get_type gwy_color_axis_new gwy_color_axis_new_with_range gwy_color_axis_set_gradient gwy_color_axis_set_labels_visible gwy_color_axis_set_range gwy_color_axis_set_si_unit gwy_color_axis_set_tick_map_func gwy_color_axis_set_ticks_style gwy_color_button_get_color gwy_color_button_get_type gwy_color_button_get_use_alpha gwy_color_button_new gwy_color_button_new_with_color gwy_color_button_set_color gwy_color_button_set_use_alpha gwy_color_selector_for_mask gwy_combo_box_graph_curve_new gwy_combo_box_lawn_curve_new gwy_combo_box_lawn_segment_new gwy_combo_box_metric_unit_new gwy_combo_box_metric_unit_set_unit gwy_compare_double gwy_computation_state_get_fraction gwy_computation_state_get_state gwy_computation_state_get_type gwy_computation_state_type_get_type gwy_container_contains gwy_container_deserialize_from_text gwy_container_duplicate_by_prefix gwy_container_duplicate_by_prefixv gwy_container_foreach gwy_container_get_boolean gwy_container_get_double gwy_container_get_enum gwy_container_get_int32 gwy_container_get_int64 gwy_container_get_n_items gwy_container_get_object gwy_container_get_string gwy_container_get_type gwy_container_get_uchar gwy_container_get_value gwy_container_gis_boolean gwy_container_gis_double gwy_container_gis_enum gwy_container_gis_int32 gwy_container_gis_int64 gwy_container_gis_object gwy_container_gis_string gwy_container_gis_uchar gwy_container_gis_value gwy_container_keys gwy_container_keys_by_name gwy_container_keys_with_prefix gwy_container_keys_with_prefix_by_name gwy_container_new gwy_container_remove gwy_container_remove_by_prefix gwy_container_rename gwy_container_serialize_to_text gwy_container_set_boolean gwy_container_set_const_string gwy_container_set_double gwy_container_set_enum gwy_container_set_int32 gwy_container_set_int64 gwy_container_set_object gwy_container_set_string gwy_container_set_uchar gwy_container_set_value gwy_container_set_value_by_name gwy_container_transfer gwy_container_value_type gwy_convert_raw_data gwy_corr_search_type_get_type gwy_correlation_type_get_enum gwy_correlation_type_get_type gwy_create_dialog_preview_hbox gwy_create_expander_with_param gwy_create_inventory_model_without_default gwy_create_preview gwy_create_preview_vector_layer gwy_curve_channel_get_type gwy_curve_get_control_points gwy_curve_get_type gwy_curve_map_func_current gwy_curve_map_func_exists gwy_curve_map_func_foreach gwy_curve_map_func_get_menu_path gwy_curve_map_func_get_run_types gwy_curve_map_func_get_sensitivity_mask gwy_curve_map_func_get_stock_id gwy_curve_map_func_get_tooltip gwy_curve_map_func_register gwy_curve_map_func_run gwy_curve_new gwy_curve_reset gwy_curve_set_channels gwy_curve_set_control_points gwy_curve_set_curve_type gwy_curve_set_range gwy_curve_type_get_type gwy_cwt_wfunc_2d gwy_data_chooser_get_active gwy_data_chooser_get_active_id gwy_data_chooser_get_filter gwy_data_chooser_get_none gwy_data_chooser_get_type gwy_data_chooser_new_channels gwy_data_chooser_new_curve_maps gwy_data_chooser_new_graphs gwy_data_chooser_new_volumes gwy_data_chooser_new_xyzs gwy_data_chooser_refilter gwy_data_chooser_set_active gwy_data_chooser_set_active_id gwy_data_chooser_set_filter gwy_data_chooser_set_none gwy_data_compatibility_flags_get_type gwy_data_error_desrcibe gwy_data_error_get_type gwy_data_field_1dfft gwy_data_field_1dfft_raw gwy_data_field_2dacf gwy_data_field_2dfft gwy_data_field_2dfft_dehumanize gwy_data_field_2dfft_humanize gwy_data_field_2dfft_raw gwy_data_field_2dpsdf gwy_data_field_abs gwy_data_field_acf gwy_data_field_acf_uncertainty gwy_data_field_add gwy_data_field_affine gwy_data_field_affine_prepare gwy_data_field_angular_average gwy_data_field_area_1dfft gwy_data_field_area_2dacf gwy_data_field_area_2dacf_mask gwy_data_field_area_2dfft gwy_data_field_area_2dpsdf_mask gwy_data_field_area_abs gwy_data_field_area_acf gwy_data_field_area_acf_uncertainty gwy_data_field_area_add gwy_data_field_area_cda gwy_data_field_area_cda_mask gwy_data_field_area_cdh gwy_data_field_area_cdh_uncertainty gwy_data_field_area_clamp gwy_data_field_area_clear gwy_data_field_area_convolve gwy_data_field_area_convolve_1d gwy_data_field_area_copy gwy_data_field_area_count_in_range gwy_data_field_area_da gwy_data_field_area_da_mask gwy_data_field_area_dh gwy_data_field_area_dh_uncertainty gwy_data_field_area_ext_convolve gwy_data_field_area_ext_row_convolve gwy_data_field_area_extract gwy_data_field_area_fill gwy_data_field_area_fill_mask gwy_data_field_area_filter_conservative gwy_data_field_area_filter_dechecker gwy_data_field_area_filter_disc_asf gwy_data_field_area_filter_gaussian gwy_data_field_area_filter_kth_rank gwy_data_field_area_filter_kuwahara gwy_data_field_area_filter_laplacian gwy_data_field_area_filter_laplacian_of_gaussians gwy_data_field_area_filter_maximum gwy_data_field_area_filter_mean gwy_data_field_area_filter_median gwy_data_field_area_filter_min_max gwy_data_field_area_filter_minimum gwy_data_field_area_filter_prewitt gwy_data_field_area_filter_rms gwy_data_field_area_filter_sobel gwy_data_field_area_filter_trimmed_mean gwy_data_field_area_fit_legendre gwy_data_field_area_fit_local_planes gwy_data_field_area_fit_plane gwy_data_field_area_fit_plane_mask gwy_data_field_area_fit_poly gwy_data_field_area_fit_poly_max gwy_data_field_area_fit_polynom gwy_data_field_area_flip_xy gwy_data_field_area_gather gwy_data_field_area_get_autorange gwy_data_field_area_get_avg_mask gwy_data_field_area_get_avg_uncertainty gwy_data_field_area_get_avg_uncertainty_mask gwy_data_field_area_get_dispersion gwy_data_field_area_get_entropy gwy_data_field_area_get_entropy_at_scales gwy_data_field_area_get_grainwise_rms gwy_data_field_area_get_inclination gwy_data_field_area_get_inclination_uncertainty gwy_data_field_area_get_line_stats gwy_data_field_area_get_max gwy_data_field_area_get_max_uncertainty gwy_data_field_area_get_mean_square gwy_data_field_area_get_median_mask gwy_data_field_area_get_median_uncertainty gwy_data_field_area_get_median_uncertainty_mask gwy_data_field_area_get_min gwy_data_field_area_get_min_max_mask gwy_data_field_area_get_min_max_uncertainty gwy_data_field_area_get_min_max_uncertainty_mask gwy_data_field_area_get_min_uncertainty gwy_data_field_area_get_normal_coeffs gwy_data_field_area_get_normal_coeffs_uncertainty gwy_data_field_area_get_projected_area_uncertainty gwy_data_field_area_get_rms_mask gwy_data_field_area_get_rms_uncertainty gwy_data_field_area_get_rms_uncertainty_mask gwy_data_field_area_get_stats_mask gwy_data_field_area_get_stats_uncertainties gwy_data_field_area_get_stats_uncertainties_mask gwy_data_field_area_get_sum_mask gwy_data_field_area_get_surface_area_mask gwy_data_field_area_get_surface_area_mask_uncertainty gwy_data_field_area_get_surface_area_uncertainty gwy_data_field_area_get_surface_slope_mask gwy_data_field_area_get_variation gwy_data_field_area_get_volume gwy_data_field_area_grains_tgnd gwy_data_field_area_grains_tgnd_range gwy_data_field_area_hhcf gwy_data_field_area_hhcf_uncertainty gwy_data_field_area_local_plane_quantity gwy_data_field_area_minkowski_boundary gwy_data_field_area_minkowski_euler gwy_data_field_area_minkowski_volume gwy_data_field_area_multiply gwy_data_field_area_psdf gwy_data_field_area_racf gwy_data_field_area_renormalize gwy_data_field_area_row_acf gwy_data_field_area_row_asg gwy_data_field_area_row_hhcf gwy_data_field_area_row_psdf gwy_data_field_area_rpsdf gwy_data_field_area_subtract_legendre gwy_data_field_area_subtract_poly gwy_data_field_area_subtract_poly_max gwy_data_field_area_subtract_polynom gwy_data_field_area_threshold gwy_data_field_average_xyz gwy_data_field_bin gwy_data_field_cached_get_type gwy_data_field_cda gwy_data_field_cdh gwy_data_field_cdh_uncertainty gwy_data_field_check_compatibility gwy_data_field_check_compatibility_with_brick_xy gwy_data_field_check_compatibility_with_lawn gwy_data_field_circular_area_extract gwy_data_field_circular_area_extract_with_pos gwy_data_field_circular_area_fill gwy_data_field_circular_area_unextract gwy_data_field_clamp gwy_data_field_clear gwy_data_field_column_gaussian gwy_data_field_convolve gwy_data_field_convolve_1d gwy_data_field_copy gwy_data_field_copy_units gwy_data_field_copy_units_to_data_line gwy_data_field_copy_units_to_surface gwy_data_field_correct_average gwy_data_field_correct_average_unmasked gwy_data_field_correct_laplace_iteration gwy_data_field_correlate gwy_data_field_correlate_finalize gwy_data_field_correlate_init gwy_data_field_correlate_iteration gwy_data_field_correlation_search gwy_data_field_count_maxima gwy_data_field_count_minima gwy_data_field_crosscorrelate gwy_data_field_crosscorrelate_finalize gwy_data_field_crosscorrelate_init gwy_data_field_crosscorrelate_iteration gwy_data_field_crosscorrelate_set_weights gwy_data_field_cwt gwy_data_field_da gwy_data_field_data_changed gwy_data_field_deconvolve_psf_leastsq gwy_data_field_deconvolve_regularized gwy_data_field_dh gwy_data_field_dh_uncertainty gwy_data_field_distort gwy_data_field_divide_fields gwy_data_field_dwt gwy_data_field_dwt_mark_anisotropy gwy_data_field_elliptic_area_extract gwy_data_field_elliptic_area_fill gwy_data_field_elliptic_area_unextract gwy_data_field_extend gwy_data_field_fft_convolve gwy_data_field_fft_filter_1d gwy_data_field_fft_postprocess gwy_data_field_fft_window gwy_data_field_fft_window_1d gwy_data_field_fill gwy_data_field_fill_voids gwy_data_field_filter_canny gwy_data_field_filter_conservative gwy_data_field_filter_dechecker gwy_data_field_filter_gauss_step gwy_data_field_filter_gaussian gwy_data_field_filter_harris gwy_data_field_filter_kuwahara gwy_data_field_filter_laplacian gwy_data_field_filter_laplacian_of_gaussians gwy_data_field_filter_maximum gwy_data_field_filter_mean gwy_data_field_filter_median gwy_data_field_filter_minimum gwy_data_field_filter_prewitt gwy_data_field_filter_prewitt_total gwy_data_field_filter_rms gwy_data_field_filter_slope gwy_data_field_filter_sobel gwy_data_field_filter_sobel_total gwy_data_field_find_regularization_sigma_for_psf gwy_data_field_find_regularization_sigma_leastsq gwy_data_field_find_row_shifts_trimmed_diff gwy_data_field_find_row_shifts_trimmed_mean gwy_data_field_fit_facet_plane gwy_data_field_fit_legendre gwy_data_field_fit_lines gwy_data_field_fit_local_planes gwy_data_field_fit_plane gwy_data_field_fit_poly gwy_data_field_fit_poly_max gwy_data_field_fit_polynom gwy_data_field_flip_xy gwy_data_field_fractal_correction gwy_data_field_fractal_cubecounting gwy_data_field_fractal_cubecounting_dim gwy_data_field_fractal_partitioning gwy_data_field_fractal_partitioning_dim gwy_data_field_fractal_psdf gwy_data_field_fractal_psdf_dim gwy_data_field_fractal_triangulation gwy_data_field_fractal_triangulation_dim gwy_data_field_get_angder gwy_data_field_get_autorange gwy_data_field_get_avg gwy_data_field_get_avg_uncertainty gwy_data_field_get_circular_area_size gwy_data_field_get_column gwy_data_field_get_column_part gwy_data_field_get_correlation_score gwy_data_field_get_data gwy_data_field_get_data_const gwy_data_field_get_dispersion gwy_data_field_get_dval gwy_data_field_get_dval_real gwy_data_field_get_dx gwy_data_field_get_dy gwy_data_field_get_elliptic_area_size gwy_data_field_get_elliptic_intersection gwy_data_field_get_entropy gwy_data_field_get_entropy_2d gwy_data_field_get_entropy_2d_at_scales gwy_data_field_get_grain_bounding_boxes gwy_data_field_get_grain_bounding_boxes_periodic gwy_data_field_get_grain_inscribed_boxes gwy_data_field_get_grain_sizes gwy_data_field_get_inclination gwy_data_field_get_inclination_uncertainty gwy_data_field_get_line_stats gwy_data_field_get_line_stats_mask gwy_data_field_get_local_maxima_list gwy_data_field_get_local_minima_list gwy_data_field_get_max gwy_data_field_get_max_uncertainty gwy_data_field_get_mean_square gwy_data_field_get_median gwy_data_field_get_median_uncertainty gwy_data_field_get_min gwy_data_field_get_min_max gwy_data_field_get_min_max_uncertainty gwy_data_field_get_min_uncertainty gwy_data_field_get_normal_coeffs gwy_data_field_get_normal_coeffs_uncertainty gwy_data_field_get_profile gwy_data_field_get_profile_mask gwy_data_field_get_rms gwy_data_field_get_rms_uncertainty gwy_data_field_get_row gwy_data_field_get_row_part gwy_data_field_get_si_unit_xy gwy_data_field_get_si_unit_z gwy_data_field_get_stats gwy_data_field_get_stats_uncertainties gwy_data_field_get_sum gwy_data_field_get_surface_area gwy_data_field_get_surface_area_uncertainty gwy_data_field_get_surface_slope gwy_data_field_get_type gwy_data_field_get_val gwy_data_field_get_value_format_xy gwy_data_field_get_value_format_z gwy_data_field_get_variation gwy_data_field_get_weighted_correlation_score gwy_data_field_get_xder gwy_data_field_get_xder_uncertainty gwy_data_field_get_xoffset gwy_data_field_get_xreal gwy_data_field_get_xres gwy_data_field_get_yder gwy_data_field_get_yder_uncertainty gwy_data_field_get_yoffset gwy_data_field_get_yreal gwy_data_field_get_yres gwy_data_field_grain_distance_transform gwy_data_field_grain_simple_dist_trans gwy_data_field_grains_add gwy_data_field_grains_autocrop gwy_data_field_grains_extract_grain gwy_data_field_grains_find_boundaries gwy_data_field_grains_get_distribution gwy_data_field_grains_get_quantities gwy_data_field_grains_get_values gwy_data_field_grains_grow gwy_data_field_grains_intersect gwy_data_field_grains_invert gwy_data_field_grains_mark_curvature gwy_data_field_grains_mark_height gwy_data_field_grains_mark_slope gwy_data_field_grains_mark_watershed gwy_data_field_grains_remove_by_height gwy_data_field_grains_remove_by_number gwy_data_field_grains_remove_by_size gwy_data_field_grains_remove_grain gwy_data_field_grains_remove_touching_border gwy_data_field_grains_shrink gwy_data_field_grains_splash_water gwy_data_field_grains_thin gwy_data_field_grains_watershed_finalize gwy_data_field_grains_watershed_init gwy_data_field_grains_watershed_iteration gwy_data_field_hhcf gwy_data_field_hhcf_uncertainty gwy_data_field_hough_circle gwy_data_field_hough_circle_strenghten gwy_data_field_hough_datafield_line_to_polar gwy_data_field_hough_line gwy_data_field_hough_line_strenghten gwy_data_field_hough_polar_line_to_datafield gwy_data_field_hypot_of_fields gwy_data_field_invalidate gwy_data_field_invert gwy_data_field_itor gwy_data_field_jtor gwy_data_field_laplace_solve gwy_data_field_linear_combination gwy_data_field_local_maximum gwy_data_field_local_plane_quantity gwy_data_field_mark_extrema gwy_data_field_mark_scars gwy_data_field_mask_outliers gwy_data_field_mask_outliers2 gwy_data_field_max_of_fields gwy_data_field_measure_lattice_acf gwy_data_field_measure_lattice_psdf gwy_data_field_mfm_current_line gwy_data_field_mfm_find_shift_z gwy_data_field_mfm_parallel_medium gwy_data_field_mfm_perpendicular_medium_force gwy_data_field_mfm_perpendicular_stray_field gwy_data_field_mfm_perpendicular_stray_field_angle_correction gwy_data_field_mfm_shift_z gwy_data_field_min_of_fields gwy_data_field_minkowski_boundary gwy_data_field_minkowski_euler gwy_data_field_minkowski_volume gwy_data_field_multiply gwy_data_field_multiply_fields gwy_data_field_new gwy_data_field_new_alike gwy_data_field_new_binned gwy_data_field_new_resampled gwy_data_field_new_rotated gwy_data_field_new_rotated_90 gwy_data_field_normalize gwy_data_field_number_grains gwy_data_field_number_grains_periodic gwy_data_field_otsu_threshold gwy_data_field_plane_level gwy_data_field_plane_rotate gwy_data_field_psdf gwy_data_field_psdf_to_angular_spectrum gwy_data_field_racf gwy_data_field_renormalize gwy_data_field_resample gwy_data_field_resize gwy_data_field_rotate gwy_data_field_row_gaussian gwy_data_field_rpsdf gwy_data_field_rtoi gwy_data_field_rtoj gwy_data_field_sample_distorted gwy_data_field_set_column gwy_data_field_set_column_part gwy_data_field_set_row gwy_data_field_set_row_part gwy_data_field_set_si_unit_xy gwy_data_field_set_si_unit_z gwy_data_field_set_val gwy_data_field_set_xoffset gwy_data_field_set_xreal gwy_data_field_set_yoffset gwy_data_field_set_yreal gwy_data_field_shade gwy_data_field_slope_distribution gwy_data_field_subtract_fields gwy_data_field_subtract_legendre gwy_data_field_subtract_poly gwy_data_field_subtract_poly_max gwy_data_field_subtract_polynom gwy_data_field_subtract_row_shifts gwy_data_field_sum_fields gwy_data_field_synth_gaussian_displacement gwy_data_field_threshold gwy_data_field_unrotate_find_corrections gwy_data_field_waterpour gwy_data_field_xdwt gwy_data_field_ydwt gwy_data_field_zoom_fft gwy_data_item_get_type gwy_data_line_acf gwy_data_line_acf_uncertainty gwy_data_line_add gwy_data_line_cda gwy_data_line_cdh gwy_data_line_check_compatibility gwy_data_line_check_compatibility_with_brick_z gwy_data_line_clear gwy_data_line_copy gwy_data_line_copy_units gwy_data_line_copy_units_to_data_field gwy_data_line_correct_laplace gwy_data_line_count_peaks gwy_data_line_cumulate gwy_data_line_cumulate_uncertainty gwy_data_line_da gwy_data_line_data_changed gwy_data_line_dh gwy_data_line_distribution gwy_data_line_dwt gwy_data_line_fft gwy_data_line_fft_raw gwy_data_line_fft_window gwy_data_line_fill gwy_data_line_fit_polynom gwy_data_line_get_avg gwy_data_line_get_data gwy_data_line_get_data_const gwy_data_line_get_der gwy_data_line_get_dval gwy_data_line_get_dval_real gwy_data_line_get_dx gwy_data_line_get_kth_peaks gwy_data_line_get_kurtosis gwy_data_line_get_length gwy_data_line_get_line_coeffs gwy_data_line_get_max gwy_data_line_get_median gwy_data_line_get_min gwy_data_line_get_min_max gwy_data_line_get_modus gwy_data_line_get_offset gwy_data_line_get_ra gwy_data_line_get_real gwy_data_line_get_res gwy_data_line_get_rms gwy_data_line_get_si_unit_x gwy_data_line_get_si_unit_y gwy_data_line_get_skew gwy_data_line_get_sum gwy_data_line_get_tan_beta0 gwy_data_line_get_type gwy_data_line_get_val gwy_data_line_get_value_format_x gwy_data_line_get_value_format_y gwy_data_line_get_variation gwy_data_line_get_xpm gwy_data_line_get_xtm gwy_data_line_get_xvm gwy_data_line_hhcf gwy_data_line_hhcf_uncertainty gwy_data_line_invert gwy_data_line_itor gwy_data_line_line_level gwy_data_line_linear_combination gwy_data_line_max_pos_i gwy_data_line_max_pos_r gwy_data_line_min_pos_i gwy_data_line_min_pos_r gwy_data_line_multiply gwy_data_line_multiply_lines gwy_data_line_new gwy_data_line_new_alike gwy_data_line_new_resampled gwy_data_line_part_add gwy_data_line_part_clear gwy_data_line_part_extract gwy_data_line_part_fft gwy_data_line_part_fill gwy_data_line_part_fit_polynom gwy_data_line_part_get_avg gwy_data_line_part_get_kurtosis gwy_data_line_part_get_max gwy_data_line_part_get_median gwy_data_line_part_get_min gwy_data_line_part_get_min_max gwy_data_line_part_get_modus gwy_data_line_part_get_ra gwy_data_line_part_get_rms gwy_data_line_part_get_skew gwy_data_line_part_get_sum gwy_data_line_part_get_tan_beta0 gwy_data_line_part_get_variation gwy_data_line_part_multiply gwy_data_line_part_subtract_polynom gwy_data_line_part_threshold gwy_data_line_psdf gwy_data_line_resample gwy_data_line_resize gwy_data_line_rotate gwy_data_line_rtoi gwy_data_line_set_offset gwy_data_line_set_real gwy_data_line_set_si_unit_x gwy_data_line_set_si_unit_y gwy_data_line_set_val gwy_data_line_sqrt gwy_data_line_subtract_lines gwy_data_line_subtract_polynom gwy_data_line_sum_lines gwy_data_line_threshold gwy_data_line_zoom_fft gwy_data_validate gwy_data_validate_flags_get_type gwy_data_validation_failure_list_free gwy_data_view_coords_real_to_xy gwy_data_view_coords_real_to_xy_float gwy_data_view_coords_xy_clamp gwy_data_view_coords_xy_cut_line gwy_data_view_coords_xy_to_real gwy_data_view_export_pixbuf gwy_data_view_get_alpha_layer gwy_data_view_get_base_layer gwy_data_view_get_data gwy_data_view_get_data_prefix gwy_data_view_get_hexcess gwy_data_view_get_metric gwy_data_view_get_pixbuf gwy_data_view_get_pixel_data_sizes gwy_data_view_get_real_data_offsets gwy_data_view_get_real_data_sizes gwy_data_view_get_real_zoom gwy_data_view_get_top_layer gwy_data_view_get_type gwy_data_view_get_vexcess gwy_data_view_get_xmeasure gwy_data_view_get_ymeasure gwy_data_view_get_zoom gwy_data_view_layer_get_type gwy_data_view_layer_plugged gwy_data_view_layer_realize gwy_data_view_layer_type_get_type gwy_data_view_layer_unplugged gwy_data_view_layer_unrealize gwy_data_view_layer_updated gwy_data_view_new gwy_data_view_set_alpha_layer gwy_data_view_set_base_layer gwy_data_view_set_data_prefix gwy_data_view_set_top_layer gwy_data_view_set_zoom gwy_data_watch_event_type_get_type gwy_data_window_fit_to_screen gwy_data_window_get_color_axis gwy_data_window_get_data gwy_data_window_get_data_name gwy_data_window_get_data_view gwy_data_window_get_type gwy_data_window_get_ul_corner_widget gwy_data_window_new gwy_data_window_set_data_name gwy_data_window_set_ul_corner_widget gwy_data_window_set_zoom gwy_debug_gnu gwy_debug_objects_clear gwy_debug_objects_creation_detailed gwy_debug_objects_dump_to_file gwy_debug_objects_enable gwy_deserialize_object_hash gwy_dialog_add_buttons gwy_dialog_add_content gwy_dialog_add_param_table gwy_dialog_get_type gwy_dialog_have_result gwy_dialog_invalidate gwy_dialog_new gwy_dialog_outcome_get_type gwy_dialog_remove_param_table gwy_dialog_run gwy_dialog_set_instant_updates_param gwy_dialog_set_preview_func gwy_distance_transform_type_get_enum gwy_distance_transform_type_get_type gwy_draw_data_field_map_adaptive gwy_draw_type_init gwy_dwt_denoise_type_get_enum gwy_dwt_denoise_type_get_type gwy_dwt_set_coefficients gwy_dwt_type_get_enum gwy_dwt_type_get_type gwy_entities gwy_entities_entity_to_utf8 gwy_entities_text_to_utf8 gwy_enum_combo_box_get_active gwy_enum_combo_box_new gwy_enum_combo_box_newl gwy_enum_combo_box_set_active gwy_enum_combo_box_update_int gwy_enum_fill_from_struct gwy_enum_freev gwy_enum_get_type gwy_enum_inventory_new gwy_enum_sanitize_value gwy_enum_to_string gwy_enuml_to_string gwy_expr_compile gwy_expr_define_constant gwy_expr_error_get_type gwy_expr_error_quark gwy_expr_evaluate gwy_expr_execute gwy_expr_free gwy_expr_get_expression gwy_expr_get_variables gwy_expr_new gwy_expr_resolve_variables gwy_expr_undefine_constant gwy_expr_vector_execute gwy_exterior_type_get_type gwy_fd_curve_preset_get_type gwy_fd_curve_presets gwy_fft_find_nice_size gwy_fft_simple gwy_fft_window gwy_fft_window_data_field gwy_file_abandon_contents gwy_file_channel_import_log_add gwy_file_curve_map_import_log_add gwy_file_detect gwy_file_detect_with_score gwy_file_func_current gwy_file_func_exists gwy_file_func_foreach gwy_file_func_get_description gwy_file_func_get_is_detectable gwy_file_func_get_operations gwy_file_func_register gwy_file_func_run_detect gwy_file_func_run_export gwy_file_func_run_load gwy_file_func_run_save gwy_file_func_set_is_detectable gwy_file_get_contents gwy_file_get_data_info gwy_file_get_filename_sys gwy_file_load gwy_file_load_with_func gwy_file_operation_type_get_type gwy_file_save gwy_file_save_with_func gwy_file_volume_import_log_add gwy_file_xyz_import_log_add gwy_filename_ignore gwy_find_self_dir gwy_flags_to_string gwy_fopen gwy_format_result_table_mixed gwy_format_result_table_row gwy_format_result_table_rowv gwy_format_result_table_strings gwy_format_result_table_stringsv gwy_fprintf gwy_func_use_add gwy_func_use_free gwy_func_use_get gwy_func_use_get_filename gwy_func_use_load gwy_func_use_new gwy_func_use_save gwy_get_gboolean8 gwy_get_gdouble_be gwy_get_gdouble_le gwy_get_gfloat_be gwy_get_gfloat_le gwy_get_gint16_be gwy_get_gint16_le gwy_get_gint32_be gwy_get_gint32_le gwy_get_gint64_be gwy_get_gint64_le gwy_get_guint16_be gwy_get_guint16_le gwy_get_guint32_be gwy_get_guint32_le gwy_get_guint64_be gwy_get_guint64_le gwy_get_home_dir gwy_get_pascal_real_be gwy_get_pascal_real_le gwy_get_user_dir gwy_gl_material_get_ambient gwy_gl_material_get_diffuse gwy_gl_material_get_emission gwy_gl_material_get_shininess gwy_gl_material_get_specular gwy_gl_material_get_type gwy_gl_material_reset gwy_gl_material_sample_to_pixbuf gwy_gl_material_selection_get_active gwy_gl_material_selection_new gwy_gl_material_selection_set_active gwy_gl_material_set_ambient gwy_gl_material_set_diffuse gwy_gl_material_set_emission gwy_gl_material_set_shininess gwy_gl_material_set_specular gwy_gl_material_tree_view_new gwy_gl_material_tree_view_set_active gwy_gl_materials gwy_gl_materials_get_gl_material gwy_gradient_delete_point gwy_gradient_get_color gwy_gradient_get_npoints gwy_gradient_get_point gwy_gradient_get_points gwy_gradient_get_samples gwy_gradient_get_type gwy_gradient_insert_point gwy_gradient_insert_point_sorted gwy_gradient_reset gwy_gradient_sample gwy_gradient_sample_to_pixbuf gwy_gradient_selection_get_active gwy_gradient_selection_new gwy_gradient_selection_set_active gwy_gradient_set_from_samples gwy_gradient_set_point gwy_gradient_set_point_color gwy_gradient_set_points gwy_gradient_tree_view_new gwy_gradient_tree_view_set_active gwy_gradients gwy_gradients_get_gradient gwy_grain_quantity_get_type gwy_grain_quantity_get_units gwy_grain_quantity_needs_same_units gwy_grain_value_flags_get_type gwy_grain_value_get_expression gwy_grain_value_get_flags gwy_grain_value_get_group gwy_grain_value_get_power_xy gwy_grain_value_get_power_z gwy_grain_value_get_quantity gwy_grain_value_get_symbol gwy_grain_value_get_symbol_markup gwy_grain_value_get_type gwy_grain_value_group_get_type gwy_grain_value_group_name gwy_grain_value_set_expression gwy_grain_value_set_flags gwy_grain_value_set_power_xy gwy_grain_value_set_power_z gwy_grain_value_set_symbol gwy_grain_value_set_symbol_markup gwy_grain_value_store_column_get_type gwy_grain_value_tree_view_get_enabled gwy_grain_value_tree_view_get_expanded_groups gwy_grain_value_tree_view_n_enabled gwy_grain_value_tree_view_new gwy_grain_value_tree_view_select gwy_grain_value_tree_view_set_enabled gwy_grain_value_tree_view_set_expanded_groups gwy_grain_value_tree_view_set_same_units gwy_grain_values gwy_grain_values_calculate gwy_grain_values_get_builtin_grain_value gwy_grain_values_get_grain_value gwy_grain_values_get_grain_value_by_symbol gwy_graph_area_draw_on_drawable gwy_graph_area_edit_curve gwy_graph_area_enable_user_input gwy_graph_area_export_vector gwy_graph_area_get_cursor gwy_graph_area_get_label gwy_graph_area_get_model gwy_graph_area_get_selection gwy_graph_area_get_status gwy_graph_area_get_type gwy_graph_area_get_x_grid_data gwy_graph_area_get_y_grid_data gwy_graph_area_new gwy_graph_area_set_model gwy_graph_area_set_selection_editable gwy_graph_area_set_status gwy_graph_area_set_x_grid_data gwy_graph_area_set_x_range gwy_graph_area_set_y_grid_data gwy_graph_area_set_y_range gwy_graph_corner_get_type gwy_graph_corner_new gwy_graph_curve_model_enforce_order gwy_graph_curve_model_get_calibration_data gwy_graph_curve_model_get_ndata gwy_graph_curve_model_get_ranges gwy_graph_curve_model_get_type gwy_graph_curve_model_get_x_range gwy_graph_curve_model_get_xdata gwy_graph_curve_model_get_y_range gwy_graph_curve_model_get_ydata gwy_graph_curve_model_is_ordered gwy_graph_curve_model_new gwy_graph_curve_model_new_alike gwy_graph_curve_model_set_calibration_data gwy_graph_curve_model_set_data gwy_graph_curve_model_set_data_from_dataline gwy_graph_curve_model_set_data_interleaved gwy_graph_curve_type_get_enum gwy_graph_curve_type_get_type gwy_graph_curves_get_model gwy_graph_curves_get_type gwy_graph_curves_new gwy_graph_curves_set_model gwy_graph_data_get_model gwy_graph_data_get_type gwy_graph_data_new gwy_graph_data_set_model gwy_graph_draw_curve gwy_graph_draw_grid gwy_graph_draw_line gwy_graph_draw_point gwy_graph_draw_selection_areas gwy_graph_draw_selection_lines gwy_graph_draw_selection_points gwy_graph_draw_selection_xareas gwy_graph_draw_selection_yareas gwy_graph_enable_user_input gwy_graph_export_pixmap gwy_graph_export_postscript gwy_graph_func_current gwy_graph_func_exists gwy_graph_func_foreach gwy_graph_func_get_menu_path gwy_graph_func_get_sensitivity_mask gwy_graph_func_get_stock_id gwy_graph_func_get_tooltip gwy_graph_func_register gwy_graph_func_run gwy_graph_get_area gwy_graph_get_axis gwy_graph_get_model gwy_graph_get_n_preset_colors gwy_graph_get_preset_color gwy_graph_get_status gwy_graph_get_type gwy_graph_grid_type_get_type gwy_graph_label_draw_on_drawable gwy_graph_label_enable_user_input gwy_graph_label_export_vector gwy_graph_label_get_model gwy_graph_label_get_type gwy_graph_label_new gwy_graph_label_position_get_type gwy_graph_label_set_model gwy_graph_model_add_curve gwy_graph_model_append_curves gwy_graph_model_export_ascii gwy_graph_model_export_style_get_type gwy_graph_model_get_axis_label gwy_graph_model_get_curve gwy_graph_model_get_curve_by_description gwy_graph_model_get_curve_index gwy_graph_model_get_n_curves gwy_graph_model_get_ranges gwy_graph_model_get_type gwy_graph_model_get_x_range gwy_graph_model_get_y_range gwy_graph_model_new gwy_graph_model_new_alike gwy_graph_model_remove_all_curves gwy_graph_model_remove_curve gwy_graph_model_remove_curve_by_description gwy_graph_model_replace_curve gwy_graph_model_set_axis_label gwy_graph_model_set_units_from_data_field gwy_graph_model_set_units_from_data_line gwy_graph_model_units_are_compatible gwy_graph_model_x_data_can_be_logarithmed gwy_graph_model_y_data_can_be_logarithmed gwy_graph_new gwy_graph_point_type_get_type gwy_graph_set_axis_visible gwy_graph_set_model gwy_graph_set_status gwy_graph_status_type_get_type gwy_graph_window_get_graph gwy_graph_window_get_graph_curves gwy_graph_window_get_graph_data gwy_graph_window_get_type gwy_graph_window_new gwy_gstring_replace gwy_gstring_to_native_eol gwy_guint_sort gwy_hash_table_to_list_cb gwy_hash_table_to_slist_cb gwy_hbox_new gwy_help_add_to_cmap_dialog gwy_help_add_to_file_dialog gwy_help_add_to_graph_dialog gwy_help_add_to_proc_dialog gwy_help_add_to_tool_dialog gwy_help_add_to_volume_dialog gwy_help_add_to_window gwy_help_add_to_window_uri gwy_help_add_to_xyz_dialog gwy_help_flags_get_type gwy_help_is_available gwy_help_show gwy_hmarker_box_get_type gwy_hmarker_box_new gwy_hruler_get_type gwy_hruler_new gwy_hscale_style_get_type gwy_interpolation_get_dval gwy_interpolation_get_dval_of_equidists gwy_interpolation_get_support_size gwy_interpolation_has_interpolating_basis gwy_interpolation_interpolate_1d gwy_interpolation_interpolate_2d gwy_interpolation_resample_block_1d gwy_interpolation_resample_block_2d gwy_interpolation_resolve_coeffs_1d gwy_interpolation_resolve_coeffs_2d gwy_interpolation_shift_block_1d gwy_interpolation_type_get_enum gwy_interpolation_type_get_type gwy_inventory_can_make_copies gwy_inventory_delete_item gwy_inventory_delete_nth_item gwy_inventory_find gwy_inventory_foreach gwy_inventory_forget_order gwy_inventory_get_default_item gwy_inventory_get_default_item_name gwy_inventory_get_item gwy_inventory_get_item_or_default gwy_inventory_get_item_position gwy_inventory_get_item_type gwy_inventory_get_n_items gwy_inventory_get_nth_item gwy_inventory_get_type gwy_inventory_insert_item gwy_inventory_insert_nth_item gwy_inventory_is_const gwy_inventory_item_updated gwy_inventory_new gwy_inventory_new_filled gwy_inventory_new_from_array gwy_inventory_new_item gwy_inventory_nth_item_updated gwy_inventory_rename_item gwy_inventory_restore_order gwy_inventory_set_default_item_name gwy_inventory_store_get_column_by_name gwy_inventory_store_get_inventory gwy_inventory_store_get_iter gwy_inventory_store_get_type gwy_inventory_store_iter_is_valid gwy_inventory_store_new gwy_label_new_header gwy_lawn_area_reduce_to_plane gwy_lawn_check_compatibility gwy_lawn_clear gwy_lawn_copy gwy_lawn_copy_units gwy_lawn_curve_set_segments gwy_lawn_data_changed gwy_lawn_get_curve_data gwy_lawn_get_curve_data_const gwy_lawn_get_curve_label gwy_lawn_get_curve_length gwy_lawn_get_curves_data_const gwy_lawn_get_dx gwy_lawn_get_dy gwy_lawn_get_n_curves gwy_lawn_get_n_segments gwy_lawn_get_segment_label gwy_lawn_get_segments gwy_lawn_get_si_unit_curve gwy_lawn_get_si_unit_xy gwy_lawn_get_type gwy_lawn_get_value_format_curve gwy_lawn_get_value_format_xy gwy_lawn_get_xoffset gwy_lawn_get_xreal gwy_lawn_get_xres gwy_lawn_get_yoffset gwy_lawn_get_yreal gwy_lawn_get_yres gwy_lawn_invert gwy_lawn_new gwy_lawn_new_alike gwy_lawn_new_part gwy_lawn_new_rotated_90 gwy_lawn_reduce_to_plane gwy_lawn_set_curve_data gwy_lawn_set_curve_label gwy_lawn_set_curves gwy_lawn_set_segment_label gwy_lawn_set_segments gwy_lawn_set_si_unit_curve gwy_lawn_set_si_unit_xy gwy_lawn_set_xoffset gwy_lawn_set_xreal gwy_lawn_set_yoffset gwy_lawn_set_yreal gwy_layer_basic_get_gradient_key gwy_layer_basic_get_has_presentation gwy_layer_basic_get_min_max_key gwy_layer_basic_get_presentation_key gwy_layer_basic_get_range gwy_layer_basic_get_range_type gwy_layer_basic_get_range_type_key gwy_layer_basic_get_type gwy_layer_basic_new gwy_layer_basic_range_type_get_type gwy_layer_basic_set_gradient_key gwy_layer_basic_set_min_max_key gwy_layer_basic_set_presentation_key gwy_layer_basic_set_range_type_key gwy_layer_func_foreach gwy_layer_func_register gwy_layer_mask_get_color gwy_layer_mask_get_color_key gwy_layer_mask_get_type gwy_layer_mask_new gwy_layer_mask_set_color_key gwy_line_stat_quantity_get_type gwy_list_store_row_changed gwy_log_get_enabled gwy_log_set_enabled gwy_marker_box_add_marker gwy_marker_box_get_flipped gwy_marker_box_get_highlight_selected gwy_marker_box_get_marker_position gwy_marker_box_get_markers gwy_marker_box_get_nmarkers gwy_marker_box_get_selected_marker gwy_marker_box_get_type gwy_marker_box_get_validator gwy_marker_box_remove_marker gwy_marker_box_set_flipped gwy_marker_box_set_highlight_selected gwy_marker_box_set_marker_position gwy_marker_box_set_markers gwy_marker_box_set_selected_marker gwy_marker_box_set_validator gwy_marker_operation_type_get_type gwy_mask_color_selector_run gwy_masking_type_get_enum gwy_masking_type_get_type gwy_math_choleski_decompose gwy_math_choleski_invert gwy_math_choleski_solve gwy_math_curvature gwy_math_curvature_at_apex gwy_math_curvature_at_origin gwy_math_fallback_acosh gwy_math_fallback_asinh gwy_math_fallback_atanh gwy_math_fallback_cbrt gwy_math_fallback_hypot gwy_math_fallback_isinf gwy_math_fallback_isnan gwy_math_fallback_pow10 gwy_math_fallback_powi gwy_math_find_minimum_1d gwy_math_find_nearest_line gwy_math_find_nearest_point gwy_math_fit_polynom gwy_math_histogram gwy_math_humanize_numbers gwy_math_is_in_polygon gwy_math_kth_rank gwy_math_kth_ranks gwy_math_lin_solve gwy_math_lin_solve_rewrite gwy_math_median gwy_math_median_uncertainty gwy_math_nlfit_copy gwy_math_nlfit_derive gwy_math_nlfit_diff gwy_math_nlfit_diff_idx gwy_math_nlfit_fit gwy_math_nlfit_fit_full gwy_math_nlfit_fit_idx gwy_math_nlfit_fit_idx_full gwy_math_nlfit_free gwy_math_nlfit_get_approx_geometric gwy_math_nlfit_get_correlations gwy_math_nlfit_get_covar gwy_math_nlfit_get_dispersion gwy_math_nlfit_get_eval gwy_math_nlfit_get_max_iterations gwy_math_nlfit_get_nparam gwy_math_nlfit_get_sigma gwy_math_nlfit_map_free_params gwy_math_nlfit_new gwy_math_nlfit_new_idx gwy_math_nlfit_set_approx_geometric gwy_math_nlfit_set_callbacks gwy_math_nlfit_set_max_iterations gwy_math_nlfit_succeeded gwy_math_percentiles gwy_math_refine_maximum gwy_math_refine_maximum_1d gwy_math_refine_maximum_2d gwy_math_sort gwy_math_sort_with_index gwy_math_tridiag_solve_rewrite gwy_math_trimmed_mean gwy_md5_get_digest gwy_memcpy_byte_swap gwy_memmem gwy_menu_gl_material gwy_menu_gradient gwy_menu_sens_flags_get_type gwy_merge_type_get_enum gwy_merge_type_get_type gwy_mfm_component_type_get_type gwy_mfm_gradient_type_get_type gwy_mfm_probe_type_get_type gwy_min_max_filter_type_get_type gwy_module_browser gwy_module_data_fopen gwy_module_data_load gwy_module_data_save gwy_module_disable_registration gwy_module_enable_registration gwy_module_error_get_type gwy_module_error_quark gwy_module_failure_foreach gwy_module_file_error_get_type gwy_module_file_error_quark gwy_module_foreach gwy_module_get_filename gwy_module_get_functions gwy_module_is_enabled gwy_module_lookup gwy_module_register_module gwy_module_register_modules gwy_nl_fit_param_flags_get_type gwy_nlfit_preset_create_fitter gwy_nlfit_preset_fit gwy_nlfit_preset_get_formula gwy_nlfit_preset_get_nparams gwy_nlfit_preset_get_param_name gwy_nlfit_preset_get_param_units gwy_nlfit_preset_get_type gwy_nlfit_preset_get_value gwy_nlfit_preset_guess gwy_nlfit_presets gwy_null_store_get_model gwy_null_store_get_n_rows gwy_null_store_get_type gwy_null_store_iter_is_valid gwy_null_store_new gwy_null_store_row_changed gwy_null_store_rows_changed gwy_null_store_set_model gwy_null_store_set_n_rows gwy_object_set_or_reset gwy_orientation_get_enum gwy_orientation_get_type gwy_param_active_page_link_to_notebook gwy_param_def_add_active_page gwy_param_def_add_angle gwy_param_def_add_boolean gwy_param_def_add_curve_map_id gwy_param_def_add_double gwy_param_def_add_enum gwy_param_def_add_grain_groups gwy_param_def_add_graph_curve gwy_param_def_add_graph_id gwy_param_def_add_gwyenum gwy_param_def_add_gwyflags gwy_param_def_add_image_id gwy_param_def_add_instant_updates gwy_param_def_add_int gwy_param_def_add_lawn_curve gwy_param_def_add_lawn_segment gwy_param_def_add_mask_color gwy_param_def_add_percentage gwy_param_def_add_randomize gwy_param_def_add_report_type gwy_param_def_add_resource gwy_param_def_add_seed gwy_param_def_add_string gwy_param_def_add_target_graph gwy_param_def_add_unit gwy_param_def_add_volume_id gwy_param_def_add_xyz_id gwy_param_def_get_function_name gwy_param_def_get_param_label gwy_param_def_get_param_name gwy_param_def_get_type gwy_param_def_make_resource_type gwy_param_def_new gwy_param_def_set_function_name gwy_param_resource_get_params gwy_param_resource_get_type gwy_param_table_add_enabler gwy_param_table_alt_set_brick_pixel_x gwy_param_table_alt_set_brick_pixel_y gwy_param_table_alt_set_brick_pixel_z gwy_param_table_alt_set_calibration gwy_param_table_alt_set_field_frac_z gwy_param_table_alt_set_field_pixel_x gwy_param_table_alt_set_field_pixel_y gwy_param_table_alt_set_lawn_pixel_x gwy_param_table_alt_set_lawn_pixel_y gwy_param_table_alt_set_linear gwy_param_table_append_button gwy_param_table_append_checkbox gwy_param_table_append_checkboxes gwy_param_table_append_combo gwy_param_table_append_curve_map_id gwy_param_table_append_entry gwy_param_table_append_foreign gwy_param_table_append_graph_curve gwy_param_table_append_graph_id gwy_param_table_append_header gwy_param_table_append_image_id gwy_param_table_append_info gwy_param_table_append_lawn_curve gwy_param_table_append_lawn_segment gwy_param_table_append_mask_color gwy_param_table_append_message gwy_param_table_append_radio gwy_param_table_append_radio_buttons gwy_param_table_append_radio_header gwy_param_table_append_radio_item gwy_param_table_append_radio_row gwy_param_table_append_report gwy_param_table_append_results gwy_param_table_append_resultsv gwy_param_table_append_seed gwy_param_table_append_separator gwy_param_table_append_slider gwy_param_table_append_target_graph gwy_param_table_append_unit_chooser gwy_param_table_append_volume_id gwy_param_table_append_xyz_id gwy_param_table_checkboxes_set_sensitive gwy_param_table_combo_refilter gwy_param_table_combo_set_filter gwy_param_table_data_id_refilter gwy_param_table_data_id_set_filter gwy_param_table_entry_set_instant_changes gwy_param_table_entry_set_value_format gwy_param_table_entry_set_width gwy_param_table_exists gwy_param_table_get_type gwy_param_table_graph_curve_set_model gwy_param_table_info_set_add_punctuation gwy_param_table_info_set_valuestr gwy_param_table_message_set_type gwy_param_table_new gwy_param_table_param_changed gwy_param_table_params gwy_param_table_radio_set_sensitive gwy_param_table_report_set_formatter gwy_param_table_report_set_results gwy_param_table_reset gwy_param_table_results_clear gwy_param_table_results_fill gwy_param_table_set_boolean gwy_param_table_set_curve gwy_param_table_set_data_id gwy_param_table_set_double gwy_param_table_set_enum gwy_param_table_set_flags gwy_param_table_set_from_params gwy_param_table_set_int gwy_param_table_set_label gwy_param_table_set_no_reset gwy_param_table_set_no_resetv gwy_param_table_set_sensitive gwy_param_table_set_string gwy_param_table_set_unitstr gwy_param_table_slider_add_alt gwy_param_table_slider_restrict_range gwy_param_table_slider_set_digits gwy_param_table_slider_set_factor gwy_param_table_slider_set_mapping gwy_param_table_slider_set_snapping gwy_param_table_slider_set_steps gwy_param_table_slider_set_transform gwy_param_table_widget gwy_params_assign gwy_params_data_id_is_none gwy_params_duplicate gwy_params_get_boolean gwy_params_get_color gwy_params_get_curve_map gwy_params_get_data_id gwy_params_get_def gwy_params_get_double gwy_params_get_enum gwy_params_get_flags gwy_params_get_graph gwy_params_get_image gwy_params_get_int gwy_params_get_mask gwy_params_get_masking gwy_params_get_report_type gwy_params_get_resource gwy_params_get_string gwy_params_get_type gwy_params_get_unit gwy_params_get_volume gwy_params_get_xyz gwy_params_load_from_settings gwy_params_new gwy_params_new_from_settings gwy_params_randomize_seed gwy_params_reset gwy_params_reset_all gwy_params_save_to_settings gwy_params_set_boolean gwy_params_set_color gwy_params_set_curve gwy_params_set_curve_map_id gwy_params_set_def gwy_params_set_double gwy_params_set_enum gwy_params_set_flag gwy_params_set_flags gwy_params_set_graph_id gwy_params_set_image_id gwy_params_set_int gwy_params_set_report_type gwy_params_set_resource gwy_params_set_string gwy_params_set_unit gwy_params_set_volume_id gwy_params_set_xyz_id gwy_peak_background_type_get_type gwy_peak_order_type_get_type gwy_peak_quantity_get_type gwy_peaks_analyze gwy_peaks_analyze_dataline gwy_peaks_analyze_xy gwy_peaks_copy gwy_peaks_free gwy_peaks_get_quantity gwy_peaks_get_type gwy_peaks_n_peaks gwy_peaks_new gwy_peaks_set_background gwy_peaks_set_order gwy_percentile_interpolation_type_get_type gwy_pixbuf_draw_data_field gwy_pixbuf_draw_data_field_adaptive gwy_pixbuf_draw_data_field_as_mask gwy_pixbuf_draw_data_field_with_range gwy_pixmap_layer_get_data_key gwy_pixmap_layer_get_type gwy_pixmap_layer_make_pixbuf gwy_pixmap_layer_paint gwy_pixmap_layer_set_data_key gwy_pixmap_layer_wants_repaint gwy_plain_tool_add_clear_button gwy_plain_tool_add_param_table gwy_plain_tool_changed_get_type gwy_plain_tool_check_layer_type gwy_plain_tool_connect_selection gwy_plain_tool_enable_object_deletion gwy_plain_tool_ensure_layer gwy_plain_tool_get_type gwy_plain_tool_get_z_average gwy_plain_tool_log_add gwy_plain_tool_set_selection_key gwy_plane_fit_quantity_get_type gwy_plane_symmetry_get_enum gwy_plane_symmetry_get_type gwy_preview_surface_flags_get_type gwy_preview_surface_to_datafield gwy_preview_type_get_type gwy_process_func_current gwy_process_func_exists gwy_process_func_foreach gwy_process_func_get_menu_path gwy_process_func_get_run_types gwy_process_func_get_sensitivity_mask gwy_process_func_get_stock_id gwy_process_func_get_tooltip gwy_process_func_register gwy_process_func_run gwy_process_type_init gwy_radio_button_get_value gwy_radio_button_set_value gwy_radio_buttons_attach_to_table gwy_radio_buttons_create gwy_radio_buttons_createl gwy_radio_buttons_find gwy_radio_buttons_get_current gwy_radio_buttons_set_current gwy_radio_buttons_set_sensitive gwy_rand_gen_set_choose_shuffle gwy_rand_gen_set_double gwy_rand_gen_set_exponential gwy_rand_gen_set_fill_doubles gwy_rand_gen_set_fill_ints gwy_rand_gen_set_free gwy_rand_gen_set_gaussian gwy_rand_gen_set_init gwy_rand_gen_set_int gwy_rand_gen_set_multiplier gwy_rand_gen_set_new gwy_rand_gen_set_range gwy_rand_gen_set_rng gwy_rand_gen_set_triangular gwy_rand_gen_set_uniform gwy_raw_data_size gwy_raw_data_type_get_type gwy_rect_selection_labels_fill gwy_rect_selection_labels_get_table gwy_rect_selection_labels_new gwy_rect_selection_labels_select gwy_rendering_target_get_type gwy_require_image_same_units gwy_require_square_image gwy_resource_build_filename gwy_resource_class_get_inventory gwy_resource_class_get_item_type gwy_resource_class_get_name gwy_resource_class_load gwy_resource_class_mkdir gwy_resource_class_save_modified gwy_resource_classes_finalize gwy_resource_data_changed gwy_resource_data_saved gwy_resource_delete gwy_resource_dump gwy_resource_editor_class_setup gwy_resource_editor_commit gwy_resource_editor_get_edited gwy_resource_editor_get_type gwy_resource_editor_queue_commit gwy_resource_editor_setup gwy_resource_get_is_modifiable gwy_resource_get_is_preferred gwy_resource_get_name gwy_resource_get_type gwy_resource_is_used gwy_resource_parse gwy_resource_release gwy_resource_rename gwy_resource_save gwy_resource_set_is_preferred gwy_resource_tree_view_set_active gwy_resource_use gwy_response_type_get_type gwy_results_add_covariance_matrix gwy_results_add_covariance_matrixv gwy_results_add_format gwy_results_add_header gwy_results_add_separator gwy_results_add_value gwy_results_add_value_angle gwy_results_add_value_int gwy_results_add_value_percents gwy_results_add_value_plain gwy_results_add_value_str gwy_results_add_value_x gwy_results_add_value_y gwy_results_add_value_yesno gwy_results_add_value_z gwy_results_bind_formats gwy_results_copy gwy_results_create_report gwy_results_export_get_format gwy_results_export_get_results gwy_results_export_get_style gwy_results_export_get_type gwy_results_export_new gwy_results_export_set_actions_sensitive gwy_results_export_set_format gwy_results_export_set_format_func gwy_results_export_set_results gwy_results_export_set_style gwy_results_export_set_title gwy_results_export_style_get_type gwy_results_fill_channel gwy_results_fill_covariance_matrix gwy_results_fill_curve_map gwy_results_fill_filename gwy_results_fill_format gwy_results_fill_graph gwy_results_fill_graph_curve gwy_results_fill_lawn_curve gwy_results_fill_values gwy_results_fill_values_with_errors gwy_results_fill_volume gwy_results_fill_xyz gwy_results_get_error gwy_results_get_full gwy_results_get_label gwy_results_get_label_with_symbol gwy_results_get_symbol gwy_results_get_type gwy_results_get_units gwy_results_get_value gwy_results_get_value_with_error gwy_results_new gwy_results_report_type_get_type gwy_results_set_na gwy_results_set_nav gwy_results_set_unit gwy_results_set_unit_str gwy_results_unbind_formats gwy_results_value_is_na gwy_results_value_type_get_type gwy_rgba_copy gwy_rgba_free gwy_rgba_from_gdk_color gwy_rgba_from_gdk_color_and_alpha gwy_rgba_from_pixbuf_pixel gwy_rgba_get_from_container gwy_rgba_get_type gwy_rgba_interpolate gwy_rgba_new gwy_rgba_remove_from_container gwy_rgba_set_gdk_gc_bg gwy_rgba_set_gdk_gc_fg gwy_rgba_store_to_container gwy_rgba_to_gdk_alpha gwy_rgba_to_gdk_color gwy_rgba_to_hex6 gwy_rgba_to_hex8 gwy_rgba_to_pixbuf_pixel gwy_rotate_resize_type_get_type gwy_ruler_draw_pos gwy_ruler_get_range gwy_ruler_get_si_unit gwy_ruler_get_type gwy_ruler_get_units_placement gwy_ruler_set_range gwy_ruler_set_si_unit gwy_ruler_set_units_placement gwy_run_subdialog gwy_run_type_get_type gwy_save_auxiliary_data gwy_save_auxiliary_with_callback gwy_scale_mapping_type_get_type gwy_sci_text_get_entry gwy_sci_text_get_has_preview gwy_sci_text_get_text gwy_sci_text_get_type gwy_sci_text_new gwy_sci_text_set_has_preview gwy_sci_text_set_text gwy_select_in_filtered_inventory_treeeview gwy_selection_changed gwy_selection_clear gwy_selection_crop gwy_selection_delete_object gwy_selection_filter gwy_selection_finished gwy_selection_get_data gwy_selection_get_max_objects gwy_selection_get_object gwy_selection_get_object_size gwy_selection_get_type gwy_selection_graph_1darea_get_type gwy_selection_graph_1darea_new gwy_selection_graph_area_get_type gwy_selection_graph_area_new gwy_selection_graph_line_get_type gwy_selection_graph_line_new gwy_selection_graph_point_get_type gwy_selection_graph_point_new gwy_selection_graph_zoom_get_type gwy_selection_graph_zoom_new gwy_selection_is_full gwy_selection_move gwy_selection_set_data gwy_selection_set_max_objects gwy_selection_set_object gwy_sensitivity_group_add_widget gwy_sensitivity_group_contains_widget gwy_sensitivity_group_get_state gwy_sensitivity_group_get_type gwy_sensitivity_group_get_widget_mask gwy_sensitivity_group_new gwy_sensitivity_group_release_widget gwy_sensitivity_group_set_state gwy_sensitivity_group_set_widget_mask gwy_serializable_clone gwy_serializable_clone_with_type gwy_serializable_deserialize gwy_serializable_duplicate gwy_serializable_get_size gwy_serializable_get_type gwy_serializable_serialize gwy_serialize_check_string gwy_serialize_get_items_size gwy_serialize_get_struct_size gwy_serialize_object_items gwy_serialize_pack_object_struct gwy_serialize_unpack_object_struct gwy_set_data_preview_size gwy_set_member_object gwy_sgettext gwy_shader_get_gradient gwy_shader_get_phi gwy_shader_get_theta gwy_shader_get_type gwy_shader_get_update_policy gwy_shader_new gwy_shader_set_angle gwy_shader_set_gradient gwy_shader_set_phi gwy_shader_set_theta gwy_shader_set_update_policy gwy_shape_fit_preset_calculate_xyz gwy_shape_fit_preset_calculate_z gwy_shape_fit_preset_create_fitter gwy_shape_fit_preset_fit gwy_shape_fit_preset_get_nparams gwy_shape_fit_preset_get_nsecondary gwy_shape_fit_preset_get_param_description gwy_shape_fit_preset_get_param_flags gwy_shape_fit_preset_get_param_name gwy_shape_fit_preset_get_param_power_xy gwy_shape_fit_preset_get_param_power_z gwy_shape_fit_preset_get_param_units gwy_shape_fit_preset_get_secondary_description gwy_shape_fit_preset_get_secondary_error gwy_shape_fit_preset_get_secondary_flags gwy_shape_fit_preset_get_secondary_name gwy_shape_fit_preset_get_secondary_power_xy gwy_shape_fit_preset_get_secondary_power_z gwy_shape_fit_preset_get_secondary_units gwy_shape_fit_preset_get_secondary_value gwy_shape_fit_preset_get_type gwy_shape_fit_preset_get_value gwy_shape_fit_preset_guess gwy_shape_fit_preset_needs_same_units gwy_shape_fit_preset_quick_fit gwy_shape_fit_preset_setup gwy_shape_fit_presets gwy_si_unit_divide gwy_si_unit_equal gwy_si_unit_equal_string gwy_si_unit_factor_to_base gwy_si_unit_format_style_get_type gwy_si_unit_get_format gwy_si_unit_get_format_for_power10 gwy_si_unit_get_format_with_digits gwy_si_unit_get_format_with_resolution gwy_si_unit_get_string gwy_si_unit_get_type gwy_si_unit_multiply gwy_si_unit_new gwy_si_unit_new_parse gwy_si_unit_nth_root gwy_si_unit_power gwy_si_unit_power_multiply gwy_si_unit_set_from_string gwy_si_unit_set_from_string_parse gwy_si_unit_value_format_clone gwy_si_unit_value_format_copy gwy_si_unit_value_format_free gwy_si_unit_value_format_new gwy_si_unit_value_format_set_units gwy_si_value_format_get_type gwy_sinc gwy_spectra_add_spectrum gwy_spectra_clear gwy_spectra_data_changed gwy_spectra_find_nearest gwy_spectra_get_n_spectra gwy_spectra_get_si_unit_xy gwy_spectra_get_spectrum gwy_spectra_get_spectrum_selected gwy_spectra_get_spectrum_x_label gwy_spectra_get_spectrum_y_label gwy_spectra_get_title gwy_spectra_get_type gwy_spectra_itoxy gwy_spectra_new gwy_spectra_new_alike gwy_spectra_remove_spectrum gwy_spectra_set_si_unit_xy gwy_spectra_set_spectrum gwy_spectra_set_spectrum_selected gwy_spectra_set_spectrum_x_label gwy_spectra_set_spectrum_y_label gwy_spectra_set_title gwy_spectra_setpos gwy_spectra_xytoi gwy_spline_copy gwy_spline_free gwy_spline_get_closed gwy_spline_get_npoints gwy_spline_get_points gwy_spline_get_slackness gwy_spline_get_tangents gwy_spline_get_type gwy_spline_length gwy_spline_new gwy_spline_new_from_points gwy_spline_sample_naturally gwy_spline_sample_uniformly gwy_spline_set_closed gwy_spline_set_points gwy_spline_set_slackness gwy_statusbar_get_type gwy_statusbar_new gwy_statusbar_set_markup gwy_stock_like_button_new gwy_stock_register_stock_items gwy_str_fixed_font_width gwy_str_next_line gwy_stramong gwy_strdiffpos gwy_string_list_append gwy_string_list_append_take gwy_string_list_clear gwy_string_list_get gwy_string_list_get_length gwy_string_list_get_type gwy_string_list_new gwy_string_to_enum gwy_string_to_flags gwy_strisident gwy_strkill gwy_strreplace gwy_surface_copy gwy_surface_copy_units gwy_surface_copy_units_to_data_field gwy_surface_data_changed gwy_surface_get gwy_surface_get_data gwy_surface_get_data_const gwy_surface_get_data_full gwy_surface_get_min_max gwy_surface_get_npoints gwy_surface_get_si_unit_xy gwy_surface_get_si_unit_z gwy_surface_get_type gwy_surface_get_value_format_xy gwy_surface_get_value_format_z gwy_surface_get_xrange gwy_surface_get_yrange gwy_surface_invalidate gwy_surface_new gwy_surface_new_alike gwy_surface_new_from_data gwy_surface_new_part gwy_surface_new_sized gwy_surface_reduce_points gwy_surface_resize gwy_surface_set gwy_surface_set_data_full gwy_surface_set_from_data_field gwy_surface_set_from_data_field_mask gwy_surface_set_si_unit_xy gwy_surface_set_si_unit_z gwy_surface_xy_is_compatible gwy_synth_add_result_to_file gwy_synth_append_dimensions_to_param_table gwy_synth_define_dimensions_params gwy_synth_dims_flags_get_type gwy_synth_dims_param_get_type gwy_synth_handle_param_changed gwy_synth_make_preview_data_field gwy_synth_make_result_data_field gwy_synth_response_type_get_type gwy_synth_sanitise_params gwy_synth_update_lateral_alts gwy_synth_update_like_current_button_sensitivity gwy_synth_update_progress gwy_synth_update_type_get_type gwy_synth_update_value_unitstrs gwy_synth_use_dimensions_template gwy_table_attach_adjbar gwy_table_attach_hscale gwy_table_attach_row gwy_table_attach_spinbutton gwy_table_get_child_widget gwy_table_hscale_get_check gwy_table_hscale_get_label gwy_table_hscale_get_middle_widget gwy_table_hscale_get_scale gwy_table_hscale_get_units gwy_table_hscale_set_sensitive gwy_text_header_context_get_lineno gwy_text_header_context_get_section gwy_text_header_error_get_type gwy_text_header_error_quark gwy_text_header_parse gwy_threads_are_enabled gwy_threads_set_enabled gwy_ticks_style_get_type gwy_tip_cmap gwy_tip_dilation gwy_tip_erosion gwy_tip_estimate_full gwy_tip_estimate_partial gwy_tip_model_get_npresets gwy_tip_model_get_preset gwy_tip_model_get_preset_by_name gwy_tip_model_get_preset_group_name gwy_tip_model_get_preset_id gwy_tip_model_get_preset_nparams gwy_tip_model_get_preset_params gwy_tip_model_get_preset_tip_name gwy_tip_model_preset_create gwy_tip_model_preset_create_for_zrange gwy_tip_model_preset_get_type gwy_tip_param_type_get_type gwy_tip_type_get_type gwy_tool_add_hide_button gwy_tool_class_get_stock_id gwy_tool_class_get_title gwy_tool_class_get_tooltip gwy_tool_data_switched gwy_tool_func_foreach gwy_tool_func_register gwy_tool_get_type gwy_tool_hide gwy_tool_is_visible gwy_tool_like_button_new gwy_tool_response_type_get_type gwy_tool_restore_screen_position gwy_tool_show gwy_tool_spectra_switched gwy_tool_switch_event_get_type gwy_transform_direction_get_type gwy_triangulation_boundary gwy_triangulation_data_free gwy_triangulation_delaunay gwy_triangulation_get_type gwy_triangulation_interpolate gwy_triangulation_new gwy_triangulation_triangulate gwy_triangulation_triangulate_iterative gwy_triangulation_voronoi gwy_type_init gwy_undo_checkpoint gwy_undo_checkpointv gwy_undo_container_get_modified gwy_undo_container_has_redo gwy_undo_container_has_undo gwy_undo_container_remove gwy_undo_container_set_unmodified gwy_undo_get_enabled gwy_undo_qcheckpoint gwy_undo_qcheckpointv gwy_undo_redo_container gwy_undo_set_enabled gwy_undo_undo_container gwy_units_placement_get_type gwy_utf16_to_utf8 gwy_utf8_strescape gwy_vbox_new gwy_vector_layer_button_press gwy_vector_layer_button_release gwy_vector_layer_class_get_selection_type gwy_vector_layer_draw gwy_vector_layer_ensure_selection gwy_vector_layer_get_editable gwy_vector_layer_get_focus gwy_vector_layer_get_selection_key gwy_vector_layer_get_type gwy_vector_layer_key_press gwy_vector_layer_key_release gwy_vector_layer_motion_notify gwy_vector_layer_object_chosen gwy_vector_layer_set_editable gwy_vector_layer_set_focus gwy_vector_layer_set_selection_key gwy_version_major gwy_version_minor gwy_version_string gwy_visibility_reset_type_get_type gwy_volume_func_current gwy_volume_func_exists gwy_volume_func_foreach gwy_volume_func_get_menu_path gwy_volume_func_get_run_types gwy_volume_func_get_sensitivity_mask gwy_volume_func_get_stock_id gwy_volume_func_get_tooltip gwy_volume_func_register gwy_volume_func_run gwy_vruler_get_type gwy_vruler_new gwy_watershed_state_type_get_type gwy_widget_get_activate_on_unfocus gwy_widget_set_activate_on_unfocus gwy_widget_sync_sensitivity gwy_widgets_get_gl_config gwy_widgets_gl_init gwy_widgets_type_init gwy_windowing_type_get_enum gwy_windowing_type_get_type gwy_xlnx_int gwy_xy_copy gwy_xy_free gwy_xy_get_type gwy_xy_new gwy_xyz_copy gwy_xyz_free gwy_xyz_func_current gwy_xyz_func_exists gwy_xyz_func_foreach gwy_xyz_func_get_menu_path gwy_xyz_func_get_run_types gwy_xyz_func_get_sensitivity_mask gwy_xyz_func_get_stock_id gwy_xyz_func_get_tooltip gwy_xyz_func_register gwy_xyz_func_run gwy_xyz_get_type gwy_xyz_new +syn keyword gwyddionFunction gwy_2d_cwt_wavelet_type_get_enum gwy_2d_cwt_wavelet_type_get_type gwy_3d_label_expand_text gwy_3d_label_get_text gwy_3d_label_get_type gwy_3d_label_new gwy_3d_label_reset gwy_3d_label_reset_text gwy_3d_label_set_text gwy_3d_label_user_size gwy_3d_movement_get_type gwy_3d_projection_get_type gwy_3d_setup_get_type gwy_3d_setup_new gwy_3d_view_class_disable_axis_drawing gwy_3d_view_get_data gwy_3d_view_get_data_key gwy_3d_view_get_gradient_key gwy_3d_view_get_label gwy_3d_view_get_mask_key gwy_3d_view_get_material_key gwy_3d_view_get_movement_type gwy_3d_view_get_pixbuf gwy_3d_view_get_pixbuf_with_alpha gwy_3d_view_get_reduced_size gwy_3d_view_get_scale_range gwy_3d_view_get_setup gwy_3d_view_get_setup_prefix gwy_3d_view_get_type gwy_3d_view_label_get_type gwy_3d_view_new gwy_3d_view_set_data_key gwy_3d_view_set_gradient_key gwy_3d_view_set_mask_key gwy_3d_view_set_material_key gwy_3d_view_set_movement_type gwy_3d_view_set_ovlay gwy_3d_view_set_reduced_size gwy_3d_view_set_scale_range gwy_3d_view_set_setup_prefix gwy_3d_visualization_get_type gwy_3d_window_add_action_widget gwy_3d_window_add_small_toolbar_button gwy_3d_window_get_3d_view gwy_3d_window_get_type gwy_3d_window_new gwy_3d_window_set_overlay_chooser gwy_adjust_bar_get_adjustment gwy_adjust_bar_get_bar_sensitive gwy_adjust_bar_get_check_button gwy_adjust_bar_get_has_check_button gwy_adjust_bar_get_label gwy_adjust_bar_get_mapping gwy_adjust_bar_get_snap_to_ticks gwy_adjust_bar_get_type gwy_adjust_bar_new gwy_adjust_bar_set_adjustment gwy_adjust_bar_set_bar_sensitive gwy_adjust_bar_set_has_check_button gwy_adjust_bar_set_mapping gwy_adjust_bar_set_snap_to_ticks gwy_affine_scaling_type_get_type gwy_app_add_graph_or_curves gwy_app_add_main_accel_group gwy_app_build_curve_map_menu gwy_app_build_graph_menu gwy_app_build_process_menu gwy_app_build_volume_menu gwy_app_build_xyz_menu gwy_app_channel_check_nonsquare gwy_app_channel_log_add gwy_app_channel_log_add_proc gwy_app_channel_mask_of_nans gwy_app_channel_remove_bad_data gwy_app_channel_title_fall_back gwy_app_current_tool gwy_app_current_tool_name gwy_app_curve_map_log_add gwy_app_curve_map_log_add_curve_map gwy_app_data_browser_add gwy_app_data_browser_add_brick gwy_app_data_browser_add_channel_watch gwy_app_data_browser_add_curve_map_watch gwy_app_data_browser_add_data_field gwy_app_data_browser_add_graph_model gwy_app_data_browser_add_graph_watch gwy_app_data_browser_add_lawn gwy_app_data_browser_add_spectra gwy_app_data_browser_add_surface gwy_app_data_browser_add_volume_watch gwy_app_data_browser_add_xyz_watch gwy_app_data_browser_copy_channel gwy_app_data_browser_copy_curve_map gwy_app_data_browser_copy_volume gwy_app_data_browser_copy_xyz gwy_app_data_browser_find_curve_map_by_title gwy_app_data_browser_find_data_by_title gwy_app_data_browser_find_graphs_by_title gwy_app_data_browser_find_spectra_by_title gwy_app_data_browser_find_volume_by_title gwy_app_data_browser_find_xyz_by_title gwy_app_data_browser_foreach gwy_app_data_browser_get gwy_app_data_browser_get_current gwy_app_data_browser_get_curve_map_ids gwy_app_data_browser_get_data_ids gwy_app_data_browser_get_graph_ids gwy_app_data_browser_get_gui_enabled gwy_app_data_browser_get_keep_invisible gwy_app_data_browser_get_number gwy_app_data_browser_get_spectra_ids gwy_app_data_browser_get_volume_ids gwy_app_data_browser_get_xyz_ids gwy_app_data_browser_merge gwy_app_data_browser_remove gwy_app_data_browser_remove_channel_watch gwy_app_data_browser_remove_curve_map_watch gwy_app_data_browser_remove_graph_watch gwy_app_data_browser_remove_volume_watch gwy_app_data_browser_remove_xyz_watch gwy_app_data_browser_reset_visibility gwy_app_data_browser_restore gwy_app_data_browser_select_brick gwy_app_data_browser_select_curve_map gwy_app_data_browser_select_data_field gwy_app_data_browser_select_data_view gwy_app_data_browser_select_graph gwy_app_data_browser_select_graph_model gwy_app_data_browser_select_lawn gwy_app_data_browser_select_spectra gwy_app_data_browser_select_surface gwy_app_data_browser_select_volume gwy_app_data_browser_select_xyz gwy_app_data_browser_set_gui_enabled gwy_app_data_browser_set_keep_invisible gwy_app_data_browser_show gwy_app_data_browser_show_3d gwy_app_data_browser_shut_down gwy_app_data_clear_selections gwy_app_data_id_copy gwy_app_data_id_free gwy_app_data_id_get_type gwy_app_data_id_new gwy_app_data_id_verify_channel gwy_app_data_id_verify_curve_map gwy_app_data_id_verify_graph gwy_app_data_id_verify_spectra gwy_app_data_id_verify_volume gwy_app_data_id_verify_xyz gwy_app_data_view_change_mask_color gwy_app_file_close gwy_app_file_confirm_overwrite gwy_app_file_load gwy_app_file_merge gwy_app_file_open gwy_app_file_save gwy_app_file_save_as gwy_app_file_write gwy_app_find_window_for_channel gwy_app_find_window_for_curve_map gwy_app_find_window_for_graph gwy_app_find_window_for_volume gwy_app_find_window_for_xyz gwy_app_get_brick_key_for_id gwy_app_get_brick_meta_key_for_id gwy_app_get_brick_palette_key_for_id gwy_app_get_brick_preview_key_for_id gwy_app_get_brick_title gwy_app_get_brick_title_key_for_id gwy_app_get_channel_thumbnail gwy_app_get_current_directory gwy_app_get_curve_map_thumbnail gwy_app_get_data_base_key_for_id gwy_app_get_data_field_title gwy_app_get_data_key_for_id gwy_app_get_data_meta_key_for_id gwy_app_get_data_palette_key_for_id gwy_app_get_data_range_max_key_for_id gwy_app_get_data_range_min_key_for_id gwy_app_get_data_range_type_key_for_id gwy_app_get_data_real_square_key_for_id gwy_app_get_data_title_key_for_id gwy_app_get_graph_key_for_id gwy_app_get_graph_thumbnail gwy_app_get_lawn_key_for_id gwy_app_get_lawn_meta_key_for_id gwy_app_get_lawn_palette_key_for_id gwy_app_get_lawn_preview_key_for_id gwy_app_get_lawn_real_square_key_for_id gwy_app_get_lawn_title gwy_app_get_lawn_title_key_for_id gwy_app_get_log_text_buffer gwy_app_get_mask_key_for_id gwy_app_get_show_key_for_id gwy_app_get_spectra_key_for_id gwy_app_get_surface_key_for_id gwy_app_get_surface_meta_key_for_id gwy_app_get_surface_palette_key_for_id gwy_app_get_surface_preview_key_for_id gwy_app_get_surface_title gwy_app_get_surface_title_key_for_id gwy_app_get_volume_thumbnail gwy_app_get_xyz_thumbnail gwy_app_gl_init gwy_app_gl_is_ok gwy_app_gl_material_editor gwy_app_gradient_editor gwy_app_init_common gwy_app_init_i18n gwy_app_init_nongui gwy_app_init_widget_styles gwy_app_log_browser_for_channel gwy_app_log_browser_for_curve_map gwy_app_log_browser_for_volume gwy_app_log_browser_for_xyz gwy_app_logging_flags_get_type gwy_app_main_window_get gwy_app_main_window_set gwy_app_menu_recent_files_get gwy_app_menu_recent_files_update gwy_app_metadata_browser_for_channel gwy_app_metadata_browser_for_curve_map gwy_app_metadata_browser_for_volume gwy_app_metadata_browser_for_xyz gwy_app_page_get_type gwy_app_process_func_get_use gwy_app_process_func_save_use gwy_app_process_menu_add_run_last gwy_app_quit gwy_app_recent_file_get_thumbnail gwy_app_recent_file_list_free gwy_app_recent_file_list_load gwy_app_recent_file_list_new gwy_app_recent_file_list_save gwy_app_recent_file_list_update gwy_app_restore_window_position gwy_app_run_curve_map_func gwy_app_run_curve_map_func_in_mode gwy_app_run_graph_func gwy_app_run_process_func gwy_app_run_process_func_in_mode gwy_app_run_volume_func gwy_app_run_volume_func_in_mode gwy_app_run_xyz_func gwy_app_run_xyz_func_in_mode gwy_app_save_window_position gwy_app_sensitivity_add_widget gwy_app_sensitivity_get_group gwy_app_sensitivity_set_state gwy_app_set_brick_title gwy_app_set_current_directory gwy_app_set_data_field_title gwy_app_set_lawn_title gwy_app_set_surface_title gwy_app_settings_create_config_dir gwy_app_settings_error_get_type gwy_app_settings_error_quark gwy_app_settings_free gwy_app_settings_get gwy_app_settings_get_log_filename gwy_app_settings_get_module_dirs gwy_app_settings_get_recent_file_list_filename gwy_app_settings_get_settings_filename gwy_app_settings_load gwy_app_settings_merge_string gwy_app_settings_save gwy_app_setup_logging gwy_app_switch_tool gwy_app_sync_curve_map_items gwy_app_sync_curve_map_itemsv gwy_app_sync_data_items gwy_app_sync_data_itemsv gwy_app_sync_volume_items gwy_app_sync_volume_itemsv gwy_app_sync_xyz_items gwy_app_sync_xyz_itemsv gwy_app_undo_checkpoint gwy_app_undo_checkpointv gwy_app_undo_container_remove gwy_app_undo_qcheckpoint gwy_app_undo_qcheckpointv gwy_app_undo_redo_container gwy_app_undo_undo_container gwy_app_volume_log_add gwy_app_volume_log_add_volume gwy_app_wait_cursor_finish gwy_app_wait_cursor_start gwy_app_wait_finish gwy_app_wait_get_enabled gwy_app_wait_preview_data_field gwy_app_wait_set_enabled gwy_app_wait_set_fraction gwy_app_wait_set_message gwy_app_wait_set_message_prefix gwy_app_wait_set_preview_widget gwy_app_wait_start gwy_app_wait_was_canceled gwy_app_what_get_type gwy_app_xyz_log_add gwy_app_xyz_log_add_xyz gwy_app_xyz_title_fall_back gwy_append_doubles_to_gstring gwy_ascii_strcase_equal gwy_ascii_strcase_hash gwy_assign_string gwy_axis_draw_on_drawable gwy_axis_enable_label_edit gwy_axis_export_vector gwy_axis_get_label gwy_axis_get_magnification gwy_axis_get_magnification_string gwy_axis_get_major_ticks gwy_axis_get_orientation gwy_axis_get_range gwy_axis_get_requested_range gwy_axis_get_type gwy_axis_is_logarithmic gwy_axis_is_visible gwy_axis_new gwy_axis_request_range gwy_axis_scale_format_get_type gwy_axis_set_auto gwy_axis_set_label gwy_axis_set_logarithmic gwy_axis_set_si_unit gwy_axis_set_visible gwy_brick_add gwy_brick_add_to_xy_planes gwy_brick_add_to_z_lines gwy_brick_check_compatibility gwy_brick_clear gwy_brick_copy gwy_brick_copy_units gwy_brick_copy_zcalibration gwy_brick_data_changed gwy_brick_extract_line gwy_brick_extract_plane gwy_brick_extract_xy_plane gwy_brick_extract_z_line gwy_brick_fill gwy_brick_get_data gwy_brick_get_data_const gwy_brick_get_dval gwy_brick_get_dval_real gwy_brick_get_dx gwy_brick_get_dy gwy_brick_get_dz gwy_brick_get_max gwy_brick_get_min gwy_brick_get_si_unit_w gwy_brick_get_si_unit_x gwy_brick_get_si_unit_y gwy_brick_get_si_unit_z gwy_brick_get_type gwy_brick_get_val gwy_brick_get_val_real gwy_brick_get_value_format_w gwy_brick_get_value_format_x gwy_brick_get_value_format_y gwy_brick_get_value_format_z gwy_brick_get_xoffset gwy_brick_get_xreal gwy_brick_get_xres gwy_brick_get_yoffset gwy_brick_get_yreal gwy_brick_get_yres gwy_brick_get_zcalibration gwy_brick_get_zoffset gwy_brick_get_zreal gwy_brick_get_zres gwy_brick_invert gwy_brick_itor gwy_brick_jtor gwy_brick_ktor gwy_brick_ktor_cal gwy_brick_max_plane gwy_brick_max_xy_plane gwy_brick_maxpos_plane gwy_brick_maxpos_xy_plane gwy_brick_mean_plane gwy_brick_mean_xy_plane gwy_brick_min_plane gwy_brick_min_xy_plane gwy_brick_minpos_plane gwy_brick_minpos_xy_plane gwy_brick_multiply gwy_brick_new gwy_brick_new_alike gwy_brick_new_part gwy_brick_resample gwy_brick_rms_plane gwy_brick_rms_xy_plane gwy_brick_rtoi gwy_brick_rtoj gwy_brick_rtok gwy_brick_rtok_cal gwy_brick_set_plane gwy_brick_set_si_unit_w gwy_brick_set_si_unit_x gwy_brick_set_si_unit_y gwy_brick_set_si_unit_z gwy_brick_set_val gwy_brick_set_val_real gwy_brick_set_xoffset gwy_brick_set_xreal gwy_brick_set_xy_plane gwy_brick_set_yoffset gwy_brick_set_yreal gwy_brick_set_zcalibration gwy_brick_set_zoffset gwy_brick_set_zreal gwy_brick_sum_plane gwy_brick_sum_xy_plane gwy_brick_transpose gwy_brick_transpose_type_get_type gwy_byte_order_get_type gwy_caldata_append gwy_caldata_get_ndata gwy_caldata_get_range gwy_caldata_get_si_unit_x gwy_caldata_get_si_unit_y gwy_caldata_get_si_unit_z gwy_caldata_get_type gwy_caldata_get_x gwy_caldata_get_xerr gwy_caldata_get_xunc gwy_caldata_get_y gwy_caldata_get_yerr gwy_caldata_get_yunc gwy_caldata_get_z gwy_caldata_get_zerr gwy_caldata_get_zunc gwy_caldata_inside gwy_caldata_interpolate gwy_caldata_new gwy_caldata_resize gwy_caldata_save_data gwy_caldata_set_range gwy_caldata_set_si_unit_x gwy_caldata_set_si_unit_y gwy_caldata_set_si_unit_z gwy_caldata_setup_interpolation gwy_calibration_get_data gwy_calibration_get_filename gwy_calibration_get_ndata gwy_calibration_get_type gwy_calibration_new gwy_calibrations gwy_calibrations_get_calibration gwy_canonicalize_angle gwy_canonicalize_path gwy_cdline_fit gwy_cdline_fit_with_caldata gwy_cdline_get_definition gwy_cdline_get_name gwy_cdline_get_nparams gwy_cdline_get_param_name gwy_cdline_get_param_units gwy_cdline_get_type gwy_cdline_get_value gwy_cdlines gwy_check_box_get_group gwy_check_box_get_value gwy_check_boxes_attach_to_table gwy_check_boxes_create gwy_check_boxes_createl gwy_check_boxes_find gwy_check_boxes_get_selected gwy_check_boxes_set_selected gwy_check_boxes_set_sensitive gwy_check_regular_2d_grid gwy_color_axis_get_gradient gwy_color_axis_get_labels_visible gwy_color_axis_get_range gwy_color_axis_get_si_unit gwy_color_axis_get_ticks_style gwy_color_axis_get_type gwy_color_axis_new gwy_color_axis_new_with_range gwy_color_axis_set_gradient gwy_color_axis_set_labels_visible gwy_color_axis_set_range gwy_color_axis_set_si_unit gwy_color_axis_set_tick_map_func gwy_color_axis_set_ticks_style gwy_color_button_get_color gwy_color_button_get_type gwy_color_button_get_use_alpha gwy_color_button_new gwy_color_button_new_with_color gwy_color_button_set_color gwy_color_button_set_use_alpha gwy_color_selector_for_mask gwy_combo_box_graph_curve_new gwy_combo_box_lawn_curve_new gwy_combo_box_lawn_segment_new gwy_combo_box_metric_unit_new gwy_combo_box_metric_unit_set_unit gwy_compare_double gwy_computation_state_get_fraction gwy_computation_state_get_state gwy_computation_state_get_type gwy_computation_state_type_get_type gwy_container_contains gwy_container_deserialize_from_text gwy_container_duplicate_by_prefix gwy_container_duplicate_by_prefixv gwy_container_foreach gwy_container_get_boolean gwy_container_get_double gwy_container_get_enum gwy_container_get_int32 gwy_container_get_int64 gwy_container_get_n_items gwy_container_get_object gwy_container_get_string gwy_container_get_type gwy_container_get_uchar gwy_container_get_value gwy_container_gis_boolean gwy_container_gis_double gwy_container_gis_enum gwy_container_gis_int32 gwy_container_gis_int64 gwy_container_gis_object gwy_container_gis_string gwy_container_gis_uchar gwy_container_gis_value gwy_container_keys gwy_container_keys_by_name gwy_container_keys_with_prefix gwy_container_keys_with_prefix_by_name gwy_container_new gwy_container_remove gwy_container_remove_by_prefix gwy_container_rename gwy_container_serialize_to_text gwy_container_set_boolean gwy_container_set_const_string gwy_container_set_double gwy_container_set_enum gwy_container_set_int32 gwy_container_set_int64 gwy_container_set_object gwy_container_set_string gwy_container_set_uchar gwy_container_set_value gwy_container_set_value_by_name gwy_container_transfer gwy_container_value_type gwy_convert_raw_data gwy_corr_search_type_get_type gwy_correlation_type_get_enum gwy_correlation_type_get_type gwy_create_dialog_preview_hbox gwy_create_expander_with_param gwy_create_graph_xrange_with_params gwy_create_inventory_model_without_default gwy_create_preview gwy_create_preview_vector_layer gwy_curve_channel_get_type gwy_curve_get_control_points gwy_curve_get_type gwy_curve_map_func_current gwy_curve_map_func_exists gwy_curve_map_func_foreach gwy_curve_map_func_get_menu_path gwy_curve_map_func_get_run_types gwy_curve_map_func_get_sensitivity_mask gwy_curve_map_func_get_stock_id gwy_curve_map_func_get_tooltip gwy_curve_map_func_register gwy_curve_map_func_run gwy_curve_new gwy_curve_reset gwy_curve_set_channels gwy_curve_set_control_points gwy_curve_set_curve_type gwy_curve_set_range gwy_curve_type_get_type gwy_cwt_wfunc_2d gwy_data_chooser_get_active gwy_data_chooser_get_active_id gwy_data_chooser_get_filter gwy_data_chooser_get_none gwy_data_chooser_get_type gwy_data_chooser_new_channels gwy_data_chooser_new_curve_maps gwy_data_chooser_new_graphs gwy_data_chooser_new_volumes gwy_data_chooser_new_xyzs gwy_data_chooser_refilter gwy_data_chooser_set_active gwy_data_chooser_set_active_id gwy_data_chooser_set_filter gwy_data_chooser_set_none gwy_data_compatibility_flags_get_type gwy_data_error_desrcibe gwy_data_error_get_type gwy_data_field_1dfft gwy_data_field_1dfft_raw gwy_data_field_2dacf gwy_data_field_2dfft gwy_data_field_2dfft_dehumanize gwy_data_field_2dfft_humanize gwy_data_field_2dfft_raw gwy_data_field_2dpsdf gwy_data_field_abs gwy_data_field_acf gwy_data_field_acf_uncertainty gwy_data_field_add gwy_data_field_affine gwy_data_field_affine_prepare gwy_data_field_angular_average gwy_data_field_area_1dfft gwy_data_field_area_2dacf gwy_data_field_area_2dacf_mask gwy_data_field_area_2dfft gwy_data_field_area_2dpsdf_mask gwy_data_field_area_abs gwy_data_field_area_acf gwy_data_field_area_acf_uncertainty gwy_data_field_area_add gwy_data_field_area_cda gwy_data_field_area_cda_mask gwy_data_field_area_cdh gwy_data_field_area_cdh_uncertainty gwy_data_field_area_clamp gwy_data_field_area_clear gwy_data_field_area_convolve gwy_data_field_area_convolve_1d gwy_data_field_area_copy gwy_data_field_area_count_in_range gwy_data_field_area_da gwy_data_field_area_da_mask gwy_data_field_area_dh gwy_data_field_area_dh_uncertainty gwy_data_field_area_ext_convolve gwy_data_field_area_ext_row_convolve gwy_data_field_area_extract gwy_data_field_area_fill gwy_data_field_area_fill_mask gwy_data_field_area_filter_conservative gwy_data_field_area_filter_dechecker gwy_data_field_area_filter_disc_asf gwy_data_field_area_filter_gaussian gwy_data_field_area_filter_kth_rank gwy_data_field_area_filter_kuwahara gwy_data_field_area_filter_laplacian gwy_data_field_area_filter_laplacian_of_gaussians gwy_data_field_area_filter_maximum gwy_data_field_area_filter_mean gwy_data_field_area_filter_median gwy_data_field_area_filter_min_max gwy_data_field_area_filter_minimum gwy_data_field_area_filter_prewitt gwy_data_field_area_filter_rms gwy_data_field_area_filter_sobel gwy_data_field_area_filter_trimmed_mean gwy_data_field_area_fit_legendre gwy_data_field_area_fit_local_planes gwy_data_field_area_fit_plane gwy_data_field_area_fit_plane_mask gwy_data_field_area_fit_poly gwy_data_field_area_fit_poly_max gwy_data_field_area_fit_polynom gwy_data_field_area_flip_xy gwy_data_field_area_gather gwy_data_field_area_get_autorange gwy_data_field_area_get_avg_mask gwy_data_field_area_get_avg_uncertainty gwy_data_field_area_get_avg_uncertainty_mask gwy_data_field_area_get_dispersion gwy_data_field_area_get_entropy gwy_data_field_area_get_entropy_at_scales gwy_data_field_area_get_grainwise_rms gwy_data_field_area_get_inclination gwy_data_field_area_get_inclination_uncertainty gwy_data_field_area_get_line_stats gwy_data_field_area_get_max gwy_data_field_area_get_max_uncertainty gwy_data_field_area_get_mean_square gwy_data_field_area_get_median_mask gwy_data_field_area_get_median_uncertainty gwy_data_field_area_get_median_uncertainty_mask gwy_data_field_area_get_min gwy_data_field_area_get_min_max_mask gwy_data_field_area_get_min_max_uncertainty gwy_data_field_area_get_min_max_uncertainty_mask gwy_data_field_area_get_min_uncertainty gwy_data_field_area_get_normal_coeffs gwy_data_field_area_get_normal_coeffs_uncertainty gwy_data_field_area_get_projected_area_uncertainty gwy_data_field_area_get_rms_mask gwy_data_field_area_get_rms_uncertainty gwy_data_field_area_get_rms_uncertainty_mask gwy_data_field_area_get_stats_mask gwy_data_field_area_get_stats_uncertainties gwy_data_field_area_get_stats_uncertainties_mask gwy_data_field_area_get_sum_mask gwy_data_field_area_get_surface_area_mask gwy_data_field_area_get_surface_area_mask_uncertainty gwy_data_field_area_get_surface_area_uncertainty gwy_data_field_area_get_surface_slope_mask gwy_data_field_area_get_variation gwy_data_field_area_get_volume gwy_data_field_area_grains_tgnd gwy_data_field_area_grains_tgnd_range gwy_data_field_area_hhcf gwy_data_field_area_hhcf_uncertainty gwy_data_field_area_local_plane_quantity gwy_data_field_area_minkowski_boundary gwy_data_field_area_minkowski_euler gwy_data_field_area_minkowski_volume gwy_data_field_area_multiply gwy_data_field_area_psdf gwy_data_field_area_racf gwy_data_field_area_renormalize gwy_data_field_area_row_acf gwy_data_field_area_row_asg gwy_data_field_area_row_hhcf gwy_data_field_area_row_psdf gwy_data_field_area_rpsdf gwy_data_field_area_subtract_legendre gwy_data_field_area_subtract_poly gwy_data_field_area_subtract_poly_max gwy_data_field_area_subtract_polynom gwy_data_field_area_threshold gwy_data_field_average_xyz gwy_data_field_bin gwy_data_field_cached_get_type gwy_data_field_cda gwy_data_field_cdh gwy_data_field_cdh_uncertainty gwy_data_field_check_compatibility gwy_data_field_check_compatibility_with_brick_xy gwy_data_field_check_compatibility_with_lawn gwy_data_field_circular_area_extract gwy_data_field_circular_area_extract_with_pos gwy_data_field_circular_area_fill gwy_data_field_circular_area_unextract gwy_data_field_clamp gwy_data_field_clear gwy_data_field_column_gaussian gwy_data_field_convolve gwy_data_field_convolve_1d gwy_data_field_copy gwy_data_field_copy_units gwy_data_field_copy_units_to_data_line gwy_data_field_copy_units_to_surface gwy_data_field_correct_average gwy_data_field_correct_average_unmasked gwy_data_field_correct_laplace_iteration gwy_data_field_correlate gwy_data_field_correlate_finalize gwy_data_field_correlate_init gwy_data_field_correlate_iteration gwy_data_field_correlation_search gwy_data_field_count_maxima gwy_data_field_count_minima gwy_data_field_crosscorrelate gwy_data_field_crosscorrelate_finalize gwy_data_field_crosscorrelate_init gwy_data_field_crosscorrelate_iteration gwy_data_field_crosscorrelate_set_weights gwy_data_field_cwt gwy_data_field_da gwy_data_field_data_changed gwy_data_field_deconvolve_psf_leastsq gwy_data_field_deconvolve_regularized gwy_data_field_dh gwy_data_field_dh_uncertainty gwy_data_field_distort gwy_data_field_divide_fields gwy_data_field_dwt gwy_data_field_dwt_mark_anisotropy gwy_data_field_elliptic_area_extract gwy_data_field_elliptic_area_fill gwy_data_field_elliptic_area_unextract gwy_data_field_extend gwy_data_field_fft_convolve gwy_data_field_fft_filter_1d gwy_data_field_fft_postprocess gwy_data_field_fft_window gwy_data_field_fft_window_1d gwy_data_field_fill gwy_data_field_fill_voids gwy_data_field_filter_canny gwy_data_field_filter_conservative gwy_data_field_filter_dechecker gwy_data_field_filter_gauss_step gwy_data_field_filter_gaussian gwy_data_field_filter_harris gwy_data_field_filter_kuwahara gwy_data_field_filter_laplacian gwy_data_field_filter_laplacian_of_gaussians gwy_data_field_filter_maximum gwy_data_field_filter_mean gwy_data_field_filter_median gwy_data_field_filter_minimum gwy_data_field_filter_prewitt gwy_data_field_filter_prewitt_total gwy_data_field_filter_rms gwy_data_field_filter_slope gwy_data_field_filter_sobel gwy_data_field_filter_sobel_total gwy_data_field_find_regularization_sigma_for_psf gwy_data_field_find_regularization_sigma_leastsq gwy_data_field_find_row_shifts_trimmed_diff gwy_data_field_find_row_shifts_trimmed_mean gwy_data_field_fit_facet_plane gwy_data_field_fit_legendre gwy_data_field_fit_lines gwy_data_field_fit_local_planes gwy_data_field_fit_plane gwy_data_field_fit_poly gwy_data_field_fit_poly_max gwy_data_field_fit_polynom gwy_data_field_flip_xy gwy_data_field_fractal_correction gwy_data_field_fractal_cubecounting gwy_data_field_fractal_cubecounting_dim gwy_data_field_fractal_partitioning gwy_data_field_fractal_partitioning_dim gwy_data_field_fractal_psdf gwy_data_field_fractal_psdf_dim gwy_data_field_fractal_triangulation gwy_data_field_fractal_triangulation_dim gwy_data_field_get_angder gwy_data_field_get_autorange gwy_data_field_get_avg gwy_data_field_get_avg_uncertainty gwy_data_field_get_circular_area_size gwy_data_field_get_column gwy_data_field_get_column_part gwy_data_field_get_correlation_score gwy_data_field_get_data gwy_data_field_get_data_const gwy_data_field_get_dispersion gwy_data_field_get_dval gwy_data_field_get_dval_real gwy_data_field_get_dx gwy_data_field_get_dy gwy_data_field_get_elliptic_area_size gwy_data_field_get_elliptic_intersection gwy_data_field_get_entropy gwy_data_field_get_entropy_2d gwy_data_field_get_entropy_2d_at_scales gwy_data_field_get_grain_bounding_boxes gwy_data_field_get_grain_bounding_boxes_periodic gwy_data_field_get_grain_inscribed_boxes gwy_data_field_get_grain_sizes gwy_data_field_get_inclination gwy_data_field_get_inclination_uncertainty gwy_data_field_get_line_stats gwy_data_field_get_line_stats_mask gwy_data_field_get_local_maxima_list gwy_data_field_get_local_minima_list gwy_data_field_get_max gwy_data_field_get_max_uncertainty gwy_data_field_get_mean_square gwy_data_field_get_median gwy_data_field_get_median_uncertainty gwy_data_field_get_min gwy_data_field_get_min_max gwy_data_field_get_min_max_uncertainty gwy_data_field_get_min_uncertainty gwy_data_field_get_normal_coeffs gwy_data_field_get_normal_coeffs_uncertainty gwy_data_field_get_profile gwy_data_field_get_profile_mask gwy_data_field_get_rms gwy_data_field_get_rms_uncertainty gwy_data_field_get_row gwy_data_field_get_row_part gwy_data_field_get_si_unit_xy gwy_data_field_get_si_unit_z gwy_data_field_get_stats gwy_data_field_get_stats_uncertainties gwy_data_field_get_sum gwy_data_field_get_surface_area gwy_data_field_get_surface_area_uncertainty gwy_data_field_get_surface_slope gwy_data_field_get_type gwy_data_field_get_val gwy_data_field_get_value_format_xy gwy_data_field_get_value_format_z gwy_data_field_get_variation gwy_data_field_get_weighted_correlation_score gwy_data_field_get_xder gwy_data_field_get_xder_uncertainty gwy_data_field_get_xoffset gwy_data_field_get_xreal gwy_data_field_get_xres gwy_data_field_get_yder gwy_data_field_get_yder_uncertainty gwy_data_field_get_yoffset gwy_data_field_get_yreal gwy_data_field_get_yres gwy_data_field_grain_distance_transform gwy_data_field_grain_simple_dist_trans gwy_data_field_grains_add gwy_data_field_grains_autocrop gwy_data_field_grains_extract_grain gwy_data_field_grains_find_boundaries gwy_data_field_grains_get_distribution gwy_data_field_grains_get_quantities gwy_data_field_grains_get_values gwy_data_field_grains_grow gwy_data_field_grains_intersect gwy_data_field_grains_invert gwy_data_field_grains_mark_curvature gwy_data_field_grains_mark_height gwy_data_field_grains_mark_slope gwy_data_field_grains_mark_watershed gwy_data_field_grains_remove_by_height gwy_data_field_grains_remove_by_number gwy_data_field_grains_remove_by_size gwy_data_field_grains_remove_grain gwy_data_field_grains_remove_touching_border gwy_data_field_grains_shrink gwy_data_field_grains_splash_water gwy_data_field_grains_thin gwy_data_field_grains_watershed_finalize gwy_data_field_grains_watershed_init gwy_data_field_grains_watershed_iteration gwy_data_field_hhcf gwy_data_field_hhcf_uncertainty gwy_data_field_hough_circle gwy_data_field_hough_circle_strenghten gwy_data_field_hough_datafield_line_to_polar gwy_data_field_hough_line gwy_data_field_hough_line_strenghten gwy_data_field_hough_polar_line_to_datafield gwy_data_field_hypot_of_fields gwy_data_field_invalidate gwy_data_field_invert gwy_data_field_itor gwy_data_field_jtor gwy_data_field_laplace_solve gwy_data_field_linear_combination gwy_data_field_local_maximum gwy_data_field_local_plane_quantity gwy_data_field_mark_extrema gwy_data_field_mark_scars gwy_data_field_mask_outliers gwy_data_field_mask_outliers2 gwy_data_field_max_of_fields gwy_data_field_measure_lattice_acf gwy_data_field_measure_lattice_psdf gwy_data_field_mfm_current_line gwy_data_field_mfm_find_shift_z gwy_data_field_mfm_parallel_medium gwy_data_field_mfm_perpendicular_medium_force gwy_data_field_mfm_perpendicular_stray_field gwy_data_field_mfm_perpendicular_stray_field_angle_correction gwy_data_field_mfm_shift_z gwy_data_field_min_of_fields gwy_data_field_minkowski_boundary gwy_data_field_minkowski_euler gwy_data_field_minkowski_volume gwy_data_field_multiply gwy_data_field_multiply_fields gwy_data_field_new gwy_data_field_new_alike gwy_data_field_new_binned gwy_data_field_new_resampled gwy_data_field_new_rotated gwy_data_field_new_rotated_90 gwy_data_field_normalize gwy_data_field_number_grains gwy_data_field_number_grains_periodic gwy_data_field_otsu_threshold gwy_data_field_plane_level gwy_data_field_plane_rotate gwy_data_field_psdf gwy_data_field_psdf_to_angular_spectrum gwy_data_field_racf gwy_data_field_renormalize gwy_data_field_resample gwy_data_field_resize gwy_data_field_rotate gwy_data_field_row_gaussian gwy_data_field_rpsdf gwy_data_field_rtoi gwy_data_field_rtoj gwy_data_field_sample_distorted gwy_data_field_set_column gwy_data_field_set_column_part gwy_data_field_set_row gwy_data_field_set_row_part gwy_data_field_set_si_unit_xy gwy_data_field_set_si_unit_z gwy_data_field_set_val gwy_data_field_set_xoffset gwy_data_field_set_xreal gwy_data_field_set_yoffset gwy_data_field_set_yreal gwy_data_field_shade gwy_data_field_slope_distribution gwy_data_field_subtract_fields gwy_data_field_subtract_legendre gwy_data_field_subtract_poly gwy_data_field_subtract_poly_max gwy_data_field_subtract_polynom gwy_data_field_subtract_row_shifts gwy_data_field_sum_fields gwy_data_field_synth_gaussian_displacement gwy_data_field_threshold gwy_data_field_unrotate_find_corrections gwy_data_field_waterpour gwy_data_field_xdwt gwy_data_field_ydwt gwy_data_field_zoom_fft gwy_data_item_get_type gwy_data_line_acf gwy_data_line_acf_uncertainty gwy_data_line_add gwy_data_line_cda gwy_data_line_cdh gwy_data_line_check_compatibility gwy_data_line_check_compatibility_with_brick_z gwy_data_line_clear gwy_data_line_copy gwy_data_line_copy_units gwy_data_line_copy_units_to_data_field gwy_data_line_correct_laplace gwy_data_line_count_peaks gwy_data_line_cumulate gwy_data_line_cumulate_uncertainty gwy_data_line_da gwy_data_line_data_changed gwy_data_line_dh gwy_data_line_distribution gwy_data_line_dwt gwy_data_line_fft gwy_data_line_fft_raw gwy_data_line_fft_window gwy_data_line_fill gwy_data_line_filter_slope gwy_data_line_fit_polynom gwy_data_line_get_avg gwy_data_line_get_data gwy_data_line_get_data_const gwy_data_line_get_der gwy_data_line_get_dval gwy_data_line_get_dval_real gwy_data_line_get_dx gwy_data_line_get_kth_peaks gwy_data_line_get_kurtosis gwy_data_line_get_length gwy_data_line_get_line_coeffs gwy_data_line_get_max gwy_data_line_get_median gwy_data_line_get_min gwy_data_line_get_min_max gwy_data_line_get_modus gwy_data_line_get_offset gwy_data_line_get_ra gwy_data_line_get_real gwy_data_line_get_res gwy_data_line_get_rms gwy_data_line_get_si_unit_x gwy_data_line_get_si_unit_y gwy_data_line_get_skew gwy_data_line_get_sum gwy_data_line_get_tan_beta0 gwy_data_line_get_type gwy_data_line_get_val gwy_data_line_get_value_format_x gwy_data_line_get_value_format_y gwy_data_line_get_variation gwy_data_line_get_xpm gwy_data_line_get_xtm gwy_data_line_get_xvm gwy_data_line_hhcf gwy_data_line_hhcf_uncertainty gwy_data_line_invert gwy_data_line_itor gwy_data_line_line_level gwy_data_line_linear_combination gwy_data_line_max_pos_i gwy_data_line_max_pos_r gwy_data_line_min_pos_i gwy_data_line_min_pos_r gwy_data_line_multiply gwy_data_line_multiply_lines gwy_data_line_new gwy_data_line_new_alike gwy_data_line_new_resampled gwy_data_line_part_add gwy_data_line_part_clear gwy_data_line_part_extract gwy_data_line_part_fft gwy_data_line_part_fill gwy_data_line_part_filter_kth_rank gwy_data_line_part_fit_polynom gwy_data_line_part_get_avg gwy_data_line_part_get_kurtosis gwy_data_line_part_get_max gwy_data_line_part_get_median gwy_data_line_part_get_min gwy_data_line_part_get_min_max gwy_data_line_part_get_modus gwy_data_line_part_get_ra gwy_data_line_part_get_rms gwy_data_line_part_get_skew gwy_data_line_part_get_sum gwy_data_line_part_get_tan_beta0 gwy_data_line_part_get_variation gwy_data_line_part_multiply gwy_data_line_part_subtract_polynom gwy_data_line_part_threshold gwy_data_line_psdf gwy_data_line_resample gwy_data_line_resize gwy_data_line_rotate gwy_data_line_rtoi gwy_data_line_set_offset gwy_data_line_set_real gwy_data_line_set_si_unit_x gwy_data_line_set_si_unit_y gwy_data_line_set_val gwy_data_line_sqrt gwy_data_line_subtract_lines gwy_data_line_subtract_polynom gwy_data_line_sum_lines gwy_data_line_threshold gwy_data_line_zoom_fft gwy_data_validate gwy_data_validate_flags_get_type gwy_data_validation_failure_list_free gwy_data_view_coords_real_to_xy gwy_data_view_coords_real_to_xy_float gwy_data_view_coords_xy_clamp gwy_data_view_coords_xy_cut_line gwy_data_view_coords_xy_to_real gwy_data_view_export_pixbuf gwy_data_view_get_alpha_layer gwy_data_view_get_base_layer gwy_data_view_get_data gwy_data_view_get_data_prefix gwy_data_view_get_hexcess gwy_data_view_get_metric gwy_data_view_get_pixbuf gwy_data_view_get_pixel_data_sizes gwy_data_view_get_real_data_offsets gwy_data_view_get_real_data_sizes gwy_data_view_get_real_zoom gwy_data_view_get_top_layer gwy_data_view_get_type gwy_data_view_get_vexcess gwy_data_view_get_xmeasure gwy_data_view_get_ymeasure gwy_data_view_get_zoom gwy_data_view_layer_get_type gwy_data_view_layer_plugged gwy_data_view_layer_realize gwy_data_view_layer_type_get_type gwy_data_view_layer_unplugged gwy_data_view_layer_unrealize gwy_data_view_layer_updated gwy_data_view_new gwy_data_view_set_alpha_layer gwy_data_view_set_base_layer gwy_data_view_set_data_prefix gwy_data_view_set_top_layer gwy_data_view_set_zoom gwy_data_watch_event_type_get_type gwy_data_window_fit_to_screen gwy_data_window_get_color_axis gwy_data_window_get_data gwy_data_window_get_data_name gwy_data_window_get_data_view gwy_data_window_get_type gwy_data_window_get_ul_corner_widget gwy_data_window_new gwy_data_window_set_data_name gwy_data_window_set_ul_corner_widget gwy_data_window_set_zoom gwy_debug_gnu gwy_debug_objects_clear gwy_debug_objects_creation_detailed gwy_debug_objects_dump_to_file gwy_debug_objects_enable gwy_deserialize_object_hash gwy_dialog_add_buttons gwy_dialog_add_content gwy_dialog_add_param_table gwy_dialog_get_type gwy_dialog_have_result gwy_dialog_invalidate gwy_dialog_new gwy_dialog_outcome_get_type gwy_dialog_remove_param_table gwy_dialog_run gwy_dialog_set_instant_updates_param gwy_dialog_set_preview_func gwy_distance_transform_type_get_enum gwy_distance_transform_type_get_type gwy_draw_data_field_map_adaptive gwy_draw_type_init gwy_dwt_denoise_type_get_enum gwy_dwt_denoise_type_get_type gwy_dwt_set_coefficients gwy_dwt_type_get_enum gwy_dwt_type_get_type gwy_entities gwy_entities_entity_to_utf8 gwy_entities_text_to_utf8 gwy_enum_combo_box_get_active gwy_enum_combo_box_new gwy_enum_combo_box_newl gwy_enum_combo_box_set_active gwy_enum_combo_box_update_int gwy_enum_fill_from_struct gwy_enum_freev gwy_enum_get_type gwy_enum_inventory_new gwy_enum_sanitize_value gwy_enum_to_string gwy_enuml_to_string gwy_expr_compile gwy_expr_define_constant gwy_expr_error_get_type gwy_expr_error_quark gwy_expr_evaluate gwy_expr_execute gwy_expr_free gwy_expr_get_expression gwy_expr_get_variables gwy_expr_new gwy_expr_resolve_variables gwy_expr_undefine_constant gwy_expr_vector_execute gwy_exterior_type_get_type gwy_fd_curve_preset_get_type gwy_fd_curve_presets gwy_fft_find_nice_size gwy_fft_simple gwy_fft_window gwy_fft_window_data_field gwy_file_abandon_contents gwy_file_channel_import_log_add gwy_file_curve_map_import_log_add gwy_file_detect gwy_file_detect_with_score gwy_file_func_current gwy_file_func_exists gwy_file_func_foreach gwy_file_func_get_description gwy_file_func_get_is_detectable gwy_file_func_get_operations gwy_file_func_register gwy_file_func_run_detect gwy_file_func_run_export gwy_file_func_run_load gwy_file_func_run_save gwy_file_func_set_is_detectable gwy_file_get_contents gwy_file_get_data_info gwy_file_get_filename_sys gwy_file_load gwy_file_load_with_func gwy_file_operation_type_get_type gwy_file_save gwy_file_save_with_func gwy_file_volume_import_log_add gwy_file_xyz_import_log_add gwy_filename_ignore gwy_find_self_dir gwy_flags_to_string gwy_fopen gwy_format_result_table_mixed gwy_format_result_table_row gwy_format_result_table_rowv gwy_format_result_table_strings gwy_format_result_table_stringsv gwy_fprintf gwy_func_use_add gwy_func_use_free gwy_func_use_get gwy_func_use_get_filename gwy_func_use_load gwy_func_use_new gwy_func_use_save gwy_get_decimal_separator gwy_get_gboolean8 gwy_get_gdouble_be gwy_get_gdouble_le gwy_get_gfloat_be gwy_get_gfloat_le gwy_get_gint16_be gwy_get_gint16_le gwy_get_gint32_be gwy_get_gint32_le gwy_get_gint64_be gwy_get_gint64_le gwy_get_guint16_be gwy_get_guint16_le gwy_get_guint32_be gwy_get_guint32_le gwy_get_guint64_be gwy_get_guint64_le gwy_get_home_dir gwy_get_pascal_real_be gwy_get_pascal_real_le gwy_get_user_dir gwy_gl_material_get_ambient gwy_gl_material_get_diffuse gwy_gl_material_get_emission gwy_gl_material_get_shininess gwy_gl_material_get_specular gwy_gl_material_get_type gwy_gl_material_reset gwy_gl_material_sample_to_pixbuf gwy_gl_material_selection_get_active gwy_gl_material_selection_new gwy_gl_material_selection_set_active gwy_gl_material_set_ambient gwy_gl_material_set_diffuse gwy_gl_material_set_emission gwy_gl_material_set_shininess gwy_gl_material_set_specular gwy_gl_material_tree_view_new gwy_gl_material_tree_view_set_active gwy_gl_materials gwy_gl_materials_get_gl_material gwy_gradient_delete_point gwy_gradient_get_color gwy_gradient_get_npoints gwy_gradient_get_point gwy_gradient_get_points gwy_gradient_get_samples gwy_gradient_get_type gwy_gradient_insert_point gwy_gradient_insert_point_sorted gwy_gradient_reset gwy_gradient_sample gwy_gradient_sample_to_pixbuf gwy_gradient_selection_get_active gwy_gradient_selection_new gwy_gradient_selection_set_active gwy_gradient_set_from_samples gwy_gradient_set_point gwy_gradient_set_point_color gwy_gradient_set_points gwy_gradient_tree_view_new gwy_gradient_tree_view_set_active gwy_gradients gwy_gradients_get_gradient gwy_grain_quantity_get_type gwy_grain_quantity_get_units gwy_grain_quantity_needs_same_units gwy_grain_value_flags_get_type gwy_grain_value_get_expression gwy_grain_value_get_flags gwy_grain_value_get_group gwy_grain_value_get_power_xy gwy_grain_value_get_power_z gwy_grain_value_get_quantity gwy_grain_value_get_symbol gwy_grain_value_get_symbol_markup gwy_grain_value_get_type gwy_grain_value_group_get_type gwy_grain_value_group_name gwy_grain_value_set_expression gwy_grain_value_set_flags gwy_grain_value_set_power_xy gwy_grain_value_set_power_z gwy_grain_value_set_symbol gwy_grain_value_set_symbol_markup gwy_grain_value_store_column_get_type gwy_grain_value_tree_view_get_enabled gwy_grain_value_tree_view_get_expanded_groups gwy_grain_value_tree_view_n_enabled gwy_grain_value_tree_view_new gwy_grain_value_tree_view_select gwy_grain_value_tree_view_set_enabled gwy_grain_value_tree_view_set_expanded_groups gwy_grain_value_tree_view_set_same_units gwy_grain_values gwy_grain_values_calculate gwy_grain_values_get_builtin_grain_value gwy_grain_values_get_grain_value gwy_grain_values_get_grain_value_by_symbol gwy_graph_area_draw_on_drawable gwy_graph_area_edit_curve gwy_graph_area_enable_user_input gwy_graph_area_export_vector gwy_graph_area_get_cursor gwy_graph_area_get_label gwy_graph_area_get_model gwy_graph_area_get_selection gwy_graph_area_get_status gwy_graph_area_get_type gwy_graph_area_get_x_grid_data gwy_graph_area_get_y_grid_data gwy_graph_area_new gwy_graph_area_set_model gwy_graph_area_set_selection_editable gwy_graph_area_set_status gwy_graph_area_set_x_grid_data gwy_graph_area_set_x_range gwy_graph_area_set_y_grid_data gwy_graph_area_set_y_range gwy_graph_corner_get_type gwy_graph_corner_new gwy_graph_curve_model_enforce_order gwy_graph_curve_model_get_calibration_data gwy_graph_curve_model_get_ndata gwy_graph_curve_model_get_ranges gwy_graph_curve_model_get_type gwy_graph_curve_model_get_x_range gwy_graph_curve_model_get_xdata gwy_graph_curve_model_get_y_range gwy_graph_curve_model_get_ydata gwy_graph_curve_model_is_ordered gwy_graph_curve_model_new gwy_graph_curve_model_new_alike gwy_graph_curve_model_set_calibration_data gwy_graph_curve_model_set_data gwy_graph_curve_model_set_data_from_dataline gwy_graph_curve_model_set_data_interleaved gwy_graph_curve_type_get_enum gwy_graph_curve_type_get_type gwy_graph_curves_get_model gwy_graph_curves_get_type gwy_graph_curves_new gwy_graph_curves_set_model gwy_graph_data_get_model gwy_graph_data_get_type gwy_graph_data_new gwy_graph_data_set_model gwy_graph_draw_curve gwy_graph_draw_grid gwy_graph_draw_line gwy_graph_draw_point gwy_graph_draw_selection_areas gwy_graph_draw_selection_lines gwy_graph_draw_selection_points gwy_graph_draw_selection_xareas gwy_graph_draw_selection_yareas gwy_graph_enable_user_input gwy_graph_export_pixmap gwy_graph_export_postscript gwy_graph_func_current gwy_graph_func_exists gwy_graph_func_foreach gwy_graph_func_get_menu_path gwy_graph_func_get_sensitivity_mask gwy_graph_func_get_stock_id gwy_graph_func_get_tooltip gwy_graph_func_register gwy_graph_func_run gwy_graph_get_area gwy_graph_get_axis gwy_graph_get_model gwy_graph_get_n_preset_colors gwy_graph_get_preset_color gwy_graph_get_status gwy_graph_get_type gwy_graph_grid_type_get_type gwy_graph_label_draw_on_drawable gwy_graph_label_enable_user_input gwy_graph_label_export_vector gwy_graph_label_get_model gwy_graph_label_get_type gwy_graph_label_new gwy_graph_label_position_get_type gwy_graph_label_set_model gwy_graph_model_add_curve gwy_graph_model_append_curves gwy_graph_model_export_ascii gwy_graph_model_export_style_get_type gwy_graph_model_get_axis_label gwy_graph_model_get_curve gwy_graph_model_get_curve_by_description gwy_graph_model_get_curve_index gwy_graph_model_get_n_curves gwy_graph_model_get_ranges gwy_graph_model_get_type gwy_graph_model_get_x_range gwy_graph_model_get_y_range gwy_graph_model_new gwy_graph_model_new_alike gwy_graph_model_remove_all_curves gwy_graph_model_remove_curve gwy_graph_model_remove_curve_by_description gwy_graph_model_replace_curve gwy_graph_model_set_axis_label gwy_graph_model_set_units_from_data_field gwy_graph_model_set_units_from_data_line gwy_graph_model_units_are_compatible gwy_graph_model_x_data_can_be_logarithmed gwy_graph_model_y_data_can_be_logarithmed gwy_graph_new gwy_graph_point_type_get_type gwy_graph_set_axis_visible gwy_graph_set_model gwy_graph_set_status gwy_graph_status_type_get_type gwy_graph_window_get_graph gwy_graph_window_get_graph_curves gwy_graph_window_get_graph_data gwy_graph_window_get_type gwy_graph_window_new gwy_gstring_replace gwy_gstring_to_native_eol gwy_guint_sort gwy_hash_table_to_list_cb gwy_hash_table_to_slist_cb gwy_hbox_new gwy_help_add_to_cmap_dialog gwy_help_add_to_file_dialog gwy_help_add_to_graph_dialog gwy_help_add_to_proc_dialog gwy_help_add_to_tool_dialog gwy_help_add_to_volume_dialog gwy_help_add_to_window gwy_help_add_to_window_uri gwy_help_add_to_xyz_dialog gwy_help_flags_get_type gwy_help_is_available gwy_help_show gwy_hmarker_box_get_type gwy_hmarker_box_new gwy_hold_selection_flags_get_type gwy_hruler_get_type gwy_hruler_new gwy_hscale_style_get_type gwy_interpolation_get_dval gwy_interpolation_get_dval_of_equidists gwy_interpolation_get_support_size gwy_interpolation_has_interpolating_basis gwy_interpolation_interpolate_1d gwy_interpolation_interpolate_2d gwy_interpolation_resample_block_1d gwy_interpolation_resample_block_2d gwy_interpolation_resolve_coeffs_1d gwy_interpolation_resolve_coeffs_2d gwy_interpolation_shift_block_1d gwy_interpolation_type_get_enum gwy_interpolation_type_get_type gwy_inventory_can_make_copies gwy_inventory_delete_item gwy_inventory_delete_nth_item gwy_inventory_find gwy_inventory_foreach gwy_inventory_forget_order gwy_inventory_get_default_item gwy_inventory_get_default_item_name gwy_inventory_get_item gwy_inventory_get_item_or_default gwy_inventory_get_item_position gwy_inventory_get_item_type gwy_inventory_get_n_items gwy_inventory_get_nth_item gwy_inventory_get_type gwy_inventory_insert_item gwy_inventory_insert_nth_item gwy_inventory_is_const gwy_inventory_item_updated gwy_inventory_new gwy_inventory_new_filled gwy_inventory_new_from_array gwy_inventory_new_item gwy_inventory_nth_item_updated gwy_inventory_rename_item gwy_inventory_restore_order gwy_inventory_set_default_item_name gwy_inventory_store_get_column_by_name gwy_inventory_store_get_inventory gwy_inventory_store_get_iter gwy_inventory_store_get_type gwy_inventory_store_iter_is_valid gwy_inventory_store_new gwy_label_new_header gwy_lawn_area_reduce_to_plane gwy_lawn_check_compatibility gwy_lawn_clear gwy_lawn_copy gwy_lawn_copy_units gwy_lawn_curve_set_segments gwy_lawn_data_changed gwy_lawn_get_curve_data gwy_lawn_get_curve_data_const gwy_lawn_get_curve_label gwy_lawn_get_curve_length gwy_lawn_get_curves_data_const gwy_lawn_get_dx gwy_lawn_get_dy gwy_lawn_get_n_curves gwy_lawn_get_n_segments gwy_lawn_get_segment_label gwy_lawn_get_segments gwy_lawn_get_si_unit_curve gwy_lawn_get_si_unit_xy gwy_lawn_get_type gwy_lawn_get_value_format_curve gwy_lawn_get_value_format_xy gwy_lawn_get_xoffset gwy_lawn_get_xreal gwy_lawn_get_xres gwy_lawn_get_yoffset gwy_lawn_get_yreal gwy_lawn_get_yres gwy_lawn_invert gwy_lawn_new gwy_lawn_new_alike gwy_lawn_new_part gwy_lawn_new_rotated_90 gwy_lawn_reduce_to_plane gwy_lawn_set_curve_data gwy_lawn_set_curve_label gwy_lawn_set_curves gwy_lawn_set_segment_label gwy_lawn_set_segments gwy_lawn_set_si_unit_curve gwy_lawn_set_si_unit_xy gwy_lawn_set_xoffset gwy_lawn_set_xreal gwy_lawn_set_yoffset gwy_lawn_set_yreal gwy_layer_basic_get_gradient_key gwy_layer_basic_get_has_presentation gwy_layer_basic_get_min_max_key gwy_layer_basic_get_presentation_key gwy_layer_basic_get_range gwy_layer_basic_get_range_type gwy_layer_basic_get_range_type_key gwy_layer_basic_get_type gwy_layer_basic_new gwy_layer_basic_range_type_get_type gwy_layer_basic_set_gradient_key gwy_layer_basic_set_min_max_key gwy_layer_basic_set_presentation_key gwy_layer_basic_set_range_type_key gwy_layer_func_foreach gwy_layer_func_register gwy_layer_mask_get_color gwy_layer_mask_get_color_key gwy_layer_mask_get_type gwy_layer_mask_new gwy_layer_mask_set_color_key gwy_line_stat_quantity_get_type gwy_list_store_row_changed gwy_log_get_enabled gwy_log_set_enabled gwy_marker_box_add_marker gwy_marker_box_get_flipped gwy_marker_box_get_highlight_selected gwy_marker_box_get_marker_position gwy_marker_box_get_markers gwy_marker_box_get_nmarkers gwy_marker_box_get_selected_marker gwy_marker_box_get_type gwy_marker_box_get_validator gwy_marker_box_remove_marker gwy_marker_box_set_flipped gwy_marker_box_set_highlight_selected gwy_marker_box_set_marker_position gwy_marker_box_set_markers gwy_marker_box_set_selected_marker gwy_marker_box_set_validator gwy_marker_operation_type_get_type gwy_mask_color_selector_run gwy_masking_type_get_enum gwy_masking_type_get_type gwy_math_choleski_decompose gwy_math_choleski_invert gwy_math_choleski_solve gwy_math_curvature gwy_math_curvature_at_apex gwy_math_curvature_at_origin gwy_math_fallback_acosh gwy_math_fallback_asinh gwy_math_fallback_atanh gwy_math_fallback_cbrt gwy_math_fallback_hypot gwy_math_fallback_isinf gwy_math_fallback_isnan gwy_math_fallback_pow10 gwy_math_fallback_powi gwy_math_find_minimum_1d gwy_math_find_nearest_line gwy_math_find_nearest_point gwy_math_fit_polynom gwy_math_histogram gwy_math_humanize_numbers gwy_math_is_in_polygon gwy_math_kth_rank gwy_math_kth_ranks gwy_math_lin_solve gwy_math_lin_solve_rewrite gwy_math_median gwy_math_median_uncertainty gwy_math_nlfit_copy gwy_math_nlfit_derive gwy_math_nlfit_diff gwy_math_nlfit_diff_idx gwy_math_nlfit_fit gwy_math_nlfit_fit_full gwy_math_nlfit_fit_idx gwy_math_nlfit_fit_idx_full gwy_math_nlfit_free gwy_math_nlfit_get_approx_geometric gwy_math_nlfit_get_correlations gwy_math_nlfit_get_covar gwy_math_nlfit_get_dispersion gwy_math_nlfit_get_eval gwy_math_nlfit_get_max_iterations gwy_math_nlfit_get_nparam gwy_math_nlfit_get_sigma gwy_math_nlfit_map_free_params gwy_math_nlfit_new gwy_math_nlfit_new_idx gwy_math_nlfit_set_approx_geometric gwy_math_nlfit_set_callbacks gwy_math_nlfit_set_max_iterations gwy_math_nlfit_succeeded gwy_math_percentiles gwy_math_refine_maximum gwy_math_refine_maximum_1d gwy_math_refine_maximum_2d gwy_math_sort gwy_math_sort_with_index gwy_math_tridiag_solve_rewrite gwy_math_trimmed_mean gwy_md5_get_digest gwy_memcpy_byte_swap gwy_memmem gwy_menu_gl_material gwy_menu_gradient gwy_menu_sens_flags_get_type gwy_merge_type_get_enum gwy_merge_type_get_type gwy_mfm_component_type_get_type gwy_mfm_gradient_type_get_type gwy_mfm_probe_type_get_type gwy_min_max_filter_type_get_type gwy_module_browser gwy_module_data_fopen gwy_module_data_load gwy_module_data_save gwy_module_disable_registration gwy_module_enable_registration gwy_module_error_get_type gwy_module_error_quark gwy_module_failure_foreach gwy_module_file_error_get_type gwy_module_file_error_quark gwy_module_foreach gwy_module_get_filename gwy_module_get_functions gwy_module_is_enabled gwy_module_lookup gwy_module_register_module gwy_module_register_modules gwy_nl_fit_param_flags_get_type gwy_nlfit_preset_create_fitter gwy_nlfit_preset_fit gwy_nlfit_preset_get_formula gwy_nlfit_preset_get_nparams gwy_nlfit_preset_get_param_name gwy_nlfit_preset_get_param_units gwy_nlfit_preset_get_type gwy_nlfit_preset_get_value gwy_nlfit_preset_guess gwy_nlfit_presets gwy_null_store_get_model gwy_null_store_get_n_rows gwy_null_store_get_type gwy_null_store_iter_is_valid gwy_null_store_new gwy_null_store_row_changed gwy_null_store_rows_changed gwy_null_store_set_model gwy_null_store_set_n_rows gwy_object_set_or_reset gwy_orientation_get_enum gwy_orientation_get_type gwy_param_active_page_link_to_notebook gwy_param_def_add_active_page gwy_param_def_add_angle gwy_param_def_add_boolean gwy_param_def_add_curve_map_id gwy_param_def_add_double gwy_param_def_add_enum gwy_param_def_add_grain_groups gwy_param_def_add_graph_curve gwy_param_def_add_graph_id gwy_param_def_add_gwyenum gwy_param_def_add_gwyflags gwy_param_def_add_hold_selection gwy_param_def_add_image_id gwy_param_def_add_instant_updates gwy_param_def_add_int gwy_param_def_add_lawn_curve gwy_param_def_add_lawn_segment gwy_param_def_add_mask_color gwy_param_def_add_percentage gwy_param_def_add_randomize gwy_param_def_add_report_type gwy_param_def_add_resource gwy_param_def_add_seed gwy_param_def_add_string gwy_param_def_add_target_graph gwy_param_def_add_unit gwy_param_def_add_volume_id gwy_param_def_add_xyz_id gwy_param_def_get_function_name gwy_param_def_get_param_label gwy_param_def_get_param_name gwy_param_def_get_type gwy_param_def_make_resource_type gwy_param_def_new gwy_param_def_set_function_name gwy_param_resource_get_params gwy_param_resource_get_type gwy_param_table_add_enabler gwy_param_table_alt_set_brick_pixel_x gwy_param_table_alt_set_brick_pixel_y gwy_param_table_alt_set_brick_pixel_z gwy_param_table_alt_set_calibration gwy_param_table_alt_set_field_frac_z gwy_param_table_alt_set_field_pixel_x gwy_param_table_alt_set_field_pixel_y gwy_param_table_alt_set_lawn_pixel_x gwy_param_table_alt_set_lawn_pixel_y gwy_param_table_alt_set_linear gwy_param_table_append_button gwy_param_table_append_checkbox gwy_param_table_append_checkboxes gwy_param_table_append_combo gwy_param_table_append_curve_map_id gwy_param_table_append_entry gwy_param_table_append_foreign gwy_param_table_append_graph_curve gwy_param_table_append_graph_id gwy_param_table_append_header gwy_param_table_append_hold_selection gwy_param_table_append_image_id gwy_param_table_append_info gwy_param_table_append_lawn_curve gwy_param_table_append_lawn_segment gwy_param_table_append_mask_color gwy_param_table_append_message gwy_param_table_append_radio gwy_param_table_append_radio_buttons gwy_param_table_append_radio_header gwy_param_table_append_radio_item gwy_param_table_append_radio_row gwy_param_table_append_range gwy_param_table_append_report gwy_param_table_append_results gwy_param_table_append_resultsv gwy_param_table_append_seed gwy_param_table_append_separator gwy_param_table_append_slider gwy_param_table_append_target_graph gwy_param_table_append_unit_chooser gwy_param_table_append_volume_id gwy_param_table_append_xyz_id gwy_param_table_checkboxes_set_sensitive gwy_param_table_combo_refilter gwy_param_table_combo_set_filter gwy_param_table_data_id_refilter gwy_param_table_data_id_set_filter gwy_param_table_entry_set_instant_changes gwy_param_table_entry_set_value_format gwy_param_table_entry_set_width gwy_param_table_exists gwy_param_table_get_type gwy_param_table_graph_curve_set_model gwy_param_table_info_set_add_punctuation gwy_param_table_info_set_valuestr gwy_param_table_message_set_type gwy_param_table_new gwy_param_table_param_changed gwy_param_table_params gwy_param_table_radio_set_sensitive gwy_param_table_report_set_formatter gwy_param_table_report_set_results gwy_param_table_reset gwy_param_table_results_clear gwy_param_table_results_fill gwy_param_table_set_boolean gwy_param_table_set_curve gwy_param_table_set_data_id gwy_param_table_set_double gwy_param_table_set_enum gwy_param_table_set_flags gwy_param_table_set_from_params gwy_param_table_set_int gwy_param_table_set_label gwy_param_table_set_no_reset gwy_param_table_set_no_resetv gwy_param_table_set_sensitive gwy_param_table_set_string gwy_param_table_set_unitstr gwy_param_table_slider_add_alt gwy_param_table_slider_restrict_range gwy_param_table_slider_set_digits gwy_param_table_slider_set_factor gwy_param_table_slider_set_mapping gwy_param_table_slider_set_snapping gwy_param_table_slider_set_steps gwy_param_table_slider_set_transform gwy_param_table_widget gwy_params_assign gwy_params_data_id_is_none gwy_params_duplicate gwy_params_get_boolean gwy_params_get_color gwy_params_get_curve_map gwy_params_get_data_id gwy_params_get_def gwy_params_get_double gwy_params_get_enum gwy_params_get_flags gwy_params_get_graph gwy_params_get_image gwy_params_get_int gwy_params_get_mask gwy_params_get_masking gwy_params_get_report_type gwy_params_get_resource gwy_params_get_string gwy_params_get_type gwy_params_get_unit gwy_params_get_volume gwy_params_get_xyz gwy_params_load_from_settings gwy_params_new gwy_params_new_from_settings gwy_params_randomize_seed gwy_params_reset gwy_params_reset_all gwy_params_save_to_settings gwy_params_set_boolean gwy_params_set_color gwy_params_set_curve gwy_params_set_curve_map_id gwy_params_set_def gwy_params_set_double gwy_params_set_enum gwy_params_set_flag gwy_params_set_flags gwy_params_set_graph_id gwy_params_set_image_id gwy_params_set_int gwy_params_set_report_type gwy_params_set_resource gwy_params_set_string gwy_params_set_unit gwy_params_set_volume_id gwy_params_set_xyz_id gwy_peak_background_type_get_type gwy_peak_order_type_get_type gwy_peak_quantity_get_type gwy_peaks_analyze gwy_peaks_analyze_dataline gwy_peaks_analyze_xy gwy_peaks_copy gwy_peaks_free gwy_peaks_get_quantity gwy_peaks_get_type gwy_peaks_n_peaks gwy_peaks_new gwy_peaks_set_background gwy_peaks_set_order gwy_percentile_interpolation_type_get_type gwy_pixbuf_draw_data_field gwy_pixbuf_draw_data_field_adaptive gwy_pixbuf_draw_data_field_as_mask gwy_pixbuf_draw_data_field_with_range gwy_pixmap_layer_get_data_key gwy_pixmap_layer_get_type gwy_pixmap_layer_make_pixbuf gwy_pixmap_layer_paint gwy_pixmap_layer_set_data_key gwy_pixmap_layer_wants_repaint gwy_plain_tool_add_clear_button gwy_plain_tool_add_param_table gwy_plain_tool_changed_get_type gwy_plain_tool_check_layer_type gwy_plain_tool_connect_selection gwy_plain_tool_enable_object_deletion gwy_plain_tool_enable_selection_holding gwy_plain_tool_ensure_layer gwy_plain_tool_get_type gwy_plain_tool_get_z_average gwy_plain_tool_hold_selection gwy_plain_tool_log_add gwy_plain_tool_set_selection_key gwy_plane_fit_quantity_get_type gwy_plane_symmetry_get_enum gwy_plane_symmetry_get_type gwy_preview_surface_flags_get_type gwy_preview_surface_to_datafield gwy_preview_type_get_type gwy_process_func_current gwy_process_func_exists gwy_process_func_foreach gwy_process_func_get_menu_path gwy_process_func_get_run_types gwy_process_func_get_sensitivity_mask gwy_process_func_get_stock_id gwy_process_func_get_tooltip gwy_process_func_register gwy_process_func_run gwy_process_type_init gwy_radio_button_get_value gwy_radio_button_set_value gwy_radio_buttons_attach_to_table gwy_radio_buttons_create gwy_radio_buttons_createl gwy_radio_buttons_find gwy_radio_buttons_get_current gwy_radio_buttons_set_current gwy_radio_buttons_set_sensitive gwy_rand_gen_set_choose_shuffle gwy_rand_gen_set_double gwy_rand_gen_set_exponential gwy_rand_gen_set_fill_doubles gwy_rand_gen_set_fill_ints gwy_rand_gen_set_free gwy_rand_gen_set_gaussian gwy_rand_gen_set_init gwy_rand_gen_set_int gwy_rand_gen_set_multiplier gwy_rand_gen_set_new gwy_rand_gen_set_range gwy_rand_gen_set_rng gwy_rand_gen_set_triangular gwy_rand_gen_set_uniform gwy_raw_data_size gwy_raw_data_type_get_type gwy_rect_selection_labels_fill gwy_rect_selection_labels_get_table gwy_rect_selection_labels_new gwy_rect_selection_labels_select gwy_rendering_target_get_type gwy_require_image_same_units gwy_require_square_image gwy_resource_build_filename gwy_resource_class_get_inventory gwy_resource_class_get_item_type gwy_resource_class_get_name gwy_resource_class_load gwy_resource_class_mkdir gwy_resource_class_save_modified gwy_resource_classes_finalize gwy_resource_data_changed gwy_resource_data_saved gwy_resource_delete gwy_resource_dump gwy_resource_editor_class_setup gwy_resource_editor_commit gwy_resource_editor_get_edited gwy_resource_editor_get_type gwy_resource_editor_queue_commit gwy_resource_editor_setup gwy_resource_get_is_modifiable gwy_resource_get_is_preferred gwy_resource_get_name gwy_resource_get_type gwy_resource_is_used gwy_resource_parse gwy_resource_release gwy_resource_rename gwy_resource_save gwy_resource_set_is_preferred gwy_resource_tree_view_set_active gwy_resource_use gwy_response_type_get_type gwy_results_add_covariance_matrix gwy_results_add_covariance_matrixv gwy_results_add_format gwy_results_add_header gwy_results_add_separator gwy_results_add_value gwy_results_add_value_angle gwy_results_add_value_int gwy_results_add_value_percents gwy_results_add_value_plain gwy_results_add_value_str gwy_results_add_value_x gwy_results_add_value_y gwy_results_add_value_yesno gwy_results_add_value_z gwy_results_bind_formats gwy_results_copy gwy_results_create_report gwy_results_export_get_format gwy_results_export_get_results gwy_results_export_get_style gwy_results_export_get_type gwy_results_export_new gwy_results_export_set_actions_sensitive gwy_results_export_set_format gwy_results_export_set_format_func gwy_results_export_set_results gwy_results_export_set_style gwy_results_export_set_title gwy_results_export_style_get_type gwy_results_fill_channel gwy_results_fill_covariance_matrix gwy_results_fill_curve_map gwy_results_fill_filename gwy_results_fill_format gwy_results_fill_graph gwy_results_fill_graph_curve gwy_results_fill_lawn_curve gwy_results_fill_values gwy_results_fill_values_with_errors gwy_results_fill_volume gwy_results_fill_xyz gwy_results_get_error gwy_results_get_full gwy_results_get_label gwy_results_get_label_with_symbol gwy_results_get_symbol gwy_results_get_type gwy_results_get_units gwy_results_get_value gwy_results_get_value_with_error gwy_results_new gwy_results_report_type_get_type gwy_results_set_na gwy_results_set_nav gwy_results_set_unit gwy_results_set_unit_str gwy_results_unbind_formats gwy_results_value_is_na gwy_results_value_type_get_type gwy_rgba_copy gwy_rgba_free gwy_rgba_from_gdk_color gwy_rgba_from_gdk_color_and_alpha gwy_rgba_from_pixbuf_pixel gwy_rgba_get_from_container gwy_rgba_get_type gwy_rgba_interpolate gwy_rgba_new gwy_rgba_remove_from_container gwy_rgba_set_gdk_gc_bg gwy_rgba_set_gdk_gc_fg gwy_rgba_store_to_container gwy_rgba_to_gdk_alpha gwy_rgba_to_gdk_color gwy_rgba_to_hex6 gwy_rgba_to_hex8 gwy_rgba_to_pixbuf_pixel gwy_rotate_resize_type_get_type gwy_ruler_draw_pos gwy_ruler_get_range gwy_ruler_get_si_unit gwy_ruler_get_type gwy_ruler_get_units_placement gwy_ruler_set_range gwy_ruler_set_si_unit gwy_ruler_set_units_placement gwy_run_subdialog gwy_run_type_get_type gwy_save_auxiliary_data gwy_save_auxiliary_with_callback gwy_scale_mapping_type_get_type gwy_sci_text_get_entry gwy_sci_text_get_has_preview gwy_sci_text_get_text gwy_sci_text_get_type gwy_sci_text_new gwy_sci_text_set_has_preview gwy_sci_text_set_text gwy_select_in_filtered_inventory_treeeview gwy_selection_changed gwy_selection_clear gwy_selection_crop gwy_selection_delete_object gwy_selection_filter gwy_selection_finished gwy_selection_get_data gwy_selection_get_max_objects gwy_selection_get_object gwy_selection_get_object_size gwy_selection_get_type gwy_selection_graph_1darea_get_type gwy_selection_graph_1darea_new gwy_selection_graph_area_get_type gwy_selection_graph_area_new gwy_selection_graph_line_get_type gwy_selection_graph_line_new gwy_selection_graph_point_get_type gwy_selection_graph_point_new gwy_selection_graph_zoom_get_type gwy_selection_graph_zoom_new gwy_selection_is_full gwy_selection_move gwy_selection_set_data gwy_selection_set_max_objects gwy_selection_set_object gwy_sensitivity_group_add_widget gwy_sensitivity_group_contains_widget gwy_sensitivity_group_get_state gwy_sensitivity_group_get_type gwy_sensitivity_group_get_widget_mask gwy_sensitivity_group_new gwy_sensitivity_group_release_widget gwy_sensitivity_group_set_state gwy_sensitivity_group_set_widget_mask gwy_serializable_clone gwy_serializable_clone_with_type gwy_serializable_deserialize gwy_serializable_duplicate gwy_serializable_get_size gwy_serializable_get_type gwy_serializable_serialize gwy_serialize_check_string gwy_serialize_get_items_size gwy_serialize_get_struct_size gwy_serialize_object_items gwy_serialize_pack_object_struct gwy_serialize_unpack_object_struct gwy_set_data_preview_size gwy_set_member_object gwy_sgettext gwy_shader_get_gradient gwy_shader_get_phi gwy_shader_get_theta gwy_shader_get_type gwy_shader_get_update_policy gwy_shader_new gwy_shader_set_angle gwy_shader_set_gradient gwy_shader_set_phi gwy_shader_set_theta gwy_shader_set_update_policy gwy_shape_fit_preset_calculate_xyz gwy_shape_fit_preset_calculate_z gwy_shape_fit_preset_create_fitter gwy_shape_fit_preset_fit gwy_shape_fit_preset_get_nparams gwy_shape_fit_preset_get_nsecondary gwy_shape_fit_preset_get_param_description gwy_shape_fit_preset_get_param_flags gwy_shape_fit_preset_get_param_name gwy_shape_fit_preset_get_param_power_xy gwy_shape_fit_preset_get_param_power_z gwy_shape_fit_preset_get_param_units gwy_shape_fit_preset_get_secondary_description gwy_shape_fit_preset_get_secondary_error gwy_shape_fit_preset_get_secondary_flags gwy_shape_fit_preset_get_secondary_name gwy_shape_fit_preset_get_secondary_power_xy gwy_shape_fit_preset_get_secondary_power_z gwy_shape_fit_preset_get_secondary_units gwy_shape_fit_preset_get_secondary_value gwy_shape_fit_preset_get_type gwy_shape_fit_preset_get_value gwy_shape_fit_preset_guess gwy_shape_fit_preset_needs_same_units gwy_shape_fit_preset_quick_fit gwy_shape_fit_preset_setup gwy_shape_fit_presets gwy_si_unit_divide gwy_si_unit_equal gwy_si_unit_equal_string gwy_si_unit_factor_to_base gwy_si_unit_format_style_get_type gwy_si_unit_get_format gwy_si_unit_get_format_for_power10 gwy_si_unit_get_format_with_digits gwy_si_unit_get_format_with_resolution gwy_si_unit_get_string gwy_si_unit_get_type gwy_si_unit_multiply gwy_si_unit_new gwy_si_unit_new_parse gwy_si_unit_nth_root gwy_si_unit_power gwy_si_unit_power_multiply gwy_si_unit_set_from_string gwy_si_unit_set_from_string_parse gwy_si_unit_value_format_clone gwy_si_unit_value_format_copy gwy_si_unit_value_format_free gwy_si_unit_value_format_new gwy_si_unit_value_format_set_units gwy_si_value_format_get_type gwy_sinc gwy_spectra_add_spectrum gwy_spectra_clear gwy_spectra_data_changed gwy_spectra_find_nearest gwy_spectra_get_n_spectra gwy_spectra_get_si_unit_xy gwy_spectra_get_spectrum gwy_spectra_get_spectrum_selected gwy_spectra_get_spectrum_x_label gwy_spectra_get_spectrum_y_label gwy_spectra_get_title gwy_spectra_get_type gwy_spectra_itoxy gwy_spectra_new gwy_spectra_new_alike gwy_spectra_remove_spectrum gwy_spectra_set_si_unit_xy gwy_spectra_set_spectrum gwy_spectra_set_spectrum_selected gwy_spectra_set_spectrum_x_label gwy_spectra_set_spectrum_y_label gwy_spectra_set_title gwy_spectra_setpos gwy_spectra_xytoi gwy_spline_copy gwy_spline_free gwy_spline_get_closed gwy_spline_get_npoints gwy_spline_get_points gwy_spline_get_slackness gwy_spline_get_tangents gwy_spline_get_type gwy_spline_length gwy_spline_new gwy_spline_new_from_points gwy_spline_sample_naturally gwy_spline_sample_uniformly gwy_spline_set_closed gwy_spline_set_points gwy_spline_set_slackness gwy_statusbar_get_type gwy_statusbar_new gwy_statusbar_set_markup gwy_stock_like_button_new gwy_stock_register_stock_items gwy_str_fixed_font_width gwy_str_next_line gwy_stramong gwy_strdiffpos gwy_string_list_append gwy_string_list_append_take gwy_string_list_clear gwy_string_list_get gwy_string_list_get_length gwy_string_list_get_type gwy_string_list_new gwy_string_to_enum gwy_string_to_flags gwy_strisident gwy_strkill gwy_strreplace gwy_surface_copy gwy_surface_copy_units gwy_surface_copy_units_to_data_field gwy_surface_data_changed gwy_surface_get gwy_surface_get_data gwy_surface_get_data_const gwy_surface_get_data_full gwy_surface_get_min_max gwy_surface_get_npoints gwy_surface_get_si_unit_xy gwy_surface_get_si_unit_z gwy_surface_get_type gwy_surface_get_value_format_xy gwy_surface_get_value_format_z gwy_surface_get_xrange gwy_surface_get_yrange gwy_surface_invalidate gwy_surface_new gwy_surface_new_alike gwy_surface_new_from_data gwy_surface_new_part gwy_surface_new_sized gwy_surface_reduce_points gwy_surface_resize gwy_surface_set gwy_surface_set_data_full gwy_surface_set_from_data_field gwy_surface_set_from_data_field_mask gwy_surface_set_si_unit_xy gwy_surface_set_si_unit_z gwy_surface_xy_is_compatible gwy_synth_add_result_to_file gwy_synth_append_dimensions_to_param_table gwy_synth_define_dimensions_params gwy_synth_dims_flags_get_type gwy_synth_dims_param_get_type gwy_synth_handle_param_changed gwy_synth_make_preview_data_field gwy_synth_make_result_data_field gwy_synth_response_type_get_type gwy_synth_sanitise_params gwy_synth_update_lateral_alts gwy_synth_update_like_current_button_sensitivity gwy_synth_update_progress gwy_synth_update_type_get_type gwy_synth_update_value_unitstrs gwy_synth_use_dimensions_template gwy_table_attach_adjbar gwy_table_attach_hscale gwy_table_attach_row gwy_table_attach_spinbutton gwy_table_get_child_widget gwy_table_hscale_get_check gwy_table_hscale_get_label gwy_table_hscale_get_middle_widget gwy_table_hscale_get_scale gwy_table_hscale_get_units gwy_table_hscale_set_sensitive gwy_text_header_context_get_lineno gwy_text_header_context_get_section gwy_text_header_error_get_type gwy_text_header_error_quark gwy_text_header_parse gwy_threads_are_enabled gwy_threads_set_enabled gwy_ticks_style_get_type gwy_tip_cmap gwy_tip_dilation gwy_tip_erosion gwy_tip_estimate_full gwy_tip_estimate_partial gwy_tip_model_get_npresets gwy_tip_model_get_preset gwy_tip_model_get_preset_by_name gwy_tip_model_get_preset_group_name gwy_tip_model_get_preset_id gwy_tip_model_get_preset_nparams gwy_tip_model_get_preset_params gwy_tip_model_get_preset_tip_name gwy_tip_model_preset_create gwy_tip_model_preset_create_for_zrange gwy_tip_model_preset_get_type gwy_tip_param_type_get_type gwy_tip_type_get_type gwy_tool_add_hide_button gwy_tool_class_get_stock_id gwy_tool_class_get_title gwy_tool_class_get_tooltip gwy_tool_data_switched gwy_tool_func_foreach gwy_tool_func_register gwy_tool_get_type gwy_tool_hide gwy_tool_is_visible gwy_tool_like_button_new gwy_tool_response_type_get_type gwy_tool_restore_screen_position gwy_tool_show gwy_tool_spectra_switched gwy_tool_switch_event_get_type gwy_transform_direction_get_type gwy_triangulation_boundary gwy_triangulation_data_free gwy_triangulation_delaunay gwy_triangulation_get_type gwy_triangulation_interpolate gwy_triangulation_new gwy_triangulation_triangulate gwy_triangulation_triangulate_iterative gwy_triangulation_voronoi gwy_type_init gwy_undo_checkpoint gwy_undo_checkpointv gwy_undo_container_get_modified gwy_undo_container_has_redo gwy_undo_container_has_undo gwy_undo_container_remove gwy_undo_container_set_unmodified gwy_undo_get_enabled gwy_undo_qcheckpoint gwy_undo_qcheckpointv gwy_undo_redo_container gwy_undo_set_enabled gwy_undo_undo_container gwy_units_placement_get_type gwy_utf16_to_utf8 gwy_utf8_strescape gwy_vbox_new gwy_vector_layer_button_press gwy_vector_layer_button_release gwy_vector_layer_class_get_selection_type gwy_vector_layer_draw gwy_vector_layer_ensure_selection gwy_vector_layer_get_editable gwy_vector_layer_get_focus gwy_vector_layer_get_selection_key gwy_vector_layer_get_type gwy_vector_layer_key_press gwy_vector_layer_key_release gwy_vector_layer_motion_notify gwy_vector_layer_object_chosen gwy_vector_layer_set_editable gwy_vector_layer_set_focus gwy_vector_layer_set_selection_key gwy_version_major gwy_version_minor gwy_version_string gwy_visibility_reset_type_get_type gwy_volume_func_current gwy_volume_func_exists gwy_volume_func_foreach gwy_volume_func_get_menu_path gwy_volume_func_get_run_types gwy_volume_func_get_sensitivity_mask gwy_volume_func_get_stock_id gwy_volume_func_get_tooltip gwy_volume_func_register gwy_volume_func_run gwy_vruler_get_type gwy_vruler_new gwy_watershed_state_type_get_type gwy_widget_get_activate_on_unfocus gwy_widget_set_activate_on_unfocus gwy_widget_sync_sensitivity gwy_widgets_get_gl_config gwy_widgets_gl_init gwy_widgets_type_init gwy_windowing_type_get_enum gwy_windowing_type_get_type gwy_xlnx_int gwy_xy_copy gwy_xy_free gwy_xy_get_type gwy_xy_new gwy_xyz_copy gwy_xyz_free gwy_xyz_func_current gwy_xyz_func_exists gwy_xyz_func_foreach gwy_xyz_func_get_menu_path gwy_xyz_func_get_run_types gwy_xyz_func_get_sensitivity_mask gwy_xyz_func_get_stock_id gwy_xyz_func_get_tooltip gwy_xyz_func_register gwy_xyz_func_run gwy_xyz_get_type gwy_xyz_new syn keyword gwyddionTypedef GdkGLConfig GwyPoint GwyTriangulationPointXY GwyTriangulationPointXYZ -syn keyword gwyddionConstant GWY_2DCWT_GAUSS GWY_2DCWT_HAT GWY_3D_MOVEMENT_DEFORMATION GWY_3D_MOVEMENT_LIGHT GWY_3D_MOVEMENT_NONE GWY_3D_MOVEMENT_ROTATION GWY_3D_MOVEMENT_SCALE GWY_3D_PROJECTION_ORTHOGRAPHIC GWY_3D_PROJECTION_PERSPECTIVE GWY_3D_VIEW_LABEL_MAX GWY_3D_VIEW_LABEL_MIN GWY_3D_VIEW_LABEL_X GWY_3D_VIEW_LABEL_Y GWY_3D_VIEW_NLABELS GWY_3D_VISUALIZATION_GRADIENT GWY_3D_VISUALIZATION_LIGHTING GWY_3D_VISUALIZATION_OVERLAY GWY_3D_VISUALIZATION_OVERLAY_NO_LIGHT GWY_AFFINE_SCALING_AS_GIVEN GWY_AFFINE_SCALING_PRESERVE_AREA GWY_AFFINE_SCALING_PRESERVE_X GWY_APP_BRICK GWY_APP_BRICK_ID GWY_APP_BRICK_KEY GWY_APP_CONTAINER GWY_APP_CONTAINER_ID GWY_APP_CURVE_MAP_VIEW GWY_APP_DATA_FIELD GWY_APP_DATA_FIELD_ID GWY_APP_DATA_FIELD_KEY GWY_APP_DATA_VIEW GWY_APP_GRAPH GWY_APP_GRAPH_MODEL GWY_APP_GRAPH_MODEL_ID GWY_APP_GRAPH_MODEL_KEY GWY_APP_LAWN GWY_APP_LAWN_ID GWY_APP_LAWN_KEY GWY_APP_LOGGING_TO_CONSOLE GWY_APP_LOGGING_TO_FILE GWY_APP_MASK_FIELD GWY_APP_MASK_FIELD_KEY GWY_APP_PAGE GWY_APP_SETTINGS_ERROR_CFGDIR GWY_APP_SETTINGS_ERROR_CORRUPT GWY_APP_SETTINGS_ERROR_EMPTY GWY_APP_SETTINGS_ERROR_FILE GWY_APP_SHOW_FIELD GWY_APP_SHOW_FIELD_KEY GWY_APP_SPECTRA GWY_APP_SPECTRA_ID GWY_APP_SPECTRA_KEY GWY_APP_SURFACE GWY_APP_SURFACE_ID GWY_APP_SURFACE_KEY GWY_APP_VOLUME_VIEW GWY_APP_XYZ_VIEW GWY_AXIS_SCALE_FORMAT_AUTO GWY_AXIS_SCALE_FORMAT_EXP GWY_AXIS_SCALE_FORMAT_INT GWY_BRICK_TRANSPOSE_XYZ GWY_BRICK_TRANSPOSE_XZY GWY_BRICK_TRANSPOSE_YXZ GWY_BRICK_TRANSPOSE_YZX GWY_BRICK_TRANSPOSE_ZXY GWY_BRICK_TRANSPOSE_ZYX GWY_BYTE_ORDER_BIG_ENDIAN GWY_BYTE_ORDER_IMPLICIT GWY_BYTE_ORDER_LITTLE_ENDIAN GWY_BYTE_ORDER_NATIVE GWY_COMPUTATION_STATE_FINISHED GWY_COMPUTATION_STATE_INIT GWY_COMPUTATION_STATE_ITERATE GWY_CORRELATION_FFT GWY_CORRELATION_NORMAL GWY_CORRELATION_POC GWY_CORR_SEARCH_COVARIANCE GWY_CORR_SEARCH_COVARIANCE_RAW GWY_CORR_SEARCH_COVARIANCE_SCORE GWY_CORR_SEARCH_HEIGHT_DIFF GWY_CORR_SEARCH_HEIGHT_DIFF_RAW GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE GWY_CURVE_CHANNEL_BLUE GWY_CURVE_CHANNEL_GREEN GWY_CURVE_CHANNEL_RED GWY_CURVE_TYPE_FREE GWY_CURVE_TYPE_LINEAR GWY_CURVE_TYPE_SPLINE GWY_DATA_COMPATIBILITY_ALL GWY_DATA_COMPATIBILITY_AXISCAL GWY_DATA_COMPATIBILITY_CURVELEN GWY_DATA_COMPATIBILITY_LATERAL GWY_DATA_COMPATIBILITY_MEASURE GWY_DATA_COMPATIBILITY_NCURVES GWY_DATA_COMPATIBILITY_REAL GWY_DATA_COMPATIBILITY_RES GWY_DATA_COMPATIBILITY_VALUE GWY_DATA_ERROR_ITEM_TYPE GWY_DATA_ERROR_KEY_CHARACTERS GWY_DATA_ERROR_KEY_FORMAT GWY_DATA_ERROR_KEY_ID GWY_DATA_ERROR_KEY_UNKNOWN GWY_DATA_ERROR_NON_UTF8_STRING GWY_DATA_ERROR_REF_COUNT GWY_DATA_ERROR_STRAY_SECONDARY_DATA GWY_DATA_FIELD_CACHE_ARE GWY_DATA_FIELD_CACHE_ARF GWY_DATA_FIELD_CACHE_ART GWY_DATA_FIELD_CACHE_ENT GWY_DATA_FIELD_CACHE_MAX GWY_DATA_FIELD_CACHE_MED GWY_DATA_FIELD_CACHE_MIN GWY_DATA_FIELD_CACHE_MSQ GWY_DATA_FIELD_CACHE_RMS GWY_DATA_FIELD_CACHE_SIZE GWY_DATA_FIELD_CACHE_SUM GWY_DATA_FIELD_CACHE_VAR GWY_DATA_ITEM_CALDATA GWY_DATA_ITEM_GRADIENT GWY_DATA_ITEM_MASK_COLOR GWY_DATA_ITEM_META GWY_DATA_ITEM_PALETTE GWY_DATA_ITEM_PREVIEW GWY_DATA_ITEM_RANGE GWY_DATA_ITEM_RANGE_TYPE GWY_DATA_ITEM_REAL_SQUARE GWY_DATA_ITEM_SELECTIONS GWY_DATA_ITEM_TITLE GWY_DATA_VALIDATE_ALL GWY_DATA_VALIDATE_CORRECT GWY_DATA_VALIDATE_NO_REPORT GWY_DATA_VALIDATE_REF_COUNT GWY_DATA_VALIDATE_UNKNOWN GWY_DATA_VIEW_LAYER_ALPHA GWY_DATA_VIEW_LAYER_BASE GWY_DATA_VIEW_LAYER_TOP GWY_DATA_WATCH_EVENT_ADDED GWY_DATA_WATCH_EVENT_CHANGED GWY_DATA_WATCH_EVENT_REMOVED GWY_DEBUG_OBJECTS_DUMP_ONLY_ALIVE GWY_DIALOG_CANCEL GWY_DIALOG_HAVE_RESULT GWY_DIALOG_PROCEED GWY_DIMS_BUTTON_TAKE GWY_DIMS_HEADER_CURRENT_IMAGE GWY_DIMS_HEADER_PHYSICAL GWY_DIMS_HEADER_PIXEL GWY_DIMS_HEADER_UNITS GWY_DIMS_PARAM_INITIALIZE GWY_DIMS_PARAM_REPLACE GWY_DIMS_PARAM_SQUARE_IMAGE GWY_DIMS_PARAM_SQUARE_PIXELS GWY_DIMS_PARAM_XREAL GWY_DIMS_PARAM_XRES GWY_DIMS_PARAM_XYUNIT GWY_DIMS_PARAM_YREAL GWY_DIMS_PARAM_YRES GWY_DIMS_PARAM_ZUNIT GWY_DISTANCE_TRANSFORM_CHESS GWY_DISTANCE_TRANSFORM_CITYBLOCK GWY_DISTANCE_TRANSFORM_CONN4 GWY_DISTANCE_TRANSFORM_CONN8 GWY_DISTANCE_TRANSFORM_EUCLIDEAN GWY_DISTANCE_TRANSFORM_OCTAGONAL GWY_DISTANCE_TRANSFORM_OCTAGONAL48 GWY_DISTANCE_TRANSFORM_OCTAGONAL84 GWY_DWT_DAUB12 GWY_DWT_DAUB20 GWY_DWT_DAUB4 GWY_DWT_DAUB6 GWY_DWT_DAUB8 GWY_DWT_DENOISE_SCALE_ADAPTIVE GWY_DWT_DENOISE_SPACE_ADAPTIVE GWY_DWT_DENOISE_UNIVERSAL GWY_DWT_HAAR GWY_EXPR_ERROR_CLOSING_PARENTHESIS GWY_EXPR_ERROR_CONSTANT_NAME GWY_EXPR_ERROR_EMPTY GWY_EXPR_ERROR_EMPTY_PARENTHESES GWY_EXPR_ERROR_GARBAGE GWY_EXPR_ERROR_INVALID_ARGUMENT GWY_EXPR_ERROR_INVALID_TOKEN GWY_EXPR_ERROR_MISSING_ARGUMENT GWY_EXPR_ERROR_NOT_EXECUTABLE GWY_EXPR_ERROR_OPENING_PARENTHESIS GWY_EXPR_ERROR_STRAY_COMMA GWY_EXPR_ERROR_UNRESOLVED_IDENTIFIERS GWY_EXTERIOR_BORDER_EXTEND GWY_EXTERIOR_FIXED_VALUE GWY_EXTERIOR_LAPLACE GWY_EXTERIOR_MIRROR_EXTEND GWY_EXTERIOR_PERIODIC GWY_EXTERIOR_UNDEFINED GWY_FILE_OPERATION_DETECT GWY_FILE_OPERATION_EXPORT GWY_FILE_OPERATION_LOAD GWY_FILE_OPERATION_MASK GWY_FILE_OPERATION_SAVE GWY_GRAIN_VALUE_BOUNDARY_MAXIMUM GWY_GRAIN_VALUE_BOUNDARY_MINIMUM GWY_GRAIN_VALUE_CENTER_X GWY_GRAIN_VALUE_CENTER_Y GWY_GRAIN_VALUE_CIRCUMCIRCLE_R GWY_GRAIN_VALUE_CIRCUMCIRCLE_X GWY_GRAIN_VALUE_CIRCUMCIRCLE_Y GWY_GRAIN_VALUE_CONVEX_HULL_AREA GWY_GRAIN_VALUE_CURVATURE1 GWY_GRAIN_VALUE_CURVATURE2 GWY_GRAIN_VALUE_CURVATURE_ANGLE1 GWY_GRAIN_VALUE_CURVATURE_ANGLE2 GWY_GRAIN_VALUE_CURVATURE_CENTER_X GWY_GRAIN_VALUE_CURVATURE_CENTER_Y GWY_GRAIN_VALUE_CURVATURE_CENTER_Z GWY_GRAIN_VALUE_EQUIV_DISC_RADIUS GWY_GRAIN_VALUE_EQUIV_ELLIPSE_ANGLE GWY_GRAIN_VALUE_EQUIV_ELLIPSE_MAJOR GWY_GRAIN_VALUE_EQUIV_ELLIPSE_MINOR GWY_GRAIN_VALUE_EQUIV_SQUARE_SIDE GWY_GRAIN_VALUE_FLAT_BOUNDARY_LENGTH GWY_GRAIN_VALUE_GROUP_AREA GWY_GRAIN_VALUE_GROUP_BOUNDARY GWY_GRAIN_VALUE_GROUP_CURVATURE GWY_GRAIN_VALUE_GROUP_ID GWY_GRAIN_VALUE_GROUP_MOMENT GWY_GRAIN_VALUE_GROUP_POSITION GWY_GRAIN_VALUE_GROUP_SLOPE GWY_GRAIN_VALUE_GROUP_USER GWY_GRAIN_VALUE_GROUP_VALUE GWY_GRAIN_VALUE_GROUP_VOLUME GWY_GRAIN_VALUE_HALF_HEIGHT_AREA GWY_GRAIN_VALUE_INSCRIBED_DISC_R GWY_GRAIN_VALUE_INSCRIBED_DISC_X GWY_GRAIN_VALUE_INSCRIBED_DISC_Y GWY_GRAIN_VALUE_IS_ANGLE GWY_GRAIN_VALUE_MAXIMUM GWY_GRAIN_VALUE_MAXIMUM_BOUND_ANGLE GWY_GRAIN_VALUE_MAXIMUM_BOUND_SIZE GWY_GRAIN_VALUE_MAXIMUM_MARTIN_ANGLE GWY_GRAIN_VALUE_MAXIMUM_MARTIN_DIAMETER GWY_GRAIN_VALUE_MEAN GWY_GRAIN_VALUE_MEAN_RADIUS GWY_GRAIN_VALUE_MEDIAN GWY_GRAIN_VALUE_MINIMUM GWY_GRAIN_VALUE_MINIMUM_BOUND_ANGLE GWY_GRAIN_VALUE_MINIMUM_BOUND_SIZE GWY_GRAIN_VALUE_MINIMUM_MARTIN_ANGLE GWY_GRAIN_VALUE_MINIMUM_MARTIN_DIAMETER GWY_GRAIN_VALUE_PIXEL_AREA GWY_GRAIN_VALUE_PROJECTED_AREA GWY_GRAIN_VALUE_RMS GWY_GRAIN_VALUE_SAME_UNITS GWY_GRAIN_VALUE_SLOPE_PHI GWY_GRAIN_VALUE_SLOPE_THETA GWY_GRAIN_VALUE_STORE_COLUMN_ENABLED GWY_GRAIN_VALUE_STORE_COLUMN_GROUP GWY_GRAIN_VALUE_STORE_COLUMN_ITEM GWY_GRAIN_VALUE_SURFACE_AREA GWY_GRAIN_VALUE_VOLUME_0 GWY_GRAIN_VALUE_VOLUME_LAPLACE GWY_GRAIN_VALUE_VOLUME_MIN GWY_GRAPH_CURVE_HIDDEN GWY_GRAPH_CURVE_LINE GWY_GRAPH_CURVE_LINE_POINTS GWY_GRAPH_CURVE_POINTS GWY_GRAPH_GRID_AUTO GWY_GRAPH_GRID_NONE GWY_GRAPH_GRID_USER GWY_GRAPH_LABEL_NORTHEAST GWY_GRAPH_LABEL_NORTHWEST GWY_GRAPH_LABEL_SOUTHEAST GWY_GRAPH_LABEL_SOUTHWEST GWY_GRAPH_LABEL_USER GWY_GRAPH_MODEL_EXPORT_ASCII_CSV GWY_GRAPH_MODEL_EXPORT_ASCII_GNUPLOT GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED GWY_GRAPH_MODEL_EXPORT_ASCII_ORIGIN GWY_GRAPH_MODEL_EXPORT_ASCII_PLAIN GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX GWY_GRAPH_POINT_ASTERISK GWY_GRAPH_POINT_CIRCLE GWY_GRAPH_POINT_CROSS GWY_GRAPH_POINT_DIAMOND GWY_GRAPH_POINT_DISC GWY_GRAPH_POINT_FILLED_CIRCLE GWY_GRAPH_POINT_FILLED_DIAMOND GWY_GRAPH_POINT_FILLED_SQUARE GWY_GRAPH_POINT_FILLED_TRIANGLE_DOWN GWY_GRAPH_POINT_FILLED_TRIANGLE_LEFT GWY_GRAPH_POINT_FILLED_TRIANGLE_RIGHT GWY_GRAPH_POINT_FILLED_TRIANGLE_UP GWY_GRAPH_POINT_SQUARE GWY_GRAPH_POINT_STAR GWY_GRAPH_POINT_TIMES GWY_GRAPH_POINT_TRIANGLE_DOWN GWY_GRAPH_POINT_TRIANGLE_LEFT GWY_GRAPH_POINT_TRIANGLE_RIGHT GWY_GRAPH_POINT_TRIANGLE_UP GWY_GRAPH_STATUS_PLAIN GWY_GRAPH_STATUS_POINTS GWY_GRAPH_STATUS_XLINES GWY_GRAPH_STATUS_XSEL GWY_GRAPH_STATUS_YLINES GWY_GRAPH_STATUS_YSEL GWY_GRAPH_STATUS_ZOOM GWY_HELP_DEFAULT GWY_HELP_NO_BUTTON GWY_HSCALE_CHECK GWY_HSCALE_DEFAULT GWY_HSCALE_LINEAR GWY_HSCALE_LOG GWY_HSCALE_NO_SCALE GWY_HSCALE_SNAP GWY_HSCALE_SQRT GWY_HSCALE_WIDGET GWY_HSCALE_WIDGET_NO_EXPAND GWY_INTERPOLATION_BILINEAR GWY_INTERPOLATION_BSPLINE GWY_INTERPOLATION_KEY GWY_INTERPOLATION_LINEAR GWY_INTERPOLATION_NNA GWY_INTERPOLATION_NONE GWY_INTERPOLATION_OMOMS GWY_INTERPOLATION_ROUND GWY_INTERPOLATION_SCHAUM GWY_LAYER_BASIC_RANGE_ADAPT GWY_LAYER_BASIC_RANGE_AUTO GWY_LAYER_BASIC_RANGE_FIXED GWY_LAYER_BASIC_RANGE_FULL GWY_LINE_STAT_KURTOSIS GWY_LINE_STAT_LENGTH GWY_LINE_STAT_MAXIMUM GWY_LINE_STAT_MAXPOS GWY_LINE_STAT_MEAN GWY_LINE_STAT_MEDIAN GWY_LINE_STAT_MINIMUM GWY_LINE_STAT_MINPOS GWY_LINE_STAT_RA GWY_LINE_STAT_RANGE GWY_LINE_STAT_RMS GWY_LINE_STAT_RT GWY_LINE_STAT_RZ GWY_LINE_STAT_SKEW GWY_LINE_STAT_SLOPE GWY_LINE_STAT_TAN_BETA0 GWY_LINE_STAT_VARIATION GWY_MARKER_OPERATION_ADD GWY_MARKER_OPERATION_MOVE GWY_MARKER_OPERATION_REMOVE GWY_MASK_EXCLUDE GWY_MASK_IGNORE GWY_MASK_INCLUDE GWY_MENU_FLAG_3D GWY_MENU_FLAG_CURVE_MAP GWY_MENU_FLAG_DATA GWY_MENU_FLAG_DATA_MASK GWY_MENU_FLAG_DATA_SHOW GWY_MENU_FLAG_FILE GWY_MENU_FLAG_GRAPH GWY_MENU_FLAG_GRAPH_CURVE GWY_MENU_FLAG_LAST_GRAPH GWY_MENU_FLAG_LAST_PROC GWY_MENU_FLAG_MASK GWY_MENU_FLAG_REDO GWY_MENU_FLAG_UNDO GWY_MENU_FLAG_VOLUME GWY_MENU_FLAG_XYZ GWY_MERGE_INTERSECTION GWY_MERGE_UNION GWY_MFM_COMPONENT_D2HZ_DZ2 GWY_MFM_COMPONENT_DHZ_DZ GWY_MFM_COMPONENT_HX GWY_MFM_COMPONENT_HY GWY_MFM_COMPONENT_HZ GWY_MFM_GRADIENT_FORCE GWY_MFM_GRADIENT_MFM GWY_MFM_GRADIENT_MFM_AREA GWY_MFM_PROBE_BAR GWY_MFM_PROBE_CHARGE GWY_MIN_MAX_FILTER_CLOSING GWY_MIN_MAX_FILTER_DILATION GWY_MIN_MAX_FILTER_EROSION GWY_MIN_MAX_FILTER_MAXIMUM GWY_MIN_MAX_FILTER_MINIMUM GWY_MIN_MAX_FILTER_NORMALIZATION GWY_MIN_MAX_FILTER_OPENING GWY_MIN_MAX_FILTER_RANGE GWY_MODULE_ERROR_ABI GWY_MODULE_ERROR_DUPLICATE GWY_MODULE_ERROR_INFO GWY_MODULE_ERROR_NAME GWY_MODULE_ERROR_NESTING GWY_MODULE_ERROR_OPEN GWY_MODULE_ERROR_QUERY GWY_MODULE_ERROR_REGISTER GWY_MODULE_FILE_ERROR_CANCELED GWY_MODULE_FILE_ERROR_CANCELLED GWY_MODULE_FILE_ERROR_DATA GWY_MODULE_FILE_ERROR_INTERACTIVE GWY_MODULE_FILE_ERROR_IO GWY_MODULE_FILE_ERROR_SPECIFIC GWY_MODULE_FILE_ERROR_UNIMPLEMENTED GWY_NLFIT_PARAM_ABSVAL GWY_NLFIT_PARAM_ANGLE GWY_ORIENTATION_HORIZONTAL GWY_ORIENTATION_VERTICAL GWY_PAGE_CHANNELS GWY_PAGE_CURVE_MAPS GWY_PAGE_GRAPHS GWY_PAGE_NOPAGE GWY_PAGE_SPECTRA GWY_PAGE_VOLUMES GWY_PAGE_XYZS GWY_PARAM_STRING_DO_NOT_STRIP GWY_PARAM_STRING_EMPTY_IS_NULL GWY_PARAM_STRING_NULL_IS_EMPTY GWY_PEAK_ABSCISSA GWY_PEAK_AREA GWY_PEAK_BACKGROUND_MMSTEP GWY_PEAK_BACKGROUND_ZERO GWY_PEAK_HEIGHT GWY_PEAK_ORDER_ABSCISSA GWY_PEAK_ORDER_PROMINENCE GWY_PEAK_PROMINENCE GWY_PEAK_WIDTH GWY_PERCENTILE_INTERPOLATION_HIGHER GWY_PERCENTILE_INTERPOLATION_LINEAR GWY_PERCENTILE_INTERPOLATION_LOWER GWY_PERCENTILE_INTERPOLATION_MIDPOINT GWY_PERCENTILE_INTERPOLATION_NEAREST GWY_PLAIN_TOOL_CHANGED_DATA GWY_PLAIN_TOOL_CHANGED_MASK GWY_PLAIN_TOOL_CHANGED_SELECTION GWY_PLAIN_TOOL_CHANGED_SHOW GWY_PLAIN_TOOL_FINISHED_SELECTION GWY_PLANE_FIT_A GWY_PLANE_FIT_ANGLE GWY_PLANE_FIT_BX GWY_PLANE_FIT_BY GWY_PLANE_FIT_S0 GWY_PLANE_FIT_S0_REDUCED GWY_PLANE_FIT_SLOPE GWY_PREVIEW_IMMEDIATE GWY_PREVIEW_NONE GWY_PREVIEW_SURFACE_DENSITY GWY_PREVIEW_SURFACE_FILL GWY_PREVIEW_UPON_REQUEST GWY_RAW_DATA_DOUBLE GWY_RAW_DATA_FLOAT GWY_RAW_DATA_HALF GWY_RAW_DATA_REAL GWY_RAW_DATA_SINT16 GWY_RAW_DATA_SINT32 GWY_RAW_DATA_SINT64 GWY_RAW_DATA_SINT8 GWY_RAW_DATA_UINT16 GWY_RAW_DATA_UINT32 GWY_RAW_DATA_UINT64 GWY_RAW_DATA_UINT8 GWY_RENDERING_TARGET_PIXMAP_IMAGE GWY_RENDERING_TARGET_SCREEN GWY_RESPONSE_CLEAR GWY_RESPONSE_RESET GWY_RESPONSE_SYNTH_INIT_Z GWY_RESPONSE_SYNTH_TAKE_DIMS GWY_RESPONSE_UPDATE GWY_RESULTS_EXPORT_FIXED_FORMAT GWY_RESULTS_EXPORT_PARAMETERS GWY_RESULTS_EXPORT_TABULAR_DATA GWY_RESULTS_REPORT_COLON GWY_RESULTS_REPORT_CSV GWY_RESULTS_REPORT_MACHINE GWY_RESULTS_REPORT_TABSEP GWY_RESULTS_VALUE_FLOAT GWY_RESULTS_VALUE_INT GWY_RESULTS_VALUE_STRING GWY_RESULTS_VALUE_YESNO GWY_ROTATE_RESIZE_CUT GWY_ROTATE_RESIZE_EXPAND GWY_ROTATE_RESIZE_SAME_SIZE GWY_RUN_IMMEDIATE GWY_RUN_INTERACTIVE GWY_RUN_MASK GWY_RUN_NONE GWY_RUN_NONINTERACTIVE GWY_SCALE_MAPPING_LINEAR GWY_SCALE_MAPPING_LOG GWY_SCALE_MAPPING_LOG1P GWY_SCALE_MAPPING_SQRT GWY_SI_UNIT_FORMAT_MARKUP GWY_SI_UNIT_FORMAT_NONE GWY_SI_UNIT_FORMAT_PLAIN GWY_SI_UNIT_FORMAT_TEX GWY_SI_UNIT_FORMAT_UNICODE GWY_SI_UNIT_FORMAT_VFMARKUP GWY_SI_UNIT_FORMAT_VFTEX GWY_SI_UNIT_FORMAT_VFUNICODE GWY_SYMMETRY_AUTO GWY_SYMMETRY_HEXAGONAL GWY_SYMMETRY_LAST GWY_SYMMETRY_PARALLEL GWY_SYMMETRY_RHOMBIC GWY_SYMMETRY_SQUARE GWY_SYMMETRY_TRIANGULAR GWY_SYNTH_FIXED_UNITS GWY_SYNTH_FIXED_XYUNIT GWY_SYNTH_FIXED_ZUNIT GWY_SYNTH_NO_INITIALIZE GWY_SYNTH_UPDATE_CANCELLED GWY_SYNTH_UPDATE_DO_PREVIEW GWY_SYNTH_UPDATE_NOTHING GWY_TEXT_HEADER_ERROR_GARBAGE GWY_TEXT_HEADER_ERROR_KEY GWY_TEXT_HEADER_ERROR_PREFIX GWY_TEXT_HEADER_ERROR_SECTION_END GWY_TEXT_HEADER_ERROR_SECTION_NAME GWY_TEXT_HEADER_ERROR_SECTION_START GWY_TEXT_HEADER_ERROR_TERMINATOR GWY_TEXT_HEADER_ERROR_VALUE GWY_TICKS_STYLE_AUTO GWY_TICKS_STYLE_CENTER GWY_TICKS_STYLE_NONE GWY_TICKS_STYLE_UNLABELED GWY_TICKS_STYLE_UNLABELLED GWY_TIP_BALL_ON_STICK GWY_TIP_CONE GWY_TIP_CONTACT GWY_TIP_DELTA GWY_TIP_ELLPARABOLA GWY_TIP_NONCONTACT GWY_TIP_PARABOLA GWY_TIP_PARAM_ANISOTROPY GWY_TIP_PARAM_HEIGHT GWY_TIP_PARAM_NSIDES GWY_TIP_PARAM_RADIUS GWY_TIP_PARAM_ROTATION GWY_TIP_PARAM_SLOPE GWY_TIP_PYRAMID GWY_TIP_PYRAMIDE GWY_TOOL_RESPONSE_CLEAR GWY_TOOL_RESPONSE_UPDATE GWY_TRANSFORM_DIRECTION_BACKWARD GWY_TRANSFORM_DIRECTION_FORWARD GWY_UNITS_PLACEMENT_AT_ZERO GWY_UNITS_PLACEMENT_NONE GWY_VISIBILITY_RESET_DEFAULT GWY_VISIBILITY_RESET_HIDE_ALL GWY_VISIBILITY_RESET_RESTORE GWY_VISIBILITY_RESET_SHOW_ALL GWY_WATERSHED_STATE_FINISHED GWY_WATERSHED_STATE_INIT GWY_WATERSHED_STATE_LOCATE GWY_WATERSHED_STATE_MARK GWY_WATERSHED_STATE_MIN GWY_WATERSHED_STATE_WATERSHED GWY_WINDOWING_BLACKMANN GWY_WINDOWING_FLAT_TOP GWY_WINDOWING_HAMMING GWY_WINDOWING_HANN GWY_WINDOWING_KAISER25 GWY_WINDOWING_LANCZOS GWY_WINDOWING_NONE GWY_WINDOWING_NUTTALL GWY_WINDOWING_RECT GWY_WINDOWING_WELCH -syn keyword gwyddionStruct Gwy3DLabel Gwy3DLabelClass Gwy3DSetup Gwy3DSetupClass Gwy3DView Gwy3DViewClass Gwy3DWindow Gwy3DWindowClass GwyAdjustBar GwyAdjustBarClass GwyAppDataId GwyAxis GwyAxisClass GwyAxisParams GwyBrick GwyBrickClass GwyBrickPart GwyCDLine GwyCDLineBuiltin GwyCDLineClass GwyCalData GwyCalDataClass GwyCalibration GwyCalibrationClass GwyChannelData GwyColorAxis GwyColorAxisClass GwyColorButton GwyColorButtonClass GwyComputationState GwyContainer GwyContainerClass GwyCurve GwyCurveCalibrationData GwyCurveClass GwyDataChooser GwyDataChooserClass GwyDataField GwyDataFieldClass GwyDataLine GwyDataLineClass GwyDataValidationFailure GwyDataView GwyDataViewClass GwyDataViewLayer GwyDataViewLayerClass GwyDataWindow GwyDataWindowClass GwyDialog GwyDialogClass GwyEnum GwyExpr GwyFDCurvePreset GwyFDCurvePresetBuiltin GwyFDCurvePresetClass GwyFileDetectInfo GwyFunctionUse GwyGLMaterial GwyGLMaterialClass GwyGradient GwyGradientClass GwyGradientPoint GwyGrainValue GwyGrainValueClass GwyGrainValueData GwyGraph GwyGraphActiveAreaSpecs GwyGraphArea GwyGraphAreaClass GwyGraphClass GwyGraphCorner GwyGraphCornerClass GwyGraphCurveModel GwyGraphCurveModelClass GwyGraphCurves GwyGraphCurvesClass GwyGraphData GwyGraphDataClass GwyGraphLabel GwyGraphLabelClass GwyGraphModel GwyGraphModelClass GwyGraphWindow GwyGraphWindowClass GwyHMarkerBox GwyHMarkerBoxClass GwyHRuler GwyHRulerClass GwyInventory GwyInventoryClass GwyInventoryItemType GwyInventoryStore GwyInventoryStoreClass GwyLawn GwyLawnClass GwyLayerBasic GwyLayerBasicClass GwyLayerMask GwyLayerMaskClass GwyMarkerBox GwyMarkerBoxClass GwyModuleFailureInfo GwyModuleInfo GwyModuleRecord GwyNLFitPreset GwyNLFitPresetBuiltin GwyNLFitPresetClass GwyNLFitter GwyNullStore GwyNullStoreClass GwyParamDef GwyParamDefClass GwyParamResource GwyParamResourceClass GwyParamTable GwyParamTableClass GwyParams GwyParamsClass GwyPeaks GwyPixmapLayer GwyPixmapLayerClass GwyPlainTool GwyPlainToolClass GwyRGBA GwyRandGenSet GwyRectSelectionLabels GwyResource GwyResourceClass GwyResourceEditor GwyResourceEditorClass GwyResults GwyResultsClass GwyResultsExport GwyResultsExportClass GwyRuler GwyRulerClass GwySIUnit GwySIUnitClass GwySIValueFormat GwySciText GwySciTextClass GwySelection GwySelectionClass GwySelectionGraph1DArea GwySelectionGraph1DAreaClass GwySelectionGraphArea GwySelectionGraphAreaClass GwySelectionGraphLine GwySelectionGraphLineClass GwySelectionGraphPoint GwySelectionGraphPointClass GwySelectionGraphZoom GwySelectionGraphZoomClass GwySensitivityGroup GwySensitivityGroupClass GwySerializable GwySerializableIface GwySerializeItem GwySerializeSpec GwyShader GwyShaderClass GwyShapeFitPreset GwyShapeFitPresetClass GwySpectra GwySpectraClass GwySpline GwyStatusbar GwyStatusbarClass GwyStringList GwyStringListClass GwySurface GwySurfaceClass GwyTextEntity GwyTextHeaderContext GwyTextHeaderParser GwyTool GwyToolClass GwyTriangulation GwyTriangulationClass GwyTriangulationData GwyVRuler GwyVRulerClass GwyVectorLayer GwyVectorLayerClass GwyXY GwyXYZ +syn keyword gwyddionConstant GWY_2DCWT_GAUSS GWY_2DCWT_HAT GWY_3D_MOVEMENT_DEFORMATION GWY_3D_MOVEMENT_LIGHT GWY_3D_MOVEMENT_NONE GWY_3D_MOVEMENT_ROTATION GWY_3D_MOVEMENT_SCALE GWY_3D_PROJECTION_ORTHOGRAPHIC GWY_3D_PROJECTION_PERSPECTIVE GWY_3D_VIEW_LABEL_MAX GWY_3D_VIEW_LABEL_MIN GWY_3D_VIEW_LABEL_X GWY_3D_VIEW_LABEL_Y GWY_3D_VIEW_NLABELS GWY_3D_VISUALIZATION_GRADIENT GWY_3D_VISUALIZATION_LIGHTING GWY_3D_VISUALIZATION_OVERLAY GWY_3D_VISUALIZATION_OVERLAY_NO_LIGHT GWY_AFFINE_SCALING_AS_GIVEN GWY_AFFINE_SCALING_PRESERVE_AREA GWY_AFFINE_SCALING_PRESERVE_X GWY_APP_BRICK GWY_APP_BRICK_ID GWY_APP_BRICK_KEY GWY_APP_CONTAINER GWY_APP_CONTAINER_ID GWY_APP_CURVE_MAP_VIEW GWY_APP_DATA_FIELD GWY_APP_DATA_FIELD_ID GWY_APP_DATA_FIELD_KEY GWY_APP_DATA_VIEW GWY_APP_GRAPH GWY_APP_GRAPH_MODEL GWY_APP_GRAPH_MODEL_ID GWY_APP_GRAPH_MODEL_KEY GWY_APP_LAWN GWY_APP_LAWN_ID GWY_APP_LAWN_KEY GWY_APP_LOGGING_TO_CONSOLE GWY_APP_LOGGING_TO_FILE GWY_APP_MASK_FIELD GWY_APP_MASK_FIELD_KEY GWY_APP_PAGE GWY_APP_SETTINGS_ERROR_CFGDIR GWY_APP_SETTINGS_ERROR_CORRUPT GWY_APP_SETTINGS_ERROR_EMPTY GWY_APP_SETTINGS_ERROR_FILE GWY_APP_SHOW_FIELD GWY_APP_SHOW_FIELD_KEY GWY_APP_SPECTRA GWY_APP_SPECTRA_ID GWY_APP_SPECTRA_KEY GWY_APP_SURFACE GWY_APP_SURFACE_ID GWY_APP_SURFACE_KEY GWY_APP_VOLUME_VIEW GWY_APP_XYZ_VIEW GWY_AXIS_SCALE_FORMAT_AUTO GWY_AXIS_SCALE_FORMAT_EXP GWY_AXIS_SCALE_FORMAT_INT GWY_BRICK_TRANSPOSE_XYZ GWY_BRICK_TRANSPOSE_XZY GWY_BRICK_TRANSPOSE_YXZ GWY_BRICK_TRANSPOSE_YZX GWY_BRICK_TRANSPOSE_ZXY GWY_BRICK_TRANSPOSE_ZYX GWY_BYTE_ORDER_BIG_ENDIAN GWY_BYTE_ORDER_IMPLICIT GWY_BYTE_ORDER_LITTLE_ENDIAN GWY_BYTE_ORDER_NATIVE GWY_COMPUTATION_STATE_FINISHED GWY_COMPUTATION_STATE_INIT GWY_COMPUTATION_STATE_ITERATE GWY_CORRELATION_FFT GWY_CORRELATION_NORMAL GWY_CORRELATION_POC GWY_CORR_SEARCH_COVARIANCE GWY_CORR_SEARCH_COVARIANCE_RAW GWY_CORR_SEARCH_COVARIANCE_SCORE GWY_CORR_SEARCH_HEIGHT_DIFF GWY_CORR_SEARCH_HEIGHT_DIFF_RAW GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE GWY_CORR_SEARCH_PHASE_ONLY_SCORE GWY_CURVE_CHANNEL_BLUE GWY_CURVE_CHANNEL_GREEN GWY_CURVE_CHANNEL_RED GWY_CURVE_TYPE_FREE GWY_CURVE_TYPE_LINEAR GWY_CURVE_TYPE_SPLINE GWY_DATA_COMPATIBILITY_ALL GWY_DATA_COMPATIBILITY_AXISCAL GWY_DATA_COMPATIBILITY_CURVELEN GWY_DATA_COMPATIBILITY_LATERAL GWY_DATA_COMPATIBILITY_MEASURE GWY_DATA_COMPATIBILITY_NCURVES GWY_DATA_COMPATIBILITY_REAL GWY_DATA_COMPATIBILITY_RES GWY_DATA_COMPATIBILITY_VALUE GWY_DATA_ERROR_ITEM_TYPE GWY_DATA_ERROR_KEY_CHARACTERS GWY_DATA_ERROR_KEY_FORMAT GWY_DATA_ERROR_KEY_ID GWY_DATA_ERROR_KEY_UNKNOWN GWY_DATA_ERROR_NON_UTF8_STRING GWY_DATA_ERROR_REF_COUNT GWY_DATA_ERROR_STRAY_SECONDARY_DATA GWY_DATA_FIELD_CACHE_ARE GWY_DATA_FIELD_CACHE_ARF GWY_DATA_FIELD_CACHE_ART GWY_DATA_FIELD_CACHE_ENT GWY_DATA_FIELD_CACHE_MAX GWY_DATA_FIELD_CACHE_MED GWY_DATA_FIELD_CACHE_MIN GWY_DATA_FIELD_CACHE_MSQ GWY_DATA_FIELD_CACHE_RMS GWY_DATA_FIELD_CACHE_SIZE GWY_DATA_FIELD_CACHE_SUM GWY_DATA_FIELD_CACHE_VAR GWY_DATA_ITEM_CALDATA GWY_DATA_ITEM_GRADIENT GWY_DATA_ITEM_MASK_COLOR GWY_DATA_ITEM_META GWY_DATA_ITEM_PALETTE GWY_DATA_ITEM_PREVIEW GWY_DATA_ITEM_RANGE GWY_DATA_ITEM_RANGE_TYPE GWY_DATA_ITEM_REAL_SQUARE GWY_DATA_ITEM_SELECTIONS GWY_DATA_ITEM_TITLE GWY_DATA_VALIDATE_ALL GWY_DATA_VALIDATE_CORRECT GWY_DATA_VALIDATE_NO_REPORT GWY_DATA_VALIDATE_REF_COUNT GWY_DATA_VALIDATE_UNKNOWN GWY_DATA_VIEW_LAYER_ALPHA GWY_DATA_VIEW_LAYER_BASE GWY_DATA_VIEW_LAYER_TOP GWY_DATA_WATCH_EVENT_ADDED GWY_DATA_WATCH_EVENT_CHANGED GWY_DATA_WATCH_EVENT_REMOVED GWY_DEBUG_OBJECTS_DUMP_ONLY_ALIVE GWY_DIALOG_CANCEL GWY_DIALOG_HAVE_RESULT GWY_DIALOG_PROCEED GWY_DIMS_BUTTON_TAKE GWY_DIMS_HEADER_CURRENT_IMAGE GWY_DIMS_HEADER_PHYSICAL GWY_DIMS_HEADER_PIXEL GWY_DIMS_HEADER_UNITS GWY_DIMS_PARAM_INITIALIZE GWY_DIMS_PARAM_REPLACE GWY_DIMS_PARAM_SQUARE_IMAGE GWY_DIMS_PARAM_SQUARE_PIXELS GWY_DIMS_PARAM_XREAL GWY_DIMS_PARAM_XRES GWY_DIMS_PARAM_XYUNIT GWY_DIMS_PARAM_YREAL GWY_DIMS_PARAM_YRES GWY_DIMS_PARAM_ZUNIT GWY_DISTANCE_TRANSFORM_CHESS GWY_DISTANCE_TRANSFORM_CITYBLOCK GWY_DISTANCE_TRANSFORM_CONN4 GWY_DISTANCE_TRANSFORM_CONN8 GWY_DISTANCE_TRANSFORM_EUCLIDEAN GWY_DISTANCE_TRANSFORM_OCTAGONAL GWY_DISTANCE_TRANSFORM_OCTAGONAL48 GWY_DISTANCE_TRANSFORM_OCTAGONAL84 GWY_DWT_DAUB12 GWY_DWT_DAUB20 GWY_DWT_DAUB4 GWY_DWT_DAUB6 GWY_DWT_DAUB8 GWY_DWT_DENOISE_SCALE_ADAPTIVE GWY_DWT_DENOISE_SPACE_ADAPTIVE GWY_DWT_DENOISE_UNIVERSAL GWY_DWT_HAAR GWY_EXPR_ERROR_CLOSING_PARENTHESIS GWY_EXPR_ERROR_CONSTANT_NAME GWY_EXPR_ERROR_EMPTY GWY_EXPR_ERROR_EMPTY_PARENTHESES GWY_EXPR_ERROR_GARBAGE GWY_EXPR_ERROR_INVALID_ARGUMENT GWY_EXPR_ERROR_INVALID_TOKEN GWY_EXPR_ERROR_MISSING_ARGUMENT GWY_EXPR_ERROR_NOT_EXECUTABLE GWY_EXPR_ERROR_OPENING_PARENTHESIS GWY_EXPR_ERROR_STRAY_COMMA GWY_EXPR_ERROR_UNRESOLVED_IDENTIFIERS GWY_EXTERIOR_BORDER_EXTEND GWY_EXTERIOR_FIXED_VALUE GWY_EXTERIOR_LAPLACE GWY_EXTERIOR_MIRROR_EXTEND GWY_EXTERIOR_PERIODIC GWY_EXTERIOR_UNDEFINED GWY_FILE_OPERATION_DETECT GWY_FILE_OPERATION_EXPORT GWY_FILE_OPERATION_LOAD GWY_FILE_OPERATION_MASK GWY_FILE_OPERATION_SAVE GWY_GRAIN_VALUE_BOUNDARY_MAXIMUM GWY_GRAIN_VALUE_BOUNDARY_MINIMUM GWY_GRAIN_VALUE_CENTER_X GWY_GRAIN_VALUE_CENTER_Y GWY_GRAIN_VALUE_CIRCUMCIRCLE_R GWY_GRAIN_VALUE_CIRCUMCIRCLE_X GWY_GRAIN_VALUE_CIRCUMCIRCLE_Y GWY_GRAIN_VALUE_CONVEX_HULL_AREA GWY_GRAIN_VALUE_CURVATURE1 GWY_GRAIN_VALUE_CURVATURE2 GWY_GRAIN_VALUE_CURVATURE_ANGLE1 GWY_GRAIN_VALUE_CURVATURE_ANGLE2 GWY_GRAIN_VALUE_CURVATURE_CENTER_X GWY_GRAIN_VALUE_CURVATURE_CENTER_Y GWY_GRAIN_VALUE_CURVATURE_CENTER_Z GWY_GRAIN_VALUE_EQUIV_DISC_RADIUS GWY_GRAIN_VALUE_EQUIV_ELLIPSE_ANGLE GWY_GRAIN_VALUE_EQUIV_ELLIPSE_MAJOR GWY_GRAIN_VALUE_EQUIV_ELLIPSE_MINOR GWY_GRAIN_VALUE_EQUIV_SQUARE_SIDE GWY_GRAIN_VALUE_FLAT_BOUNDARY_LENGTH GWY_GRAIN_VALUE_GROUP_AREA GWY_GRAIN_VALUE_GROUP_BOUNDARY GWY_GRAIN_VALUE_GROUP_CURVATURE GWY_GRAIN_VALUE_GROUP_ID GWY_GRAIN_VALUE_GROUP_MOMENT GWY_GRAIN_VALUE_GROUP_POSITION GWY_GRAIN_VALUE_GROUP_SLOPE GWY_GRAIN_VALUE_GROUP_USER GWY_GRAIN_VALUE_GROUP_VALUE GWY_GRAIN_VALUE_GROUP_VOLUME GWY_GRAIN_VALUE_HALF_HEIGHT_AREA GWY_GRAIN_VALUE_INSCRIBED_DISC_R GWY_GRAIN_VALUE_INSCRIBED_DISC_X GWY_GRAIN_VALUE_INSCRIBED_DISC_Y GWY_GRAIN_VALUE_IS_ANGLE GWY_GRAIN_VALUE_MAXIMUM GWY_GRAIN_VALUE_MAXIMUM_BOUND_ANGLE GWY_GRAIN_VALUE_MAXIMUM_BOUND_SIZE GWY_GRAIN_VALUE_MAXIMUM_MARTIN_ANGLE GWY_GRAIN_VALUE_MAXIMUM_MARTIN_DIAMETER GWY_GRAIN_VALUE_MEAN GWY_GRAIN_VALUE_MEAN_RADIUS GWY_GRAIN_VALUE_MEDIAN GWY_GRAIN_VALUE_MINIMUM GWY_GRAIN_VALUE_MINIMUM_BOUND_ANGLE GWY_GRAIN_VALUE_MINIMUM_BOUND_SIZE GWY_GRAIN_VALUE_MINIMUM_MARTIN_ANGLE GWY_GRAIN_VALUE_MINIMUM_MARTIN_DIAMETER GWY_GRAIN_VALUE_PIXEL_AREA GWY_GRAIN_VALUE_PROJECTED_AREA GWY_GRAIN_VALUE_RMS GWY_GRAIN_VALUE_SAME_UNITS GWY_GRAIN_VALUE_SLOPE_PHI GWY_GRAIN_VALUE_SLOPE_THETA GWY_GRAIN_VALUE_STORE_COLUMN_ENABLED GWY_GRAIN_VALUE_STORE_COLUMN_GROUP GWY_GRAIN_VALUE_STORE_COLUMN_ITEM GWY_GRAIN_VALUE_SURFACE_AREA GWY_GRAIN_VALUE_VOLUME_0 GWY_GRAIN_VALUE_VOLUME_LAPLACE GWY_GRAIN_VALUE_VOLUME_MIN GWY_GRAPH_CURVE_HIDDEN GWY_GRAPH_CURVE_LINE GWY_GRAPH_CURVE_LINE_POINTS GWY_GRAPH_CURVE_POINTS GWY_GRAPH_GRID_AUTO GWY_GRAPH_GRID_NONE GWY_GRAPH_GRID_USER GWY_GRAPH_LABEL_NORTHEAST GWY_GRAPH_LABEL_NORTHWEST GWY_GRAPH_LABEL_SOUTHEAST GWY_GRAPH_LABEL_SOUTHWEST GWY_GRAPH_LABEL_USER GWY_GRAPH_MODEL_EXPORT_ASCII_CSV GWY_GRAPH_MODEL_EXPORT_ASCII_GNUPLOT GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED GWY_GRAPH_MODEL_EXPORT_ASCII_ORIGIN GWY_GRAPH_MODEL_EXPORT_ASCII_PLAIN GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX GWY_GRAPH_POINT_ASTERISK GWY_GRAPH_POINT_CIRCLE GWY_GRAPH_POINT_CROSS GWY_GRAPH_POINT_DIAMOND GWY_GRAPH_POINT_DISC GWY_GRAPH_POINT_FILLED_CIRCLE GWY_GRAPH_POINT_FILLED_DIAMOND GWY_GRAPH_POINT_FILLED_SQUARE GWY_GRAPH_POINT_FILLED_TRIANGLE_DOWN GWY_GRAPH_POINT_FILLED_TRIANGLE_LEFT GWY_GRAPH_POINT_FILLED_TRIANGLE_RIGHT GWY_GRAPH_POINT_FILLED_TRIANGLE_UP GWY_GRAPH_POINT_SQUARE GWY_GRAPH_POINT_STAR GWY_GRAPH_POINT_TIMES GWY_GRAPH_POINT_TRIANGLE_DOWN GWY_GRAPH_POINT_TRIANGLE_LEFT GWY_GRAPH_POINT_TRIANGLE_RIGHT GWY_GRAPH_POINT_TRIANGLE_UP GWY_GRAPH_STATUS_PLAIN GWY_GRAPH_STATUS_POINTS GWY_GRAPH_STATUS_XLINES GWY_GRAPH_STATUS_XSEL GWY_GRAPH_STATUS_YLINES GWY_GRAPH_STATUS_YSEL GWY_GRAPH_STATUS_ZOOM GWY_HELP_DEFAULT GWY_HELP_NO_BUTTON GWY_HOLD_SELECTION_CLEAR GWY_HOLD_SELECTION_HOLD GWY_HOLD_SELECTION_OVERWRITE GWY_HSCALE_CHECK GWY_HSCALE_DEFAULT GWY_HSCALE_LINEAR GWY_HSCALE_LOG GWY_HSCALE_NO_SCALE GWY_HSCALE_SNAP GWY_HSCALE_SQRT GWY_HSCALE_WIDGET GWY_HSCALE_WIDGET_NO_EXPAND GWY_INTERPOLATION_BILINEAR GWY_INTERPOLATION_BSPLINE GWY_INTERPOLATION_KEY GWY_INTERPOLATION_LINEAR GWY_INTERPOLATION_NNA GWY_INTERPOLATION_NONE GWY_INTERPOLATION_OMOMS GWY_INTERPOLATION_ROUND GWY_INTERPOLATION_SCHAUM GWY_LAYER_BASIC_RANGE_ADAPT GWY_LAYER_BASIC_RANGE_AUTO GWY_LAYER_BASIC_RANGE_FIXED GWY_LAYER_BASIC_RANGE_FULL GWY_LINE_STAT_KURTOSIS GWY_LINE_STAT_LENGTH GWY_LINE_STAT_MAXIMUM GWY_LINE_STAT_MAXPOS GWY_LINE_STAT_MEAN GWY_LINE_STAT_MEDIAN GWY_LINE_STAT_MINIMUM GWY_LINE_STAT_MINPOS GWY_LINE_STAT_RA GWY_LINE_STAT_RANGE GWY_LINE_STAT_RMS GWY_LINE_STAT_RT GWY_LINE_STAT_RZ GWY_LINE_STAT_SKEW GWY_LINE_STAT_SLOPE GWY_LINE_STAT_TAN_BETA0 GWY_LINE_STAT_VARIATION GWY_MARKER_OPERATION_ADD GWY_MARKER_OPERATION_MOVE GWY_MARKER_OPERATION_REMOVE GWY_MASK_EXCLUDE GWY_MASK_IGNORE GWY_MASK_INCLUDE GWY_MENU_FLAG_3D GWY_MENU_FLAG_CURVE_MAP GWY_MENU_FLAG_DATA GWY_MENU_FLAG_DATA_MASK GWY_MENU_FLAG_DATA_SHOW GWY_MENU_FLAG_FILE GWY_MENU_FLAG_GRAPH GWY_MENU_FLAG_GRAPH_CURVE GWY_MENU_FLAG_LAST_GRAPH GWY_MENU_FLAG_LAST_PROC GWY_MENU_FLAG_MASK GWY_MENU_FLAG_REDO GWY_MENU_FLAG_UNDO GWY_MENU_FLAG_VOLUME GWY_MENU_FLAG_XYZ GWY_MERGE_INTERSECTION GWY_MERGE_UNION GWY_MFM_COMPONENT_D2HZ_DZ2 GWY_MFM_COMPONENT_DHZ_DZ GWY_MFM_COMPONENT_HX GWY_MFM_COMPONENT_HY GWY_MFM_COMPONENT_HZ GWY_MFM_GRADIENT_FORCE GWY_MFM_GRADIENT_MFM GWY_MFM_GRADIENT_MFM_AREA GWY_MFM_PROBE_BAR GWY_MFM_PROBE_CHARGE GWY_MIN_MAX_FILTER_CLOSING GWY_MIN_MAX_FILTER_DILATION GWY_MIN_MAX_FILTER_EROSION GWY_MIN_MAX_FILTER_MAXIMUM GWY_MIN_MAX_FILTER_MINIMUM GWY_MIN_MAX_FILTER_NORMALIZATION GWY_MIN_MAX_FILTER_OPENING GWY_MIN_MAX_FILTER_RANGE GWY_MODULE_ERROR_ABI GWY_MODULE_ERROR_DUPLICATE GWY_MODULE_ERROR_INFO GWY_MODULE_ERROR_NAME GWY_MODULE_ERROR_NESTING GWY_MODULE_ERROR_OPEN GWY_MODULE_ERROR_QUERY GWY_MODULE_ERROR_REGISTER GWY_MODULE_FILE_ERROR_CANCELED GWY_MODULE_FILE_ERROR_CANCELLED GWY_MODULE_FILE_ERROR_DATA GWY_MODULE_FILE_ERROR_INTERACTIVE GWY_MODULE_FILE_ERROR_IO GWY_MODULE_FILE_ERROR_SPECIFIC GWY_MODULE_FILE_ERROR_UNIMPLEMENTED GWY_NLFIT_PARAM_ABSVAL GWY_NLFIT_PARAM_ANGLE GWY_ORIENTATION_HORIZONTAL GWY_ORIENTATION_VERTICAL GWY_PAGE_CHANNELS GWY_PAGE_CURVE_MAPS GWY_PAGE_GRAPHS GWY_PAGE_NOPAGE GWY_PAGE_SPECTRA GWY_PAGE_VOLUMES GWY_PAGE_XYZS GWY_PARAM_STRING_DO_NOT_STRIP GWY_PARAM_STRING_EMPTY_IS_NULL GWY_PARAM_STRING_NULL_IS_EMPTY GWY_PEAK_ABSCISSA GWY_PEAK_AREA GWY_PEAK_BACKGROUND_MMSTEP GWY_PEAK_BACKGROUND_ZERO GWY_PEAK_HEIGHT GWY_PEAK_ORDER_ABSCISSA GWY_PEAK_ORDER_PROMINENCE GWY_PEAK_PROMINENCE GWY_PEAK_WIDTH GWY_PERCENTILE_INTERPOLATION_HIGHER GWY_PERCENTILE_INTERPOLATION_LINEAR GWY_PERCENTILE_INTERPOLATION_LOWER GWY_PERCENTILE_INTERPOLATION_MIDPOINT GWY_PERCENTILE_INTERPOLATION_NEAREST GWY_PLAIN_TOOL_CHANGED_DATA GWY_PLAIN_TOOL_CHANGED_MASK GWY_PLAIN_TOOL_CHANGED_SELECTION GWY_PLAIN_TOOL_CHANGED_SHOW GWY_PLAIN_TOOL_FINISHED_SELECTION GWY_PLANE_FIT_A GWY_PLANE_FIT_ANGLE GWY_PLANE_FIT_BX GWY_PLANE_FIT_BY GWY_PLANE_FIT_S0 GWY_PLANE_FIT_S0_REDUCED GWY_PLANE_FIT_SLOPE GWY_PREVIEW_IMMEDIATE GWY_PREVIEW_NONE GWY_PREVIEW_SURFACE_DENSITY GWY_PREVIEW_SURFACE_FILL GWY_PREVIEW_UPON_REQUEST GWY_RAW_DATA_DOUBLE GWY_RAW_DATA_FLOAT GWY_RAW_DATA_HALF GWY_RAW_DATA_REAL GWY_RAW_DATA_SINT16 GWY_RAW_DATA_SINT32 GWY_RAW_DATA_SINT64 GWY_RAW_DATA_SINT8 GWY_RAW_DATA_UINT16 GWY_RAW_DATA_UINT32 GWY_RAW_DATA_UINT64 GWY_RAW_DATA_UINT8 GWY_RENDERING_TARGET_PIXMAP_IMAGE GWY_RENDERING_TARGET_SCREEN GWY_RESPONSE_CLEAR GWY_RESPONSE_RESET GWY_RESPONSE_SYNTH_INIT_Z GWY_RESPONSE_SYNTH_TAKE_DIMS GWY_RESPONSE_UPDATE GWY_RESULTS_EXPORT_FIXED_FORMAT GWY_RESULTS_EXPORT_PARAMETERS GWY_RESULTS_EXPORT_TABULAR_DATA GWY_RESULTS_REPORT_COLON GWY_RESULTS_REPORT_CSV GWY_RESULTS_REPORT_MACHINE GWY_RESULTS_REPORT_TABSEP GWY_RESULTS_VALUE_FLOAT GWY_RESULTS_VALUE_INT GWY_RESULTS_VALUE_STRING GWY_RESULTS_VALUE_YESNO GWY_ROTATE_RESIZE_CUT GWY_ROTATE_RESIZE_EXPAND GWY_ROTATE_RESIZE_SAME_SIZE GWY_RUN_IMMEDIATE GWY_RUN_INTERACTIVE GWY_RUN_MASK GWY_RUN_NONE GWY_RUN_NONINTERACTIVE GWY_SCALE_MAPPING_LINEAR GWY_SCALE_MAPPING_LOG GWY_SCALE_MAPPING_LOG1P GWY_SCALE_MAPPING_SQRT GWY_SI_UNIT_FORMAT_MARKUP GWY_SI_UNIT_FORMAT_NONE GWY_SI_UNIT_FORMAT_PLAIN GWY_SI_UNIT_FORMAT_TEX GWY_SI_UNIT_FORMAT_UNICODE GWY_SI_UNIT_FORMAT_VFMARKUP GWY_SI_UNIT_FORMAT_VFTEX GWY_SI_UNIT_FORMAT_VFUNICODE GWY_SYMMETRY_AUTO GWY_SYMMETRY_HEXAGONAL GWY_SYMMETRY_LAST GWY_SYMMETRY_PARALLEL GWY_SYMMETRY_RHOMBIC GWY_SYMMETRY_SQUARE GWY_SYMMETRY_TRIANGULAR GWY_SYNTH_FIXED_UNITS GWY_SYNTH_FIXED_XYUNIT GWY_SYNTH_FIXED_ZUNIT GWY_SYNTH_NO_INITIALIZE GWY_SYNTH_UPDATE_CANCELLED GWY_SYNTH_UPDATE_DO_PREVIEW GWY_SYNTH_UPDATE_NOTHING GWY_TEXT_HEADER_ERROR_GARBAGE GWY_TEXT_HEADER_ERROR_KEY GWY_TEXT_HEADER_ERROR_PREFIX GWY_TEXT_HEADER_ERROR_SECTION_END GWY_TEXT_HEADER_ERROR_SECTION_NAME GWY_TEXT_HEADER_ERROR_SECTION_START GWY_TEXT_HEADER_ERROR_TERMINATOR GWY_TEXT_HEADER_ERROR_VALUE GWY_TICKS_STYLE_AUTO GWY_TICKS_STYLE_CENTER GWY_TICKS_STYLE_NONE GWY_TICKS_STYLE_UNLABELED GWY_TICKS_STYLE_UNLABELLED GWY_TIP_BALL_ON_STICK GWY_TIP_CONE GWY_TIP_CONTACT GWY_TIP_DELTA GWY_TIP_ELLPARABOLA GWY_TIP_NONCONTACT GWY_TIP_PARABOLA GWY_TIP_PARAM_ANISOTROPY GWY_TIP_PARAM_HEIGHT GWY_TIP_PARAM_NSIDES GWY_TIP_PARAM_RADIUS GWY_TIP_PARAM_ROTATION GWY_TIP_PARAM_SLOPE GWY_TIP_PYRAMID GWY_TIP_PYRAMIDE GWY_TOOL_RESPONSE_CLEAR GWY_TOOL_RESPONSE_UPDATE GWY_TRANSFORM_DIRECTION_BACKWARD GWY_TRANSFORM_DIRECTION_FORWARD GWY_UNITS_PLACEMENT_AT_ZERO GWY_UNITS_PLACEMENT_NONE GWY_VISIBILITY_RESET_DEFAULT GWY_VISIBILITY_RESET_HIDE_ALL GWY_VISIBILITY_RESET_RESTORE GWY_VISIBILITY_RESET_SHOW_ALL GWY_WATERSHED_STATE_FINISHED GWY_WATERSHED_STATE_INIT GWY_WATERSHED_STATE_LOCATE GWY_WATERSHED_STATE_MARK GWY_WATERSHED_STATE_MIN GWY_WATERSHED_STATE_WATERSHED GWY_WINDOWING_BLACKMANN GWY_WINDOWING_FLAT_TOP GWY_WINDOWING_HAMMING GWY_WINDOWING_HANN GWY_WINDOWING_KAISER25 GWY_WINDOWING_LANCZOS GWY_WINDOWING_NONE GWY_WINDOWING_NUTTALL GWY_WINDOWING_RECT GWY_WINDOWING_WELCH +syn keyword gwyddionStruct Gwy3DLabel Gwy3DLabelClass Gwy3DSetup Gwy3DSetupClass Gwy3DView Gwy3DViewClass Gwy3DWindow Gwy3DWindowClass GwyAdjustBar GwyAdjustBarClass GwyAppDataId GwyAxis GwyAxisClass GwyAxisParams GwyBrick GwyBrickClass GwyBrickPart GwyCDLine GwyCDLineBuiltin GwyCDLineClass GwyCalData GwyCalDataClass GwyCalibration GwyCalibrationClass GwyChannelData GwyColorAxis GwyColorAxisClass GwyColorButton GwyColorButtonClass GwyComputationState GwyContainer GwyContainerClass GwyCurve GwyCurveCalibrationData GwyCurveClass GwyDataChooser GwyDataChooserClass GwyDataField GwyDataFieldClass GwyDataLine GwyDataLineClass GwyDataValidationFailure GwyDataView GwyDataViewClass GwyDataViewLayer GwyDataViewLayerClass GwyDataWindow GwyDataWindowClass GwyDialog GwyDialogClass GwyEnum GwyExpr GwyFDCurvePreset GwyFDCurvePresetBuiltin GwyFDCurvePresetClass GwyFileDetectInfo GwyFunctionUse GwyGLMaterial GwyGLMaterialClass GwyGradient GwyGradientClass GwyGradientPoint GwyGrainValue GwyGrainValueClass GwyGrainValueData GwyGraph GwyGraphActiveAreaSpecs GwyGraphArea GwyGraphAreaClass GwyGraphClass GwyGraphCorner GwyGraphCornerClass GwyGraphCurveModel GwyGraphCurveModelClass GwyGraphCurves GwyGraphCurvesClass GwyGraphData GwyGraphDataClass GwyGraphLabel GwyGraphLabelClass GwyGraphModel GwyGraphModelClass GwyGraphWindow GwyGraphWindowClass GwyHMarkerBox GwyHMarkerBoxClass GwyHRuler GwyHRulerClass GwyInventory GwyInventoryClass GwyInventoryItemType GwyInventoryStore GwyInventoryStoreClass GwyLawn GwyLawnClass GwyLayerBasic GwyLayerBasicClass GwyLayerMask GwyLayerMaskClass GwyMarkerBox GwyMarkerBoxClass GwyModuleFailureInfo GwyModuleInfo GwyModuleRecord GwyNLFitPreset GwyNLFitPresetBuiltin GwyNLFitPresetClass GwyNLFitter GwyNullStore GwyNullStoreClass GwyParamDef GwyParamDefClass GwyParamResource GwyParamResourceClass GwyParamTable GwyParamTableClass GwyParams GwyParamsClass GwyPeaks GwyPixmapLayer GwyPixmapLayerClass GwyPlainTool GwyPlainToolClass GwyRGBA GwyRandGenSet GwyRectSelectionLabels GwyResource GwyResourceClass GwyResourceEditor GwyResourceEditorClass GwyResults GwyResultsClass GwyResultsExport GwyResultsExportClass GwyRuler GwyRulerClass GwySIUnit GwySIUnitClass GwySIValueFormat GwySciText GwySciTextClass GwySelection GwySelectionClass GwySelectionGraph1DArea GwySelectionGraph1DAreaClass GwySelectionGraphArea GwySelectionGraphAreaClass GwySelectionGraphLine GwySelectionGraphLineClass GwySelectionGraphPoint GwySelectionGraphPointClass GwySelectionGraphZoom GwySelectionGraphZoomClass GwySensitivityGroup GwySensitivityGroupClass GwySerializable GwySerializableIface GwySerializeItem GwySerializeSpec GwyShader GwyShaderClass GwyShapeFitPreset GwyShapeFitPresetClass GwySpectra GwySpectraClass GwySpline GwyStatusbar GwyStatusbarClass GwyStringList GwyStringListClass GwySurface GwySurfaceClass GwyTextEntity GwyTextHeaderContext GwyTextHeaderParser GwyTool GwyToolClass GwyToolHeldSelection GwyTriangulation GwyTriangulationClass GwyTriangulationData GwyVRuler GwyVRulerClass GwyVectorLayer GwyVectorLayerClass GwyXY GwyXYZ syn keyword gwyddionUnion GwySerializeValue syn keyword gwyddionMacro GWY_3D_LABEL GWY_3D_LABEL_CLASS GWY_3D_LABEL_GET_CLASS GWY_3D_SETUP GWY_3D_SETUP_CLASS GWY_3D_SETUP_GET_CLASS GWY_3D_VIEW GWY_3D_VIEW_CLASS GWY_3D_VIEW_GET_CLASS GWY_3D_WINDOW GWY_3D_WINDOW_CLASS GWY_3D_WINDOW_GET_CLASS GWY_ADJUST_BAR GWY_ADJUST_BAR_CLASS GWY_ADJUST_BAR_GET_CLASS GWY_AXIS GWY_AXIS_CLASS GWY_AXIS_GET_CLASS GWY_BRICK GWY_BRICK_CLASS GWY_BRICK_GET_CLASS GWY_CALDATA GWY_CALDATA_CLASS GWY_CALDATA_GET_CLASS GWY_CALIBRATION GWY_CALIBRATION_CLASS GWY_CALIBRATION_GET_CLASS GWY_CDLINE GWY_CDLINE_CLASS GWY_CDLINE_GET_CLASS GWY_CLAMP GWY_COLOR_AXIS GWY_COLOR_AXIS_CLASS GWY_COLOR_AXIS_GET_CLASS GWY_COLOR_BUTTON GWY_COLOR_BUTTON_CLASS GWY_COLOR_BUTTON_GET_CLASS GWY_CONTAINER GWY_CONTAINER_CLASS GWY_CONTAINER_GET_CLASS GWY_CURVE GWY_CURVE_CLASS GWY_CURVE_GET_CLASS GWY_DATA_CHOOSER GWY_DATA_CHOOSER_CLASS GWY_DATA_CHOOSER_GET_CLASS GWY_DATA_FIELD GWY_DATA_FIELD_CLASS GWY_DATA_FIELD_GET_CLASS GWY_DATA_LINE GWY_DATA_LINE_CLASS GWY_DATA_LINE_GET_CLASS GWY_DATA_VIEW GWY_DATA_VIEW_CLASS GWY_DATA_VIEW_GET_CLASS GWY_DATA_VIEW_LAYER GWY_DATA_VIEW_LAYER_CLASS GWY_DATA_VIEW_LAYER_GET_CLASS GWY_DATA_WINDOW GWY_DATA_WINDOW_CLASS GWY_DATA_WINDOW_GET_CLASS GWY_DIALOG GWY_DIALOG_CLASS GWY_DIALOG_GET_CLASS GWY_FD_CURVE_PRESET GWY_FD_CURVE_PRESET_CLASS GWY_FD_CURVE_PRESET_GET_CLASS GWY_FIND_PSPEC GWY_FREE GWY_GL_MATERIAL GWY_GL_MATERIAL_CLASS GWY_GL_MATERIAL_GET_CLASS GWY_GRADIENT GWY_GRADIENT_CLASS GWY_GRADIENT_GET_CLASS GWY_GRAIN_VALUE GWY_GRAIN_VALUE_CLASS GWY_GRAIN_VALUE_GET_CLASS GWY_GRAPH GWY_GRAPH_AREA GWY_GRAPH_AREA_CLASS GWY_GRAPH_AREA_GET_CLASS GWY_GRAPH_CLASS GWY_GRAPH_CORNER GWY_GRAPH_CORNER_CLASS GWY_GRAPH_CORNER_GET_CLASS GWY_GRAPH_CURVES GWY_GRAPH_CURVES_CLASS GWY_GRAPH_CURVES_GET_CLASS GWY_GRAPH_CURVE_MODEL GWY_GRAPH_CURVE_MODEL_CLASS GWY_GRAPH_CURVE_MODEL_GET_CLASS GWY_GRAPH_DATA GWY_GRAPH_DATA_CLASS GWY_GRAPH_DATA_GET_CLASS GWY_GRAPH_GET_CLASS GWY_GRAPH_LABEL GWY_GRAPH_LABEL_CLASS GWY_GRAPH_LABEL_GET_CLASS GWY_GRAPH_MODEL GWY_GRAPH_MODEL_CLASS GWY_GRAPH_MODEL_GET_CLASS GWY_GRAPH_WINDOW GWY_GRAPH_WINDOW_CLASS GWY_GRAPH_WINDOW_GET_CLASS GWY_HMARKER_BOX GWY_HMARKER_BOX_CLASS GWY_HMARKER_BOX_GET_CLASS GWY_HRULER GWY_HRULER_CLASS GWY_HRULER_GET_CLASS GWY_IMPLEMENT_SERIALIZABLE GWY_INVENTORY GWY_INVENTORY_CLASS GWY_INVENTORY_GET_CLASS GWY_INVENTORY_STORE GWY_INVENTORY_STORE_CLASS GWY_INVENTORY_STORE_GET_CLASS GWY_IS_3D_LABEL GWY_IS_3D_LABEL_CLASS GWY_IS_3D_SETUP GWY_IS_3D_SETUP_CLASS GWY_IS_3D_VIEW GWY_IS_3D_VIEW_CLASS GWY_IS_3D_WINDOW GWY_IS_3D_WINDOW_CLASS GWY_IS_ADJUST_BAR GWY_IS_ADJUST_BAR_CLASS GWY_IS_AXIS GWY_IS_AXIS_CLASS GWY_IS_BRICK GWY_IS_BRICK_CLASS GWY_IS_CALDATA GWY_IS_CALDATA_CLASS GWY_IS_CALIBRATION GWY_IS_CALIBRATION_CLASS GWY_IS_CDLINE GWY_IS_CDLINE_CLASS GWY_IS_COLOR_AXIS GWY_IS_COLOR_AXIS_CLASS GWY_IS_COLOR_BUTTON GWY_IS_COLOR_BUTTON_CLASS GWY_IS_CONTAINER GWY_IS_CONTAINER_CLASS GWY_IS_CURVE GWY_IS_CURVE_CLASS GWY_IS_DATA_CHOOSER GWY_IS_DATA_CHOOSER_CLASS GWY_IS_DATA_FIELD GWY_IS_DATA_FIELD_CLASS GWY_IS_DATA_LINE GWY_IS_DATA_LINE_CLASS GWY_IS_DATA_VIEW GWY_IS_DATA_VIEW_CLASS GWY_IS_DATA_VIEW_LAYER GWY_IS_DATA_VIEW_LAYER_CLASS GWY_IS_DATA_WINDOW GWY_IS_DATA_WINDOW_CLASS GWY_IS_DIALOG GWY_IS_DIALOG_CLASS GWY_IS_FD_CURVE_PRESET GWY_IS_FD_CURVE_PRESET_CLASS GWY_IS_GL_MATERIAL GWY_IS_GL_MATERIAL_CLASS GWY_IS_GRADIENT GWY_IS_GRADIENT_CLASS GWY_IS_GRAIN_VALUE GWY_IS_GRAIN_VALUE_CLASS GWY_IS_GRAPH GWY_IS_GRAPH_AREA GWY_IS_GRAPH_AREA_CLASS GWY_IS_GRAPH_CLASS GWY_IS_GRAPH_CORNER GWY_IS_GRAPH_CORNER_CLASS GWY_IS_GRAPH_CURVES GWY_IS_GRAPH_CURVES_CLASS GWY_IS_GRAPH_CURVE_MODEL GWY_IS_GRAPH_CURVE_MODEL_CLASS GWY_IS_GRAPH_DATA GWY_IS_GRAPH_DATA_CLASS GWY_IS_GRAPH_LABEL GWY_IS_GRAPH_LABEL_CLASS GWY_IS_GRAPH_MODEL GWY_IS_GRAPH_MODEL_CLASS GWY_IS_GRAPH_WINDOW GWY_IS_GRAPH_WINDOW_CLASS GWY_IS_HMARKER_BOX GWY_IS_HMARKER_BOX_CLASS GWY_IS_HRULER GWY_IS_HRULER_CLASS GWY_IS_INVENTORY GWY_IS_INVENTORY_CLASS GWY_IS_INVENTORY_STORE GWY_IS_INVENTORY_STORE_CLASS GWY_IS_LAWN GWY_IS_LAWN_CLASS GWY_IS_LAYER_BASIC GWY_IS_LAYER_BASIC_CLASS GWY_IS_LAYER_MASK GWY_IS_LAYER_MASK_CLASS GWY_IS_MARKER_BOX GWY_IS_MARKER_BOX_CLASS GWY_IS_NLFIT_PRESET GWY_IS_NLFIT_PRESET_CLASS GWY_IS_NULL_STORE GWY_IS_NULL_STORE_CLASS GWY_IS_PARAMS GWY_IS_PARAMS_CLASS GWY_IS_PARAM_DEF GWY_IS_PARAM_DEF_CLASS GWY_IS_PARAM_RESOURCE GWY_IS_PARAM_RESOURCE_CLASS GWY_IS_PARAM_TABLE GWY_IS_PARAM_TABLE_CLASS GWY_IS_PIXMAP_LAYER GWY_IS_PIXMAP_LAYER_CLASS GWY_IS_PLAIN_TOOL GWY_IS_PLAIN_TOOL_CLASS GWY_IS_RESOURCE GWY_IS_RESOURCE_CLASS GWY_IS_RESOURCE_EDITOR GWY_IS_RESOURCE_EDITOR_CLASS GWY_IS_RESULTS GWY_IS_RESULTS_CLASS GWY_IS_RESULTS_EXPORT GWY_IS_RESULTS_EXPORT_CLASS GWY_IS_RULER GWY_IS_RULER_CLASS GWY_IS_SCI_TEXT GWY_IS_SCI_TEXT_CLASS GWY_IS_SELECTION GWY_IS_SELECTION_CLASS GWY_IS_SELECTION_GRAPH_1DAREA GWY_IS_SELECTION_GRAPH_1DAREA_CLASS GWY_IS_SELECTION_GRAPH_AREA GWY_IS_SELECTION_GRAPH_AREA_CLASS GWY_IS_SELECTION_GRAPH_LINE GWY_IS_SELECTION_GRAPH_LINE_CLASS GWY_IS_SELECTION_GRAPH_POINT GWY_IS_SELECTION_GRAPH_POINT_CLASS GWY_IS_SELECTION_GRAPH_ZOOM GWY_IS_SELECTION_GRAPH_ZOOM_CLASS GWY_IS_SENSITIVITY_GROUP GWY_IS_SENSITIVITY_GROUP_CLASS GWY_IS_SERIALIZABLE GWY_IS_SHADER GWY_IS_SHADER_CLASS GWY_IS_SHAPE_FIT_PRESET GWY_IS_SHAPE_FIT_PRESET_CLASS GWY_IS_SI_UNIT GWY_IS_SI_UNIT_CLASS GWY_IS_SPECTRA GWY_IS_SPECTRA_CLASS GWY_IS_STATUSBAR GWY_IS_STATUSBAR_CLASS GWY_IS_STRING_LIST GWY_IS_STRING_LIST_CLASS GWY_IS_SURFACE GWY_IS_SURFACE_CLASS GWY_IS_TOOL GWY_IS_TOOL_CLASS GWY_IS_TRIANGULATION GWY_IS_TRIANGULATION_CLASS GWY_IS_VECTOR_LAYER GWY_IS_VECTOR_LAYER_CLASS GWY_IS_VRULER GWY_IS_VRULER_CLASS GWY_LAWN GWY_LAWN_CLASS GWY_LAWN_GET_CLASS GWY_LAYER_BASIC GWY_LAYER_BASIC_CLASS GWY_LAYER_BASIC_GET_CLASS GWY_LAYER_MASK GWY_LAYER_MASK_CLASS GWY_LAYER_MASK_GET_CLASS GWY_MARKER_BOX GWY_MARKER_BOX_CLASS GWY_MARKER_BOX_GET_CLASS GWY_MODULE_QUERY GWY_MODULE_QUERY2 GWY_NLFIT_PRESET GWY_NLFIT_PRESET_CLASS GWY_NLFIT_PRESET_GET_CLASS GWY_NULL_STORE GWY_NULL_STORE_CLASS GWY_NULL_STORE_GET_CLASS GWY_OBJECT_UNREF GWY_ORDER GWY_PARAMS GWY_PARAMS_CLASS GWY_PARAMS_GET_CLASS GWY_PARAM_DEF GWY_PARAM_DEF_CLASS GWY_PARAM_DEF_GET_CLASS GWY_PARAM_RESOURCE GWY_PARAM_RESOURCE_CLASS GWY_PARAM_RESOURCE_GET_CLASS GWY_PARAM_TABLE GWY_PARAM_TABLE_CLASS GWY_PARAM_TABLE_GET_CLASS GWY_PIXMAP_LAYER GWY_PIXMAP_LAYER_CLASS GWY_PIXMAP_LAYER_GET_CLASS GWY_PLAIN_TOOL GWY_PLAIN_TOOL_CLASS GWY_PLAIN_TOOL_GET_CLASS GWY_RESOURCE GWY_RESOURCE_CLASS GWY_RESOURCE_EDITOR GWY_RESOURCE_EDITOR_CLASS GWY_RESOURCE_EDITOR_GET_CLASS GWY_RESOURCE_GET_CLASS GWY_RESULTS GWY_RESULTS_CLASS GWY_RESULTS_EXPORT GWY_RESULTS_EXPORT_CLASS GWY_RESULTS_EXPORT_GET_CLASS GWY_RESULTS_GET_CLASS GWY_ROUND GWY_RULER GWY_RULER_CLASS GWY_RULER_GET_CLASS GWY_SCI_TEXT GWY_SCI_TEXT_CLASS GWY_SCI_TEXT_GET_CLASS GWY_SELECTION GWY_SELECTION_CLASS GWY_SELECTION_GET_CLASS GWY_SELECTION_GRAPH_1DAREA GWY_SELECTION_GRAPH_1DAREA_CLASS GWY_SELECTION_GRAPH_1DAREA_GET_CLASS GWY_SELECTION_GRAPH_AREA GWY_SELECTION_GRAPH_AREA_CLASS GWY_SELECTION_GRAPH_AREA_GET_CLASS GWY_SELECTION_GRAPH_LINE GWY_SELECTION_GRAPH_LINE_CLASS GWY_SELECTION_GRAPH_LINE_GET_CLASS GWY_SELECTION_GRAPH_POINT GWY_SELECTION_GRAPH_POINT_CLASS GWY_SELECTION_GRAPH_POINT_GET_CLASS GWY_SELECTION_GRAPH_ZOOM GWY_SELECTION_GRAPH_ZOOM_CLASS GWY_SELECTION_GRAPH_ZOOM_GET_CLASS GWY_SENSITIVITY_GROUP GWY_SENSITIVITY_GROUP_CLASS GWY_SENSITIVITY_GROUP_GET_CLASS GWY_SERIALIZABLE GWY_SERIALIZABLE_GET_IFACE GWY_SHADER GWY_SHADER_CLASS GWY_SHADER_GET_CLASS GWY_SHAPE_FIT_PRESET GWY_SHAPE_FIT_PRESET_CLASS GWY_SHAPE_FIT_PRESET_GET_CLASS GWY_SIGNAL_HANDLER_DISCONNECT GWY_SI_UNIT GWY_SI_UNIT_CLASS GWY_SI_UNIT_GET_CLASS GWY_SI_VALUE_FORMAT_FREE GWY_SPECTRA GWY_SPECTRA_CLASS GWY_SPECTRA_GET_CLASS GWY_STATUSBAR GWY_STATUSBAR_CLASS GWY_STATUSBAR_GET_CLASS GWY_STRING_LIST GWY_STRING_LIST_CLASS GWY_STRING_LIST_GET_CLASS GWY_SURFACE GWY_SURFACE_CLASS GWY_SURFACE_GET_CLASS GWY_SWAP GWY_TOOL GWY_TOOL_CLASS GWY_TOOL_GET_CLASS GWY_TRIANGULATION GWY_TRIANGULATION_CLASS GWY_TRIANGULATION_GET_CLASS GWY_VECTOR_LAYER GWY_VECTOR_LAYER_CLASS GWY_VECTOR_LAYER_GET_CLASS GWY_VRULER GWY_VRULER_CLASS GWY_VRULER_GET_CLASS N_ acosh asinh atanh cbrt gettext gwy_adjustment_get_int gwy_assign gwy_brick_assign gwy_brick_duplicate gwy_caldata_duplicate gwy_clear gwy_container_contains_by_name gwy_container_duplicate gwy_container_get_boolean_by_name gwy_container_get_double_by_name gwy_container_get_enum_by_name gwy_container_get_int32_by_name gwy_container_get_int64_by_name gwy_container_get_object_by_name gwy_container_get_string_by_name gwy_container_get_uchar_by_name gwy_container_get_value_by_name gwy_container_gis_boolean_by_name gwy_container_gis_double_by_name gwy_container_gis_enum_by_name gwy_container_gis_int32_by_name gwy_container_gis_int64_by_name gwy_container_gis_object_by_name gwy_container_gis_string_by_name gwy_container_gis_uchar_by_name gwy_container_gis_value_by_name gwy_container_remove_by_name gwy_container_rename_by_name gwy_container_set_boolean_by_name gwy_container_set_const_string_by_name gwy_container_set_double_by_name gwy_container_set_enum_by_name gwy_container_set_int32_by_name gwy_container_set_int64_by_name gwy_container_set_object_by_name gwy_container_set_string_by_name gwy_container_set_uchar_by_name gwy_container_value_type_by_name gwy_data_field_assign gwy_data_field_duplicate gwy_data_field_get_xmeasure gwy_data_field_get_ymeasure gwy_data_line_assign gwy_data_line_duplicate gwy_debug gwy_debug_objects_creation gwy_graph_curve_model_duplicate gwy_graph_model_duplicate gwy_info gwy_lawn_assign gwy_lawn_duplicate gwy_object_unref gwy_powi gwy_selection_assign gwy_selection_duplicate gwy_si_unit_assign gwy_si_unit_duplicate gwy_signal_handler_disconnect gwy_spectra_duplicate gwy_strequal gwy_string_list_duplicate gwy_surface_assign gwy_surface_duplicate gwy_vector_layer_get_selection_type hypot ngettext -syn keyword gwyddionEnum Gwy2DCWTWaveletType Gwy3DMovement Gwy3DProjection Gwy3DViewLabel Gwy3DVisualization GwyAffineScalingType GwyAppLoggingFlags GwyAppPage GwyAppSettingsError GwyAppWhat GwyAxisScaleFormat GwyBrickTransposeType GwyByteOrder GwyComputationStateType GwyCorrSearchType GwyCorrelationType GwyCurveChannel GwyCurveType GwyDWTDenoiseType GwyDWTType GwyDataCompatibilityFlags GwyDataError GwyDataFieldCached GwyDataItem GwyDataValidateFlags GwyDataViewLayerType GwyDataWatchEventType GwyDebugObjectsDumpFlags GwyDialogOutcome GwyDistanceTransformType GwyExprError GwyExteriorType GwyFileOperationType GwyGrainQuantity GwyGrainValueFlags GwyGrainValueGroup GwyGrainValueStoreColumn GwyGraphCurveType GwyGraphGridType GwyGraphLabelPosition GwyGraphModelExportStyle GwyGraphPointType GwyGraphStatusType GwyHScaleStyle GwyHelpFlags GwyInterpolationType GwyLayerBasicRangeType GwyLineStatQuantity GwyMFMComponentType GwyMFMGradientType GwyMFMProbeType GwyMarkerOperationType GwyMaskingType GwyMenuSensFlags GwyMergeType GwyMinMaxFilterType GwyModuleError GwyModuleFileError GwyNLFitParamFlags GwyOrientation GwyParamStringFlags GwyPeakBackgroundType GwyPeakOrderType GwyPeakQuantity GwyPercentileInterpolationType GwyPlainToolChanged GwyPlaneFitQuantity GwyPlaneSymmetry GwyPreviewSurfaceFlags GwyPreviewType GwyRawDataType GwyRenderingTarget GwyResponseType GwyResultsExportStyle GwyResultsReportType GwyResultsValueType GwyRotateResizeType GwyRunType GwySIUnitFormatStyle GwyScaleMappingType GwySynthDimsFlags GwySynthDimsParam GwySynthResponseType GwySynthUpdateType GwyTextHeaderError GwyTicksStyle GwyTipParamType GwyTipType GwyToolResponseType GwyTransformDirection GwyUnitsPlacement GwyVisibilityResetType GwyWatershedStateType GwyWindowingType +syn keyword gwyddionEnum Gwy2DCWTWaveletType Gwy3DMovement Gwy3DProjection Gwy3DViewLabel Gwy3DVisualization GwyAffineScalingType GwyAppLoggingFlags GwyAppPage GwyAppSettingsError GwyAppWhat GwyAxisScaleFormat GwyBrickTransposeType GwyByteOrder GwyComputationStateType GwyCorrSearchType GwyCorrelationType GwyCurveChannel GwyCurveType GwyDWTDenoiseType GwyDWTType GwyDataCompatibilityFlags GwyDataError GwyDataFieldCached GwyDataItem GwyDataValidateFlags GwyDataViewLayerType GwyDataWatchEventType GwyDebugObjectsDumpFlags GwyDialogOutcome GwyDistanceTransformType GwyExprError GwyExteriorType GwyFileOperationType GwyGrainQuantity GwyGrainValueFlags GwyGrainValueGroup GwyGrainValueStoreColumn GwyGraphCurveType GwyGraphGridType GwyGraphLabelPosition GwyGraphModelExportStyle GwyGraphPointType GwyGraphStatusType GwyHScaleStyle GwyHelpFlags GwyHoldSelectionFlags GwyInterpolationType GwyLayerBasicRangeType GwyLineStatQuantity GwyMFMComponentType GwyMFMGradientType GwyMFMProbeType GwyMarkerOperationType GwyMaskingType GwyMenuSensFlags GwyMergeType GwyMinMaxFilterType GwyModuleError GwyModuleFileError GwyNLFitParamFlags GwyOrientation GwyParamStringFlags GwyPeakBackgroundType GwyPeakOrderType GwyPeakQuantity GwyPercentileInterpolationType GwyPlainToolChanged GwyPlaneFitQuantity GwyPlaneSymmetry GwyPreviewSurfaceFlags GwyPreviewType GwyRawDataType GwyRenderingTarget GwyResponseType GwyResultsExportStyle GwyResultsReportType GwyResultsValueType GwyRotateResizeType GwyRunType GwySIUnitFormatStyle GwyScaleMappingType GwySynthDimsFlags GwySynthDimsParam GwySynthResponseType GwySynthUpdateType GwyTextHeaderError GwyTicksStyle GwyTipParamType GwyTipType GwyToolResponseType GwyTransformDirection GwyUnitsPlacement GwyVisibilityResetType GwyWatershedStateType GwyWindowingType syn keyword gwyddionUserFunction GwyAppDataForeachFunc GwyAppDataWatchFunc GwyColorAxisMapFunc GwyCoordTransform2DFunc GwyCreateTextFunc GwyCreateWidgetFunc GwyCurveMapFunc GwyCurveReduceFunction GwyDataChooserFilterFunc GwyDeserializeFunc GwyDialogPreviewFunc GwyEnumFilterFunc GwyFileDetectFunc GwyFileLoadFunc GwyFileSaveFunc GwyGraphFunc GwyMarkerValidateFunc GwyModuleBundleRegisterFunc GwyModuleQueryFunc GwyModuleRegisterFunc GwyNLFitDerFunc GwyNLFitFunc GwyNLFitIdxDiffFunc GwyNLFitIdxFunc GwyProcessFunc GwyRealFunc GwyRectifyStringFunc GwyResultsFormatFunc GwySaveAuxiliaryCreate GwySaveAuxiliaryDestroy GwySelectionFilterFunc GwySerializeFunc GwySetFractionFunc GwySetMessageFunc GwyVolumeFunc GwyXYZFunc -syn keyword gwyddionDefine GWY_APP_DATA_ID_NONE GWY_APP_SETTINGS_ERROR GWY_CONTAINER_PATHSEP GWY_CONTAINER_PATHSEP_STR GWY_EXPR_ERROR GWY_FILE_DETECT_BUFFER_SIZE GWY_GL_MATERIAL_DEFAULT GWY_GL_MATERIAL_NONE GWY_GRADIENT_DEFAULT GWY_ICON_SIZE_ABOUT GWY_MODULE_ABI_VERSION GWY_MODULE_BUNDLE_FLAG GWY_MODULE_ERROR GWY_MODULE_FILE_ERROR GWY_SQRT3 GWY_SQRT_PI GWY_STOCK_3D_BASE GWY_STOCK_ARITHMETIC GWY_STOCK_BINNING GWY_STOCK_BOLD GWY_STOCK_CANTILEVER GWY_STOCK_COLOR_RANGE GWY_STOCK_COLOR_RANGE_ADAPTIVE GWY_STOCK_COLOR_RANGE_AUTO GWY_STOCK_COLOR_RANGE_FIXED GWY_STOCK_COLOR_RANGE_FULL GWY_STOCK_CONVOLUTION GWY_STOCK_CONVOLVE GWY_STOCK_CORRECT_AFFINE GWY_STOCK_CORRELATION_LENGTH GWY_STOCK_CORRELATION_MASK GWY_STOCK_CROP GWY_STOCK_CROSS_PROFILE GWY_STOCK_CURVATURE GWY_STOCK_CWT GWY_STOCK_DATA_MEASURE GWY_STOCK_DECONVOLVE GWY_STOCK_DISCONNECTED GWY_STOCK_DISPLACEMENT_FIELD GWY_STOCK_DISTANCE GWY_STOCK_DISTANCE_TRANSFORM GWY_STOCK_DISTRIBUTION_ANGLE GWY_STOCK_DISTRIBUTION_SLOPE GWY_STOCK_DRIFT GWY_STOCK_DWT GWY_STOCK_EDGE GWY_STOCK_ENFORCE_DISTRIBUTION GWY_STOCK_ENTROPY GWY_STOCK_EXTEND GWY_STOCK_EXTRACT_PATH GWY_STOCK_FACET_ANALYSIS GWY_STOCK_FACET_LEVEL GWY_STOCK_FACET_MEASURE GWY_STOCK_FAVOURITE GWY_STOCK_FFT GWY_STOCK_FFT_2D GWY_STOCK_FFT_FILTER_1D GWY_STOCK_FFT_FILTER_2D GWY_STOCK_FILTER GWY_STOCK_FIND_PEAKS GWY_STOCK_FIT_SHAPE GWY_STOCK_FIX_ZERO GWY_STOCK_FLIP_DIAGONALLY GWY_STOCK_FLIP_HORIZONTALLY GWY_STOCK_FLIP_VERTICALLY GWY_STOCK_FRACTAL GWY_STOCK_FRACTAL_CORRECTION GWY_STOCK_FRACTAL_MEASURE GWY_STOCK_FREQUENCY_SPLIT GWY_STOCK_GL_MATERIAL GWY_STOCK_GRADIENT_HORIZONTAL GWY_STOCK_GRADIENT_VERTICAL GWY_STOCK_GRAINS GWY_STOCK_GRAINS_EDGE GWY_STOCK_GRAINS_EDGE_REMOVE GWY_STOCK_GRAINS_GRAPH GWY_STOCK_GRAINS_MEASURE GWY_STOCK_GRAINS_OTSU GWY_STOCK_GRAINS_REMOVE GWY_STOCK_GRAINS_STATISTICS GWY_STOCK_GRAINS_WATER GWY_STOCK_GRAIN_BOUNDING_BOX GWY_STOCK_GRAIN_CORRELATION GWY_STOCK_GRAIN_EXSCRIBED_CIRCLE GWY_STOCK_GRAIN_INSCRIBED_BOX GWY_STOCK_GRAIN_INSCRIBED_CIRCLE GWY_STOCK_GRAPH GWY_STOCK_GRAPH_ALIGN GWY_STOCK_GRAPH_CUT GWY_STOCK_GRAPH_DOS GWY_STOCK_GRAPH_EXPORT_ASCII GWY_STOCK_GRAPH_EXPORT_PNG GWY_STOCK_GRAPH_EXPORT_VECTOR GWY_STOCK_GRAPH_FD GWY_STOCK_GRAPH_FILTER GWY_STOCK_GRAPH_FUNCTION GWY_STOCK_GRAPH_HALFGAUSS GWY_STOCK_GRAPH_LEVEL GWY_STOCK_GRAPH_MEASURE GWY_STOCK_GRAPH_PALETTE GWY_STOCK_GRAPH_POINTER GWY_STOCK_GRAPH_RULER GWY_STOCK_GRAPH_STATISTICS GWY_STOCK_GRAPH_TERRACE_MEASURE GWY_STOCK_GRAPH_VERTICAL GWY_STOCK_GRAPH_ZOOM_FIT GWY_STOCK_GRAPH_ZOOM_IN GWY_STOCK_GRAPH_ZOOM_OUT GWY_STOCK_GWYDDION GWY_STOCK_HOUGH GWY_STOCK_IMAGE_RELATION GWY_STOCK_IMMERSE GWY_STOCK_ISO_ROUGHNESS GWY_STOCK_ITALIC GWY_STOCK_LESS GWY_STOCK_LEVEL GWY_STOCK_LEVEL_FLATTEN_BASE GWY_STOCK_LEVEL_MEDIAN GWY_STOCK_LEVEL_TRIANGLE GWY_STOCK_LIGHT_ROTATE GWY_STOCK_LIMIT_RANGE GWY_STOCK_LINE_LEVEL GWY_STOCK_LOAD_DEBUG GWY_STOCK_LOAD_INFO GWY_STOCK_LOAD_WARNING GWY_STOCK_LOCAL_SLOPE GWY_STOCK_LOGSCALE_HORIZONTAL GWY_STOCK_LOGSCALE_VERTICAL GWY_STOCK_MARK_OUTLIERS GWY_STOCK_MARK_SCARS GWY_STOCK_MARK_WITH GWY_STOCK_MASK GWY_STOCK_MASK_ADD GWY_STOCK_MASK_CIRCLE GWY_STOCK_MASK_CIRCLE_EXCLUSIVE GWY_STOCK_MASK_CIRCLE_INCLUSIVE GWY_STOCK_MASK_DISTRIBUTE GWY_STOCK_MASK_EDITOR GWY_STOCK_MASK_EXCLUDE GWY_STOCK_MASK_EXCLUDE_CIRCLE GWY_STOCK_MASK_EXTRACT GWY_STOCK_MASK_FILL_DRAW GWY_STOCK_MASK_FILL_ERASE GWY_STOCK_MASK_GROW GWY_STOCK_MASK_INTERSECT GWY_STOCK_MASK_INVERT GWY_STOCK_MASK_LINE GWY_STOCK_MASK_MORPH GWY_STOCK_MASK_NOISIFY GWY_STOCK_MASK_PAINT_DRAW GWY_STOCK_MASK_PAINT_ERASE GWY_STOCK_MASK_RECT_EXCLUSIVE GWY_STOCK_MASK_RECT_INCLUSIVE GWY_STOCK_MASK_REMOVE GWY_STOCK_MASK_SET GWY_STOCK_MASK_SHIFT GWY_STOCK_MASK_SHRINK GWY_STOCK_MASK_SUBTRACT GWY_STOCK_MASK_THIN GWY_STOCK_MEASURE_LATTICE GWY_STOCK_MERGE GWY_STOCK_MFM_CONVERT_TO_FORCE GWY_STOCK_MFM_CURRENT_LINE GWY_STOCK_MFM_FIELD_FIND_SHIFT GWY_STOCK_MFM_FIELD_SHIFT GWY_STOCK_MFM_PARALLEL GWY_STOCK_MFM_PERPENDICULAR GWY_STOCK_MORE GWY_STOCK_MUTUAL_CROP GWY_STOCK_NEURAL_APPLY GWY_STOCK_NEURAL_TRAIN GWY_STOCK_NEXT GWY_STOCK_NULL_OFFSETS GWY_STOCK_PALETTES GWY_STOCK_PATH_LEVEL GWY_STOCK_PERSPECTIVE_DISTORT GWY_STOCK_POINTER_MEASURE GWY_STOCK_POLYNOM GWY_STOCK_POLYNOM_LEVEL GWY_STOCK_POLY_DISTORT GWY_STOCK_PREVIOUS GWY_STOCK_PROFILE GWY_STOCK_PROFILE_MULTIPLE GWY_STOCK_PSDF_LOG_PHI GWY_STOCK_PSDF_SECTION GWY_STOCK_PYGWY GWY_STOCK_RADIAL_PROFILE GWY_STOCK_RANK_FILTER GWY_STOCK_RASTERIZE GWY_STOCK_REMOVE_UNDER_MASK GWY_STOCK_REVOLVE_ARC GWY_STOCK_REVOLVE_SPHERE GWY_STOCK_ROTATE GWY_STOCK_ROTATE_180 GWY_STOCK_ROTATE_3D GWY_STOCK_ROTATE_90_CCW GWY_STOCK_ROTATE_90_CW GWY_STOCK_SCALE GWY_STOCK_SCALE_HORIZONTALLY GWY_STOCK_SCALE_VERTICALLY GWY_STOCK_SCARS GWY_STOCK_SCIENTIFIC_NUMBER_FORMAT GWY_STOCK_SELECTIONS GWY_STOCK_SHADER GWY_STOCK_SPECTRUM GWY_STOCK_SPOT_REMOVE GWY_STOCK_SQUARE_SAMPLES GWY_STOCK_STAT_QUANTITIES GWY_STOCK_STITCH GWY_STOCK_STRAIGHTEN_PATH GWY_STOCK_SUBSCRIPT GWY_STOCK_SUPERSCRIPT GWY_STOCK_SYNTHETIC_ANNEAL GWY_STOCK_SYNTHETIC_BALLISTIC_DEPOSITION GWY_STOCK_SYNTHETIC_BROWNIAN_MOTION GWY_STOCK_SYNTHETIC_COLUMNAR GWY_STOCK_SYNTHETIC_DIFFUSION GWY_STOCK_SYNTHETIC_DISCS GWY_STOCK_SYNTHETIC_DOMAINS GWY_STOCK_SYNTHETIC_FIBRES GWY_STOCK_SYNTHETIC_LATTICE GWY_STOCK_SYNTHETIC_LINE_NOISE GWY_STOCK_SYNTHETIC_NOISE GWY_STOCK_SYNTHETIC_OBJECTS GWY_STOCK_SYNTHETIC_PARTICLES GWY_STOCK_SYNTHETIC_PATTERN GWY_STOCK_SYNTHETIC_PHASES GWY_STOCK_SYNTHETIC_PILEUP GWY_STOCK_SYNTHETIC_SPECTRAL GWY_STOCK_SYNTHETIC_TURING_PATTERN GWY_STOCK_SYNTHETIC_WAVES GWY_STOCK_TERRACE_MEASURE GWY_STOCK_TILT GWY_STOCK_TIP_DILATION GWY_STOCK_TIP_EROSION GWY_STOCK_TIP_ESTIMATION GWY_STOCK_TIP_INDENT_ANALYZE GWY_STOCK_TIP_LATERAL_FORCE GWY_STOCK_TIP_MAP GWY_STOCK_TIP_MODEL GWY_STOCK_TIP_PID GWY_STOCK_UNROTATE GWY_STOCK_VALUE_INVERT GWY_STOCK_VOLUME GWY_STOCK_VOLUME_ARITHMETIC GWY_STOCK_VOLUME_CALIBRATE GWY_STOCK_VOLUME_DIMENSIONS GWY_STOCK_VOLUME_FD GWY_STOCK_VOLUME_INVERT GWY_STOCK_VOLUME_KMEANS GWY_STOCK_VOLUME_KMEDIANS GWY_STOCK_VOLUME_LINE_STATS GWY_STOCK_VOLUME_PLANE_STATS GWY_STOCK_VOLUME_SLICE GWY_STOCK_VOLUME_SWAP_AXES GWY_STOCK_VOLUMIZE GWY_STOCK_VOLUMIZE_LAYERS GWY_STOCK_WRAP_VALUE GWY_STOCK_XYZIZE GWY_STOCK_XY_DENOISE GWY_STOCK_ZERO_MAXIMUM GWY_STOCK_ZERO_MEAN GWY_STOCK_ZERO_UNDER_MASK GWY_STOCK_ZOOM_1_1 GWY_STOCK_ZOOM_FIT GWY_STOCK_ZOOM_IN GWY_STOCK_ZOOM_OUT GWY_TEXT_HEADER_ERROR GWY_TRIANGULATION_NONE GWY_TYPE_2D_CWT_WAVELET_TYPE GWY_TYPE_3D_LABEL GWY_TYPE_3D_MOVEMENT GWY_TYPE_3D_PROJECTION GWY_TYPE_3D_SETUP GWY_TYPE_3D_VIEW GWY_TYPE_3D_VIEW_LABEL GWY_TYPE_3D_VISUALIZATION GWY_TYPE_3D_WINDOW GWY_TYPE_ADJUST_BAR GWY_TYPE_AFFINE_SCALING_TYPE GWY_TYPE_APP_DATA_ID GWY_TYPE_APP_LOGGING_FLAGS GWY_TYPE_APP_PAGE GWY_TYPE_APP_SETTINGS_ERROR GWY_TYPE_APP_WHAT GWY_TYPE_AXIS GWY_TYPE_AXIS_SCALE_FORMAT GWY_TYPE_BRICK GWY_TYPE_BRICK_TRANSPOSE_TYPE GWY_TYPE_BYTE_ORDER GWY_TYPE_CALDATA GWY_TYPE_CALIBRATION GWY_TYPE_CDLINE GWY_TYPE_COLOR_AXIS GWY_TYPE_COLOR_BUTTON GWY_TYPE_COMPUTATION_STATE GWY_TYPE_COMPUTATION_STATE_TYPE GWY_TYPE_CONTAINER GWY_TYPE_CORRELATION_TYPE GWY_TYPE_CORR_SEARCH_TYPE GWY_TYPE_CURVE GWY_TYPE_CURVE_CHANNEL GWY_TYPE_CURVE_TYPE GWY_TYPE_DATA_CHOOSER GWY_TYPE_DATA_COMPATIBILITY_FLAGS GWY_TYPE_DATA_ERROR GWY_TYPE_DATA_FIELD GWY_TYPE_DATA_FIELD_CACHED GWY_TYPE_DATA_ITEM GWY_TYPE_DATA_LINE GWY_TYPE_DATA_VALIDATE_FLAGS GWY_TYPE_DATA_VIEW GWY_TYPE_DATA_VIEW_LAYER GWY_TYPE_DATA_VIEW_LAYER_TYPE GWY_TYPE_DATA_WATCH_EVENT_TYPE GWY_TYPE_DATA_WINDOW GWY_TYPE_DIALOG GWY_TYPE_DIALOG_OUTCOME GWY_TYPE_DISTANCE_TRANSFORM_TYPE GWY_TYPE_DWT_DENOISE_TYPE GWY_TYPE_DWT_TYPE GWY_TYPE_ENUM GWY_TYPE_EXPR_ERROR GWY_TYPE_EXTERIOR_TYPE GWY_TYPE_FD_CURVE_PRESET GWY_TYPE_FILE_OPERATION_TYPE GWY_TYPE_GL_MATERIAL GWY_TYPE_GRADIENT GWY_TYPE_GRAIN_QUANTITY GWY_TYPE_GRAIN_VALUE GWY_TYPE_GRAIN_VALUE_FLAGS GWY_TYPE_GRAIN_VALUE_GROUP GWY_TYPE_GRAIN_VALUE_STORE_COLUMN GWY_TYPE_GRAPH GWY_TYPE_GRAPH_AREA GWY_TYPE_GRAPH_CORNER GWY_TYPE_GRAPH_CURVES GWY_TYPE_GRAPH_CURVE_MODEL GWY_TYPE_GRAPH_CURVE_TYPE GWY_TYPE_GRAPH_DATA GWY_TYPE_GRAPH_GRID_TYPE GWY_TYPE_GRAPH_LABEL GWY_TYPE_GRAPH_LABEL_POSITION GWY_TYPE_GRAPH_MODEL GWY_TYPE_GRAPH_MODEL_EXPORT_STYLE GWY_TYPE_GRAPH_POINT_TYPE GWY_TYPE_GRAPH_STATUS_TYPE GWY_TYPE_GRAPH_WINDOW GWY_TYPE_HELP_FLAGS GWY_TYPE_HMARKER_BOX GWY_TYPE_HRULER GWY_TYPE_HSCALE_STYLE GWY_TYPE_INTERPOLATION_TYPE GWY_TYPE_INVENTORY GWY_TYPE_INVENTORY_STORE GWY_TYPE_LAWN GWY_TYPE_LAYER_BASIC GWY_TYPE_LAYER_BASIC_RANGE_TYPE GWY_TYPE_LAYER_MASK GWY_TYPE_LINE_STAT_QUANTITY GWY_TYPE_MARKER_BOX GWY_TYPE_MARKER_OPERATION_TYPE GWY_TYPE_MASKING_TYPE GWY_TYPE_MENU_SENS_FLAGS GWY_TYPE_MERGE_TYPE GWY_TYPE_MFM_COMPONENT_TYPE GWY_TYPE_MFM_GRADIENT_TYPE GWY_TYPE_MFM_PROBE_TYPE GWY_TYPE_MIN_MAX_FILTER_TYPE GWY_TYPE_MODULE_ERROR GWY_TYPE_MODULE_FILE_ERROR GWY_TYPE_NLFIT_PRESET GWY_TYPE_NL_FIT_PARAM_FLAGS GWY_TYPE_NULL_STORE GWY_TYPE_ORIENTATION GWY_TYPE_PARAMS GWY_TYPE_PARAM_DEF GWY_TYPE_PARAM_RESOURCE GWY_TYPE_PARAM_TABLE GWY_TYPE_PEAKS GWY_TYPE_PEAK_BACKGROUND_TYPE GWY_TYPE_PEAK_ORDER_TYPE GWY_TYPE_PEAK_QUANTITY GWY_TYPE_PERCENTILE_INTERPOLATION_TYPE GWY_TYPE_PIXMAP_LAYER GWY_TYPE_PLAIN_TOOL GWY_TYPE_PLAIN_TOOL_CHANGED GWY_TYPE_PLANE_FIT_QUANTITY GWY_TYPE_PLANE_SYMMETRY GWY_TYPE_PREVIEW_SURFACE_FLAGS GWY_TYPE_PREVIEW_TYPE GWY_TYPE_RAW_DATA_TYPE GWY_TYPE_RENDERING_TARGET GWY_TYPE_RESOURCE GWY_TYPE_RESOURCE_EDITOR GWY_TYPE_RESPONSE_TYPE GWY_TYPE_RESULTS GWY_TYPE_RESULTS_EXPORT GWY_TYPE_RESULTS_EXPORT_STYLE GWY_TYPE_RESULTS_REPORT_TYPE GWY_TYPE_RESULTS_VALUE_TYPE GWY_TYPE_RGBA GWY_TYPE_ROTATE_RESIZE_TYPE GWY_TYPE_RULER GWY_TYPE_RUN_TYPE GWY_TYPE_SCALE_MAPPING_TYPE GWY_TYPE_SCI_TEXT GWY_TYPE_SELECTION GWY_TYPE_SELECTION_GRAPH_1DAREA GWY_TYPE_SELECTION_GRAPH_AREA GWY_TYPE_SELECTION_GRAPH_LINE GWY_TYPE_SELECTION_GRAPH_POINT GWY_TYPE_SELECTION_GRAPH_ZOOM GWY_TYPE_SENSITIVITY_GROUP GWY_TYPE_SERIALIZABLE GWY_TYPE_SHADER GWY_TYPE_SHAPE_FIT_PRESET GWY_TYPE_SI_UNIT GWY_TYPE_SI_UNIT_FORMAT_STYLE GWY_TYPE_SI_VALUE_FORMAT GWY_TYPE_SPECTRA GWY_TYPE_SPLINE GWY_TYPE_STATUSBAR GWY_TYPE_STRING_LIST GWY_TYPE_SURFACE GWY_TYPE_SYNTH_DIMS_FLAGS GWY_TYPE_SYNTH_DIMS_PARAM GWY_TYPE_SYNTH_RESPONSE_TYPE GWY_TYPE_SYNTH_UPDATE_TYPE GWY_TYPE_TEXT_HEADER_ERROR GWY_TYPE_TICKS_STYLE GWY_TYPE_TIP_MODEL_PRESET GWY_TYPE_TIP_PARAM_TYPE GWY_TYPE_TIP_TYPE GWY_TYPE_TOOL GWY_TYPE_TOOL_RESPONSE_TYPE GWY_TYPE_TOOL_SWITCH_EVENT GWY_TYPE_TRANSFORM_DIRECTION GWY_TYPE_TRIANGULATION GWY_TYPE_UNITS_PLACEMENT GWY_TYPE_VECTOR_LAYER GWY_TYPE_VISIBILITY_RESET_TYPE GWY_TYPE_VRULER GWY_TYPE_WATERSHED_STATE_TYPE GWY_TYPE_WINDOWING_TYPE GWY_TYPE_XY GWY_TYPE_XYZ GWY_VERSION_MAJOR GWY_VERSION_MINOR GWY_VERSION_STRING gwy_isinf gwy_isnan pow10 +syn keyword gwyddionDefine GWY_APP_DATA_ID_NONE GWY_APP_SETTINGS_ERROR GWY_CONTAINER_PATHSEP GWY_CONTAINER_PATHSEP_STR GWY_EXPR_ERROR GWY_FILE_DETECT_BUFFER_SIZE GWY_GL_MATERIAL_DEFAULT GWY_GL_MATERIAL_NONE GWY_GRADIENT_DEFAULT GWY_ICON_SIZE_ABOUT GWY_MODULE_ABI_VERSION GWY_MODULE_BUNDLE_FLAG GWY_MODULE_ERROR GWY_MODULE_FILE_ERROR GWY_SQRT3 GWY_SQRT_PI GWY_STOCK_3D_BASE GWY_STOCK_ARITHMETIC GWY_STOCK_BINNING GWY_STOCK_BOLD GWY_STOCK_CANTILEVER GWY_STOCK_COLOR_RANGE GWY_STOCK_COLOR_RANGE_ADAPTIVE GWY_STOCK_COLOR_RANGE_AUTO GWY_STOCK_COLOR_RANGE_FIXED GWY_STOCK_COLOR_RANGE_FULL GWY_STOCK_CONVOLUTION GWY_STOCK_CONVOLVE GWY_STOCK_CORRECT_AFFINE GWY_STOCK_CORRELATION_LENGTH GWY_STOCK_CORRELATION_MASK GWY_STOCK_CROP GWY_STOCK_CROSS_PROFILE GWY_STOCK_CURVATURE GWY_STOCK_CWT GWY_STOCK_DATA_MEASURE GWY_STOCK_DECONVOLVE GWY_STOCK_DISCONNECTED GWY_STOCK_DISPLACEMENT_FIELD GWY_STOCK_DISTANCE GWY_STOCK_DISTANCE_TRANSFORM GWY_STOCK_DISTRIBUTION_ANGLE GWY_STOCK_DISTRIBUTION_SLOPE GWY_STOCK_DRIFT GWY_STOCK_DWT GWY_STOCK_EDGE GWY_STOCK_ENFORCE_DISTRIBUTION GWY_STOCK_ENTROPY GWY_STOCK_EXTEND GWY_STOCK_EXTRACT_PATH GWY_STOCK_FACET_ANALYSIS GWY_STOCK_FACET_LEVEL GWY_STOCK_FACET_MEASURE GWY_STOCK_FAVOURITE GWY_STOCK_FFT GWY_STOCK_FFT_2D GWY_STOCK_FFT_FILTER_1D GWY_STOCK_FFT_FILTER_2D GWY_STOCK_FILTER GWY_STOCK_FIND_PEAKS GWY_STOCK_FIT_SHAPE GWY_STOCK_FIX_ZERO GWY_STOCK_FLIP_DIAGONALLY GWY_STOCK_FLIP_HORIZONTALLY GWY_STOCK_FLIP_VERTICALLY GWY_STOCK_FRACTAL GWY_STOCK_FRACTAL_CORRECTION GWY_STOCK_FRACTAL_MEASURE GWY_STOCK_FREQUENCY_SPLIT GWY_STOCK_GL_MATERIAL GWY_STOCK_GRADIENT_HORIZONTAL GWY_STOCK_GRADIENT_VERTICAL GWY_STOCK_GRAINS GWY_STOCK_GRAINS_EDGE GWY_STOCK_GRAINS_EDGE_REMOVE GWY_STOCK_GRAINS_GRAPH GWY_STOCK_GRAINS_MEASURE GWY_STOCK_GRAINS_OTSU GWY_STOCK_GRAINS_REMOVE GWY_STOCK_GRAINS_STATISTICS GWY_STOCK_GRAINS_WATER GWY_STOCK_GRAIN_BOUNDING_BOX GWY_STOCK_GRAIN_CORRELATION GWY_STOCK_GRAIN_EXSCRIBED_CIRCLE GWY_STOCK_GRAIN_INSCRIBED_BOX GWY_STOCK_GRAIN_INSCRIBED_CIRCLE GWY_STOCK_GRAPH GWY_STOCK_GRAPH_ALIGN GWY_STOCK_GRAPH_CUT GWY_STOCK_GRAPH_DOS GWY_STOCK_GRAPH_EXPORT_ASCII GWY_STOCK_GRAPH_EXPORT_PNG GWY_STOCK_GRAPH_EXPORT_VECTOR GWY_STOCK_GRAPH_FD GWY_STOCK_GRAPH_FILTER GWY_STOCK_GRAPH_FUNCTION GWY_STOCK_GRAPH_HALFGAUSS GWY_STOCK_GRAPH_LEVEL GWY_STOCK_GRAPH_MEASURE GWY_STOCK_GRAPH_PALETTE GWY_STOCK_GRAPH_PERIOD_MEASURE GWY_STOCK_GRAPH_POINTER GWY_STOCK_GRAPH_RULER GWY_STOCK_GRAPH_STATISTICS GWY_STOCK_GRAPH_TERRACE_MEASURE GWY_STOCK_GRAPH_VERTICAL GWY_STOCK_GRAPH_ZOOM_FIT GWY_STOCK_GRAPH_ZOOM_IN GWY_STOCK_GRAPH_ZOOM_OUT GWY_STOCK_GWYDDION GWY_STOCK_HOLD_SELECTION_CLEAR GWY_STOCK_HOLD_SELECTION_REPLACE GWY_STOCK_HOUGH GWY_STOCK_IMAGE_RELATION GWY_STOCK_IMMERSE GWY_STOCK_ISO_ROUGHNESS GWY_STOCK_ITALIC GWY_STOCK_LESS GWY_STOCK_LEVEL GWY_STOCK_LEVEL_FLATTEN_BASE GWY_STOCK_LEVEL_MEDIAN GWY_STOCK_LEVEL_TRIANGLE GWY_STOCK_LIGHT_ROTATE GWY_STOCK_LIMIT_RANGE GWY_STOCK_LINE_LEVEL GWY_STOCK_LOAD_DEBUG GWY_STOCK_LOAD_INFO GWY_STOCK_LOAD_WARNING GWY_STOCK_LOCAL_SLOPE GWY_STOCK_LOGSCALE_HORIZONTAL GWY_STOCK_LOGSCALE_VERTICAL GWY_STOCK_MARK_OUTLIERS GWY_STOCK_MARK_SCARS GWY_STOCK_MARK_WITH GWY_STOCK_MASK GWY_STOCK_MASK_ADD GWY_STOCK_MASK_CIRCLE GWY_STOCK_MASK_CIRCLE_EXCLUSIVE GWY_STOCK_MASK_CIRCLE_INCLUSIVE GWY_STOCK_MASK_DISTRIBUTE GWY_STOCK_MASK_EDITOR GWY_STOCK_MASK_EXCLUDE GWY_STOCK_MASK_EXCLUDE_CIRCLE GWY_STOCK_MASK_EXTRACT GWY_STOCK_MASK_FILL_DRAW GWY_STOCK_MASK_FILL_ERASE GWY_STOCK_MASK_GROW GWY_STOCK_MASK_INTERSECT GWY_STOCK_MASK_INVERT GWY_STOCK_MASK_LINE GWY_STOCK_MASK_MORPH GWY_STOCK_MASK_NOISIFY GWY_STOCK_MASK_PAINT_DRAW GWY_STOCK_MASK_PAINT_ERASE GWY_STOCK_MASK_RECT_EXCLUSIVE GWY_STOCK_MASK_RECT_INCLUSIVE GWY_STOCK_MASK_REMOVE GWY_STOCK_MASK_SET GWY_STOCK_MASK_SHIFT GWY_STOCK_MASK_SHRINK GWY_STOCK_MASK_SUBTRACT GWY_STOCK_MASK_THIN GWY_STOCK_MEASURE_LATTICE GWY_STOCK_MERGE GWY_STOCK_MFM_CONVERT_TO_FORCE GWY_STOCK_MFM_CURRENT_LINE GWY_STOCK_MFM_FIELD_FIND_SHIFT GWY_STOCK_MFM_FIELD_SHIFT GWY_STOCK_MFM_PARALLEL GWY_STOCK_MFM_PERPENDICULAR GWY_STOCK_MORE GWY_STOCK_MUTUAL_CROP GWY_STOCK_NEURAL_APPLY GWY_STOCK_NEURAL_TRAIN GWY_STOCK_NEXT GWY_STOCK_NULL_OFFSETS GWY_STOCK_PALETTES GWY_STOCK_PATH_LEVEL GWY_STOCK_PERSPECTIVE_DISTORT GWY_STOCK_POINTER_MEASURE GWY_STOCK_POLYNOM GWY_STOCK_POLYNOM_LEVEL GWY_STOCK_POLY_DISTORT GWY_STOCK_PREVIOUS GWY_STOCK_PROFILE GWY_STOCK_PROFILE_MULTIPLE GWY_STOCK_PSDF_LOG_PHI GWY_STOCK_PSDF_SECTION GWY_STOCK_PYGWY GWY_STOCK_RADIAL_PROFILE GWY_STOCK_RANK_FILTER GWY_STOCK_RASTERIZE GWY_STOCK_REMOVE_UNDER_MASK GWY_STOCK_REVOLVE_ARC GWY_STOCK_REVOLVE_SPHERE GWY_STOCK_ROTATE GWY_STOCK_ROTATE_180 GWY_STOCK_ROTATE_3D GWY_STOCK_ROTATE_90_CCW GWY_STOCK_ROTATE_90_CW GWY_STOCK_SCALE GWY_STOCK_SCALE_HORIZONTALLY GWY_STOCK_SCALE_VERTICALLY GWY_STOCK_SCARS GWY_STOCK_SCIENTIFIC_NUMBER_FORMAT GWY_STOCK_SELECTIONS GWY_STOCK_SHADER GWY_STOCK_SPECTRUM GWY_STOCK_SPOT_REMOVE GWY_STOCK_SQUARE_SAMPLES GWY_STOCK_STAT_QUANTITIES GWY_STOCK_STITCH GWY_STOCK_STRAIGHTEN_PATH GWY_STOCK_SUBSCRIPT GWY_STOCK_SUPERSCRIPT GWY_STOCK_SYNTHETIC_ANNEAL GWY_STOCK_SYNTHETIC_BALLISTIC_DEPOSITION GWY_STOCK_SYNTHETIC_BROWNIAN_MOTION GWY_STOCK_SYNTHETIC_COLUMNAR GWY_STOCK_SYNTHETIC_DIFFUSION GWY_STOCK_SYNTHETIC_DISCS GWY_STOCK_SYNTHETIC_DOMAINS GWY_STOCK_SYNTHETIC_DUNES GWY_STOCK_SYNTHETIC_FIBRES GWY_STOCK_SYNTHETIC_LATTICE GWY_STOCK_SYNTHETIC_LINE_NOISE GWY_STOCK_SYNTHETIC_NOISE GWY_STOCK_SYNTHETIC_OBJECTS GWY_STOCK_SYNTHETIC_PARTICLES GWY_STOCK_SYNTHETIC_PATTERN GWY_STOCK_SYNTHETIC_PHASES GWY_STOCK_SYNTHETIC_PILEUP GWY_STOCK_SYNTHETIC_SPECTRAL GWY_STOCK_SYNTHETIC_TURING_PATTERN GWY_STOCK_SYNTHETIC_WAVES GWY_STOCK_TERRACE_MEASURE GWY_STOCK_TILT GWY_STOCK_TIP_DILATION GWY_STOCK_TIP_EROSION GWY_STOCK_TIP_ESTIMATION GWY_STOCK_TIP_INDENT_ANALYZE GWY_STOCK_TIP_LATERAL_FORCE GWY_STOCK_TIP_MAP GWY_STOCK_TIP_MODEL GWY_STOCK_TIP_PID GWY_STOCK_UNROTATE GWY_STOCK_VALUE_INVERT GWY_STOCK_VOLUME GWY_STOCK_VOLUME_ARITHMETIC GWY_STOCK_VOLUME_CALIBRATE GWY_STOCK_VOLUME_DIMENSIONS GWY_STOCK_VOLUME_FD GWY_STOCK_VOLUME_INVERT GWY_STOCK_VOLUME_KMEANS GWY_STOCK_VOLUME_KMEDIANS GWY_STOCK_VOLUME_LINE_STATS GWY_STOCK_VOLUME_PLANE_STATS GWY_STOCK_VOLUME_SLICE GWY_STOCK_VOLUME_SWAP_AXES GWY_STOCK_VOLUMIZE GWY_STOCK_VOLUMIZE_LAYERS GWY_STOCK_WRAP_VALUE GWY_STOCK_XYZIZE GWY_STOCK_XY_DENOISE GWY_STOCK_ZERO_MAXIMUM GWY_STOCK_ZERO_MEAN GWY_STOCK_ZERO_UNDER_MASK GWY_STOCK_ZOOM_1_1 GWY_STOCK_ZOOM_FIT GWY_STOCK_ZOOM_IN GWY_STOCK_ZOOM_OUT GWY_TEXT_HEADER_ERROR GWY_TRIANGULATION_NONE GWY_TYPE_2D_CWT_WAVELET_TYPE GWY_TYPE_3D_LABEL GWY_TYPE_3D_MOVEMENT GWY_TYPE_3D_PROJECTION GWY_TYPE_3D_SETUP GWY_TYPE_3D_VIEW GWY_TYPE_3D_VIEW_LABEL GWY_TYPE_3D_VISUALIZATION GWY_TYPE_3D_WINDOW GWY_TYPE_ADJUST_BAR GWY_TYPE_AFFINE_SCALING_TYPE GWY_TYPE_APP_DATA_ID GWY_TYPE_APP_LOGGING_FLAGS GWY_TYPE_APP_PAGE GWY_TYPE_APP_SETTINGS_ERROR GWY_TYPE_APP_WHAT GWY_TYPE_AXIS GWY_TYPE_AXIS_SCALE_FORMAT GWY_TYPE_BRICK GWY_TYPE_BRICK_TRANSPOSE_TYPE GWY_TYPE_BYTE_ORDER GWY_TYPE_CALDATA GWY_TYPE_CALIBRATION GWY_TYPE_CDLINE GWY_TYPE_COLOR_AXIS GWY_TYPE_COLOR_BUTTON GWY_TYPE_COMPUTATION_STATE GWY_TYPE_COMPUTATION_STATE_TYPE GWY_TYPE_CONTAINER GWY_TYPE_CORRELATION_TYPE GWY_TYPE_CORR_SEARCH_TYPE GWY_TYPE_CURVE GWY_TYPE_CURVE_CHANNEL GWY_TYPE_CURVE_TYPE GWY_TYPE_DATA_CHOOSER GWY_TYPE_DATA_COMPATIBILITY_FLAGS GWY_TYPE_DATA_ERROR GWY_TYPE_DATA_FIELD GWY_TYPE_DATA_FIELD_CACHED GWY_TYPE_DATA_ITEM GWY_TYPE_DATA_LINE GWY_TYPE_DATA_VALIDATE_FLAGS GWY_TYPE_DATA_VIEW GWY_TYPE_DATA_VIEW_LAYER GWY_TYPE_DATA_VIEW_LAYER_TYPE GWY_TYPE_DATA_WATCH_EVENT_TYPE GWY_TYPE_DATA_WINDOW GWY_TYPE_DIALOG GWY_TYPE_DIALOG_OUTCOME GWY_TYPE_DISTANCE_TRANSFORM_TYPE GWY_TYPE_DWT_DENOISE_TYPE GWY_TYPE_DWT_TYPE GWY_TYPE_ENUM GWY_TYPE_EXPR_ERROR GWY_TYPE_EXTERIOR_TYPE GWY_TYPE_FD_CURVE_PRESET GWY_TYPE_FILE_OPERATION_TYPE GWY_TYPE_GL_MATERIAL GWY_TYPE_GRADIENT GWY_TYPE_GRAIN_QUANTITY GWY_TYPE_GRAIN_VALUE GWY_TYPE_GRAIN_VALUE_FLAGS GWY_TYPE_GRAIN_VALUE_GROUP GWY_TYPE_GRAIN_VALUE_STORE_COLUMN GWY_TYPE_GRAPH GWY_TYPE_GRAPH_AREA GWY_TYPE_GRAPH_CORNER GWY_TYPE_GRAPH_CURVES GWY_TYPE_GRAPH_CURVE_MODEL GWY_TYPE_GRAPH_CURVE_TYPE GWY_TYPE_GRAPH_DATA GWY_TYPE_GRAPH_GRID_TYPE GWY_TYPE_GRAPH_LABEL GWY_TYPE_GRAPH_LABEL_POSITION GWY_TYPE_GRAPH_MODEL GWY_TYPE_GRAPH_MODEL_EXPORT_STYLE GWY_TYPE_GRAPH_POINT_TYPE GWY_TYPE_GRAPH_STATUS_TYPE GWY_TYPE_GRAPH_WINDOW GWY_TYPE_HELP_FLAGS GWY_TYPE_HMARKER_BOX GWY_TYPE_HOLD_SELECTION_FLAGS GWY_TYPE_HRULER GWY_TYPE_HSCALE_STYLE GWY_TYPE_INTERPOLATION_TYPE GWY_TYPE_INVENTORY GWY_TYPE_INVENTORY_STORE GWY_TYPE_LAWN GWY_TYPE_LAYER_BASIC GWY_TYPE_LAYER_BASIC_RANGE_TYPE GWY_TYPE_LAYER_MASK GWY_TYPE_LINE_STAT_QUANTITY GWY_TYPE_MARKER_BOX GWY_TYPE_MARKER_OPERATION_TYPE GWY_TYPE_MASKING_TYPE GWY_TYPE_MENU_SENS_FLAGS GWY_TYPE_MERGE_TYPE GWY_TYPE_MFM_COMPONENT_TYPE GWY_TYPE_MFM_GRADIENT_TYPE GWY_TYPE_MFM_PROBE_TYPE GWY_TYPE_MIN_MAX_FILTER_TYPE GWY_TYPE_MODULE_ERROR GWY_TYPE_MODULE_FILE_ERROR GWY_TYPE_NLFIT_PRESET GWY_TYPE_NL_FIT_PARAM_FLAGS GWY_TYPE_NULL_STORE GWY_TYPE_ORIENTATION GWY_TYPE_PARAMS GWY_TYPE_PARAM_DEF GWY_TYPE_PARAM_RESOURCE GWY_TYPE_PARAM_TABLE GWY_TYPE_PEAKS GWY_TYPE_PEAK_BACKGROUND_TYPE GWY_TYPE_PEAK_ORDER_TYPE GWY_TYPE_PEAK_QUANTITY GWY_TYPE_PERCENTILE_INTERPOLATION_TYPE GWY_TYPE_PIXMAP_LAYER GWY_TYPE_PLAIN_TOOL GWY_TYPE_PLAIN_TOOL_CHANGED GWY_TYPE_PLANE_FIT_QUANTITY GWY_TYPE_PLANE_SYMMETRY GWY_TYPE_PREVIEW_SURFACE_FLAGS GWY_TYPE_PREVIEW_TYPE GWY_TYPE_RAW_DATA_TYPE GWY_TYPE_RENDERING_TARGET GWY_TYPE_RESOURCE GWY_TYPE_RESOURCE_EDITOR GWY_TYPE_RESPONSE_TYPE GWY_TYPE_RESULTS GWY_TYPE_RESULTS_EXPORT GWY_TYPE_RESULTS_EXPORT_STYLE GWY_TYPE_RESULTS_REPORT_TYPE GWY_TYPE_RESULTS_VALUE_TYPE GWY_TYPE_RGBA GWY_TYPE_ROTATE_RESIZE_TYPE GWY_TYPE_RULER GWY_TYPE_RUN_TYPE GWY_TYPE_SCALE_MAPPING_TYPE GWY_TYPE_SCI_TEXT GWY_TYPE_SELECTION GWY_TYPE_SELECTION_GRAPH_1DAREA GWY_TYPE_SELECTION_GRAPH_AREA GWY_TYPE_SELECTION_GRAPH_LINE GWY_TYPE_SELECTION_GRAPH_POINT GWY_TYPE_SELECTION_GRAPH_ZOOM GWY_TYPE_SENSITIVITY_GROUP GWY_TYPE_SERIALIZABLE GWY_TYPE_SHADER GWY_TYPE_SHAPE_FIT_PRESET GWY_TYPE_SI_UNIT GWY_TYPE_SI_UNIT_FORMAT_STYLE GWY_TYPE_SI_VALUE_FORMAT GWY_TYPE_SPECTRA GWY_TYPE_SPLINE GWY_TYPE_STATUSBAR GWY_TYPE_STRING_LIST GWY_TYPE_SURFACE GWY_TYPE_SYNTH_DIMS_FLAGS GWY_TYPE_SYNTH_DIMS_PARAM GWY_TYPE_SYNTH_RESPONSE_TYPE GWY_TYPE_SYNTH_UPDATE_TYPE GWY_TYPE_TEXT_HEADER_ERROR GWY_TYPE_TICKS_STYLE GWY_TYPE_TIP_MODEL_PRESET GWY_TYPE_TIP_PARAM_TYPE GWY_TYPE_TIP_TYPE GWY_TYPE_TOOL GWY_TYPE_TOOL_RESPONSE_TYPE GWY_TYPE_TOOL_SWITCH_EVENT GWY_TYPE_TRANSFORM_DIRECTION GWY_TYPE_TRIANGULATION GWY_TYPE_UNITS_PLACEMENT GWY_TYPE_VECTOR_LAYER GWY_TYPE_VISIBILITY_RESET_TYPE GWY_TYPE_VRULER GWY_TYPE_WATERSHED_STATE_TYPE GWY_TYPE_WINDOWING_TYPE GWY_TYPE_XY GWY_TYPE_XYZ GWY_VERSION_MAJOR GWY_VERSION_MINOR GWY_VERSION_STRING gwy_isinf gwy_isnan pow10 syn keyword gwyddionDeprecatedFunction gwy_3d_window_class_get_tooltips gwy_3d_window_class_set_tooltips gwy_app_get_tooltips gwy_cdline_get_param_default gwy_data_field_area_get_avg gwy_data_field_area_get_median gwy_data_field_area_get_min_max gwy_data_field_area_get_rms gwy_data_field_area_get_stats gwy_data_field_area_get_sum gwy_data_field_area_get_surface_area gwy_data_line_line_rotate gwy_data_window_class_get_tooltips gwy_data_window_class_set_tooltips gwy_dialog_prevent_delete_cb gwy_get_pango_ft2_font_map gwy_graph_window_class_get_tooltips gwy_graph_window_class_set_tooltips syn keyword gwyddionDeprecatedConstant GWY_TOOL_SWITCH_TOOL GWY_TOOL_SWITCH_WINDOW syn keyword gwyddionDeprecatedStruct GwyTipModelPreset diff -Nru gwyddion-2.62/data/Makefile.in gwyddion-2.63/data/Makefile.in --- gwyddion-2.62/data/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/data/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -423,6 +423,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/data/net.gwyddion.Gwyddion.appdata.xml gwyddion-2.63/data/net.gwyddion.Gwyddion.appdata.xml --- gwyddion-2.62/data/net.gwyddion.Gwyddion.appdata.xml 2022-11-03 09:42:04.000000000 +0000 +++ gwyddion-2.63/data/net.gwyddion.Gwyddion.appdata.xml 2023-06-13 13:07:43.000000000 +0000 @@ -29,7 +29,7 @@ - + http://gwyddion.net/ diff -Nru gwyddion-2.62/debian/changelog gwyddion-2.63/debian/changelog --- gwyddion-2.62/debian/changelog 2022-11-04 19:44:28.000000000 +0000 +++ gwyddion-2.63/debian/changelog 2023-07-12 13:20:43.000000000 +0000 @@ -1,3 +1,10 @@ +gwyddion (2.63-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.6.2 (routine-update) + + -- Andreas Tille Wed, 12 Jul 2023 15:20:43 +0200 + gwyddion (2.62-1) unstable; urgency=medium * New upstream version diff -Nru gwyddion-2.62/debian/control gwyddion-2.63/debian/control --- gwyddion-2.62/debian/control 2022-11-04 19:44:28.000000000 +0000 +++ gwyddion-2.63/debian/control 2023-07-12 13:20:43.000000000 +0000 @@ -15,7 +15,7 @@ gtk-doc-tools, debhelper Rules-Requires-Root: no -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/med-team/gwyddion Vcs-Git: https://salsa.debian.org/med-team/gwyddion.git Homepage: http://gwyddion.net/ diff -Nru gwyddion-2.62/debian/source/include-binaries gwyddion-2.63/debian/source/include-binaries --- gwyddion-2.62/debian/source/include-binaries 2022-11-04 19:44:28.000000000 +0000 +++ gwyddion-2.63/debian/source/include-binaries 2023-07-12 13:20:43.000000000 +0000 @@ -10,3 +10,4 @@ debian/upstream/gwyddion-2.60.tar.xz.sig debian/upstream/gwyddion-2.61.tar.xz.sig debian/upstream/gwyddion-2.62.tar.xz.sig +debian/upstream/gwyddion-2.63.tar.xz.sig diff -Nru gwyddion-2.62/debian/upstream/gwyddion_2.63.orig.tar.xz.asc gwyddion-2.63/debian/upstream/gwyddion_2.63.orig.tar.xz.asc --- gwyddion-2.62/debian/upstream/gwyddion_2.63.orig.tar.xz.asc 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/debian/upstream/gwyddion_2.63.orig.tar.xz.asc 2023-07-12 13:20:43.000000000 +0000 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHAEABECADAWIQQmP5seweBSYcaJ2DsA/dHQYqB3MgUCZIhvfRIceWV0aUBnd3lk +ZGlvbi5uZXQACgkQAP3R0GKgdzJVHQCbBi2GA10QfxoqO7Q814pKeKwknsEAoIMI +hXCcSvZvvtObZ7Ut/24OzYSL +=J2Zo +-----END PGP SIGNATURE----- Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/debian/upstream/gwyddion-2.63.tar.xz.sig and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/debian/upstream/gwyddion-2.63.tar.xz.sig differ diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/api-index-2-62.html gwyddion-2.63/devel-docs/libgwyapp/html/api-index-2-62.html --- gwyddion-2.62/devel-docs/libgwyapp/html/api-index-2-62.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/api-index-2-62.html 2023-06-13 13:24:17.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -22,7 +23,7 @@ Home Prev - +Next

diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/api-index-2-63.html gwyddion-2.63/devel-docs/libgwyapp/html/api-index-2-63.html --- gwyddion-2.62/devel-docs/libgwyapp/html/api-index-2-63.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/api-index-2-63.html 2023-06-13 13:24:17.000000000 +0000 @@ -0,0 +1,70 @@ + + + + +Index of new symbols in 2.63: Gwyddion Application Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.63

+

A

+
+gwy_app_settings_merge_string, function in settings +
+
+

C

+
+gwy_create_graph_xrange_with_params, function in module utils +
+
+

H

+
+GwyHoldSelectionFlags, enum in GwyPlainTool +
+
+

P

+
+gwy_param_def_add_hold_selection, function in GwyParamDef +
+
+
+gwy_param_table_append_hold_selection, function in GwyParamTable +
+
+
+gwy_param_table_append_range, function in GwyParamTable +
+
+
+gwy_plain_tool_enable_selection_holding, function in GwyPlainTool +
+
+
+gwy_plain_tool_hold_selection, function in GwyPlainTool +
+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/api-index-all.html gwyddion-2.63/devel-docs/libgwyapp/html/api-index-all.html --- gwyddion-2.62/devel-docs/libgwyapp/html/api-index-all.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/api-index-all.html 2023-06-13 13:24:17.000000000 +0000 @@ -864,6 +864,10 @@
+gwy_app_settings_merge_string, function in settings +
+
+
gwy_app_settings_save, function in settings
@@ -1041,6 +1045,10 @@
+gwy_create_graph_xrange_with_params, function in module utils +
+
+
gwy_create_inventory_model_without_default, function in module utils
@@ -1389,6 +1397,10 @@ gwy_help_show, function in help
+
+GwyHoldSelectionFlags, enum in GwyPlainTool +
+

L

gwy_log_get_enabled, function in log @@ -1693,6 +1705,10 @@
+gwy_param_def_add_hold_selection, function in GwyParamDef +
+
+
gwy_param_def_add_image_id, function in GwyParamDef
@@ -1869,6 +1885,10 @@
+gwy_param_table_append_hold_selection, function in GwyParamTable +
+
+
gwy_param_table_append_image_id, function in GwyParamTable
@@ -1913,6 +1933,10 @@
+gwy_param_table_append_range, function in GwyParamTable +
+
+
gwy_param_table_append_report, function in GwyParamTable
@@ -2165,6 +2189,10 @@
+gwy_plain_tool_enable_selection_holding, function in GwyPlainTool +
+
+
gwy_plain_tool_ensure_layer, function in GwyPlainTool
@@ -2173,6 +2201,10 @@
+gwy_plain_tool_hold_selection, function in GwyPlainTool +
+
+
gwy_plain_tool_log_add, function in GwyPlainTool
@@ -2492,6 +2524,10 @@
+GwyToolHeldSelection, struct in GwyPlainTool +
+
+
GwyToolResponseType, enum in GwyTool
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/GwyDialog.html gwyddion-2.63/devel-docs/libgwyapp/html/GwyDialog.html --- gwyddion-2.62/devel-docs/libgwyapp/html/GwyDialog.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/GwyDialog.html 2023-06-13 13:24:17.000000000 +0000 @@ -266,7 +266,7 @@

Beside GwyResponseType, the following GTK+ responses are recognised and handled automatically.

GTK_RESPONSE_OK or GTK_RESPONSE_ACCEPT creates an OK button which finishes the dialog with result GWY_DIALOG_PROCEED (or GWY_DIALOG_HAVE_RESULT if result has been calculated).

-

GTK_RESPONSE_CANCEL or GTK_RESPONSE_REJECT creates a Cancelbutton which finishes the dialog with result +

GTK_RESPONSE_CANCEL or GTK_RESPONSE_REJECT creates a Cancel button which finishes the dialog with result GWY_DIALOG_CANCEL.

Parameters

diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/GwyParamDef.html gwyddion-2.63/devel-docs/libgwyapp/html/GwyParamDef.html --- gwyddion-2.62/devel-docs/libgwyapp/html/GwyParamDef.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/GwyParamDef.html 2023-06-13 13:24:17.000000000 +0000 @@ -266,6 +266,14 @@ void +gwy_param_def_add_hold_selection () + + + + +void + + gwy_param_def_add_seed () @@ -1834,6 +1842,50 @@
+

gwy_param_def_add_hold_selection ()

+
void
+gwy_param_def_add_hold_selection (GwyParamDef *pardef,
+                                  gint id,
+                                  const gchar *name,
+                                  const gchar *desc);
+

Defines a new flags parameter with values that are selection holding flags.

+

The values are flags from GwyHoldSelectionFlags. The default is zero.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

pardef

A set of parameter definitions.

 

id

Parameter identifier.

 

name

Parameter name for settings. It can be NULL for derived parameters not stored in settings.

 

desc

Parameter description which will be used for a label in GUI. Normally pass NULL for the default label.

 
+
+

Since: 2.63

+
+
+

gwy_param_def_add_seed ()

void
 gwy_param_def_add_seed (GwyParamDef *pardef,
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/GwyParamTable.html gwyddion-2.63/devel-docs/libgwyapp/html/GwyParamTable.html
--- gwyddion-2.62/devel-docs/libgwyapp/html/GwyParamTable.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyapp/html/GwyParamTable.html	2023-06-13 13:24:17.000000000 +0000
@@ -630,6 +630,14 @@
 void
 
 
+gwy_param_table_append_range ()
+
+
+
+
+void
+
+
 gwy_param_table_append_unit_chooser ()
 
 
@@ -718,6 +726,14 @@
 void
 
 
+gwy_param_table_append_hold_selection ()
+
+
+
+
+void
+
+
 gwy_param_table_append_seed ()
 
 
@@ -1182,7 +1198,7 @@
 
No-reset parameters are untouched by gwy_param_table_reset().  Hence they are not reset by the GwyDialog reset
 response handler either.  This can be useful for parameters that do not have static default values and need special
 treatment during the reset.

-
Some parameters are no-reset by default: data ids and mask colour.

+
Some parameters are no-reset by default: for instance data ids or mask colour.

 

 
Parameters

 

@@ -1802,7 +1818,7 @@
  must be a boolean defined by gwy_param_def_add_boolean() or a predefined boolean.
The parameter identified by other_id
  must be added as combo box, data chooser, slider or radio button row (text
-or image buttons).  The check box will the be integrated in the control of that parameter.  If you have a generic
+or image buttons).  The check box will then be integrated in the control of that parameter.  If you have a generic
 enable/disable parameter with its own standalone checkbox use gwy_param_table_append_checkbox() instead (and set
 widget sensitivity using gwy_param_table_set_sensitive() in the “param-changed” signal handler).

@@ -3732,6 +3748,52 @@
 

+
gwy_param_table_append_range ()

+
void
+gwy_param_table_append_range (GwyParamTable *partable,
+                              gint id_from,
+                              gint id_to);

+
Adds a pair of numerical entries representing a range to a parameter table.

+
This is mostly useful for entering graph ranges numerically. For image ranges separate controls are preferred as
+they allow pixel plus alternative real values.

+
The two parameters identified by id_from
+ and id_to
+ must be doubles and distinct. Parameter id_from
+ is considered
+primary and should be used for referring to the control as a whole (for instance to make it insensitive), even
+though for convenience both are passed directly to this function.

+
Use gwy_param_table_entry_set_value_format() to set the value format.

+

+
Parameters

+

 
 
 
 

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





partable
Set of parameter value controls.
 
id_from
Parameter identifier for the beginning.
 
id_to
Parameter identifier for the end.
 

+

+
Since: 2.63

+
+
+

gwy_param_table_append_unit_chooser ()

void
 gwy_param_table_append_unit_chooser (GwyParamTable *partable,
@@ -4247,6 +4309,40 @@
+

gwy_param_table_append_hold_selection ()

+
void
+gwy_param_table_append_hold_selection (GwyParamTable *partable,
+                                       gint id);
+

Adds a selection holding parameter to a parameter table.

+

The parameter identified by id + must be a selection holding flags parameter defined by +gwy_param_def_add_hold_selection().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

partable

Set of parameter value controls.

 

id

Parameter identifier.

 
+
+

Since: 2.63

+
+
+

gwy_param_table_append_seed ()

void
 gwy_param_table_append_seed (GwyParamTable *partable,
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/GwyPlainTool.html gwyddion-2.63/devel-docs/libgwyapp/html/GwyPlainTool.html
--- gwyddion-2.62/devel-docs/libgwyapp/html/GwyPlainTool.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyapp/html/GwyPlainTool.html	2023-06-13 13:24:17.000000000 +0000
@@ -97,6 +97,22 @@
 
 
 
+void
+
+
+gwy_plain_tool_hold_selection ()
+
+
+
+
+void
+
+
+gwy_plain_tool_enable_selection_holding ()
+
+
+
+
 GwyRectSelectionLabels *
 
 
@@ -159,10 +175,18 @@
 GwyPlainToolChanged
 
 
+enum
+GwyHoldSelectionFlags
+
+
  
 GwyRectSelectionLabels
 
 
+ 
+GwyToolHeldSelection
+
+
 struct
 GwyPlainTool
 
@@ -421,8 +445,7 @@
 
void
 gwy_plain_tool_enable_object_deletion (GwyPlainTool *plain_tool,
                                        GtkTreeView *treeview);

-
Enables deletion of selection objects by presssing Delete in a tree view
-diplaying them.

+
Enables deletion of selection objects by presssing Delete in a tree view diplaying them.

 

 
Parameters

 

@@ -449,6 +472,71 @@
 

+
gwy_plain_tool_hold_selection ()

+
void
+gwy_plain_tool_hold_selection (GwyPlainTool *plain_tool,
+                               GwyHoldSelectionFlags hold_flags);

+
Possibly transfers the selection to a new image upon plain tool data switch.

+
This function should be called from data_switched() class method in a tool after setting up the layer and
+selection. If the selection should be transferred to the new image according to hold_flags
+ the previous (held)
+selection will replace whatever selection might be there currently. Otherwise the new image's selection is
+preserved (and in fact held itself).

+
Selection holding must be enabled in tool instance init function using gwy_plain_tool_enable_selection_holding().

+

+
Parameters

+

 
 

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





plain_tool
A plain tool.
 
hold_flags
Flags controlling when the selection is held (transferred to another image).
 

+

+
Since: 2.63

+
+
+
+

gwy_plain_tool_enable_selection_holding ()

+
void
+gwy_plain_tool_enable_selection_holding
+                               (GwyPlainTool *plain_tool);
+

Enables selection holding for a plain tool.

+

Selection holding means that, if certain conditions are satisfied, upon data switch the tool transfers the current +selection to the new image, replacing whatever selection might be there.

+

This function should be called from the instance init function.

+

Holding is currently unsupported for tools which use multiple selection types.

+
+

Parameters

+
+++++ + + + + + +

plain_tool

A plain tool.

 
+
+

Since: 2.63

+
+
+

gwy_rect_selection_labels_new ()

GwyRectSelectionLabels *
 gwy_rect_selection_labels_new (gboolean none_is_full,
@@ -725,11 +813,59 @@
+

enum GwyHoldSelectionFlags

+

Flags controlling the selection holding behaviour of tools.

+

Although any combination of flags is valid, this is mainly so that user's choice is not reset. For any holding to +be done at all the GWY_HOLD_SELECTION_HOLD flag must be set. If it is unset then GWY_HOLD_SELECTION_OVERWRITE +and GWY_HOLD_SELECTION_CLEAR do not matter. Similarly, for GWY_HOLD_SELECTION_CLEAR has any effect only if +overwriting is enabled by setting GWY_HOLD_SELECTION_OVERWRITE.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

GWY_HOLD_SELECTION_HOLD

 +

Selections are held (transferred to the new image).

+		 

GWY_HOLD_SELECTION_OVERWRITE

 +

Existing selections on the new image is replaced.

+		 

GWY_HOLD_SELECTION_CLEAR

 +

If the current image has no selection the selection on the new image is cleared.

+		 
+
+

Since: 2.63

+
+
+

GwyRectSelectionLabels

typedef struct _GwyRectSelectionLabels GwyRectSelectionLabels;
+

GwyToolHeldSelection

+
typedef struct _GwyToolHeldSelection GwyToolHeldSelection;
+
+
+

struct GwyPlainTool

struct GwyPlainTool;
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/index.html gwyddion-2.63/devel-docs/libgwyapp/html/index.html --- gwyddion-2.62/devel-docs/libgwyapp/html/index.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/index.html 2023-06-13 13:24:17.000000000 +0000 @@ -15,7 +15,7 @@

- For Gwyddion 2.62. + For Gwyddion 2.63. The latest version of this document can be found on-line at http://gwyddion.net/documentation/libgwyapp/.

@@ -146,6 +146,7 @@
Index of new symbols in 2.60
Index of new symbols in 2.61
Index of new symbols in 2.62
+
Index of new symbols in 2.63
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-data-browser.html gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-data-browser.html --- gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-data-browser.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-data-browser.html 2023-06-13 13:24:17.000000000 +0000 @@ -2608,6 +2608,7 @@ gboolean delete_too, ...);

Synchronizes auxiliary image data items between data containers.

+

All items except GWY_DATA_ITEM_PREVIEW are valid for image data.

Parameters

@@ -2664,6 +2665,7 @@ const GwyDataItem *items, guint nitems);

Synchronizes auxiliary image data items between data containers.

+

All items except GWY_DATA_ITEM_PREVIEW are valid for image data.

Parameters

@@ -5353,6 +5355,8 @@

enum GwyDataItem

Type of auxiliary channel data.

+

Not all auxiliary data types are valid for all primary data types. See individual functions such as +gwy_app_sync_data_items() or gwy_app_sync_volume_items() for specification which items can be used with them.

Members

@@ -5436,7 +5440,7 @@ diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp.devhelp2 gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp.devhelp2 --- gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp.devhelp2 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp.devhelp2 2023-06-13 13:24:17.000000000 +0000 @@ -64,6 +64,7 @@ + @@ -207,6 +208,7 @@ + @@ -360,6 +362,7 @@ + @@ -490,6 +493,7 @@ + @@ -501,6 +505,7 @@ + @@ -550,6 +555,8 @@ + + @@ -557,7 +564,9 @@ + + @@ -575,6 +584,7 @@ + @@ -808,6 +818,9 @@ + + + diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-file-module-utils.html gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-file-module-utils.html --- gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-file-module-utils.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-file-module-utils.html 2023-06-13 13:24:17.000000000 +0000 @@ -331,22 +331,16 @@

Description

-

Functions gwy_app_channel_check_nonsquare() and -gwy_app_channel_title_fall_back() perform common tasks improving the -imported of channels from foreign data files. Typically one calls them on -all imported channel ids after storing the data fields the the container, -if they are useful for a given file type.

-

The group of functions gwy_get_gint16_le(), gwy_get_gint16_be(), etc. -is intended to portably read packed binary data structures that are commonly -found in SPM files. They all work identically: the binary data value is -read from the buffer, converted if necessary, and the provided -buffer pointer is moved to point after the value to faciliate sequential -reading.

-

As no buffer size is passed, obviously no buffer size checking is performed. -The caller has to ensure the buffer is large enough -- it is expected the -caller checks the total buffer size before starting to parse it.

-

For example to portably read the following packed struct stored -in big-endian byte order:

+

Functions gwy_app_channel_check_nonsquare() and gwy_app_channel_title_fall_back() perform common tasks improving +the imported of channels from foreign data files. Typically one calls them on all imported channel ids after +storing the data fields the the container, if they are useful for a given file type.

+

The group of functions gwy_get_gint16_le(), gwy_get_gint16_be(), etc. is intended to portably read packed binary +data structures that are commonly found in SPM files. They all work identically: the binary data value is read +from the buffer, converted if necessary, and the provided buffer pointer is moved to point after the value to +faciliate sequential reading.

+

As no buffer size is passed, obviously no buffer size checking is performed. The caller has to ensure the buffer is +large enough -- it is expected the caller checks the total buffer size before starting to parse it.

+

For example to portably read the following packed struct stored in big-endian byte order:

GWY_DATA_ITEM_PREVIEW

 -

Volume data preview. (Since 2.51)

+

Volume, XYZ or curve map data preview. (Since 2.51)

  
@@ -389,11 +383,10 @@ in buffer after this snippet is finished.

The data types used in header - do not matter (provided they are large -enough to hold the values), the exact types are determined by the functions -used. Therefore the reading would work identically if header - was defined -using common types:

+ do not matter (provided they are large enough to hold the values), the exact types +are determined by the functions used. Therefore the reading would work identically if header + was defined using +common types:

@@ -420,8 +413,8 @@

gwy_get_gboolean8 ()

gboolean
 gwy_get_gboolean8 (const guchar **ppv);
-

Reads a boolean value stored as a signle byte from a -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a boolean value stored as a signle byte from a binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -432,8 +425,7 @@ - +

ppv

Pointer to a pointer to boolean (stored as a signle byte) -in a memory buffer.

Pointer to a pointer to boolean (stored as a signle byte) in a memory buffer.

  
@@ -449,8 +441,8 @@

gwy_get_gint16_le ()

gint16
 gwy_get_gint16_le (const guchar **ppv);
-

Reads a signed 16bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 16bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -461,8 +453,7 @@ - +

ppv

Pointer to a pointer to a little-endian signed 16bit integer -in a memory buffer.

Pointer to a pointer to a little-endian signed 16bit integer in a memory buffer.

  
@@ -478,8 +469,8 @@

gwy_get_gint16_be ()

gint16
 gwy_get_gint16_be (const guchar **ppv);
-

Reads a signed 16bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 16bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -490,8 +481,7 @@ - +

ppv

Pointer to a pointer to a big-endian signed 16bit integer -in a memory buffer.

Pointer to a pointer to a big-endian signed 16bit integer in a memory buffer.

  
@@ -507,8 +497,8 @@

gwy_get_guint16_le ()

guint16
 gwy_get_guint16_le (const guchar **ppv);
-

Reads an unsigned 16bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 16bit integer value from a little-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -519,8 +509,7 @@ - +

ppv

Pointer to a pointer to a little-endian unsigned 16bit integer -in a memory buffer.

Pointer to a pointer to a little-endian unsigned 16bit integer in a memory buffer.

  
@@ -536,8 +525,8 @@

gwy_get_guint16_be ()

guint16
 gwy_get_guint16_be (const guchar **ppv);
-

Reads an unsigned 16bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 16bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -548,8 +537,7 @@ - +

ppv

Pointer to a pointer to a big-endian unsigned 16bit integer -in a memory buffer.

Pointer to a pointer to a big-endian unsigned 16bit integer in a memory buffer.

  
@@ -565,8 +553,8 @@

gwy_get_gint32_le ()

gint32
 gwy_get_gint32_le (const guchar **ppv);
-

Reads a signed 32bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 32bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -577,8 +565,7 @@ - +

ppv

Pointer to a pointer to a little-endian signed 32bit integer -in a memory buffer.

Pointer to a pointer to a little-endian signed 32bit integer in a memory buffer.

  
@@ -594,8 +581,8 @@

gwy_get_gint32_be ()

gint32
 gwy_get_gint32_be (const guchar **ppv);
-

Reads a signed 32bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 32bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -606,8 +593,7 @@ - +

ppv

Pointer to a pointer to a big-endian signed 32bit integer -in a memory buffer.

Pointer to a pointer to a big-endian signed 32bit integer in a memory buffer.

  
@@ -623,8 +609,8 @@

gwy_get_guint32_le ()

guint32
 gwy_get_guint32_le (const guchar **ppv);
-

Reads an unsigned 32bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 32bit integer value from a little-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -635,8 +621,7 @@ - +

ppv

Pointer to a pointer to a little-endian unsigned 32bit integer -in a memory buffer.

Pointer to a pointer to a little-endian unsigned 32bit integer in a memory buffer.

  
@@ -652,8 +637,8 @@

gwy_get_guint32_be ()

guint32
 gwy_get_guint32_be (const guchar **ppv);
-

Reads an unsigned 32bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 32bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -664,8 +649,7 @@ - +

ppv

Pointer to a pointer to a big-endian unsigned 32bit integer -in a memory buffer.

Pointer to a pointer to a big-endian unsigned 32bit integer in a memory buffer.

  
@@ -681,8 +665,8 @@

gwy_get_gint64_le ()

gint64
 gwy_get_gint64_le (const guchar **ppv);
-

Reads a signed 64bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 64bit integer value from a little-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -693,8 +677,7 @@ - +

ppv

Pointer to a pointer to a little-endian signed 64bit integer -in a memory buffer.

Pointer to a pointer to a little-endian signed 64bit integer in a memory buffer.

  
@@ -710,8 +693,8 @@

gwy_get_gint64_be ()

gint64
 gwy_get_gint64_be (const guchar **ppv);
-

Reads a signed 64bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a signed 64bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -722,8 +705,7 @@ - +

ppv

Pointer to a pointer to a big-endian signed 64bit integer -in a memory buffer.

Pointer to a pointer to a big-endian signed 64bit integer in a memory buffer.

  
@@ -739,8 +721,8 @@

gwy_get_guint64_le ()

guint64
 gwy_get_guint64_le (const guchar **ppv);
-

Reads an unsigned 64bit integer value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 64bit integer value from a little-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -751,8 +733,7 @@ - +

ppv

Pointer to a pointer to a little-endian unsigned 64bit integer -in a memory buffer.

Pointer to a pointer to a little-endian unsigned 64bit integer in a memory buffer.

  
@@ -768,8 +749,8 @@

gwy_get_guint64_be ()

guint64
 gwy_get_guint64_be (const guchar **ppv);
-

Reads an unsigned 64bit integer value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads an unsigned 64bit integer value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -780,8 +761,7 @@ - +

ppv

Pointer to a pointer to a big-endian unsigned 64bit integer -in a memory buffer.

Pointer to a pointer to a big-endian unsigned 64bit integer in a memory buffer.

  
@@ -797,8 +777,8 @@

gwy_get_gfloat_le ()

gfloat
 gwy_get_gfloat_le (const guchar **ppv);
-

Reads a single-precision IEEE float value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a single-precision IEEE float value from a little-endian binary data buffer, moving the buffer pointer to +point just after the value.

Parameters

@@ -809,8 +789,7 @@ - +

ppv

Pointer to a pointer to a little-endian single-precision IEEE float -in a memory buffer.

Pointer to a pointer to a little-endian single-precision IEEE float in a memory buffer.

  
@@ -826,8 +805,8 @@

gwy_get_gfloat_be ()

gfloat
 gwy_get_gfloat_be (const guchar **ppv);
-

Reads a single-precision IEEE float value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a single-precision IEEE float value from a big-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -838,8 +817,7 @@ - +

ppv

Pointer to a pointer to a big-endian single-precision IEEE float -in a memory buffer.

Pointer to a pointer to a big-endian single-precision IEEE float in a memory buffer.

  
@@ -855,8 +833,8 @@

gwy_get_gdouble_le ()

gdouble
 gwy_get_gdouble_le (const guchar **ppv);
-

Reads a double-precision IEEE float value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a double-precision IEEE float value from a little-endian binary data buffer, moving the buffer pointer to +point just after the value.

Parameters

@@ -867,8 +845,7 @@ - +

ppv

Pointer to a pointer to a little-endian double-precision IEEE float -in a memory buffer.

Pointer to a pointer to a little-endian double-precision IEEE float in a memory buffer.

  
@@ -884,8 +861,8 @@

gwy_get_gdouble_be ()

gdouble
 gwy_get_gdouble_be (const guchar **ppv);
-

Reads a double-precision IEEE float value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a double-precision IEEE float value from a big-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -896,8 +873,7 @@ - +

ppv

Pointer to a pointer to a big-endian double-precision IEEE float -in a memory buffer.

Pointer to a pointer to a big-endian double-precision IEEE float in a memory buffer.

  
@@ -913,8 +889,8 @@

gwy_get_pascal_real_le ()

gdouble
 gwy_get_pascal_real_le (const guchar **ppv);
-

Reads a six-byte Pascale Real value from a little-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a six-byte Pascale Real value from a little-endian binary data buffer, moving the buffer pointer to point +just after the value.

Parameters

@@ -925,8 +901,7 @@ - +

ppv

Pointer to a pointer to a little-endian six-byte Pascal Real -in a memory buffer.

Pointer to a pointer to a little-endian six-byte Pascal Real in a memory buffer.

  
@@ -942,8 +917,8 @@

gwy_get_pascal_real_be ()

gdouble
 gwy_get_pascal_real_be (const guchar **ppv);
-

Reads a six-byte Pascale Real value from a big-endian -binary data buffer, moving the buffer pointer to point just after the value.

+

Reads a six-byte Pascale Real value from a big-endian binary data buffer, moving the buffer pointer to point just +after the value.

Parameters

@@ -954,8 +929,7 @@ - +

ppv

Pointer to a pointer to a big-endian six-byte Pascal Real -in a memory buffer.

Pointer to a pointer to a big-endian six-byte Pascal Real in a memory buffer.

  
@@ -973,9 +947,8 @@ gwy_app_channel_check_nonsquare (GwyContainer *data, gint id);

Sets `realsquare' for a channel highly non-square pixels.

-

The threshold for highly non-square is somewhat arbitrary. -Fortunately, most files encoutered in practice have the measure ratio either -very close to 1, larger or equal than 2.

+

The threshold for highly non-square is somewhat arbitrary. Fortunately, most files encoutered in practice have the +measure ratio either very close to 1, larger or equal than 2.

Parameters

@@ -1000,8 +973,8 @@

Returns

-

TRUE if the channel was found to have highly non-square pixels -and `realsquare' was set (otherwise it was unset).

+

TRUE if the channel was found to have highly non-square pixels and `realsquare' was set (otherwise it was +unset).

Since: 2.3

@@ -1012,9 +985,8 @@ gwy_app_channel_title_fall_back (GwyContainer *data, gint id);

Adds a channel title based on data field units.

-

The guess is very simple, but probably better than `Unknown channel' in -most cases. If there already is a title it is left intact, making use of -this function as a fall-back easier.

+

The guess is very simple, but probably better than `Unknown channel' in most cases. If there already is a title it +is left intact, making use of this function as a fall-back easier.

Parameters

@@ -1050,9 +1022,8 @@ gwy_app_xyz_title_fall_back (GwyContainer *data, gint id);

Adds a XYZ data title based on surface value units.

-

The guess is very simple, but probably better than `Unknown channel' in -most cases. If there already is a title it is left intact, making use of -this function as a fall-back easier.

+

The guess is very simple, but probably better than `Unknown channel' in most cases. If there already is a title it +is left intact, making use of this function as a fall-back easier.

Parameters

@@ -1088,9 +1059,8 @@ gwy_app_channel_remove_bad_data (GwyDataField *dfield, GwyDataField *mfield);

Replaces bad data points with some neutral values.

-

Since Gwyddion has no concept of bad data points, they are usually marked -with a mask and replaced with some neutral values upon import, leaving the -user to decide how to proceed further. This helper function performs such +

Since Gwyddion has no concept of bad data points, they are usually marked with a mask and replaced with some +neutral values upon import, leaving the user to decide how to proceed further. This helper function performs such replacement.

Parameters

@@ -1103,15 +1073,13 @@
- + - + @@ -1119,8 +1087,8 @@

Returns

-

The number of bad data points replaced. If zero is returned, all -points are good and there is no need for masking.

+

The number of bad data points replaced. If zero is returned, all points are good and there is no need for +masking.

Since: 2.14

@@ -1130,13 +1098,10 @@ 
GwyDataField *
 gwy_app_channel_mask_of_nans (GwyDataField *dfield,
                               gboolean removebad);
-

Creates a mask corresponding to not-a-number and infinite values in a data -field.

-

NaNs and infinities are not normally allowed in Gwyddion so this function -should be used upon import if the source file format can represent such -values.

-

The invalid values can be automatically removed using the same method as -gwy_app_channel_remove_bad_data().

+

Creates a mask corresponding to not-a-number and infinite values in a data field.

+

NaNs and infinities are not normally allowed in Gwyddion so this function should be used upon import if the source +file format can represent such values.

+

The invalid values can be automatically removed using the same method as gwy_app_channel_remove_bad_data().

Parameters

dfield

A data field. The values of bad data points are ignored and might -be even left uninitialized.

A data field. The values of bad data points are ignored and might be even left uninitialized.

  

mfield

A mask field containing 1.0 in place of good data points, 0.0 in -place of bad points. It will be inverted to become the mask of -bad points.

A mask field containing 1.0 in place of good data points, 0.0 in place of bad points. It will be inverted +to become the mask of bad points.

  
@@ -1161,10 +1126,9 @@

Returns

-

A newly created data field with 1.0 in pixels corresponding to a -NaN or infinity in dfield -. If no such pixels are present, NULL -is returned.

+

A newly created data field with 1.0 in pixels corresponding to a NaN or infinity in dfield +. If no such +pixels are present, NULL is returned.

Since: 2.38

@@ -1203,10 +1167,8 @@ - + @@ -1229,8 +1191,7 @@

Returns

-

A newly created hash table with values indexed by they keys found -in the header.

+

A newly created hash table with values indexed by they keys found in the header.

Since: 2.18

@@ -1240,8 +1201,7 @@ 
const gchar *
 gwy_text_header_context_get_section (const GwyTextHeaderContext *context);

Gets the currently open section.

-

This function may be called if no sectioning is defined. It simply -returns NULL then.

+

This function may be called if no sectioning is defined. It simply returns NULL then.

Parameters

header

Text header to parse. It must be NULL-terminated and writable. -Its contents will be modified to directly embed the hash keys -and/or values. It must not be freed while the returned hash -table is in use.

Text header to parse. It must be NULL-terminated and writable. Its contents will be modified to directly +embed the hash keys and/or values. It must not be freed while the returned hash table is in use.

  
@@ -1299,8 +1259,8 @@ const gchar *filetype, const gchar *filename);

Logs the import of a channel from third-party file.

-

This is a convenience wrapper for gwy_app_channel_log_add(). The source id -will be set to -1. The file name will be added to function arguments.

+

This is a convenience wrapper for gwy_app_channel_log_add(). The source id will be set to -1. The file name will +be added to function arguments.

Parameters

@@ -1322,17 +1282,14 @@ - + - + @@ -1349,8 +1306,8 @@ const gchar *filetype, const gchar *filename);

Logs the import of volume data from third-party file.

-

This is a convenience wrapper for gwy_app_volume_log_add(). The source id -will be set to -1. The file name will be added to function arguments.

+

This is a convenience wrapper for gwy_app_volume_log_add(). The source id will be set to -1. The file name will +be added to function arguments.

Parameters

filetype

File type, i.e. the name of the function importing the data -(without any "file::" prefix). Since 2.38 it is possible to -pass NULL to fill the name of the currently running file type -function automatically.

File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 +it is possible to pass NULL to fill the name of the currently running file type function automatically.

  

filename

Name of the imported file. If it is not valid UTF-8, it will be -converted to UTF-8 using g_filename_to_utf8(). Failing even -that, non-ASCII characters will be escaped.

Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using +g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped.

  
@@ -1372,17 +1329,14 @@ - + - + @@ -1399,8 +1353,8 @@ const gchar *filetype, const gchar *filename);

Logs the import of xyz data from third-party file.

-

This is a convenience wrapper for gwy_app_xyz_log_add(). The source id -will be set to -1. The file name will be added to function arguments.

+

This is a convenience wrapper for gwy_app_xyz_log_add(). The source id will be set to -1. The file name will be +added to function arguments.

Parameters

filetype

File type, i.e. the name of the function importing the data -(without any "file::" prefix). Since 2.38 it is possible to -pass NULL to fill the name of the currently running file type -function automatically.

File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 +it is possible to pass NULL to fill the name of the currently running file type function automatically.

  

filename

Name of the imported file. If it is not valid UTF-8, it will be -converted to UTF-8 using g_filename_to_utf8(). Failing even -that, non-ASCII characters will be escaped.

Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using +g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped.

  
@@ -1422,17 +1376,14 @@ - + - + @@ -1449,8 +1400,8 @@ const gchar *filetype, const gchar *filename);

Logs the import of volume data from third-party file.

-

This is a convenience wrapper for gwy_app_curve_map_log_add(). The source id -will be set to -1. The file name will be added to function arguments.

+

This is a convenience wrapper for gwy_app_curve_map_log_add(). The source id will be set to -1. The file name +will be added to function arguments.

Parameters

filetype

File type, i.e. the name of the function importing the data -(without any "file::" prefix). It is possible to -pass NULL to fill the name of the currently running file type -function automatically.

File type, i.e. the name of the function importing the data (without any "file::" prefix). It is +possible to pass NULL to fill the name of the currently running file type function automatically.

  

filename

Name of the imported file. If it is not valid UTF-8, it will be -converted to UTF-8 using g_filename_to_utf8(). Failing even -that, non-ASCII characters will be escaped.

Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using +g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped.

  
@@ -1472,17 +1423,14 @@ - + - + @@ -1497,18 +1445,16 @@

GWY_TEXT_HEADER_ERROR

#define GWY_TEXT_HEADER_ERROR gwy_text_header_error_quark()
-

Error domain for text header parsing. Errors in this domain will be from the -GwyTextHeaderError enumeration. See GError for information on error -domains.

+

Error domain for text header parsing. Errors in this domain will be from the GwyTextHeaderError enumeration. See +GError for information on error domains.

Since: 2.18

enum GwyTextHeaderError

Error codes returned by text header parsing.

-

Some errors, in particular GWY_TEXT_HEADER_ERROR_KEY and -GWY_TEXT_HEADER_ERROR_VALUE are expected to be raised by user callbacks -(they are not restricted to these codes though).

+

Some errors, in particular GWY_TEXT_HEADER_ERROR_KEY and GWY_TEXT_HEADER_ERROR_VALUE are expected to be raised by +user callbacks (they are not restricted to these codes though).

Members

filetype

File type, i.e. the name of the function importing the data -(without any "file::" prefix). Since 2.38 it is possible to -pass NULL to fill the name of the currently running file type -function automatically.

File type, i.e. the name of the function importing the data (without any "file::" prefix). Since 2.38 +it is possible to pass NULL to fill the name of the currently running file type function automatically.

  

filename

Name of the imported file. If it is not valid UTF-8, it will be -converted to UTF-8 using g_filename_to_utf8(). Failing even -that, non-ASCII characters will be escaped.

Name of the imported file. If it is not valid UTF-8, it will be converted to UTF-8 using +g_filename_to_utf8(). Failing even that, non-ASCII characters will be escaped.

  
@@ -1521,8 +1467,7 @@ @@ -1530,10 +1475,8 @@ @@ -1541,8 +1484,7 @@ @@ -1572,16 +1514,14 @@ @@ -1626,18 +1566,15 @@ } GwyTextHeaderParser;

Text header parser specification.

-

Memory considerations: In general, the parser attempts to reuse the contents -of header - directly for the hash keys and values. There are two cases when -it cannot: sectioning implies that keys must be constructed dynamically -and the use of item - callback means the parser has no control on what is -inserted into the hash table.

+

Memory considerations: In general, the parser attempts to reuse the contents of header + directly for the hash keys +and values. There are two cases when it cannot: sectioning implies that keys must be constructed dynamically and +the use of item + callback means the parser has no control on what is inserted into the hash table.

This means that the item callback must free key - if sectioning is used and -it is not going to actually use it as the hash table key. And, of course, -suitable destroy_key + if sectioning is used and it is not going to actually use it as +the hash table key. And, of course, suitable destroy_key and destroy_value functions must be set.

@@ -1651,80 +1588,67 @@
- + - + - + - +. Typically, "::" is used.

- + - + - - + - + - + @@ -1735,26 +1659,22 @@ - + - + - @@ -1768,8 +1688,8 @@

GwyTextHeaderContext

typedef struct _GwyTextHeaderContext GwyTextHeaderContext;
-

GwyTextHeaderContext represents the parsing state. It is an opaque data -structure and should be only manipulated with the functions below.

+

GwyTextHeaderContext represents the parsing state. It is an opaque data structure and should be only manipulated +with the functions below.

Since: 2.18

diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-module-utils.html gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-module-utils.html --- gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-module-utils.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-module-utils.html 2023-06-13 13:24:17.000000000 +0000 @@ -161,6 +161,14 @@ + + + + + + + + @@ -241,10 +249,11 @@

gwy_app_settings_load ()

-
gboolean
+
gboolean
 gwy_app_settings_load (const gchar *filename,
                        GError **error);

-
Loads settings file.

+
Initialises settings by loading a settings file.

+
Any existing settings are discarded. Consider gwy_app_settings_merge_string() for piecewise settings creation.

 

 
Parameters

GWY_TEXT_HEADER_ERROR_SECTION_NAME

 -

Section name is invalid. It is raised -by the parser only for an empty section +

Section name is invalid. It is raised by the parser only for an empty section name.

  

GWY_TEXT_HEADER_ERROR_SECTION_END

 -

Section ended when a different section -or no section was open. Note that -gwy_text_header_context_get_section() -returns the section being closed at the +

Section ended when a different section or no section was open. Note that +gwy_text_header_context_get_section() returns the section being closed at the time this error is raised.

  

GWY_TEXT_HEADER_ERROR_SECTION_START

 -

Section started before the previous -ended. This is raised only if +

Section started before the previous ended. This is raised only if endsection_template is set.

GWY_TEXT_HEADER_ERROR_VALUE

 -

Value is invalid. This is never raised by -the parser.

+

Value is invalid. This is never raised by the parser.

  

GWY_TEXT_HEADER_ERROR_TERMINATOR

 -

The text header has ended without being -terminated by specified terminator.

+

The text header has ended without being terminated by specified terminator.

  

const gchar *comment_prefix;

Prefix denoting comment lines. It is possible to specify -multiple prefixes by separating them with newline ("\n").

Prefix denoting comment lines. It is possible to specify multiple prefixes by separating them +with newline ("\n").

  

const gchar *section_template;

Section start template. It must contain the character -"\x1a" in the place where the section name apprears. -For example, "[Section \x1a]".

Section start template. It must contain the character "\x1a" in the place where the section +name apprears. For example, "[Section \x1a]".

  

const gchar *endsection_template;

Section end template. It may or may not contain the -substitute character "\x1a" depending on whether the -section end markers contain the section name. It is -invalid to set endsection_template -without setting

Section end template. It may or may not contain the substitute character "\x1a" depending on +whether the section end markers contain the section name. It is invalid to set

  

const gchar *section_accessor;

Glue to put between the section name and key when -constructing hash table keys. It is invalid to set -section_accessor +

Glue to put between the section name and key when constructing hash table keys. It is invalid +to set section_accessor without setting section_template -. -Typically, "::" is used.

  

const gchar *line_prefix;

Mandatory prefix of each line. Note this applies only to -key-value lines. The templates, such comments, sections and -terminators, must still include line_prefix -if they start -with it.

Mandatory prefix of each line. Note this applies only to key-value lines. The templates, such +comments, sections and terminators, must still include line_prefix +if they start with it.

  

const gchar *key_value_separator;

The string separating keys and values on each line. -Typically, "=" or ":" is used. When left NULL, -whitespace plays the role of the separator. Of -course, keys cannot contain whitespace then.

The string separating keys and values on each line. Typically, "=" or ":" is used. When left +NULL, whitespace plays the role of the separator. Of course, keys cannot contain whitespace +then.

  

const gchar *terminator;

Line that marks end of the header. It is mandatory if -specified, GWY_TEXT_HEADER_ERROR_TERMINATOR -is raised when -the header ends sooner than terminator +

Line that marks end of the header. It is mandatory if specified, GWY_TEXT_HEADER_ERROR_TERMINATOR +is +raised when the header ends sooner than terminator is found.

  

item ()

Callback called when a key-value pair is found. If set it is -responsible for inserting the pair to the hash table with -g_hash_table_replace(). It is free to insert a different pair or -nothing. It must return FALSE if it raises an error.

Callback called when a key-value pair is found. If set it is responsible for inserting the pair to the hash +table with g_hash_table_replace(). It is free to insert a different pair or nothing. It must return FALSE +if it raises an error.

  

section ()

Callback called when a section starts. It must return FALSE if -it raises an error.

Callback called when a section starts. It must return FALSE if it raises an error.

  

endsection ()

Callback called when a section end. It must return FALSE if -it raises an error.

Callback called when a section end. It must return FALSE if it raises an error.

  

error ()

Callback called when an error occurs, including errors raised by -other user callbacks. If it returns TRUE the error is considered -fatal and the parsing terminates immediately. If it is left unset -no errors are fatal hence no errors are reported to the caller.

Callback called when an error occurs, including errors raised by other user callbacks. If it returns TRUE +the error is considered fatal and the parsing terminates immediately. If it is left unset no errors are +fatal hence no errors are reported to the caller.

  

GDestroyNotify destroy_key;

Function to destroy keys, passed to g_hash_table_new_full(). -It is invalid to set destroy_key -if item -callback is not -set.

Function to destroy keys, passed to g_hash_table_new_full(). It is invalid to set destroy_key +if +item +callback is not set.

  

GDestroyNotify destroy_value;

Function to destroy values, passed to -g_hash_table_new_full(). It is invalid to set -destroy_value +

Function to destroy values, passed to g_hash_table_new_full(). It is invalid to set destroy_value if item callback is not set.

  
+void + +gwy_create_graph_xrange_with_params () +
GtkTreeModel * @@ -1007,6 +1015,63 @@
+

gwy_create_graph_xrange_with_params ()

+
void
+gwy_create_graph_xrange_with_params (GwyParamTable *partable,
+                                     gint id_from,
+                                     gint id_to,
+                                     GwyGraph *graph,
+                                     GwyGraphModel *gmodel);
+

Sets up a parameter table range row for horizontal graph selection.

+

A row with the two parameters is added to the table. The graph is set up for GWY_GRAPH_STATUS_XSEL. +Synchronisation between the parameters and selection is set up.

+

The caller still needs to run gwy_dialog_invalidate() or use a similar mechanism when the parameter changes. +Usually, any change to the selection will result in two updates, one for each parameter.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

partable

Set of parameter value controls.

 

id_from

Parameter identifier for the beginning.

 

id_to

Parameter identifier for the end.

 

graph

Graph widget where the x +-range will be selected.

 

gmodel

Graph model used for determining the x +range. May be NULL to use graph +'s model, although this is not +usually useful.

 
+
+

Since: 2.63

+
+
+

gwy_create_inventory_model_without_default ()

GtkTreeModel *
 gwy_create_inventory_model_without_default
diff -Nru gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-settings.html gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-settings.html
--- gwyddion-2.62/devel-docs/libgwyapp/html/libgwyapp-settings.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyapp/html/libgwyapp-settings.html	2023-06-13 13:24:17.000000000 +0000
@@ -84,6 +84,14 @@
 gboolean
+gwy_app_settings_merge_string () +
+gboolean + gwy_app_settings_create_config_dir ()
@@ -275,6 +284,51 @@
+

gwy_app_settings_merge_string ()

+
gboolean
+gwy_app_settings_merge_string (const gchar *s,
+                               gboolean overwrite,
+                               GError **error);
+

Loads settings from a string and adds them to the global settings.

+

The contents of string s + should look like a Gwyddion settings file, including the header line "Gwyddion Settings +1.0", even though it is optional.

+

If no settings exist when this function is called, they are initialised like calling gwy_app_settings_get().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

s

String contaning a part of Gwyddion settings file.

 

overwrite

TRUE to replace existing settings; FALSE to only set values which do not exist.

 

error

Location to store loading error to, or NULL.

 
+
+
+

Returns

+

Whether it succeeded.

+
+

Since: 2.63

+
+
+

gwy_app_settings_create_config_dir ()

gboolean
 gwy_app_settings_create_config_dir (GError **error);
@@ -296,8 +350,7 @@

Returns

-

Whether it succeeded (also returns TRUE if the directory already -exists).

+

Whether it succeeded (also returns TRUE if the directory already exists).

diff -Nru gwyddion-2.62/devel-docs/libgwyapp/libgwyapp-docs.sgml gwyddion-2.63/devel-docs/libgwyapp/libgwyapp-docs.sgml --- gwyddion-2.62/devel-docs/libgwyapp/libgwyapp-docs.sgml 2022-11-02 13:45:04.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/libgwyapp-docs.sgml 2023-06-13 10:15:00.000000000 +0000 @@ -165,5 +165,9 @@ Index of new symbols in 2.62 + + Index of new symbols in 2.63 + + diff -Nru gwyddion-2.62/devel-docs/libgwyapp/Makefile.in gwyddion-2.63/devel-docs/libgwyapp/Makefile.in --- gwyddion-2.62/devel-docs/libgwyapp/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyapp/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -336,6 +336,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ # Some combinations of the tools do not give these us automatically. abs_builddir = @abs_builddir@ diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/api-index-2-62.html gwyddion-2.63/devel-docs/libgwyddion/html/api-index-2-62.html --- gwyddion-2.62/devel-docs/libgwyddion/html/api-index-2-62.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/api-index-2-62.html 2023-06-13 13:24:17.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -16,7 +17,7 @@ Home Prev - +Next

diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/api-index-2-63.html gwyddion-2.63/devel-docs/libgwyddion/html/api-index-2-63.html --- gwyddion-2.62/devel-docs/libgwyddion/html/api-index-2-63.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/api-index-2-63.html 2023-06-13 13:24:17.000000000 +0000 @@ -0,0 +1,37 @@ + + + + +Index of new symbols in 2.63: Gwyddion Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.63

+

G

+
+gwy_append_doubles_to_gstring, function in gwyutils +
+
+
+gwy_get_decimal_separator, function in gwyutils +
+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/api-index-all.html gwyddion-2.63/devel-docs/libgwyddion/html/api-index-all.html --- gwyddion-2.62/devel-docs/libgwyddion/html/api-index-all.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/api-index-all.html 2023-06-13 13:24:17.000000000 +0000 @@ -313,6 +313,10 @@
+gwy_append_doubles_to_gstring, function in gwyutils +
+
+
gwy_ascii_strcase_equal, function in gwyutils
@@ -857,6 +861,10 @@
+gwy_get_decimal_separator, function in gwyutils +
+
+
gwy_get_home_dir, function in gwyutils
diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/GwyResults.html gwyddion-2.63/devel-docs/libgwyddion/html/GwyResults.html --- gwyddion-2.62/devel-docs/libgwyddion/html/GwyResults.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/GwyResults.html 2023-06-13 13:24:17.000000000 +0000 @@ -559,6 +559,8 @@ "power-w", power of unit w (gint) +"precision", the mininum number of significant digits (gint, since 2.63) + "is-angle", TRUE if the quantity should converted to degrees for humans, this overrides any unit powers (gboolean) "is-fitting-param", TRUE if the quantity should be reported as fixed parameter when it does not have error set (gboolean) diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/index.html gwyddion-2.63/devel-docs/libgwyddion/html/index.html --- gwyddion-2.62/devel-docs/libgwyddion/html/index.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/index.html 2023-06-13 13:24:17.000000000 +0000 @@ -15,7 +15,7 @@

- For Gwyddion 2.62. + For Gwyddion 2.63. The latest version of this document can be found on-line at http://gwyddion.net/documentation/libgwyddion/.

@@ -135,6 +135,7 @@
Index of new symbols in 2.60
Index of new symbols in 2.61
Index of new symbols in 2.62
+
Index of new symbols in 2.63

This library contains basic classes and interfaces not directly related diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion.devhelp2 gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion.devhelp2 --- gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion.devhelp2 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion.devhelp2 2023-06-13 13:24:17.000000000 +0000 @@ -62,6 +62,7 @@ + @@ -374,6 +375,8 @@ + + diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html --- gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html 2023-06-13 13:24:17.000000000 +0000 @@ -253,7 +253,7 @@

Ensures ascending order of two variables (more precisely lhs and rhs expressions) of type t in a single statement.

The macro makes y - not larger than x + not smaller than x . They may be still equal or their relation can be undefined (if either is NaN).

Both x diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html --- gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html 2023-06-13 13:24:17.000000000 +0000 @@ -230,6 +230,21 @@ +const gchar * + + +gwy_get_decimal_separator () + + + + +void + + +gwy_append_doubles_to_gstring () + + + void @@ -1236,6 +1251,76 @@

+

gwy_get_decimal_separator ()

+
const gchar *
+gwy_get_decimal_separator (void);
+

Find the decimal separator for the current locale.

+

This is a localeconv() wrapper.

+
+

Returns

+

The decimal separator for the current locale as a static string.

+
+

Since: 2.63

+
+
+
+

gwy_append_doubles_to_gstring ()

+
void
+gwy_append_doubles_to_gstring (GString *str,
+                               const gdouble *values,
+                               guint n,
+                               gint precision,
+                               const gchar *field_separator,
+                               gboolean force_decimal_dot);
+

Formats a sequence of double values to a GString.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

str

String to append the formated numbers to.

 

values

Array of double values to format.

 

n

Number of values in values +to format.

 

precision

Format precision, within the standard precision of double.

 

field_separator

String to put between each two formatted numbers, usually a space or tab character.

 

force_decimal_dot

TRUE to ensure the numbers use a decimal dot, regardless of locale. FALSE to honour the +current locale.

 
+
+

Since: 2.63

+
+
+

gwy_memcpy_byte_swap ()

void
 gwy_memcpy_byte_swap (const guint8 *source,
@@ -1392,7 +1477,7 @@

Returns

-

The size of a single raw data item of type datatype +

The size (in bytes) of a single raw data item of type datatype .

Since: 2.25

diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html --- gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html 2023-06-13 13:24:17.000000000 +0000 @@ -158,7 +158,7 @@

GWY_VERSION_MINOR

-
#define GWY_VERSION_MINOR 62
+
#define GWY_VERSION_MINOR 63
 

 
Expands to the minor version of Gwyddion as a number.

 
If the version is 1.99.7.20060604, this macro is defined as 99.

@@ -166,7 +166,7 @@
 

 

 
GWY_VERSION_STRING

-
#define GWY_VERSION_STRING "2.62"
+
#define GWY_VERSION_STRING "2.63"
 

 
Expands to the full Gwyddion version as a string.

 
If the version is 1.99.7.20060604, this macro is defined as
diff -Nru gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-Math.html gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-Math.html
--- gwyddion-2.62/devel-docs/libgwyddion/html/libgwyddion-Math.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyddion/html/libgwyddion-Math.html	2023-06-13 13:24:17.000000000 +0000
@@ -2119,7 +2119,9 @@
 gwy_compare_double (gconstpointer a,
                     gconstpointer b);

 
Compares two double values, given as pointers.

-
This function is suitable as GCompareFunc and can be also used with plain qsort().

+
This function is suitable as GCompareFunc and can be also used with plain qsort(). The typical usage is sorting
+of arrays containing structs where the first item is a floating point value/coordinate, followed by additional
+data. For sorting of plain arrays of doubles use gwy_math_sort().

 
It should only be used to sort normal numbers. The behaviour for NaNs is undefined.

 

 
Parameters

diff -Nru gwyddion-2.62/devel-docs/libgwyddion/libgwyddion-docs.sgml gwyddion-2.63/devel-docs/libgwyddion/libgwyddion-docs.sgml
--- gwyddion-2.62/devel-docs/libgwyddion/libgwyddion-docs.sgml	2022-11-02 13:45:04.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyddion/libgwyddion-docs.sgml	2023-06-13 10:14:59.000000000 +0000
@@ -181,5 +181,9 @@
     Index of new symbols in 2.62
     
   
+  
+    Index of new symbols in 2.63
+    
+  
   
 
diff -Nru gwyddion-2.62/devel-docs/libgwyddion/Makefile.in gwyddion-2.63/devel-docs/libgwyddion/Makefile.in
--- gwyddion-2.62/devel-docs/libgwyddion/Makefile.in	2022-11-03 09:56:37.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyddion/Makefile.in	2023-06-13 13:22:35.000000000 +0000
@@ -336,6 +336,8 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZLIB = @ZLIB@
+ZZIP_CFLAGS = @ZZIP_CFLAGS@
+ZZIP_LIBS = @ZZIP_LIBS@
 
 # Some combinations of the tools do not give these us automatically.
 abs_builddir = @abs_builddir@
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/api-index-2-62.html gwyddion-2.63/devel-docs/libgwydgets/html/api-index-2-62.html
--- gwyddion-2.62/devel-docs/libgwydgets/html/api-index-2-62.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/api-index-2-62.html	2023-06-13 13:24:17.000000000 +0000
@@ -7,6 +7,7 @@
 
 
 
+
 
 
 
@@ -16,7 +17,7 @@
 Home
 
 Prev
-
+Next
 
 

 

diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/api-index-2-63.html gwyddion-2.63/devel-docs/libgwydgets/html/api-index-2-63.html
--- gwyddion-2.62/devel-docs/libgwydgets/html/api-index-2-63.html	1970-01-01 00:00:00.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/api-index-2-63.html	2023-06-13 13:24:17.000000000 +0000
@@ -0,0 +1,45 @@
+
+
+
+
+Index of new symbols in 2.63: Gwyddion Widgets Library Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Index of new symbols in 2.63

+
S

+

+GWY_STOCK_GRAPH_PERIOD_MEASURE, macro in gwystock
+

+

+

+GWY_STOCK_HOLD_SELECTION_CLEAR, macro in gwystock
+

+

+

+GWY_STOCK_HOLD_SELECTION_REPLACE, macro in gwystock
+

+

+

+GWY_STOCK_SYNTHETIC_DUNES, macro in gwystock
+

+

+

+

+
Generated by GTK-Doc V1.19

+
+
\ No newline at end of file
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/api-index-all.html gwyddion-2.63/devel-docs/libgwydgets/html/api-index-all.html
--- gwyddion-2.62/devel-docs/libgwydgets/html/api-index-all.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/api-index-all.html	2023-06-13 13:24:17.000000000 +0000
@@ -2947,6 +2947,10 @@
 
 

 

+GWY_STOCK_GRAPH_PERIOD_MEASURE, macro in gwystock
+

+

+

 GWY_STOCK_GRAPH_POINTER, macro in gwystock
 

 

@@ -2983,6 +2987,14 @@
 
 

 

+GWY_STOCK_HOLD_SELECTION_CLEAR, macro in gwystock
+

+

+

+GWY_STOCK_HOLD_SELECTION_REPLACE, macro in gwystock
+

+

+

 GWY_STOCK_HOUGH, macro in gwystock
 

 

@@ -3431,6 +3443,10 @@
 
 

 

+GWY_STOCK_SYNTHETIC_DUNES, macro in gwystock
+

+

+

 GWY_STOCK_SYNTHETIC_FIBRES, macro in gwystock
 

 

Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_3d_base-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_3d_base-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_arithmetic-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_arithmetic-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_binning-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_binning-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_bold-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_bold-20.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_cantilever-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_cantilever-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_color_range-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_color_range-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_color_range_adaptive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_color_range_adaptive-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_color_range_auto-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_color_range_auto-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_color_range_fixed-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_color_range_fixed-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_color_range_full-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_color_range_full-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_convolution-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_convolution-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_convolve-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_convolve-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_correct_affine-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_correct_affine-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_correlation_length-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_correlation_length-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_correlation_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_correlation_mask-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_crop-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_crop-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_cross_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_cross_profile-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_curvature-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_curvature-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_cwt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_cwt-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_data_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_data_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_deconvolve-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_deconvolve-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_disconnected-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_disconnected-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_displacement_field-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_displacement_field-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_distance-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_distance-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_distance_transform-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_distance_transform-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_distribution_angle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_distribution_angle-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_distribution_slope-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_distribution_slope-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_dwt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_dwt-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_edge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_edge-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_enforce_distribution-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_enforce_distribution-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_entropy-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_entropy-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_extend-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_extend-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_extract_path-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_extract_path-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_facet_analysis-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_facet_analysis-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_facet_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_facet_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_facet_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_facet_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_favourite-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_favourite-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fft-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fft-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fft_2d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fft_2d-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fft_filter_1d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fft_filter_1d-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fft_filter_2d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fft_filter_2d-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_filter-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_find_peaks-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_find_peaks-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fit_shape-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fit_shape-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fix_zero-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fix_zero-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_flip_diagonally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_flip_diagonally-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_flip_horizontally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_flip_horizontally-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_flip_vertically-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_flip_vertically-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fractal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fractal-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fractal_correction-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fractal_correction-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_fractal_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_fractal_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_frequency_split-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_frequency_split-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_gl_material-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_gl_material-16.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_gradient_horizontal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_gradient_horizontal-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_gradient_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_gradient_vertical-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grain_bounding_box-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grain_bounding_box-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grain_correlation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grain_correlation-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grain_exscribed_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grain_exscribed_circle-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grain_inscribed_box-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grain_inscribed_box-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grain_inscribed_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grain_inscribed_circle-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_edge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_edge-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_edge_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_edge_remove-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_graph-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_graph-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_otsu-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_otsu-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_remove-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_statistics-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_statistics-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_grains_water-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_grains_water-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_align-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_align-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_cut-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_cut-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_dos-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_dos-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_export_ascii-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_export_ascii-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_export_png-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_export_png-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_export_vector-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_export_vector-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_fd-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_fd-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_filter-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_function-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_function-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_palette-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_palette-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_period_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_period_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_pointer-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_pointer-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_ruler-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_ruler-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_statistics-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_statistics-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_vertical-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_zoom_fit-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_zoom_fit-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_zoom_in-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_zoom_in-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_graph_zoom_out-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_graph_zoom_out-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_hold_selection_clear-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_hold_selection_clear-18.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_hold_selection_replace-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_hold_selection_replace-18.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_hough-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_hough-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_image_relation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_image_relation-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_immerse-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_immerse-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_iso_roughness-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_iso_roughness-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_italic-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_italic-20.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_less-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_less-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_level_flatten_base-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_level_flatten_base-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_level_median-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_level_median-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_level_triangle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_level_triangle-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_light_rotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_light_rotate-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_limit_range-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_limit_range-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_line_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_line_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_local_slope-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_local_slope-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_logscale_horizontal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_logscale_horizontal-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_logscale_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_logscale_vertical-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mark_outliers-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mark_outliers-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mark_scars-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mark_scars-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mark_with-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mark_with-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask-16.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_add-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_add-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_circle-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_circle_inclusive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_circle_inclusive-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_distribute-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_distribute-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_editor-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_editor-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_extract-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_extract-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_fill_draw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_fill_draw-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_intersect-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_intersect-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_line-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_line-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_noisify-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_noisify-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_paint_draw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_paint_draw-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_rect_inclusive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_rect_inclusive-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_remove-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_set-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_set-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_shift-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_subtract-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_subtract-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mask_thin-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mask_thin-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_measure_lattice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_measure_lattice-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_merge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_merge-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_convert_to_force-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_convert_to_force-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_current_line-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_current_line-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_field_find_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_field_find_shift-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_field_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_field_shift-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_parallel-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_parallel-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mfm_perpendicular-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mfm_perpendicular-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_more-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_more-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_mutual_crop-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_mutual_crop-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_neural_apply-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_neural_apply-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_neural_train-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_neural_train-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_next-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_next-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_null_offsets-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_null_offsets-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_palettes-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_palettes-16.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_palettes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_palettes-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_path_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_path_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_perspective_distort-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_perspective_distort-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_pointer_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_pointer_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_poly_distort-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_poly_distort-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_polynom-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_polynom-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_polynom_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_polynom_level-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_previous-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_previous-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_profile-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_profile_multiple-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_profile_multiple-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_psdf_log_phi-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_psdf_log_phi-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_pygwy-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_pygwy-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_radial_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_radial_profile-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rank_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rank_filter-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rasterize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rasterize-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_remove_under_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_remove_under_mask-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_revolve_arc-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_revolve_arc-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_revolve_sphere-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_revolve_sphere-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rotate_180-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rotate_180-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rotate-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rotate_3d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rotate_3d-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rotate_90_ccw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rotate_90_ccw-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_rotate_90_cw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_rotate_90_cw-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_scale-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_scale-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_scale_horizontally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_scale_horizontally-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_scale_vertically-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_scale_vertically-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_scars-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_scars-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_scientific_number_format-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_scientific_number_format-18.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_selections-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_selections-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_shader-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_shader-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_spectrum-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_spectrum-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_spot_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_spot_remove-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_square_samples-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_square_samples-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_stat_quantities-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_stat_quantities-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_stitch-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_stitch-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_straighten_path-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_straighten_path-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_subscript-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_subscript-20.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_superscript-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_superscript-20.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_anneal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_anneal-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_ballistic_deposition-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_ballistic_deposition-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_brownian_motion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_brownian_motion-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_columnar-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_columnar-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_diffusion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_diffusion-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_discs-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_discs-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_domains-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_domains-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_dunes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_dunes-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_fibres-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_fibres-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_lattice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_lattice-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_line_noise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_line_noise-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_noise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_noise-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_objects-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_objects-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_particles-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_particles-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_pattern-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_pattern-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_phases-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_phases-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_pileup-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_pileup-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_spectral-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_spectral-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_turing_pattern-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_turing_pattern-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_synthetic_waves-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_synthetic_waves-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_terrace_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_terrace_measure-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tilt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tilt-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_dilation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_dilation-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_erosion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_erosion-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_estimation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_estimation-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_indent_analyze-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_indent_analyze-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_lateral_force-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_lateral_force-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_map-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_map-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_model-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_model-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_tip_pid-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_tip_pid-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_unrotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_unrotate-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_value_invert-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_value_invert-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_arithmetic-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_arithmetic-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_calibrate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_calibrate-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_dimensions-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_dimensions-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_fd-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_fd-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_invert-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_invert-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_kmeans-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_kmeans-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_kmedians-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_kmedians-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_line_stats-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_line_stats-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_plane_stats-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_plane_stats-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_slice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_slice-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volume_swap_axes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volume_swap_axes-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volumize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volumize-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_volumize_layers-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_volumize_layers-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_wrap_value-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_wrap_value-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_xy_denoise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_xy_denoise-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_xyzize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_xyzize-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zero_maximum-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zero_maximum-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zero_mean-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zero_mean-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zoom_1_1-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zoom_1_1-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zoom_fit-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zoom_fit-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zoom_in-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zoom_in-24.png differ
Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/devel-docs/libgwydgets/html/gwy_zoom_out-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/devel-docs/libgwydgets/html/gwy_zoom_out-24.png differ
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/index.html gwyddion-2.63/devel-docs/libgwydgets/html/index.html
--- gwyddion-2.62/devel-docs/libgwydgets/html/index.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/index.html	2023-06-13 13:24:17.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

-  For Gwyddion 2.62.
+  For Gwyddion 2.63.
   The latest version of this document can be found on-line at
   http://gwyddion.net/documentation/libgwydgets/.
 

@@ -232,6 +232,7 @@
 
Index of new symbols in 2.60

 
Index of new symbols in 2.61

 
Index of new symbols in 2.62

+
Index of new symbols in 2.63

 

 

     This library contains Gwyddion extension Gtk+ widgets and widget
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/libgwydgets.devhelp2 gwyddion-2.63/devel-docs/libgwydgets/html/libgwydgets.devhelp2
--- gwyddion-2.62/devel-docs/libgwydgets/html/libgwydgets.devhelp2	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/libgwydgets.devhelp2	2023-06-13 13:24:17.000000000 +0000
@@ -99,6 +99,7 @@
     
     
     
+    
   
   
     
@@ -807,6 +808,7 @@
     
     
     
+    
     
     
     
@@ -816,6 +818,8 @@
     
     
     
+    
+    
     
     
     
@@ -926,6 +930,7 @@
     
     
     
+    
     
     
     
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/html/libgwydgets-gwystock.html gwyddion-2.63/devel-docs/libgwydgets/html/libgwydgets-gwystock.html
--- gwyddion-2.62/devel-docs/libgwydgets/html/libgwydgets-gwystock.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/html/libgwydgets-gwystock.html	2023-06-13 13:24:17.000000000 +0000
@@ -394,6 +394,10 @@
 
 
 #define
+GWY_STOCK_GRAPH_PERIOD_MEASURE
+
+
+#define
 GWY_STOCK_GRAPH_POINTER
 
 
@@ -430,6 +434,14 @@
 
 
 #define
+GWY_STOCK_HOLD_SELECTION_CLEAR
+
+
+#define
+GWY_STOCK_HOLD_SELECTION_REPLACE
+
+
+#define
 GWY_STOCK_HOUGH
 
 
@@ -870,6 +882,10 @@
 
 
 #define
+GWY_STOCK_SYNTHETIC_DUNES
+
+
+#define
 GWY_STOCK_SYNTHETIC_FIBRES
 
 
@@ -1761,6 +1777,14 @@
 

 

 

+
GWY_STOCK_GRAPH_PERIOD_MEASURE

+
#define GWY_STOCK_GRAPH_PERIOD_MEASURE           "gwy_graph_period_measure"
+

+
The "Graph-Period-Measure" stock icon.

+
Since: 2.63

+

+

+

 
GWY_STOCK_GRAPH_POINTER

 
#define GWY_STOCK_GRAPH_POINTER                  "gwy_graph_pointer"
 

@@ -1833,6 +1857,22 @@
 

 

 

+
GWY_STOCK_HOLD_SELECTION_CLEAR

+
#define GWY_STOCK_HOLD_SELECTION_CLEAR           "gwy_hold_selection_clear"
+

+
The "Hold-Selection-Clear" stock icon.

+
Since: 2.63

+

+

+

+
GWY_STOCK_HOLD_SELECTION_REPLACE

+
#define GWY_STOCK_HOLD_SELECTION_REPLACE         "gwy_hold_selection_replace"
+

+
The "Hold-Selection-Replace" stock icon.

+
Since: 2.63

+

+

+

 
GWY_STOCK_HOUGH

 
#define GWY_STOCK_HOUGH                          "gwy_hough"
 

@@ -2713,6 +2753,14 @@
 

 

 

+
GWY_STOCK_SYNTHETIC_DUNES

+
#define GWY_STOCK_SYNTHETIC_DUNES                "gwy_synthetic_dunes"
+

+
The "Synthetic-Dunes" stock icon.

+
Since: 2.63

+

+

+

 
GWY_STOCK_SYNTHETIC_FIBRES

 
#define GWY_STOCK_SYNTHETIC_FIBRES               "gwy_synthetic_fibres"
 

diff -Nru gwyddion-2.62/devel-docs/libgwydgets/libgwydgets-docs.sgml gwyddion-2.63/devel-docs/libgwydgets/libgwydgets-docs.sgml
--- gwyddion-2.62/devel-docs/libgwydgets/libgwydgets-docs.sgml	2022-11-02 13:45:04.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/libgwydgets-docs.sgml	2023-06-13 10:15:00.000000000 +0000
@@ -238,5 +238,9 @@
     Index of new symbols in 2.62
     
   
+  
+    Index of new symbols in 2.63
+    
+  
   
 
diff -Nru gwyddion-2.62/devel-docs/libgwydgets/Makefile.in gwyddion-2.63/devel-docs/libgwydgets/Makefile.in
--- gwyddion-2.62/devel-docs/libgwydgets/Makefile.in	2022-11-03 09:56:37.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydgets/Makefile.in	2023-06-13 13:22:35.000000000 +0000
@@ -336,6 +336,8 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZLIB = @ZLIB@
+ZZIP_CFLAGS = @ZZIP_CFLAGS@
+ZZIP_LIBS = @ZZIP_LIBS@
 
 # Some combinations of the tools do not give these us automatically.
 abs_builddir = @abs_builddir@
diff -Nru gwyddion-2.62/devel-docs/libgwydraw/html/GwySelection.html gwyddion-2.63/devel-docs/libgwydraw/html/GwySelection.html
--- gwyddion-2.62/devel-docs/libgwydraw/html/GwySelection.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydraw/html/GwySelection.html	2023-06-13 13:24:17.000000000 +0000
@@ -268,22 +268,18 @@
 

 

 
Description

-
GwySelection is an abstract class representing data selections.  Particular
-selection types are defined by vector layer modules.

-
Selections behave as flat arrays of coordinates.  They are however logically
-split into selection objects (points, lines, rectangles), characteristic for
-each selection type. For example, to describe a horizontal line one needs
-only one coordinate, for a point two coordinates are needed, rectangle or
-arbitrary line need four.  gwy_selection_get_object_size() can be used to
-generically determine the number of coordinates used to describe a one
-selection object.

-
The number of selection objects in a selection can vary,
-gwy_selection_set_max_objects() sets the maximum possible number.  Functions
-for getting and setting individual selection objects
-(gwy_selection_get_object(), gwy_selection_set_object()) or complete
-selection (gwy_selection_get_data(), gwy_selection_set_data()) are
-available.  The method gwy_selection_set_data() with NULL second argument
-is also used to determine the number of selected object.

+
GwySelection is an abstract class representing data selections.  Particular selection types are defined by vector
+layer modules.

+
Selections behave as flat arrays of coordinates.  They are however logically split into selection objects (points,
+lines, rectangles), characteristic for each selection type. For example, to describe a horizontal line one needs
+only one coordinate, for a point two coordinates are needed, rectangle or arbitrary line need four.
+gwy_selection_get_object_size() can be used to generically determine the number of coordinates used to describe
+a one selection object.

+
The number of selection objects in a selection can vary, gwy_selection_set_max_objects() sets the maximum possible
+number.  Functions for getting and setting individual selection objects (gwy_selection_get_object(),
+gwy_selection_set_object()) or complete selection (gwy_selection_get_data(), gwy_selection_set_data()) are
+available.  The method gwy_selection_set_data() with NULL second argument is also used to determine the number of
+selected object.

 

 

 
Functions

@@ -323,8 +319,7 @@
 

 

 
Returns

-
 TRUE for objects that should be kept, FALSE for objects that
-should be removed.

+
 TRUE for objects that should be kept, FALSE for objects that should be removed.

 

 
Since: 2.16

 

@@ -332,8 +327,7 @@
 

 
gwy_selection_duplicate()

 
#define             gwy_selection_duplicate(selection)

-
Convenience macro doing gwy_serializable_duplicate() with all the necessary
-typecasting.

+
Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting.

 

 
Parameters

 

@@ -355,8 +349,8 @@
 
gwy_selection_assign()
#define             gwy_selection_assign(dest, source)
Convenience macro making one selection identical to another.

-
This is just a gwy_serializable_clone() wrapper with all the necessary
-typecasting.

+
This is just a gwy_serializable_clone() wrapper with all the necessary typecasting.

+
Note that it also copies properties like “max-objects”, which may or may not be wanted.

 
Parameters

 

 
 
 

@@ -458,9 +452,8 @@
 
-
+
@@ -480,10 +473,9 @@
                           gint i,
                           const gdouble *data);
Sets one selection object.

-
This method can be also used to append objects (if the maximum number is
-not exceeded).  Since there cannot be holes in the object list, i
- must be
-then equal to either the number of selected objects or special value -1
+
This method can be also used to append objects (if the maximum number is not exceeded).  Since there cannot be
+holes in the object list, i
+ must be then equal to either the number of selected objects or special value -1
 meaning append to end.

 
Parameters

@@ -506,8 +498,8 @@
 
 

-
+
@@ -526,8 +518,7 @@
 gwy_selection_delete_object (GwySelection *selection,
                              gint i);
Deletes a one selection object.

-
Since there cannot be holes in the object list, the rest of selection
-objects is moved to close the gap.

+
Since there cannot be holes in the object list, the rest of selection objects is moved to close the gap.

 
Parameters

 

 

 
data
Array to store selection object data to.  Object data is an
-array of coordinates whose precise meaning is defined by particular
-selection types.
Array to store selection object data to.  Object data is an array of coordinates whose precise meaning is
+defined by particular selection types.

  
 

 
 
 

 
data
Object selection data.  It's an array of coordinates whose precise
-meaning is defined by particular selection types.
Object selection data.  It's an array of coordinates whose precise meaning is defined by particular selection
+types.

  
 

 
 
 

@@ -574,9 +565,8 @@
 
-
+
@@ -584,10 +574,9 @@
 

 
Returns

-
 The number of selected objects.  This is *not* the required size
-of data
-, which must be at least gwy_selection_get_object_size()
-times larger.

+
 The number of selected objects.  This is *not* the required size of data
+, which must be at least
+gwy_selection_get_object_size() times larger.

 

@@ -620,8 +609,7 @@
 
@@ -662,8 +650,7 @@
 gwy_selection_set_max_objects (GwySelection *selection,
                                guint max_objects);
Sets the maximum number of objects allowed to select.

-
When selection reaches this number of selected objects, it emits
-"finished" signal.

+
When selection reaches this number of selected objects, it emits "finished" signal.

 
Parameters

 

 

 
data
Array to store selection data to.  Selection data is an
-array of coordinates whose precise meaning is defined by particular
-selection types.  It may be NULL.
Array to store selection data to.  Selection data is an array of coordinates whose precise meaning is
+defined by particular selection types.  It may be NULL.

  
 

 
 
 
 

 
data

 
Selection data, that is an array nselected
-*
-gwy_selection_get_object_size() long with selected object
+* gwy_selection_get_object_size() long with selected object
 coordinates.

  
 

 
 

@@ -680,8 +667,8 @@
 
-
+
@@ -711,8 +698,7 @@
 

 
Returns

-
 TRUE when the maximum possible number of objects is selected,
-FALSE otherwise.

+
 TRUE when the maximum possible number of objects is selected, FALSE otherwise.

 

@@ -725,9 +711,8 @@
                     gdouble xmax,
                     gdouble ymax);
Limits objects in a selection to a rectangle.

-
Objects that are fully outside specified rectangle are removed.  Objects
-partially outside may be removed or cut, depending on what makes sense for
-the specific selection type.  If the selection class does not implement this
+
Objects that are fully outside specified rectangle are removed.  Objects partially outside may be removed or cut,
+depending on what makes sense for the specific selection type.  If the selection class does not implement this
 method then all objects are removed.

 
Parameters

@@ -776,9 +761,8 @@
                     gdouble vx,
                     gdouble vy);
 
Moves entire selection in plane by given vector.

-
If a selection class does not implement this operation the selection remains
-unchanged.  Bult-in selection classes generally implement this operation if
-it is meaningful.  For some, such as GwySelectionLattice, it is not
+
If a selection class does not implement this operation the selection remains unchanged.  Bult-in selection classes
+generally implement this operation if it is meaningful.  For some, such as GwySelectionLattice, it is not
 meaningful and moving GwySelectionLattice thus does not do anything.

 

 
Parameters

@@ -833,8 +817,7 @@
 
 

-
+
@@ -871,8 +854,8 @@
 
-
+
@@ -953,10 +936,9 @@
 };
 
The virtual methods and data memebers of GwySelections.

-
Typically, the only field subclasses set in their class init method is
-object_size
-.  The methods are implemented generically in GwySelection
-and need not be overriden.

+
Typically, the only field subclasses set in their class init method is object_size
+.  The methods are implemented
+generically in GwySelection and need not be overriden.

 
Members

 

 

 
max_objects
The maximum number of objects allowed to select.  Note
-particular selection types may allow only specific values.
The maximum number of objects allowed to select.  Note particular selection types may allow only
+specific values.

  
 

 
 
 
 
 
 

 
filter
Function returning TRUE for objects that should be kept, FALSE
-for objects that should be removed.
Function returning TRUE for objects that should be kept, FALSE for objects that should be removed.

  
 

 

 

 
i
Index of object that changed.  Use -1 when not applicable, e.g., when
-complete selection was changed, cleared, or truncated.
Index of object that changed.  Use -1 when not applicable, e.g., when complete selection was changed, cleared,
+or truncated.

  
 

 
 
 

@@ -1068,9 +1050,8 @@
 
-
+
@@ -1090,9 +1071,8 @@
 user_function (GwySelection *gwyselection,
                gpointer      user_data)
The ::finished signal is emitted when selection is finished.

-
What exactly finished means is defined by corresponding
-GwyVectorLayer, but normally it involves user stopped changing
-a selection object. Selections never emit this signal themselves.

+
What exactly finished means is defined by corresponding GwyVectorLayer, but normally it involves user stopped
+changing a selection object. Selections never emit this signal themselves.

 
Parameters

 

 

 
arg1
Changed object position hint.  If the value is nonnegative, only
-this object has changed.  If it's negative, the selection has
-to be treated as completely changed.
Changed object position hint.  If the value is nonnegative, only this object has changed.  If it's
+negative, the selection has to be treated as completely changed.

  
 

 

 
 

diff -Nru gwyddion-2.62/devel-docs/libgwydraw/html/index.html gwyddion-2.63/devel-docs/libgwydraw/html/index.html
--- gwyddion-2.62/devel-docs/libgwydraw/html/index.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydraw/html/index.html	2023-06-13 13:24:17.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

-  For Gwyddion 2.62.
+  For Gwyddion 2.63.
   The latest version of this document can be found on-line at
   http://gwyddion.net/documentation/libgwydraw/.
 

diff -Nru gwyddion-2.62/devel-docs/libgwydraw/Makefile.in gwyddion-2.63/devel-docs/libgwydraw/Makefile.in
--- gwyddion-2.62/devel-docs/libgwydraw/Makefile.in	2022-11-03 09:56:37.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwydraw/Makefile.in	2023-06-13 13:22:35.000000000 +0000
@@ -336,6 +336,8 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZLIB = @ZLIB@
+ZZIP_CFLAGS = @ZZIP_CFLAGS@
+ZZIP_LIBS = @ZZIP_LIBS@
 
 # Some combinations of the tools do not give these us automatically.
 abs_builddir = @abs_builddir@
diff -Nru gwyddion-2.62/devel-docs/libgwymodule/html/index.html gwyddion-2.63/devel-docs/libgwymodule/html/index.html
--- gwyddion-2.62/devel-docs/libgwymodule/html/index.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwymodule/html/index.html	2023-06-13 13:24:17.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

-  For Gwyddion 2.62.
+  For Gwyddion 2.63.
   The latest version of this document can be found on-line at
   http://gwyddion.net/documentation/libgwymodule/.
 

diff -Nru gwyddion-2.62/devel-docs/libgwymodule/Makefile.in gwyddion-2.63/devel-docs/libgwymodule/Makefile.in
--- gwyddion-2.62/devel-docs/libgwymodule/Makefile.in	2022-11-03 09:56:37.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwymodule/Makefile.in	2023-06-13 13:22:35.000000000 +0000
@@ -336,6 +336,8 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 ZLIB = @ZLIB@
+ZZIP_CFLAGS = @ZZIP_CFLAGS@
+ZZIP_LIBS = @ZZIP_LIBS@
 
 # Some combinations of the tools do not give these us automatically.
 abs_builddir = @abs_builddir@
diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-2-62.html gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-2-62.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-2-62.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-2-62.html	2023-06-13 13:24:17.000000000 +0000
@@ -7,6 +7,7 @@
 
 
 
+
 
 
 
@@ -16,7 +17,7 @@
 Home
 
 Prev
-
+Next
 
 

 

diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-2-63.html gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-2-63.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-2-63.html	1970-01-01 00:00:00.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-2-63.html	2023-06-13 13:24:17.000000000 +0000
@@ -0,0 +1,33 @@
+
+
+
+
+Index of new symbols in 2.63: Gwyddion Data Processing Library Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+Index of new symbols in 2.63

+
D

+

+gwy_data_line_part_filter_kth_rank, function in filters
+

+

+

+

+
Generated by GTK-Doc V1.19

+
+
\ No newline at end of file
diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-all.html gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-all.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/api-index-all.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/api-index-all.html	2023-06-13 13:24:17.000000000 +0000
@@ -2520,6 +2520,10 @@
 
 

 

+gwy_data_line_filter_slope, function in GwyDataLine
+

+

+

 gwy_data_line_fit_polynom, function in GwyDataLine
 

 

@@ -2740,6 +2744,10 @@
 
 

 

+gwy_data_line_part_filter_kth_rank, function in filters
+

+

+

 gwy_data_line_part_fit_polynom, function in GwyDataLine
 

 

diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/GwyDataField.html gwyddion-2.63/devel-docs/libgwyprocess/html/GwyDataField.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/GwyDataField.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/GwyDataField.html	2023-06-13 13:24:17.000000000 +0000
@@ -709,10 +709,8 @@
 

 

 
Description

-
GwyDataField is an object that is used for representation of all
-two-dimensional data matrices. Most of the basic data handling and
-processing functions in Gwyddion are declared here as they are connected
-with GwyDataField.

+
GwyDataField is an object that is used for representation of all two-dimensional data matrices. Most of the basic
+data handling and processing functions in Gwyddion are declared here as they are connected with GwyDataField.

 

 

 
Functions

@@ -721,13 +719,11 @@
 
void
 gwy_data_field_invalidate (GwyDataField *data_field);

 
Invalidates cached data field stats.

-
User code should rarely need this macro, as all GwyDataField methods do
-proper invalidation when they change data, as well as
-gwy_data_field_get_data() does.

-
However, if you get raw data with gwy_data_field_get_data() and then mix
-direct changes to it with calls to methods like gwy_data_field_get_max(),
-you may need to explicitely invalidate cached values to let
-gwy_data_field_get_max() know it has to recompute the maximum.

+
User code should rarely need this macro, as all GwyDataField methods do proper invalidation when they change data,
+as well as gwy_data_field_get_data() does.

+
However, if you get raw data with gwy_data_field_get_data() and then mix direct changes to it with calls to methods
+like gwy_data_field_get_max(), you may need to explicitely invalidate cached values to let gwy_data_field_get_max()
+know it has to recompute the maximum.

 

 
Parameters

 

@@ -748,10 +744,8 @@
 

 
gwy_data_field_duplicate()

 
#define             gwy_data_field_duplicate(data_field)

-
Convenience macro doing gwy_serializable_duplicate() with all the necessary
-typecasting.

-
Use gwy_data_field_new_alike() if you don't want to copy data, only
-resolutions and units.

+
Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting.

+
Use gwy_data_field_new_alike() if you don't want to copy data, only resolutions and units.

 

 
Parameters

 

@@ -773,8 +767,7 @@
 
gwy_data_field_assign()
#define             gwy_data_field_assign(dest, source)
Convenience macro making one data field identical to another.

-
This is just a gwy_serializable_clone() wrapper with all the necessary
-typecasting.

+
This is just a gwy_serializable_clone() wrapper with all the necessary typecasting.

 
Parameters

 

 
 
 

@@ -840,8 +833,7 @@
 
-
+
@@ -859,8 +851,7 @@
 gwy_data_field_new_alike (GwyDataField *model,
                           gboolean nullme);
Creates a new data field similar to an existing one.

-
Use gwy_data_field_duplicate() if you want to copy a data field including
-data.

+
Use gwy_data_field_duplicate() if you want to copy a data field including data.

 
Parameters

 

 

 
nullme
Whether the data field should be initialized to zeroes. If FALSE,
-the data will not be initialized.
Whether the data field should be initialized to zeroes. If FALSE, the data will not be initialized.

  
 

 
 
 

@@ -877,8 +868,7 @@
 
-
+
@@ -920,8 +910,8 @@
                               gint yres,
                               GwyInterpolationType interpolation);
Creates a new data field by resampling an existing one.

-
This method is equivalent to gwy_data_field_duplicate() followed by
-gwy_data_field_resample(), but it is more efficient.

+
This method is equivalent to gwy_data_field_duplicate() followed by gwy_data_field_resample(), but it is more
+efficient.

 
Parameters

 

 

 
nullme
Whether the data field should be initialized to zeroes. If FALSE,
-the data will not be initialized.
Whether the data field should be initialized to zeroes. If FALSE, the data will not be initialized.

  
 

 
 
 

@@ -968,8 +958,7 @@
                          gint yres,
                          GwyInterpolationType interpolation);
Resamples a data field using given interpolation method

-
This method may invalidate raw data buffer returned by
-gwy_data_field_get_data().

+
This method may invalidate raw data buffer returned by gwy_data_field_get_data().

 
Parameters

 

 
 

@@ -1085,24 +1074,20 @@
 
Creates a new data field by binning an existing one.
The data field is divided into rectangles of dimensions binw
 ×binh
-, offset
-by (xoff
+, offset by (xoff
 , yoff
-).  The values in each complete rectangle are averaged and
-the average becomes the pixel value in the newly created, smaller data
-field.

-
Note that the result is the average – not sum – of the individual values.
-Multiply the returned data field with binw
+).  The values in each
+complete rectangle are averaged and the average becomes the pixel value in the newly created, smaller data field.

+
Note that the result is the average – not sum – of the individual values. Multiply the returned data field with
+binw
 ×binh
  if you want sum.
By giving non-zero trimlowest
  and trimhighest
- you can change the plain
-average to a trimmed one (even turning it to median in the extreme case).
-It must always hold that trimlowest
+ you can change the plain average to a trimmed one (even turning it
+to median in the extreme case). It must always hold that trimlowest
  + trimhighest
- is smaller than
-binw
+ is smaller than binw
 ×binh
 .

@@ -1168,10 +1153,8 @@
                        gint brcol,
                        gint brrow);
 
Resizes (crops) a data field.

-
Crops a data field to a rectangle between upper-left and bottom-right
-points, recomputing real size.

-
This method may invalidate raw data buffer returned by
-gwy_data_field_get_data().

+
Crops a data field to a rectangle between upper-left and bottom-right points, recomputing real size.

+
This method may invalidate raw data buffer returned by gwy_data_field_get_data().

 

 
Parameters

 

 
 
 

@@ -1269,8 +1252,7 @@
 gwy_data_field_copy (GwyDataField *src,
                      GwyDataField *dest,
                      gboolean nondata_too);
-
Copies the contents of an already allocated data field to a data field
-of the same size.

+
Copies the contents of an already allocated data field to a data field of the same size.

 
Parameters

 

 

@@ -1317,15 +1299,14 @@
 ) in src
  and its dimension is width
 *height
-.
-It is copied to dest
- starting from (destcol
+. It is copied to dest
+ starting from
+(destcol
 , destrow
 ).
The source area has to be completely contained in src
-.  No assumptions are
-made about destination position, however, parts of the source area sticking
-out the destination data field dest
+.  No assumptions are made about destination position,
+however, parts of the source area sticking out the destination data field dest
  are cut off.
If src
  is equal to dest
@@ -1395,11 +1376,10 @@
 
gdouble *
 gwy_data_field_get_data (GwyDataField *data_field);
Gets the raw data buffer of a data field.

-
The returned buffer is not guaranteed to be valid through whole data
-field life time.  Some function may change it, most notably
-gwy_data_field_resize() and gwy_data_field_resample().

-
This function invalidates any cached information, use
-gwy_data_field_get_data_const() if you are not going to change the data.

+
The returned buffer is not guaranteed to be valid through whole data field life time.  Some function may change it,
+most notably gwy_data_field_resize() and gwy_data_field_resample().

+
This function invalidates any cached information, use gwy_data_field_get_data_const() if you are not going to
+change the data.
See gwy_data_field_invalidate() for some discussion.

 
Parameters

@@ -1418,10 +1398,8 @@
 

 
Returns

-
 The data field as a pointer to an array of
-gwy_data_field_get_xres()*gwy_data_field_get_yres() gdouble's,
-ordered by lines.  I.e., they are to be accessed as
-data[row*xres + column].

+
 The data field as a pointer to an array of gwy_data_field_get_xres()*gwy_data_field_get_yres() gdouble's,
+ordered by lines.  I.e., they are to be accessed as data[row*xres + column].

 

@@ -1430,9 +1408,8 @@
 
const gdouble *
 gwy_data_field_get_data_const (GwyDataField *data_field);
Gets the raw data buffer of a data field, read-only.

-
The returned buffer is not guaranteed to be valid through whole data
-field life time.  Some function may change it, most notably
-gwy_data_field_resize() and gwy_data_field_resample().

+
The returned buffer is not guaranteed to be valid through whole data field life time.  Some function may change it,
+most notably gwy_data_field_resize() and gwy_data_field_resample().
Use gwy_data_field_get_data() if you want to change the data.
See gwy_data_field_invalidate() for some discussion.

@@ -1452,10 +1429,8 @@
 

 
Returns

-
 The data field as a pointer to an array of
-gwy_data_field_get_xres()*gwy_data_field_get_yres() gdouble's,
-ordered by lines.  I.e., they are to be accessed as
-data[row*xres + column].

+
 The data field as a pointer to an array of gwy_data_field_get_xres()*gwy_data_field_get_yres() gdouble's,
+ordered by lines.  I.e., they are to be accessed as data[row*xres + column].

 

@@ -1628,8 +1603,7 @@
 
gdouble
 gwy_data_field_get_dx (GwyDataField *data_field);
Gets the horizontal pixel size of a data field in real units.

-
The result is the same as
-gwy_data_field_get_xreal(data_field)/gwy_data_field_get_xres(data_field).

+
The result is the same as gwy_data_field_get_xreal(data_field)/gwy_data_field_get_xres(data_field).

 
Parameters

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

@@ -1657,8 +1631,7 @@
 
gdouble
 gwy_data_field_get_dy (GwyDataField *data_field);
Gets the vertical pixel size of a data field in real units.

-
The result is the same as
-gwy_data_field_get_yreal(data_field)/gwy_data_field_get_yres(data_field).

+
The result is the same as gwy_data_field_get_yreal(data_field)/gwy_data_field_get_yres(data_field).

 
Parameters

 

 
 

@@ -1739,8 +1712,7 @@
 gwy_data_field_set_xoffset (GwyDataField *data_field,
                             gdouble xoff);
Sets the X offset of a data field origin.

-
Note offsets don't affect any calculation, nor functions like
-gwy_data_field_rtoj().

+
Note offsets don't affect any calculation, nor functions like gwy_data_field_rtoj().

 
Parameters

 

 
 

@@ -1771,8 +1743,7 @@
 gwy_data_field_set_yoffset (GwyDataField *data_field,
                             gdouble yoff);
Sets the Y offset of a data field origin.

-
Note offsets don't affect any calculation, nor functions like
-gwy_data_field_rtoi().

+
Note offsets don't affect any calculation, nor functions like gwy_data_field_rtoi().

 
Parameters

 

 
 

@@ -1819,8 +1790,8 @@
 

 
Returns

-
 SI unit corresponding to the lateral (XY) dimensions of the data
-field.  Its reference count is not incremented.

+
 SI unit corresponding to the lateral (XY) dimensions of the data field.  Its reference count is not
+incremented.

 

@@ -1846,8 +1817,8 @@
 

 
Returns

-
 SI unit corresponding to the "height" (Z) dimension of the data
-field.  Its reference count is not incremented.

+
 SI unit corresponding to the "height" (Z) dimension of the data field.  Its reference count is not
+incremented.

 

@@ -1856,11 +1827,9 @@
 
void
 gwy_data_field_set_si_unit_xy (GwyDataField *data_field,
                                GwySIUnit *si_unit);

-
Sets the SI unit corresponding to the lateral (XY) dimensions of a data
-field.

+
Sets the SI unit corresponding to the lateral (XY) dimensions of a data field.
It does not assume a reference on si_unit
-, instead it adds its own
-reference.

+, instead it adds its own reference.

 
Parameters

 

 
 
 
 
 
 
 
 

@@ -1890,11 +1859,9 @@
 
void
 gwy_data_field_set_si_unit_z (GwyDataField *data_field,
                               GwySIUnit *si_unit);

-
Sets the SI unit corresponding to the "height" (Z) dimension of a data
-field.

+
Sets the SI unit corresponding to the "height" (Z) dimension of a data field.
It does not assume a reference on si_unit
-, instead it adds its own
-reference.

+, instead it adds its own reference.

 
Parameters

 

 
 

@@ -1956,8 +1923,7 @@
 

 
Returns

 
 The value format.  If format
-is NULL, a newly allocated format
-is returned, otherwise (modified) format
+is NULL, a newly allocated format is returned, otherwise (modified) format
 itself is returned.

 

@@ -1999,8 +1965,7 @@
 

 
Returns

 
 The value format.  If format
-is NULL, a newly allocated format
-is returned, otherwise (modified) format
+is NULL, a newly allocated format is returned, otherwise (modified) format
 itself is returned.

 

@@ -2104,9 +2069,8 @@
 gwy_data_field_itor (GwyDataField *data_field,
                      gdouble row);
Transforms vertical pixel coordinate to real (physical) Y coordinate.

-
That is it maps range [0..y-resolution] to range [0..real-y-size].
-It is not suitable for conversion of matrix indices to physical coordinates,
-you have to use gwy_data_field_itor(data_field
+
That is it maps range [0..y-resolution] to range [0..real-y-size]. It is not suitable for conversion of matrix
+indices to physical coordinates, you have to use gwy_data_field_itor(data_field
 , row
  + 0.5) for that.

@@ -2143,9 +2107,8 @@
 gwy_data_field_jtor (GwyDataField *data_field,
                      gdouble col);
 
Transforms horizontal pixel coordinate to real (physical) X coordinate.

-
That is it maps range [0..x-resolution] to range [0..real-x-size].
-It is not suitable for conversion of matrix indices to physical coordinates,
-you have to use gwy_data_field_jtor(data_field
+
That is it maps range [0..x-resolution] to range [0..real-x-size]. It is not suitable for conversion of matrix
+indices to physical coordinates, you have to use gwy_data_field_jtor(data_field
 , col
  + 0.5) for that.

 

@@ -2253,9 +2216,8 @@
                         gint col,
                         gint row);
 
Gets value at given position in a data field.

-
Do not access data with this function inside inner loops, it's slow.
-Get the raw data buffer with gwy_data_field_get_data_const() and access it
-directly instead.

+
Do not access data with this function inside inner loops, it's slow. Get the raw data buffer with
+gwy_data_field_get_data_const() and access it directly instead.

 

 
Parameters

 

 
 
 
 

@@ -2299,9 +2261,8 @@
                         gint row,
                         gdouble value);
Sets value at given position in a data field.

-
Do not set data with this function inside inner loops, it's slow.  Get the
-raw data buffer with gwy_data_field_get_data() and write to it directly
-instead.

+
Do not set data with this function inside inner loops, it's slow.  Get the raw data buffer with
+gwy_data_field_get_data() and write to it directly instead.

 
Parameters

 

 
 

@@ -2343,21 +2304,17 @@
                          gdouble x,
                          gdouble y,
                          GwyInterpolationType interpolation);
-
Gets interpolated value at arbitrary data field point indexed by pixel
-coordinates.

-
Note pixel values are centered in pixels, so to get the same
-value as gwy_data_field_get_val(data_field
+
Gets interpolated value at arbitrary data field point indexed by pixel coordinates.

+
Note pixel values are centered in pixels, so to get the same value as gwy_data_field_get_val(data_field
 , j
 , i
-) returns,
-it's necessary to add 0.5:
-gwy_data_field_get_dval(data_field
+)
+returns, it's necessary to add 0.5: gwy_data_field_get_dval(data_field
 , j
 +0.5, i
 +0.5, interpolation
 ).

-
See also gwy_data_field_get_dval_real() that does the same, but takes
-real coordinates.

+
See also gwy_data_field_get_dval_real() that does the same, but takes real coordinates.

 
Parameters

 

 

@@ -2405,10 +2362,8 @@
                               gdouble x,
                               gdouble y,
                               GwyInterpolationType interpolation);
-
Gets interpolated value at arbitrary data field point indexed by real
-coordinates.

-
See also gwy_data_field_get_dval() that does the same, but takes pixel
-coordinates.

+
Gets interpolated value at arbitrary data field point indexed by real coordinates.

+
See also gwy_data_field_get_dval() that does the same, but takes pixel coordinates.

 
Parameters

 

 

@@ -2456,13 +2411,11 @@
                        gdouble angle,
                        GwyInterpolationType interpolation);
Rotates a data field by a given angle.

-
This function is mostly obsolete.  See gwy_data_field_new_rotated()
-and gwy_data_field_new_rotated_90().

-
Values that get outside of data field by the rotation are lost.
-Undefined values from outside of data field that get inside are set to
-data field minimum value.

-
The rotation is performed in pixel space, i.e. it can be in fact a more
-general affine transform in the real coordinates when pixels are not square.

+
This function is mostly obsolete.  See gwy_data_field_new_rotated() and gwy_data_field_new_rotated_90().

+
Values that get outside of data field by the rotation are lost. Undefined values from outside of data field that
+get inside are set to data field minimum value.

+
The rotation is performed in pixel space, i.e. it can be in fact a more general affine transform in the real
+coordinates when pixels are not square.

 
Parameters

 

 
 

@@ -2502,18 +2455,15 @@
                             GwyRotateResizeType resize);
Creates a new data field by rotating a data field by an atribtrary angle.
The returned data field can have pixel corresponding to exterior in dfield
-
-(unless resize
- is GWY_ROTATE_RESIZE_CUT).  They are filled with a neutral
-value; pass exterior_mask
- and replace them as you wish if you need more
-control.

-
The rotation is performed in real space, i.e. it is a more general affine
-transform in the pixel space for data field with non-square pixels.
-See gwy_data_field_rotate() which rotates in the pixel space.

-
The returned data field has always square pixels.  If you want to rotate
-by a multiple of G_PI/2 while preserving non-square pixels, you must use
-explicitly a function such as gwy_data_field_new_rotated_90().

+ (unless resize
+ is
+GWY_ROTATE_RESIZE_CUT).  They are filled with a neutral value; pass exterior_mask
+ and replace them as you wish if
+you need more control.

+
The rotation is performed in real space, i.e. it is a more general affine transform in the pixel space for data
+field with non-square pixels. See gwy_data_field_rotate() which rotates in the pixel space.

+
The returned data field has always square pixels.  If you want to rotate by a multiple of G_PI/2 while preserving
+non-square pixels, you must use explicitly a function such as gwy_data_field_new_rotated_90().

 
Parameters

 

 
 
 

@@ -2530,9 +2480,8 @@
 
-
+
@@ -2604,15 +2553,13 @@
                        gboolean z);
Reflects and/or inverts a data field.
In the case of value reflection, it's inverted about the mean value.

-
Note that the axis parameter convention is confusing and different from
-gwy_brick_invert() and gwy_data_line_invert().  Parameters x
+
Note that the axis parameter convention is confusing and different from gwy_brick_invert() and
+gwy_data_line_invert().  Parameters x
  an y
-
-correspond the axes around which to flip (which themselves stay unchanged).
-You may need to swap x
+ correspond the axes around which to flip (which themselves stay
+unchanged). You may need to swap x
  and y
- arguments compared what you would pass
-naturally.

+ arguments compared what you would pass naturally.

 
Parameters

 

 

 
exterior_mask
Optional data field where pixels corresponding to exterior
-will be set to 1.  It will be resized to match the returned
-field.
Optional data field where pixels corresponding to exterior will be set to 1.  It will be resized to
+match the returned field.

  
 

 

 
 
 

@@ -2654,10 +2601,9 @@
                         GwyDataField *dest,
                         gboolean minor);
Copies data from one data field to another with transposition.

-
The destination data field is resized as necessary, its real dimensions set
-to transposed src
- dimensions and its offsets are reset.  Units are not
-updated.

+
The destination data field is resized as necessary, its real dimensions set to transposed src
+ dimensions and its
+offsets are reset.  Units are not updated.

 
Parameters

 

 
 

@@ -2699,12 +2645,10 @@
                              gint height,
                              GwyDataField *dest,
                              gboolean minor);
-
Copies data from a rectangular part of one data field to another with
-transposition.

-
The destination data field is resized as necessary, its real dimensions set
-to transposed src
- area dimensions and its offsets are reset.  Units are not
-updated.

+
Copies data from a rectangular part of one data field to another with transposition.

+
The destination data field is resized as necessary, its real dimensions set to transposed src
+ area dimensions and
+its offsets are reset.  Units are not updated.

 
Parameters

 

 

@@ -2983,8 +2927,7 @@
 
-
+
@@ -3253,9 +3196,8 @@
 
+samples.  It is possible to pass NULL to instantiate and
+return a new GwyDataLine.

@@ -3280,8 +3222,8 @@
 
-
@@ -3301,8 +3243,7 @@
 

 
Returns

 
 data_line
-itself if it was not NULL, otherwise a newly created
-data line.

+itself if it was not NULL, otherwise a newly created data line.

 

@@ -3321,11 +3262,10 @@
                                  gint thickness,
                                  GwyInterpolationType interpolation);
Extracts a possibly averaged profile from data field, with masking.

-
The extracted profile can contain holes due to masking.  It can also contain
-no points at all if the all data values along the profile were excluded due
-to masking – in this case NULL is returned.

-
Unlike gwy_data_field_get_profile(), this function takes real coordinates
-(without offsets), not row and column indices.

+
The extracted profile can contain holes due to masking.  It can also contain no points at all if the all data
+values along the profile were excluded due to masking – in this case NULL is returned.

+
Unlike gwy_data_field_get_profile(), this function takes real coordinates (without offsets), not row and column
+indices.

 
Parameters

 

 

 
mode
Masking mode to use.  See the introduction for description of
-masking modes.
Masking mode to use.  See the introduction for description of masking modes.

  
 

 

 
data_line

 
A data line.  It will be resized to res
-samples.  It is
-possible to pass NULL to instantiate and return a new
-GwyDataLine.

  
 

 

 

 
res
Requested resolution of data line (the number of samples to take).
-If nonpositive, data line resolution is chosen to match data_field
+
Requested resolution of data line (the number of samples to take). If nonpositive, data line resolution is
+chosen to match data_field
 's.

  
 

 
 
 
 

@@ -3342,8 +3282,7 @@
 
-
@@ -3383,8 +3322,8 @@
 
-
@@ -3403,8 +3342,8 @@
 

 
Returns

-
 A newly allocated array of GwyXY coordinare pairs, or NULL.
-The caller must free the returned array with g_free().

+
 A newly allocated array of GwyXY coordinare pairs, or NULL. The caller must free the returned array with
+g_free().

 
Since: 2.49

@@ -3804,9 +3743,8 @@
                          gint row);
Computes central derivative in Y direction.
On border points, one-side derivative is returned.

-
Note the derivative is for legacy reasons calulcated for the opposite
-y direction than is usual elsewhere in Gwyddion, i.e. if values increase
-with increasing row number, the returned value is negative.

+
Note the derivative is for legacy reasons calulcated for the opposite y direction than is usual elsewhere in
+Gwyddion, i.e. if values increase with increasing row number, the returned value is negative.

 
Parameters

 

 

 
ndata
Location where to store the actual number of extracted points, which
-may differ from res
+
Location where to store the actual number of extracted points, which may differ from res
 .

  
 

 

 
res
Requested resolution, i.e. the number of samples to take.
-If nonpositive, sampling is chosen to match data_field
+
Requested resolution, i.e. the number of samples to take. If nonpositive, sampling is chosen to match
+data_field
 's.

  
 

 
 
 
 
 
 

@@ -3896,17 +3834,15 @@
                             gint npoints);
Fills a data field with regularised XYZ data using a simple method.
The real dimensions and offsets of field
- determine the rectangle in the XY
-plane that will be regularised.  The regularisation method is fast but
-simple and there are no absolute guarantees of quality, even though the
-result will be usually quite acceptable.

-
This especially applies to reasonable views of the XYZ data.  Unreasonable
-views can be rendered unreasonably.  In particular if the rectangle does not
-contain any point from points
- (either due to high zoom to an empty region
-or by just being completely off) data_field
- will be filled entirely with
-the value of the closest point or something similar.

+ determine the rectangle in the XY plane that will be regularised.  The
+regularisation method is fast but simple and there are no absolute guarantees of quality, even though the result
+will be usually quite acceptable.

+
This especially applies to reasonable views of the XYZ data.  Unreasonable views can be rendered unreasonably.  In
+particular if the rectangle does not contain any point from points
+ (either due to high zoom to an empty region or
+by just being completely off) data_field
+ will be filled entirely with the value of the closest point or something
+similar.

 
Parameters

 

 
 
 

@@ -3923,14 +3859,13 @@
 
-
+
-
+
@@ -3993,8 +3928,7 @@
 

 
struct GwyDataField

 
struct GwyDataField;

-
The GwyDataField struct contains private data only and should be accessed
-using the functions below.

+
The GwyDataField struct contains private data only and should be accessed using the functions below.

 

@@ -4014,9 +3948,8 @@
 
void
 user_function (GwyDataField *gwydatafield,
                gpointer      user_data)

-
The ::data-changed signal is never emitted by data field itself.  It
-is intended as a means to notify others data field users they should
-update themselves.

+
The ::data-changed signal is never emitted by data field itself.  It is intended as a means to notify others
+data field users they should update themselves.

 

 
Parameters

 

 

 
density_map
Optional data field to fill with XYZ point density map.  It can
-be NULL.
Optional data field to fill with XYZ point density map.  It can be NULL.

  
 

 

 
points
Array of XYZ points.  Coordinates X and Y represent positions in
-the plane; the Z-coordinate represents values.
Array of XYZ points.  Coordinates X and Y represent positions in the plane; the Z-coordinate represents
+values.

  
 

 

 
 

diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/GwyDataLine.html gwyddion-2.63/devel-docs/libgwyprocess/html/GwyDataLine.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/GwyDataLine.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/GwyDataLine.html	2023-06-13 13:24:17.000000000 +0000
@@ -490,6 +490,14 @@
 void
+
+
+
+
@@ -549,16 +557,15 @@
 

 
Description

-
GwyDataLine represents 1D data arrays in Gwyddion. It is used for most of
-the data processing functions connected with 1D data, graphs, etc.

+
GwyDataLine represents 1D data arrays in Gwyddion. It is used for most of the data processing functions connected
+with 1D data, graphs, etc.

 

 
Functions

 

 
gwy_data_line_duplicate()

 
#define             gwy_data_line_duplicate(data_line)

-
Convenience macro doing gwy_serializable_duplicate() with all the necessary
-typecasting.

+
Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting.

 

 
Parameters

 

 
 

+gwy_data_line_filter_slope ()
+

+void
+
 gwy_data_line_sqrt ()
 
 

 
 

@@ -580,8 +587,7 @@
 
gwy_data_line_assign()
#define             gwy_data_line_assign(dest, source)
Convenience macro making one data line identical to another.

-
This is just a gwy_serializable_clone() wrapper with all the necessary
-typecasting.

+
This is just a gwy_serializable_clone() wrapper with all the necessary typecasting.

 
Parameters

 

 
 
 

@@ -635,8 +641,7 @@
 
-
+
@@ -654,8 +659,7 @@
 gwy_data_line_new_alike (GwyDataLine *model,
                          gboolean nullme);
Creates a new data line similar to an existing one.

-
Use gwy_data_line_duplicate() if you want to copy a data line including
-data.

+
Use gwy_data_line_duplicate() if you want to copy a data line including data.

 
Parameters

 

 

 
nullme
Whether the data line should be initialized to zeroes. If FALSE,
-the data will not be initialized.
Whether the data line should be initialized to zeroes. If FALSE, the data will not be initialized.

  
 

 
 
 

@@ -672,8 +676,7 @@
 
-
+
@@ -714,8 +717,8 @@
                              gint res,
                              GwyInterpolationType interpolation);
Creates a new data line by resampling an existing one.

-
This method is equivalent to gwy_data_line_duplicate() followed by
-gwy_data_line_resample(), but it is more efficient.

+
This method is equivalent to gwy_data_line_duplicate() followed by gwy_data_line_resample(), but it is more
+efficient.

 
Parameters

 

 

 
nullme
Whether the data line should be initialized to zeroes. If FALSE,
-the data will not be initialized.
Whether the data line should be initialized to zeroes. If FALSE, the data will not be initialized.

  
 

 
 
 

@@ -757,9 +760,8 @@
                         gint res,
                         GwyInterpolationType interpolation);
Resamples a data line.

-
In other words changes the size of one dimensional field related with data
-line. The original values are used for resampling using a requested
-interpolation alorithm.

+
In other words changes the size of one dimensional field related with data line. The original values are used for
+resampling using a requested interpolation alorithm.

 
Parameters

 

 
 

@@ -874,10 +876,9 @@
 
void
 gwy_data_line_copy (GwyDataLine *data_line,
                     GwyDataLine *target);

-
Copies the contents of a data line to another already allocated data line
-of the same size.

-
Semantic of method differs from gwy_data_field_copy(), it copies
-only data.  It will be probably changed.

+
Copies the contents of a data line to another already allocated data line of the same size.

+
Semantic of method differs from gwy_data_field_copy(), it copies only data.  It will be probably
+changed.

 
Parameters

 

 

@@ -907,11 +908,10 @@
 
gdouble *
 gwy_data_line_get_data (GwyDataLine *data_line);
Gets the raw data buffer of a data line.

-
The returned buffer is not guaranteed to be valid through whole data
-line life time.  Some function may change it, most notably
-gwy_data_line_resize() and gwy_data_line_resample().

-
This function invalidates any cached information, use
-gwy_data_line_get_data_const() if you are not going to change the data.

+
The returned buffer is not guaranteed to be valid through whole data line life time.  Some function may change it,
+most notably gwy_data_line_resize() and gwy_data_line_resample().

+
This function invalidates any cached information, use gwy_data_line_get_data_const() if you are not going to change
+the data.

 
Parameters

 

 
 

@@ -938,9 +938,8 @@
 
const gdouble *
 gwy_data_line_get_data_const (GwyDataLine *data_line);
Gets the raw data buffer of a data line, read-only.

-
The returned buffer is not guaranteed to be valid through whole data
-line life time.  Some function may change it, most notably
-gwy_data_line_resize() and gwy_data_line_resample().

+
The returned buffer is not guaranteed to be valid through whole data line life time.  Some function may change it,
+most notably gwy_data_line_resize() and gwy_data_line_resample().
Use gwy_data_line_get_data() if you want to change the data.

 
Parameters

@@ -1077,8 +1076,7 @@
 gwy_data_line_set_offset (GwyDataLine *data_line,
                           gdouble offset);
 
Sets the offset of a data line origin.

-
Note offsets don't affect any calculation, nor functions like
-gwy_data_line_rtoi().

+
Note offsets don't affect any calculation, nor functions like gwy_data_line_rtoi().

 

 
Parameters

 

 
 
 

@@ -1108,8 +1106,7 @@
 
gdouble
 gwy_data_line_get_dx (GwyDataLine *data_line);
Gets the sample distance (pixel size) of a data line in real units.

-
The result is the same as
-gwy_data_line_get_real(data_line)/gwy_data_line_get_res(data_line).

+
The result is the same as gwy_data_line_get_real(data_line)/gwy_data_line_get_res(data_line).

 
Parameters

 

 
 

@@ -1154,8 +1151,8 @@
 

 
Returns

-
 SI unit corresponding to the lateral (X) dimension of the data
-line.  Its reference count is not incremented.

+
 SI unit corresponding to the lateral (X) dimension of the data line.  Its reference count is not
+incremented.

 

@@ -1181,8 +1178,8 @@
 

 
Returns

-
 SI unit corresponding to the "height" (Z) dimension of the data
-line.  Its reference count is not incremented.

+
 SI unit corresponding to the "height" (Z) dimension of the data line.  Its reference count is not
+incremented.

 

@@ -1191,11 +1188,9 @@
 
void
 gwy_data_line_set_si_unit_x (GwyDataLine *data_line,
                              GwySIUnit *si_unit);

-
Sets the SI unit corresponding to the lateral (X) dimension of a data
-line.

+
Sets the SI unit corresponding to the lateral (X) dimension of a data line.
It does not assume a reference on si_unit
-, instead it adds its own
-reference.

+, instead it adds its own reference.

 
Parameters

 

 
 
 
 
 
 
 
 

@@ -1225,11 +1220,9 @@
 
void
 gwy_data_line_set_si_unit_y (GwyDataLine *data_line,
                              GwySIUnit *si_unit);

-
Sets the SI unit corresponding to the "height" (Y) dimension of a data
-line.

+
Sets the SI unit corresponding to the "height" (Y) dimension of a data line.
It does not assume a reference on si_unit
-, instead it adds its own
-reference.

+, instead it adds its own reference.

 
Parameters

 

 
 

@@ -1291,8 +1284,7 @@
 

 
Returns

 
 The value format.  If format
-is NULL, a newly allocated format
-is returned, otherwise (modified) format
+is NULL, a newly allocated format is returned, otherwise (modified) format
 itself is returned.

 

@@ -1305,8 +1297,7 @@
                                   GwySIValueFormat *format);
Finds value format good for displaying values of a data line.
Note this functions searches for minimum and maximum value in data_line
-,
-therefore it's relatively slow.

+, therefore it's relatively slow.

 
Parameters

 

 
 
 
 

@@ -1337,8 +1328,7 @@
 

 
Returns

 
 The value format.  If format
-is NULL, a newly allocated format
-is returned, otherwise (modified) format
+is NULL, a newly allocated format is returned, otherwise (modified) format
 itself is returned.

 

@@ -1380,9 +1370,8 @@
 gwy_data_line_itor (GwyDataLine *data_line,
                     gdouble pixpos);
Transforms pixel coordinate to real (physical) coordinate.

-
That is it maps range [0..resolution] to range [0..real-size].  It is not
-suitable for conversion of matrix indices to physical coordinates, you
-have to use gwy_data_line_itor(data_line
+
That is it maps range [0..resolution] to range [0..real-size].  It is not suitable for conversion of matrix indices
+to physical coordinates, you have to use gwy_data_line_itor(data_line
 , pixpos
  + 0.5) for that.

@@ -1456,9 +1445,8 @@
 gwy_data_line_get_val (GwyDataLine *data_line,
                        gint i);
 
Gets value at given position in a data line.

-
Do not access data with this function inside inner loops, it's slow.
-Get raw data buffer with gwy_data_line_get_data_const() and access it
-directly instead.

+
Do not access data with this function inside inner loops, it's slow. Get raw data buffer with
+gwy_data_line_get_data_const() and access it directly instead.

 

 
Parameters

 

 
 
 

@@ -1494,8 +1482,8 @@
                        gint i,
                        gdouble value);
Sets the value at given position in a data line.

-
Do not set data with this function inside inner loops, it's slow.  Get raw
-data buffer with gwy_data_line_get_data() and write to it directly instead.

+
Do not set data with this function inside inner loops, it's slow.  Get raw data buffer with
+gwy_data_line_get_data() and write to it directly instead.

 
Parameters

 

 
 

@@ -1531,21 +1519,18 @@
 gwy_data_line_get_dval (GwyDataLine *data_line,
                         gdouble x,
                         gint interpolation);
-
Gets interpolated value at arbitrary data line point indexed by pixel
-coordinates.

+
Gets interpolated value at arbitrary data line point indexed by pixel coordinates.
Note pixel values are centered in intervals [j
 , j
-+1], so to get the same
-value as gwy_data_line_get_val(data_line
++1], so to get the same value as
+gwy_data_line_get_val(data_line
 , j
-) returns,
-it's necessary to add 0.5:
+) returns, it's necessary to add 0.5:
 gwy_data_line_get_dval(data_line
-, j
+, * j
 +0.5, interpolation
 ).

-
See also gwy_data_line_get_dval_real() that does the same, but takes
-real coordinates.

+
See also gwy_data_line_get_dval_real() that does the same, but takes real coordinates.

 
Parameters

 

 
 

@@ -1562,8 +1547,8 @@
 
-
+
@@ -1586,8 +1571,7 @@
 gwy_data_line_get_dval_real (GwyDataLine *data_line,
                              gdouble x,
                              gint interpolation);
-
Gets interpolated value at arbitrary data line point indexed by real
-coordinates.

+
Gets interpolated value at arbitrary data line point indexed by real coordinates.
See also gwy_data_line_get_dval() for interpolation explanation.

 
Parameters

@@ -1952,8 +1936,7 @@
 

@@ -1992,8 +1975,7 @@
 
@@ -2032,8 +2014,7 @@
 
@@ -2172,9 +2153,8 @@
                               gdouble top);
Sets all the values within interval to bottom
  or top
- value
-depending on whether the original values are
-below or above threshold
+ value depending on whether the original values are below or
+above threshold
  value.

 
Parameters

@@ -2231,8 +2211,8 @@
                                gdouble *av,
                                gdouble *bv);
 
Finds line leveling coefficients.

-
The coefficients can be used for line leveling using relation
-data[i] := data[i] - (av + bv*i);

+
The coefficients can be used for line leveling using relation

+
data[i] := data[i] - (av + bv*i)

 

 
Parameters

 

 

 
x
Position in data line in range [0, resolution].  If the value is outside
-this range, the nearest border value is returned.
Position in data line in range [0, resolution].  If the value is outside this range, the nearest border value
+is returned.

  
 

 

 
 

 
result

 
A data line to put the result to.  May be one of operand1
-,
-operand2
+, operand2
 .

  
 

 
result

 
A data line to put the result to.  May be one of operand1
-,
-operand2
+, operand2
 .

  
 

 
result

 
A data line to put the result to.  May be one of operand1
-,
-operand2
+, operand2
 .

  
 

 
 

@@ -2306,9 +2286,8 @@
                       gdouble angle,
                       GwyInterpolationType interpolation);
Performs line rotation.

-
This is operation similar to leveling, but it does not change the angles
-between line segments (on the other hand it introduces other deformations
-due to discretization).

+
This is operation similar to leveling, but it does not change the angles between line segments (on the other hand
+it introduces other deformations due to discretization).

 
Parameters

 

 
 

@@ -2443,8 +2422,7 @@
 
++1 to store the coefficients to, or NULL (a fresh array is allocated then).

@@ -2463,8 +2441,7 @@
 

 
Returns

 
 The coefficients of the polynomial (coeffs
-when it was not NULL,
-otherwise a newly allocated array).

+when it was not NULL, otherwise a newly allocated array).

 

@@ -2478,10 +2455,9 @@
 
Note n
  is polynomial degree, so the size of coeffs
  is n
-+1.  X-values
-are indices in the data line.

-
For polynomials of degree 0 and 1 it's better to use gwy_data_line_get_avg()
-and gwy_data_line_get_line_coeffs() because they are faster.

++1.  X-values are indices in the data line.

+
For polynomials of degree 0 and 1 it's better to use gwy_data_line_get_avg() and gwy_data_line_get_line_coeffs()
+because they are faster.

 
Parameters

 

 
coeffs

 
An array of size n
-+1 to store the coefficients to, or NULL
-(a fresh array is allocated then).

  
 

 

 
 
 

@@ -2504,8 +2480,7 @@
 
++1 to store the coefficients to, or NULL (a fresh array is allocated then).

@@ -2514,8 +2489,7 @@
 

 
Returns

 
 The coefficients of the polynomial (coeffs
-when it was not NULL,
-otherwise a newly allocated array).

+when it was not NULL, otherwise a newly allocated array).

 

@@ -2630,6 +2604,13 @@
 

+
gwy_data_line_filter_slope ()

+
void
+gwy_data_line_filter_slope (GwyDataLine *data_line,
+                            GwyDataLine *der);

+

+

+

 
gwy_data_line_sqrt ()

 
void
 gwy_data_line_sqrt (GwyDataLine *data_line);

@@ -2656,8 +2637,7 @@
 

 
struct GwyDataLine

 
struct GwyDataLine;

-
The GwyDataLine struct contains private data only and should be accessed
-using the functions below.

+
The GwyDataLine struct contains private data only and should be accessed using the functions below.

 

 

 

@@ -2677,9 +2657,8 @@
 
void
 user_function (GwyDataLine *gwydataline,
                gpointer     user_data)

-
The ::data-changed signal is never emitted by data line itself.  It
-is intended as a means to notify others data line users they should
-update themselves.

+
The ::data-changed signal is never emitted by data line itself.  It is intended as a means to notify others
+data line users they should update themselves.

 

 
Parameters

 

 
coeffs

 
An array of size n
-+1 to store the coefficients to, or NULL
-(a fresh array is allocated then).

  
 

 
 
 
 
 

diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/index.html gwyddion-2.63/devel-docs/libgwyprocess/html/index.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/index.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/index.html	2023-06-13 13:24:17.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

-  For Gwyddion 2.62.
+  For Gwyddion 2.63.
   The latest version of this document can be found on-line at
   http://gwyddion.net/documentation/libgwyprocess/.
 

@@ -177,6 +177,7 @@
 
Index of new symbols in 2.60

 
Index of new symbols in 2.61

 
Index of new symbols in 2.62

+
Index of new symbols in 2.63

 

 

     This library contains classes representing one- and twodimensional data,
diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-correct.html gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-correct.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-correct.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-correct.html	2023-06-13 13:24:17.000000000 +0000
@@ -261,24 +261,19 @@
                               gint grain_id,
                               gdouble qprec);

Replaces masked areas by the solution of Laplace equation.

-

The boundary conditions on mask boundaries are Dirichlet with values given -by pixels on the outer boundary of the masked area. Boundary conditions at -field edges are Neumann conditions ∂z/∂n=0 where n denotes the normal to the +

The boundary conditions on mask boundaries are Dirichlet with values given by pixels on the outer boundary of the +masked area. Boundary conditions at field edges are Neumann conditions ∂z/∂n=0 where n denotes the normal to the edge. If entire area of field - is to be replaced the problem is -underspecified; field + is to be replaced the problem is underspecified; field will be filled with zeros.

For the default value of qprec - the the result should be good enough for any -image processing purposes with the typical local error of order 10⁻⁵ for -very large grains and possibly much smaller for small grains. You can lower + the the result should be good enough for any image processing purposes with the +typical local error of order 10⁻⁵ for very large grains and possibly much smaller for small grains. You can lower qprec - down to about 0.3 or even 0.2 if speed is crucial and some precision -can be sacrificed. Below that the result just starts becoming somewhat -worse for not much speed increase. Conversely, you may wish to increase + down to about 0.3 or even 0.2 if speed is crucial and some precision can be sacrificed. Below that the +result just starts becoming somewhat worse for not much speed increase. Conversely, you may wish to increase qprec - up to 3 or even 5 if accuracy is important and you can afford the -increased computation time.

+ up to 3 or even 5 if accuracy is important and you can afford the increased computation time.

Parameters

@@ -295,24 +290,20 @@ - + - +gwy_data_field_grain_numbers()). Passing 0 means to replace the entire empty space outside grains while +passing a negative value means to replace the entire masked area.

- + @@ -331,13 +322,12 @@ gdouble corrfactor, gdouble *error);

Performs one interation of Laplace data correction.

-

Tries to remove all the points in mask off the data by using -iterative method similar to solving heat flux equation.

+

Tries to remove all the points in mask off the data by using iterative method similar to solving heat flux +equation.

Use this function repeatedly until reasonable error is reached.

-
For almost all purposes this function was superseded by -non-iterative gwy_data_field_laplace_solve() which is simultaneously much -faster and more accurate.
+
For almost all purposes this function was superseded by non-iterative gwy_data_field_laplace_solve() which +is simultaneously much faster and more accurate.

Parameters

mask

A two-dimensional data field containing mask defining the areas to -interpolate.

A two-dimensional data field containing mask defining the areas to interpolate.

  

grain_id

The id number of the grain to replace with the solution of -Laplace equation, from 1 to ngrains +

The id number of the grain to replace with the solution of Laplace equation, from 1 to ngrains (see -gwy_data_field_grain_numbers()). Passing 0 means to replace the -entire empty space outside grains while passing a negative value -means to replace the entire masked area.

  

qprec

Speed-accuracy tuning parameter. Pass 1.0 for the default that is -fast and sufficiently precise.

Speed-accuracy tuning parameter. Pass 1.0 for the default that is fast and sufficiently precise.

  
@@ -384,13 +374,11 @@ GwyDataField *mask_field);

Fills data under mask with the average value.

This function simply puts average value of all the data_field - values (both -masked and unmasked) into points in data_field - lying under points where -mask_field + values (both masked and unmasked) into points in +data_field + lying under points where mask_field values are nonzero.

-

In most cases you probably want to use -gwy_data_field_correct_average_unmasked() instead.

+

In most cases you probably want to use gwy_data_field_correct_average_unmasked() instead.

Parameters

@@ -422,10 +410,9 @@ (GwyDataField *data_field, GwyDataField *mask_field);

Fills data under mask with the average value of unmasked data.

-

This function calculates the average value of all unmasked pixels in -data_field - and then fills all the masked pixels with this average value. -It is useful as the first rough step of correction of data under the mask.

+

This function calculates the average value of all unmasked pixels in data_field + and then fills all the masked +pixels with this average value. It is useful as the first rough step of correction of data under the mask.

If all data are masked the field is filled with zeroes.

Parameters

@@ -459,11 +446,9 @@ GwyDataField *mask_field, gdouble thresh);

Creates mask of data that are above or below thresh -*sigma from average -height.

-

Sigma denotes root-mean square deviation of heights. This criterium -corresponds to the usual Gaussian distribution outliers detection if -thresh +*sigma from average height.

+

Sigma denotes root-mean square deviation of heights. This criterium corresponds to the usual Gaussian distribution +outliers detection if thresh is 3.

Parameters

@@ -501,18 +486,16 @@ GwyDataField *mask_field, gdouble thresh_low, gdouble thresh_high); -

Creates mask of data that are above or below multiples of rms from average -height.

+

Creates mask of data that are above or below multiples of rms from average height.

Data that are below mean -thresh_low *sigma - or above -mean + or above mean +thresh_high *sigma - are marked as outliers, where sigma - denotes the -root-mean square deviation of heights.

+ are marked as outliers, where +sigma + denotes the root-mean square deviation of heights.

Parameters

@@ -560,9 +543,8 @@ gdouble fill_value);

Distorts a data field in the horizontal plane.

Note the transform function invtrans - is the inverse transform, in other -words it calculates the old coordinates from the new coordinates (the -transform would not be uniquely defined the other way round).

+ is the inverse transform, in other words it calculates the old coordinates +from the new coordinates (the transform would not be uniquely defined the other way round).

The GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function.

Parameters

@@ -585,17 +567,15 @@
- +are the new row and column indices, passed as the input +coordinates. The output coordinates should follow the same convention. Unless a special exterior +handling is required, the transform function does not need to concern itself with coordinates being +outside of the data.

@@ -639,9 +619,9 @@

Resamples a data field in an arbitrarily distorted manner.

Each item in coords corresponds to one pixel in dest - and gives the -coordinates in source - defining the value to set in this pixel.

+ and gives the coordinates in source + defining the value to +set in this pixel.

The GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function.

Parameters

@@ -665,10 +645,9 @@
+coordinates with the same number of items as dest +, ordered as data field data. See +gwy_data_field_distort() for coordinate convention discussion.

@@ -704,10 +683,9 @@ gdouble fill_value);

Performs an affine transformation of a data field in the horizontal plane.

Note the transform invtrans - is the inverse transform, in other -words it calculates the old coordinates from the new coordinates. This -way even degenerate (non-invertible) transforms can be meaningfully used. -Also note that the (column, row) coordinate system is left-handed.

+ is the inverse transform, in other words it calculates the old coordinates from the +new coordinates. This way even degenerate (non-invertible) transforms can be meaningfully used. Also note that the +(column, row) coordinate system is left-handed.

The GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function.

Parameters

@@ -730,24 +708,21 @@
- @@ -785,22 +760,20 @@ gboolean prevent_rotation, gdouble oversampling);

Resolves an affine transformation of a data field in the horizontal plane.

-

This function calculates suitable arguments for gwy_data_field_affine() -from given images and lattice vectors (in real coordinates).

+

This function calculates suitable arguments for gwy_data_field_affine() from given images and lattice vectors (in +real coordinates).

Data field dest - will be resized and its real dimensions and units set in -anticipation of gwy_data_field_affine(). Its contents will be destroyed.

+ will be resized and its real dimensions and units set in anticipation of gwy_data_field_affine(). +Its contents will be destroyed.

Note that a1a2_corr - is an input-output parameter. In general, the vectors -will be modified according to scaling - and prevent_rotation - to the actual -vectors in dest + is an input-output parameter. In general, the vectors will be modified according to scaling + +and prevent_rotation + to the actual vectors in dest after the transformation. Only if prevent_rotation - is -FALSE and scaling - is GWY_AFFINE_SCALING_AS_GIVEN the vectors are -preserved.

+ is FALSE +and scaling + is GWY_AFFINE_SCALING_AS_GIVEN the vectors are preserved.

Parameters

invtrans

Inverse transform function, that is the transformation from -new coordinates to old coordinates. It gets -(j +

Inverse transform function, that is the transformation from new coordinates to old coordinates. It +gets (j +0.5, i +0.5), where i and j -are the new row and column -indices, passed as the input coordinates. The output coordinates -should follow the same convention. Unless a special exterior -handling is required, the transform function does not need to -concern itself with coordinates being outside of the data.

  

coords

Array of source -coordinates with the same number of items as -dest -, ordered as data field data. -See gwy_data_field_distort() for coordinate convention discussion.

  

invtrans

Inverse transform, that is the transformation from -new pixel coordinates to old pixel coordinates, represented as -(j +

Inverse transform, that is the transformation from new pixel coordinates to old pixel coordinates, +represented as (j +0.5, i +0.5), where i and j -are the row and column -indices. It is represented as a six-element array [axx +are the row and column indices. It is represented as +a six-element array [axx , axy -, -ayx +, ayx , ayy , bx , by ] where axy is the coefficient from x -to -y +to y .

  
@@ -823,26 +796,26 @@ - + @@ -852,19 +825,17 @@ - - + @@ -879,18 +850,15 @@ gwy_data_field_measure_lattice_acf (GwyDataField *acf2d, gdouble *a1a2);

Estimates or improves estimate of lattice vectors from a 2D ACF field.

-

Note that the 2D ACF of a data field has to be passed, not the data field -itself. The correlation function can be for instance calculated by -gwy_data_field_2dacf(). However, you can calculate and/or process the -correlation function in any way you see fit.

+

Note that the 2D ACF of a data field has to be passed, not the data field itself. The correlation function can be +for instance calculated by gwy_data_field_2dacf(). However, you can calculate and/or process the correlation +function in any way you see fit.

When the vectors in a1a2 - are zero the function attempts to estimate the -lattice from scratch. But if a1a2 - contains two non-zero vectors it takes -them as approximate lattice vectors to improve.

+ are zero the function attempts to estimate the lattice from scratch. But if a1a2 + +contains two non-zero vectors it takes them as approximate lattice vectors to improve.

If the function return FALSE the array a1a2 - is filled with useless values -and must be ignored.

+ is filled with useless values and must be ignored.

Parameters

a1a2

Lattice vectors (or generally base vectors) in source -, as an array -of four components: x1 +, as an array of four components: x1 , y1 , x2 -and y2 +and +y2 .

  

a1a2_corr

Correct lattice vectors (or generally base vectors) dest -should -have after the affine transform, in the same form as a1a2 +should have after the affine transform, in +the same form as a1a2 .

  

invtrans

Inverse transform as an array of six values to be filled -according to gwy_data_field_affine() specification.

Inverse transform as an array of six values to be filled according to gwy_data_field_affine() +specification.

  

prevent_rotation

TRUE to prevent rotation of the data by rotating -a1a2_corr -as a whole to a direction preserving the -data orientation. FALSE to take a1a2_corr +

TRUE to prevent rotation of the data by rotating a1a2_corr +as a whole to a direction +preserving the data orientation. FALSE to take a1a2_corr as given.

  

oversampling

Oversampling factor. Values larger than 1 mean smaller -pixels (and more of them) in dest -, values smaller than 1 -the opposite. Pass 1.0 for the default pixel size choice.

Oversampling factor. Values larger than 1 mean smaller pixels (and more of them) in dest +, values +smaller than 1 the opposite. Pass 1.0 for the default pixel size choice.

  
@@ -910,8 +878,7 @@ @@ -931,19 +898,15 @@ gwy_data_field_measure_lattice_psdf (GwyDataField *psdf2d, gdouble *a1a2);

Estimates or improves estimate of lattice vectors from a 2D PSDF field.

-

Note that the 2D PSDF of a data field has to be passed, not the data field -itself. The spectral density can be for instance calculated by -gwy_data_field_2dfft() and summing the squares of real and imaginary parts -However, you can calculate and/or process the spectral density in any way -you see fit.

+

Note that the 2D PSDF of a data field has to be passed, not the data field itself. The spectral density can be for +instance calculated by gwy_data_field_2dfft() and summing the squares of real and imaginary parts However, you can +calculate and/or process the spectral density in any way you see fit.

When the vectors in a1a2 - are zero the function attempts to estimate the -lattice from scratch. But if a1a2 - contains two non-zero vectors it takes -them as approximate lattice vectors to improve.

+ are zero the function attempts to estimate the lattice from scratch. But if a1a2 + +contains two non-zero vectors it takes them as approximate lattice vectors to improve.

If the function return FALSE the array a1a2 - is filled with useless values -and must be ignored.

+ is filled with useless values and must be ignored.

Parameters

Lattice vectors as an array of four components: x1 , y1 , x2 -and -y2 +and y2 (in real coordinates).

  
@@ -955,8 +918,8 @@ - + @@ -964,8 +927,7 @@ @@ -986,9 +948,8 @@ GwyDataLine *mask_line);

Fills missing values in a data line using Laplace data correction.

Both data lines must have the same number of values.

-

For one-dimensional data the missing data interpolation is explicit. -Interior missing segments are filled with linear dependence between the edge -points. Missing segments with one end open are filled with the edge value.

+

For one-dimensional data the missing data interpolation is explicit. Interior missing segments are filled with +linear dependence between the edge points. Missing segments with one end open are filled with the edge value.

Parameters

psdf2d

Data field containing two-dimensional power spectrum density -function (or alternatively Fourier coefficient modulus).

Data field containing two-dimensional power spectrum density function (or alternatively Fourier +coefficient modulus).

  

Lattice vectors as an array of four components: x1 , y1 , x2 -and -y2 +and y2 (in real coordinates).

  
@@ -1013,8 +974,7 @@

Returns

-

TRUE if the line contained any data at all. If there are no data -the FALSE is returned and data_line +

TRUE if the line contained any data at all. If there are no data the FALSE is returned and data_line is filled with zeros.

Since: 2.45

@@ -1031,10 +991,9 @@ gdouble max_scar_width, gboolean negative);

Find and marks scars in a data field.

-

Scars are linear horizontal defects, consisting of shifted values. -Zero or negative values in result - siginify normal data, positive -values siginify samples that are part of a scar.

+

Scars are linear horizontal defects, consisting of shifted values. Zero or negative values in result + siginify +normal data, positive values siginify samples that are part of a scar.

Parameters

@@ -1051,8 +1010,7 @@ - @@ -1063,15 +1021,13 @@ - - + @@ -1097,9 +1053,9 @@ GwyDataLine *shifts);

Shifts entire data field rows as specified by given data line.

Data line shifts - must have resolution corresponding to the number of -data_field - rows. Its values are subtracted from individual field rows.

+ must have resolution corresponding to the number of data_field + rows. Its values are subtracted +from individual field rows.

Parameters

result

A data field to store the result to (it is resized to match -data_field +

A data field to store the result to (it is resized to match data_field ).

  

threshold_low

Definite relative step for scar marking, must be at least -equal to threshold_high +

Definite relative step for scar marking, must be at least equal to threshold_high .

  

min_scar_len

Minimum length of a scar, shorter ones are discarded -(must be at least one).

Minimum length of a scar, shorter ones are discarded (must be at least one).

  
@@ -1137,9 +1093,8 @@

Finds row shifts to misaligned row correction using trimmed row means.

For zero trimfrac the function calculates row means. For trimfrac - of 1/2 -or larger it calculates row medians. Values between correspond to trimmed -means.

+ of 1/2 or larger it calculates row medians. +Values between correspond to trimmed means.

Parameters

@@ -1156,29 +1111,25 @@ - - + - + - + @@ -1186,8 +1137,7 @@

Returns

-

A newly created data line containing the row shifts, for instance -row means, medians or trimmed means.

+

A newly created data line containing the row shifts, for instance row means, medians or trimmed means.

Since: 2.52

@@ -1201,13 +1151,11 @@ GwyMaskingType masking, gdouble trimfrac, gint mincount); -

Finds row shifts to misaligned row correction using trimmed means of row -differences.

+

Finds row shifts to misaligned row correction using trimmed means of row differences.

For zero trimfrac the function calculates row means. For trimfrac - of 1/2 -or larger it calculates row medians. Values between correspond to trimmed -means.

+ of 1/2 or larger it calculates row medians. +Values between correspond to trimmed means.

Parameters

mask

Mask of values to take values into account/exclude, or NULL for full -data_field +

Mask of values to take values into account/exclude, or NULL for full data_field .

  

masking

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

trimfrac

Fraction of lowest values and highest values to discard when -trimming.

Fraction of lowest values and highest values to discard when trimming.

  

mincount

Minimum number of values in a row necessary for per-row -calculation. Rows which are essentially completely masked are -not shifted with respect to a global value. Pass a non-positive -number to use an automatic minimum count.

Minimum number of values in a row necessary for per-row calculation. Rows which are essentially +completely masked are not shifted with respect to a global value. Pass a non-positive number to use an +automatic minimum count.

  
@@ -1224,29 +1172,25 @@ - - + - + - + @@ -1254,8 +1198,7 @@

Returns

-

A newly created data line containing the row shifts, for instance -row means, medians or trimmed means.

+

A newly created data line containing the row shifts, for instance row means, medians or trimmed means.

Since: 2.52

@@ -1280,16 +1223,14 @@ - + - + diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2 gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2 --- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2 2023-06-13 13:24:17.000000000 +0000 @@ -83,6 +83,7 @@ + @@ -141,6 +142,7 @@ + @@ -597,6 +599,7 @@ + @@ -1199,6 +1202,7 @@ + diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-filters.html gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-filters.html --- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-filters.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-filters.html 2023-06-13 13:24:17.000000000 +0000 @@ -409,6 +409,14 @@ + + + + + + + + +

mask

Mask of values to take values into account/exclude, or NULL for full -data_field +

Mask of values to take values into account/exclude, or NULL for full data_field .

  

masking

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

trimfrac

Fraction of lowest values and highest values to discard when -trimming.

Fraction of lowest values and highest values to discard when trimming.

  

mincount

Minimum number of values in a row necessary for per-row -calculation. Rows which are essentially completely masked are -not shifted with respect to a global value. Pass a non-positive -number to use an automatic minimum count.

Minimum number of values in a row necessary for per-row calculation. Rows which are essentially +completely masked are not shifted with respect to a global value. Pass a non-positive number to use an +automatic minimum count.

  

derdist

Angular derivation distribution (normally obrained from -gwy_data_field_slope_distribution()).

Angular derivation distribution (normally obrained from gwy_data_field_slope_distribution()).

  

correction

Corrections for particular symmetry types will be stored -here (indexed by GwyPlaneSymmetry). correction -[0] contains -the most probable correction. All angles are in radians.

Corrections for particular symmetry types will be stored here (indexed by GwyPlaneSymmetry). +correction +[0] contains the most probable correction. All angles are in radians.

  
+void + +gwy_data_line_part_filter_kth_rank () +
gboolean @@ -1483,9 +1491,8 @@ gwy_data_field_filter_median (GwyDataField *data_field, gint size);

Filters a data field with median filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_kth_rank() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_kth_rank() to perform +filtering with a different kernel, for instance circular.

Parameters

@@ -1520,9 +1527,8 @@ gint width, gint height);

Filters a rectangular part of a data field with median filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_kth_rank() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_kth_rank() to perform +filtering with a different kernel, for instance circular.

Parameters

@@ -2107,7 +2113,7 @@ GwyDataField *xder, GwyDataField *yder);

Calculates x and y derivaties for an entire field.

-

The derivatives are calculated as the simple symmetrical differences (in physical units, not pixel-wise), except at +

The derivatives are in physical units (not pixel-wise) and calculated from simple symmetrical differences, except at the edges where the differences are one-sided.

Parameters

@@ -2125,12 +2131,16 @@
- + - + @@ -2402,9 +2412,8 @@ gwy_data_field_filter_minimum (GwyDataField *data_field, gint size);

Filters a data field with minimum filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_min_max() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform +filtering with a different kernel, for instance circular.

Parameters

xder

Data field where the x-derivarive is to be stored, or NULL if you are only interested in the y-derivarive.

Data field where the x-derivative is to be stored, or NULL if you are only interested in the y-derivative. +It will be resized to match data_field +.

  

yder

Data field where the y-derivarive is to be stored, or NULL if you are only interested in the x-derivarive.

Data field where the y-derivative is to be stored, or NULL if you are only interested in the x-derivative. +It will be resized to match data_field +.

  
@@ -2440,9 +2449,8 @@ gint height);

Filters a rectangular part of a data field with minimum filter.

This operation is often called erosion filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_min_max() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform +filtering with a different kernel, for instance circular.

Parameters

@@ -2493,9 +2501,8 @@ gwy_data_field_filter_maximum (GwyDataField *data_field, gint size);

Filters a data field with maximum filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_min_max() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform +filtering with a different kernel, for instance circular.

Parameters

@@ -2531,9 +2538,8 @@ gint height);

Filters a rectangular part of a data field with maximum filter.

This operation is often called dilation filter.

-

This method uses a simple square kernel. Use the general function -gwy_data_field_area_filter_min_max() to perform filtering with different, -for instance circular, kernel.

+

This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform +filtering with a different kernel, for instance circular.

Parameters

@@ -2588,27 +2594,20 @@ gint row, gint width, gint height); -

Applies a morphological operation with a flat structuring element to a -part of a data field.

-

Morphological operations with flat structuring elements can be expressed -using minimum (erosion) and maximum (dilation) filters that are the basic -operations this function can perform.

-

The kernel field is a mask that defines the shape of the flat structuring -element. It is reflected for all maximum operations (dilation). For -symmetrical kernels this does not matter. You can use -gwy_data_field_elliptic_area_fill() to create a true circular (or -elliptical) kernel.

-

The kernel is implicitly centered, i.e. it will be applied symmetrically to -avoid unexpected data movement. Even-sized kernels (generally not -recommended) will extend farther towards the top left image corner for -minimum (erosion) and towards the bottom right corner for maximum (dilation) -operations due to the reflection. If you need off-center structuring -elements you can add empty rows or columns to one side of the kernel to -counteract the symmetrisation.

-

The operation is linear-time in kernel size for any convex kernel. Note -gwy_data_field_area_filter_minimum() and -gwy_data_field_area_filter_maximum(), which are limited to square -structuring elements, are much faster for large sizes of the squares.

+

Applies a morphological operation with a flat structuring element to a part of a data field.

+

Morphological operations with flat structuring elements can be expressed using minimum (erosion) and maximum +(dilation) filters that are the basic operations this function can perform.

+

The kernel field is a mask that defines the shape of the flat structuring element. It is reflected for all maximum +operations (dilation). For symmetrical kernels this does not matter. You can use +gwy_data_field_elliptic_area_fill() to create a true circular (or elliptical) kernel.

+

The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement. +Even-sized kernels (generally not recommended) will extend farther towards the top left image corner for minimum +(erosion) and towards the bottom right corner for maximum (dilation) operations due to the reflection. If you need +off-center structuring elements you can add empty rows or columns to one side of the kernel to counteract the +symmetrisation.

+

The operation is linear-time in kernel size for any convex kernel. Note gwy_data_field_area_filter_minimum() and +gwy_data_field_area_filter_maximum(), which are limited to square structuring elements, are much faster for large +sizes of the squares.

The exterior is always handled as GWY_EXTERIOR_BORDER_EXTEND.

Parameters

@@ -2670,13 +2669,12 @@ gint row, gint width, gint height); -

Applies an alternating sequential morphological filter with a flat disc -structuring element to a part of a data field.

-

Alternating sequential filter is a filter consisting of repeated opening and -closing (or closing and opening) with progressively larger structuring -elements. This function performs such filtering for sequence of structuring -elements consisting of true Euclidean discs with increasing radii. The -largest disc in the sequence fits into a (2size +

Applies an alternating sequential morphological filter with a flat disc structuring element to a part of a data +field.

+

Alternating sequential filter is a filter consisting of repeated opening and closing (or closing and opening) with +progressively larger structuring elements. This function performs such filtering for sequence of structuring +elements consisting of true Euclidean discs with increasing radii. The largest disc in the sequence fits into +a (2size  + 1) × (2size  + 1) square.

@@ -2695,15 +2693,14 @@
- + - + @@ -2747,18 +2744,10 @@ -th rank filter to a part of a data field.

Pass half the number of non-zero values in kernel as k - for a median -filter.

-

The kernel field is a mask that defines the shape of the kernel. You can -use gwy_data_field_elliptic_area_fill() to create a true circular (or -elliptical) kernel. The kernel must be non-empty.

-

The kernel is implicitly centered, i.e. it will be applied symmetrically to -avoid unexpected data movement. Even-sized kernels (generally not -recommended) will extend farther towards the top left image corner for -minimum (erosion) and towards the bottom right corner for maximum (dilation) -operations due to the reflection. If you need off-center structuring -elements you can add empty rows or columns to one side of the kernel to -counteract the symmetrisation.

+ for a median filter.

+

The kernel field is a mask that defines the shape of the kernel. You can use gwy_data_field_elliptic_area_fill() +to create a true circular (or elliptical) kernel. The kernel must be non-empty.

+

The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement.

The exterior is always handled as GWY_EXTERIOR_BORDER_EXTEND.

If the operation is aborted the contents of data_field is untouched.

@@ -2823,6 +2812,62 @@
+

gwy_data_line_part_filter_kth_rank ()

+
void
+gwy_data_line_part_filter_kth_rank (GwyDataLine *data_line,
+                                    gint klen,
+                                    gint from,
+                                    gint to,
+                                    gint k);
+

Applies a k +-th rank filter to a part of a data line.

+

The exterior is always handled as GWY_EXTERIOR_BORDER_EXTEND.

+
+

Parameters

+

radius

Maximum radius of the circular structuring element, in pixels. -For radius 0 and smaller the filter is no-op.

Maximum radius of the circular structuring element, in pixels. For radius 0 and smaller the filter is +no-op.

  

closing

TRUE requests an opening-closing filter (i.e. ending with -closing), FALSE requests a closing-opening filter (i.e. ending -with opening).

TRUE requests an opening-closing filter (i.e. ending with closing), FALSE requests a closing-opening +filter (i.e. ending with opening).

  
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

data_line

A data line.

 

klen

Kernel size. The kernel is symmetrical segment of klen +pixels.

 

from

The index in data_line +to start from (inclusive).

 

to

The index in data_line +to stop (noninclusive).

 

k

Rank of the value to store as the output (from lowest to highest). It must be between 0 and klen +-1 +(inclusive).

 
+
+

Since: 2.63

+ +
+

gwy_data_field_area_filter_trimmed_mean ()

gboolean
 gwy_data_field_area_filter_trimmed_mean
@@ -2838,23 +2883,19 @@
 
Applies a trimmed mean filter to a part of a data field.

 
At least one value must remain after the trimming, i.e. nlowest
  + nhighest
-
-must be smaller than the number of non-zero values in kernel
-.  Usually one
-passes the same number as both nlowest
+ must be smaller than the number of
+non-zero values in kernel
+.  Usually one passes the same number as both nlowest
  and nhighest
 , but it is not
 a requirement.

-
The kernel field is a mask that defines the shape of the kernel.  You can
-use gwy_data_field_elliptic_area_fill() to create a true circular (or
-elliptical) kernel.  The kernel must be non-empty.

-
The kernel is implicitly centered, i.e. it will be applied symmetrically to
-avoid unexpected data movement.  Even-sized kernels (generally not
-recommended) will extend farther towards the top left image corner for
-minimum (erosion) and towards the bottom right corner for maximum (dilation)
-operations due to the reflection.  If you need off-center structuring
-elements you can add empty rows or columns to one side of the kernel to
-counteract the symmetrisation.

+
The kernel field is a mask that defines the shape of the kernel.  You can use gwy_data_field_elliptic_area_fill()
+to create a true circular (or elliptical) kernel.  The kernel must be non-empty.

+
The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement.
+Even-sized kernels (generally not recommended) will extend farther towards the top left image corner for minimum
+(erosion) and towards the bottom right corner for maximum (dilation) operations due to the reflection.  If you need
+off-center structuring elements you can add empty rows or columns to one side of the kernel to counteract the
+symmetrisation.

 
The exterior is always handled as GWY_EXTERIOR_BORDER_EXTEND.

 
If the operation is aborted the contents of data_field
  is untouched.

diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html
--- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html	2022-11-03 13:08:17.000000000 +0000
+++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html	2023-06-13 13:24:17.000000000 +0000
@@ -1426,6 +1426,13 @@
 

GWY_CORR_SEARCH_PHASE_ONLY_SCORE

 +

Score from phase-only correlation (since 2.63).

+		 
diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html --- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html 2023-06-13 13:24:17.000000000 +0000 @@ -498,8 +498,7 @@ 
gdouble
 gwy_data_line_min_pos_i (GwyDataLine *data_line);

Finds the minimum pixel position of a data line.

-

For historical reasons the value is returned as double, but it is always -an integer.

+

For historical reasons the value is returned as double, but it is always an integer.

Parameters

@@ -527,8 +526,7 @@ 
gdouble
 gwy_data_line_max_pos_i (GwyDataLine *data_line);

Finds the maximum pixel position of a data line.

-

For historical reasons the value is returned as double, but it is always -an integer.

+

For historical reasons the value is returned as double, but it is always an integer.

Parameters

@@ -815,8 +813,8 @@

Returns

The kurtosis of height values.

-

Note the kurtosis returned by this function returns is the excess kurtosis -which is zero for the Gaussian distribution (not 3).

+

Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian +distribution (not 3).

Since: 2.42

@@ -1037,8 +1035,8 @@ gint from, gint to);

Computes root mean square slope in a part of a data line.

-

This is the root mean square of value derivatives, it is also proportional -to the second derivative of both HHCF and ACF at zero.

+

This is the root mean square of value derivatives, it is also proportional to the second derivative of both HHCF +and ACF at zero.

This roughness quantity is also known as Dq.

Parameters

@@ -1081,11 +1079,9 @@ gint from, gint to);

Computes the total variation of a part of a data line.

-

The total variation is estimated as the integral of the absolute value of -local gradient. For one dimensional data, the variation reduces to the -integral of absolute value of the derivative. Its units are thus the same -as the value units of the line. See also -gwy_data_field_area_get_variation() for some more discussion.

+

The total variation is estimated as the integral of the absolute value of local gradient. For one dimensional +data, the variation reduces to the integral of absolute value of the derivative. Its units are thus the same as +the value units of the line. See also gwy_data_field_area_get_variation() for some more discussion.

Parameters

@@ -1247,8 +1243,8 @@ gint from, gint to);

Computes kurtosis value of a part of a data line.

-

Note the kurtosis returned by this function returns is the excess kurtosis -which is zero for the Gaussian distribution (not 3).

+

Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian +distribution (not 3).

Parameters

@@ -1305,8 +1301,7 @@ - + @@ -1326,8 +1321,8 @@ gint to, gint histogram_steps);

Finds approximate modus of a data line part.

-

As each number in the data line is usually unique, this function does not -return modus of the data itself, but modus of a histogram.

+

As each number in the data line is usually unique, this function does not return modus of the data itself, but +modus of a histogram.

Parameters

histogram_steps

Number of histogram steps used for modus searching, -pass a nonpositive number to autosize.

Number of histogram steps used for modus searching, pass a nonpositive number to autosize.

  
@@ -1356,8 +1351,7 @@ - + @@ -1444,8 +1438,7 @@ 
gdouble
 gwy_data_line_get_length (GwyDataLine *data_line);

Calculates physical length of a data line.

-

The length is calculated from approximation by straight segments between -values.

+

The length is calculated from approximation by straight segments between values.

Parameters

histogram_steps

Number of histogram steps used for modus searching, -pass a nonpositive number to autosize.

Number of histogram steps used for modus searching, pass a nonpositive number to autosize.

  
@@ -1476,10 +1469,9 @@

Calculates a peak roughness quantity for a data line.

Depending on m and k -, the function can calculate -Average Maximum Profile Peak Height Rpm - -or Maximum Profile Peak Height Rp +, the function can calculate Average Maximum Profile Peak Height Rpm + or Maximum Profile Peak +Height Rp , Pp , Wp .

@@ -1528,10 +1520,9 @@

Calculates a valley roughness quantity for a data line.

Depending on m and k -, the function can calculate -Average Maximum Profile Valley Depth Rvm - -or Maximum Profile Peak Depth Rv +, the function can calculate Average Maximum Profile Valley Depth Rvm + or Maximum Profile +Peak Depth Rv , Pv , Wv .

@@ -1578,8 +1569,8 @@ gint m, gint k);

Calculates a total roughness quantity for a data line.

-

The total quantity is just the sum of the corresponding quantities obtained -by gwy_data_line_get_xpm() and gwy_data_line_get_xvm().

+

The total quantity is just the sum of the corresponding quantities obtained by gwy_data_line_get_xpm() and +gwy_data_line_get_xvm().

Parameters

@@ -1627,19 +1618,14 @@ gdouble pthreshold, gdouble vthreshold, gdouble *peakvalues); -

Calculate k-th largers peaks or valleys in a data line split into given -number of sampling lengths.

-

This is a general function that can be used as the base for various standard -roughness quantities such as Rp, Rpm, Rv, Rvm or R3z. It is assumed -the line is already levelled, the form removed, etc.

-

See gwy_data_line_count_peaks() for the description what is considered -a peak.

-

For larger thresholds and/or short lines some sampling lengths may not -contain the requested number of peaks. If there are any peaks at all, the -smallest peak height (even though it is not rank --th) is used. If there -are no peaks, a large negative value is stored in the corresponding -peakvalues +

Calculate k-th largers peaks or valleys in a data line split into given number of sampling lengths.

+

This is a general function that can be used as the base for various standard roughness quantities such as Rp, Rpm, +Rv, Rvm or R3z. It is assumed the line is already levelled, the form removed, etc.

+

See gwy_data_line_count_peaks() for the description what is considered a peak.

+

For larger thresholds and/or short lines some sampling lengths may not contain the requested number of peaks. If +there are any peaks at all, the smallest peak height (even though it is not rank +-th) is used. If there are no +peaks, a large negative value is stored in the corresponding peakvalues item.

Parameters

@@ -1662,22 +1648,19 @@
- + - + @@ -1688,15 +1671,13 @@ - + +where the peak heights in each sampling length should be stored.

@@ -1704,8 +1685,7 @@

Returns

-

The actual number of peaks found (i.e. number of positive values -in peakvalues +

The actual number of peaks found (i.e. number of positive values in peakvalues ).

Since: 2.50

@@ -1719,15 +1699,13 @@ gdouble pthreshold, gdouble vthreshold);

Counts peaks or valleys defined by thresholds in a data line.

-

Peak is defined as a part of the profile that extends above the peak -threshold and is separarted by valleys that extend below the valley -threshold. For non-zero thresholds there may be parts between that are -neither peaks not valleys because the local maxima in them are -insignificant.

+

Peak is defined as a part of the profile that extends above the peak threshold and is separarted by valleys that +extend below the valley threshold. For non-zero thresholds there may be parts between that are neither peaks not +valleys because the local maxima in them are insignificant.

In either case, values of pthreshold and vthreshold - must be non-negative. -Usually one passes the same value for both.

+ must be non-negative. Usually one passes the same value for +both.

Parameters

rank

Rank of the peak to find. One means the highest peak, three the -third highers, etc.

Rank of the peak to find. One means the highest peak, three the third highers, etc.

  

peaks

TRUE for peaks, FALSE for valleys. If you pass FALSE, swap -the meanings of peaks and valleys in the description. Valley -depths are positive.

TRUE for peaks, FALSE for valleys. If you pass FALSE, swap the meanings of peaks and valleys in the +description. Valley depths are positive.

  

average

Calculate the average of the first rank -peaks instead of the -height of rank +peaks instead of the height of rank -th peak.

  

vthreshold

Valley depth threshold. Valleys must fall below this -threshold. The depth is a positive value.

Valley depth threshold. Valleys must fall below this threshold. The depth is a positive value.

  

peakvalues

Array of length at least m -where the peak heights in each -sampling length should be stored.

  
@@ -1744,9 +1722,8 @@ - + @@ -1756,8 +1733,7 @@ - + @@ -1780,9 +1756,8 @@ gboolean normalize_to_unity, gint nstats);

Calculates the distribution of data line values.

-

This function is quite similar to gwy_data_line_dh(), the differences are: -output normalization (chosen to make the integral unity), output units -(again set to make the integral unity), automated binning.

+

This function is quite similar to gwy_data_line_dh(), the differences are: output normalization (chosen to make the +integral unity), output units (again set to make the integral unity), automated binning.

Note the i -th bin is [i *dx @@ -1790,25 +1765,23 @@ ,(i +1)*dx +off -] so the central value -you probably want to use for plotting is (i +] so the central value you probably want to use for plotting is +(i +0.5)*dx +off (where dx - is -the distribution + is the distribution data line pixel size, off is its offset).

If all values are equal and ymin , ymax - are not explictly specified, the -range is chosen as [v + are not explictly specified, the range is chosen as [v -|v |/2,v +|v -/2] where v - is the unique value, -except when v +/2] +where v + is the unique value, except when v =0, in which case the range is set to [-1,1].

Parameters

@@ -1827,10 +1800,9 @@
+values to. It will be resampled to nstats +samples +(or the automatically chosen number of bins).

@@ -1847,16 +1819,14 @@ - + - + @@ -1876,8 +1846,7 @@

Computes distribution of heights in interval [ymin , ymax ).

-

If the interval is (0, 0) it computes the distribution from -real data minimum and maximum value.

+

If the interval is (0, 0) it computes the distribution from real data minimum and maximum value.

Parameters

peaks

TRUE for peaks, FALSE for valleys. If you pass FALSE, swap -the meanings of peaks and valleys in the description. Valley -depths are positive.

TRUE for peaks, FALSE for valleys. If you pass FALSE, swap the meanings of peaks and valleys in the +description. Valley depths are positive.

  

vthreshold

Valley depth threshold. Valleys must fall below this -threshold.

Valley depth threshold. Valleys must fall below this threshold.

  

distribution

Data line to put the distribution of data_line -values to. -It will be resampled to nstats -samples (or the automatically -chosen number of bins).

  

normalize_to_unity

TRUE to normalize the integral to unity (including -setting y-units of output to the inverse of x-units), -FALSE to keep plain counts in the output (and set -y-units to none).

TRUE to normalize the integral to unity (including setting y-units of output to the inverse +of x-units), FALSE to keep plain counts in the output (and set y-units to none).

  

nstats

The requested number of histogram bins, pass a non-positive number -to automatically choose a suitable number of bins.

The requested number of histogram bins, pass a non-positive number to automatically choose a suitable +number of bins.

  
@@ -1894,8 +1863,7 @@ - @@ -1930,8 +1898,7 @@

Computes cumulative distribution of heighs in interval [ymin , ymax ).

-

If the interval is (0, 0) it computes the distribution from -real data minimum and maximum value.

+

If the interval is (0, 0) it computes the distribution from real data minimum and maximum value.

Parameters

target_line

Data line to store height distribution function to. -It will be resized to nsteps +

Data line to store height distribution function to. It will be resized to nsteps .

  
@@ -1948,8 +1915,7 @@ - @@ -1984,8 +1950,7 @@

Computes distribution of angles in interval [ymin , ymax ).

-

If the interval is (0, 0) it computes the distribution from -real data minimum and maximum angle value.

+

If the interval is (0, 0) it computes the distribution from real data minimum and maximum angle value.

Parameters

target_line

Data line to store height distribution function to. -It will be resized to nsteps +

Data line to store height distribution function to. It will be resized to nsteps .

  
@@ -2036,8 +2001,7 @@

Computes cumulative distribution of angles in interval [ymin , ymax ).

-

If the interval is (0, 0) it computes the distribution from -real data minimum and maximum angle value.

+

If the interval is (0, 0) it computes the distribution from real data minimum and maximum angle value.

Parameters

@@ -2054,8 +2018,7 @@ - @@ -2084,8 +2047,7 @@ 
void
 gwy_data_line_acf (GwyDataLine *data_line,
                    GwyDataLine *target_line);
-

Coputes autocorrelation function and stores the values in -target_line +

Coputes autocorrelation function and stores the values in target_line

Up to version 2.53 it did not set the output units properly.

@@ -2119,8 +2081,7 @@ 
void
 gwy_data_line_hhcf (GwyDataLine *data_line,
                     GwyDataLine *target_line);
-

Computes height-height correlation function and stores results in -target_line +

Computes height-height correlation function and stores results in target_line .

Up to version 2.53 it did not set the output units properly.

@@ -2139,8 +2100,7 @@
- @@ -2157,8 +2117,7 @@ gint windowing, gint interpolation);

Calculates the power spectral density function of a data line.

-

Up to version 2.45 it destroyed the input data and did not set the output -units properly.

+

Up to version 2.45 it destroyed the input data and did not set the output units properly.

Parameters

target_line

Data line to store angle distribution function to. -It will be resized to nsteps +

Data line to store angle distribution function to. It will be resized to nsteps .

  

target_line

Data line to store height-height function to. It will be -resized to data_line +

Data line to store height-height function to. It will be resized to data_line size.

  
@@ -2175,8 +2134,7 @@ - @@ -2187,8 +2145,7 @@ - + diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-stats.html gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-stats.html --- gwyddion-2.62/devel-docs/libgwyprocess/html/libgwyprocess-stats.html 2022-11-03 13:08:17.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/html/libgwyprocess-stats.html 2023-06-13 13:24:17.000000000 +0000 @@ -769,18 +769,14 @@

Description

-

Many statistical functions permit to pass masks that determine which values -in the data field to take into account or ignore when calculating the -statistical characteristics. Masking mode GWY_MASK_INCLUDE means that -maks values equal to 0.0 and below cause corresponding data field samples -to be ignored, values equal to 1.0 and above cause inclusion of -corresponding data field samples. The behaviour for values inside interval -(0.0, 1.0) is undefined. In mode GWY_MASK_EXCLUDE -, the meaning of mask is -inverted, as if all mask values x were replaced with 1-x. The +

Many statistical functions permit to pass masks that determine which values in the data field to take into account +or ignore when calculating the statistical characteristics. Masking mode GWY_MASK_INCLUDE means that maks values +equal to 0.0 and below cause corresponding data field samples to be ignored, values equal to 1.0 and above cause +inclusion of corresponding data field samples. The behaviour for values inside interval (0.0, 1.0) is undefined. +In mode GWY_MASK_EXCLUDE +, the meaning of mask is inverted, as if all mask values x were replaced with 1-x. The mask field is ignored in mode GWY_MASK_IGNORE -, i.e. the same behaviour -occurs as with NULL mask argument.

+, i.e. the same behaviour occurs as with NULL mask argument.

Functions

@@ -906,9 +902,8 @@ 
gdouble
 gwy_data_field_get_rms (GwyDataField *data_field);

Computes root mean square value of a data field.

-

The root mean square value is calculated with respect to the mean value. -See gwy_data_field_get_mean_square() for a similar function which does not -subtract the mean value.

+

The root mean square value is calculated with respect to the mean value. See gwy_data_field_get_mean_square() for +a similar function which does not subtract the mean value.

This quantity is cached.

Parameters

@@ -1133,11 +1128,10 @@

Computes the entropy of a two-dimensional point cloud.

Each pair of corresponding xfield and yfield - pixels is assumed to -represent the coordinates (x + pixels is assumed to represent the coordinates (x ,y -) of a point in plane. Hence they must have -the same dimensions.

+) of a point in +plane. Hence they must have the same dimensions.

Parameters

target_line

Data line to store power spectral density function to. -It will be resized to data_line +

Data line to store power spectral density function to. It will be resized to data_line size.

  

interpolation

Interpolation type. -Ignored since 2.8 as no resampling is performed.

Interpolation type. Ignored since 2.8 as no resampling is performed.

  
@@ -1223,8 +1217,7 @@

Returns

-

The maximum value. When the number of samples to calculate -maximum of is zero, -G_MAXDOUBLE is returned.

+

The maximum value. When the number of samples to calculate maximum of is zero, -G_MAXDOUBLE is returned.

@@ -1282,8 +1275,7 @@

Returns

-

The minimum value. When the number of samples to calculate -minimum of is zero, -G_MAXDOUBLE is returned.

+

The minimum value. When the number of samples to calculate minimum of is zero, -G_MAXDOUBLE is returned.

@@ -1300,10 +1292,8 @@ gdouble *max);

gwy_data_field_area_get_min_max is deprecated and should not be used in newly-written code.

Finds minimum and maximum values in a rectangular part of a data field.

-

This function is equivalent to calling -gwy_data_field_area_get_min_max_mask() - -with masking mode GWY_MASK_INCLUDE.

+

This function is equivalent to calling gwy_data_field_area_get_min_max_mask() + with masking mode GWY_MASK_INCLUDE.

Parameters

@@ -1392,8 +1382,7 @@ - + @@ -1526,8 +1515,7 @@ - + @@ -1573,8 +1561,7 @@

Computes root mean square value of a rectangular part of a data field.

The root mean square value is calculated with respect to the mean value.

This function is equivalent to calling gwy_data_field_area_get_rms_mask() - -with masking mode GWY_MASK_INCLUDE.

+ with masking mode GWY_MASK_INCLUDE.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -1633,8 +1620,7 @@ gint row, gint width, gint height); -

Computes root mean square value of deviations of a rectangular part of a -data field.

+

Computes root mean square value of deviations of a rectangular part of a data field.

The root mean square value is calculated with respect to the mean value.

Parameters

@@ -1657,8 +1643,7 @@
- + @@ -1701,11 +1686,9 @@ gint row, gint width, gint height); -

Computes grain-wise root mean square value of deviations of a rectangular -part of a data field.

-

Grain-wise means that the mean value is determined for each grain (i.e. -cotinguous part of the mask or inverted mask) separately and the deviations -are calculated from these mean values.

+

Computes grain-wise root mean square value of deviations of a rectangular part of a data field.

+

Grain-wise means that the mean value is determined for each grain (i.e. cotinguous part of the mask or inverted +mask) separately and the deviations are calculated from these mean values.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -1727,8 +1710,7 @@ - + @@ -1773,8 +1755,7 @@

gwy_data_field_area_get_sum is deprecated and should not be used in newly-written code.

Sums values of a rectangular part of a data field.

This function is equivalent to calling gwy_data_field_area_get_sum_mask() - -with masking mode GWY_MASK_INCLUDE.

+ with masking mode GWY_MASK_INCLUDE.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -1855,8 +1836,7 @@ - + @@ -1900,10 +1880,8 @@ gint height);

gwy_data_field_area_get_median is deprecated and should not be used in newly-written code.

Computes median value of a data field area.

-

This function is equivalent to calling -gwy_data_field_area_get_median_mask() - -with masking mode GWY_MASK_INCLUDE.

+

This function is equivalent to calling gwy_data_field_area_get_median_mask() + with masking mode GWY_MASK_INCLUDE.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -1984,8 +1962,7 @@ - + @@ -2029,8 +2006,7 @@ gint height);

gwy_data_field_area_get_surface_area is deprecated and should not be used in newly-written code.

Computes surface area of a rectangular part of a data field.

-

This function is equivalent to calling -gwy_data_field_area_get_surface_area_mask() +

This function is equivalent to calling gwy_data_field_area_get_surface_area_mask() with masking mode GWY_MASK_INCLUDE.

@@ -2093,9 +2069,9 @@ gint width, gint height);

Computes surface area of a rectangular part of a data field.

-

This quantity makes sense only if the lateral dimensions and values of -data_field - are the same physical quantities.

+

This quantity makes sense only if the lateral dimensions and values of data_field + are the same physical +quantities.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -2117,8 +2093,7 @@ - + @@ -2162,8 +2137,7 @@ gint row, gint width, gint height); -

Computes root mean square surface slope (Sdq) of a rectangular part of -a data field.

+

Computes root mean square surface slope (Sdq) of a rectangular part of a data field.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -2185,8 +2159,7 @@ - + @@ -2230,10 +2203,9 @@ gint width, gint height);

Computes mean square value of a rectangular part of a data field.

-

Unlike gwy_data_field_get_rms(), this function does not -subtract the mean value beforehand. Therefore, it is useful to sum the -squared values of data fields which can have the zero level set differently, -for instance when the field contains a distribution.

+

Unlike gwy_data_field_get_rms(), this function does not subtract the mean value beforehand. +Therefore, it is useful to sum the squared values of data fields which can have the zero level set differently, for +instance when the field contains a distribution.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  
@@ -2255,8 +2227,7 @@ - + @@ -2319,8 +2290,7 @@ - @@ -2331,8 +2301,7 @@ - + @@ -2357,8 +2326,7 @@ - + @@ -2379,8 +2347,7 @@ GwyDataField *yfield, GwyDataLine *target_line, gint maxdiv); -

Calculates estimates of entropy of two-dimensional point cloud at various -scales.

+

Calculates estimates of entropy of two-dimensional point cloud at various scales.

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

target_line

A data line to store the result to. It will be resampled to -maxdiv +

A data line to store the result to. It will be resampled to maxdiv +1 items.

  

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

maxdiv

Maximum number of divisions of the value range. Pass zero to -choose it automatically.

Maximum number of divisions of the value range. Pass zero to choose it automatically.

  
@@ -2404,15 +2371,13 @@ - - + @@ -2436,16 +2401,12 @@ gint width, gint height);

Computes the total variation of a rectangular part of a data field.

-

The total variation is estimated as the integral of the absolute value of -local gradient.

-

This quantity has the somewhat odd units of value unit times lateral unit. -It can be envisioned as follows. If the surface has just two height levels -(upper and lower planes) then the quantity is the length of the boundary -between the upper and lower part, multiplied by the step height. If the -surface is piece-wise constant, then the variation is the step height -integrated along the boundaries between the constant parts. Therefore, for -non-fractal surfaces it scales with the linear dimension of the image, not -with its area, despite being an area integral.

+

The total variation is estimated as the integral of the absolute value of local gradient.

+

This quantity has the somewhat odd units of value unit times lateral unit. It can be envisioned as follows. If the +surface has just two height levels (upper and lower planes) then the quantity is the length of the boundary between +the upper and lower part, multiplied by the step height. If the surface is piece-wise constant, then the variation +is the step height integrated along the boundaries between the constant parts. Therefore, for non-fractal surfaces +it scales with the linear dimension of the image, not with its area, despite being an area integral.

Parameters

target_line

A data line to store the result to. It will be resampled to -maxdiv +

A data line to store the result to. It will be resampled to maxdiv +1 items.

  

maxdiv

Maximum number of divisions of the value range. Pass zero to -choose it automatically.

Maximum number of divisions of the value range. Pass zero to choose it automatically.

  
@@ -2467,8 +2428,7 @@ - + @@ -2517,17 +2477,14 @@  Δ) − 1/n  ∑ n_i  ln(n_i -), where -n - is the number of pixels considered, Δ the bin size and n_i - the count in -the i +), where n + is the number of pixels considered, +Δ the bin size and n_i + the count in the i -th bin. If S is plotted as a function of the bin size Δ, it is, -generally, a growing function with a plateau for ‘reasonable’ bin sizes. -The estimate is taken at the plateau. If no plateau is found, which means -the distribution is effectively a sum of δ-functions, -G_MAXDOUBLE is -returned.

+generally, a growing function with a plateau for ‘reasonable’ bin sizes. The estimate is taken at the plateau. If +no plateau is found, which means the distribution is effectively a sum of δ-functions, -G_MAXDOUBLE is returned.

It should be noted that this estimate may be biased.

Parameters

@@ -2550,8 +2507,7 @@
- + @@ -2579,8 +2535,8 @@

Returns

-

The estimated entropy of the data values. The entropy of no data -or a single single is returned as -G_MAXDOUBLE.

+

The estimated entropy of the data values. The entropy of no data or a single single is returned as +-G_MAXDOUBLE.

Since: 2.42

@@ -2612,12 +2568,11 @@ - +value. Value NULL is the same as passing all zeroes for +the basis.

@@ -2662,9 +2617,8 @@ gdouble *from, gdouble *to);

Computes data field value range with outliers cut-off.

-

The purpose of this function is to find a range is suitable for false color -mapping. The precise method how it is calculated is unspecified and may be -subject to changes.

+

The purpose of this function is to find a range is suitable for false color mapping. The precise method how it is +calculated is unspecified and may be subject to changes.

However, it is guaranteed minimum <= from <= to <= maximum.

@@ -2733,8 +2687,7 @@ - + @@ -2811,20 +2764,17 @@ - + - + - + @@ -2849,10 +2799,9 @@

gwy_data_field_area_get_stats is deprecated and should not be used in newly-written code.

Computes basic statistical quantities of a rectangular part of a data field.

This function is equivalent to calling gwy_data_field_area_get_stats_mask() - -with masking mode GWY_MASK_INCLUDE.

-

Note the kurtosis returned by this function returns is the excess kurtosis -which is zero for the Gaussian distribution (not 3).

+ with masking mode GWY_MASK_INCLUDE.

+

Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian +distribution (not 3).

Parameters

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

basis

The basis or background for volume calculation if not NULL. -The height of each vertex is then the difference between -data_field +

The basis or background for volume calculation if not NULL. The height of each vertex is then the +difference between data_field value and basis -value. Value NULL is the same -as passing all zeroes for the basis.

  

masking

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

rms

Where root mean square value of irregularities (Rq) should be stored, -or NULL.

Where root mean square value of irregularities (Rq) should be stored, or NULL.

  

skew

Where skew (symmetry of height distribution) should be stored, or -NULL.

Where skew (symmetry of height distribution) should be stored, or NULL.

  

kurtosis

Where kurtosis (peakedness of height ditribution) should be -stored, or NULL.

Where kurtosis (peakedness of height ditribution) should be stored, or NULL.

  
@@ -2904,20 +2853,17 @@ - + - + - + @@ -2941,8 +2887,8 @@ gdouble *skew, gdouble *kurtosis);

Computes basic statistical quantities of a rectangular part of a data field.

-

Note the kurtosis returned by this function returns is the excess kurtosis -which is zero for the Gaussian distribution (not 3).

+

Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian +distribution (not 3).

Parameters

rms

Where root mean square value of irregularities (Rq) should be stored, -or NULL.

Where root mean square value of irregularities (Rq) should be stored, or NULL.

  

skew

Where skew (symmetry of height distribution) should be stored, or -NULL.

Where skew (symmetry of height distribution) should be stored, or NULL.

  

kurtosis

Where kurtosis (peakedness of height ditribution) should be -stored, or NULL.

Where kurtosis (peakedness of height ditribution) should be stored, or NULL.

  
@@ -2964,8 +2910,7 @@ - + @@ -3000,20 +2945,17 @@ - + - + - + @@ -3038,20 +2980,18 @@

Counts data samples in given range.

No assertion is made about the values of above and below -, in other words -above +, in other words above may be larger than below -. To count samples in an open interval -instead of a closed interval, exchange below +. To +count samples in an open interval instead of a closed interval, exchange below and above - and then subtract -the nabove + and then subtract the +nabove and nbelow from width *height to get the complementary counts.

-

With this trick the common task of counting positive values can be -realized:

+

With this trick the common task of counting positive values can be realized:

mode

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

rms

Where root mean square value of irregularities (Rq) should be stored, -or NULL.

Where root mean square value of irregularities (Rq) should be stored, or NULL.

  

skew

Where skew (symmetry of height distribution) should be stored, or -NULL.

Where skew (symmetry of height distribution) should be stored, or NULL.

  

kurtosis

Where kurtosis (peakedness of height ditribution) should be -stored, or NULL.

Where kurtosis (peakedness of height ditribution) should be stored, or NULL.

  
@@ -3110,31 +3050,28 @@ - - - - @@ -3176,8 +3113,7 @@ - + @@ -3202,8 +3138,8 @@ - + @@ -3234,14 +3170,13 @@ - + - + @@ -3283,8 +3218,7 @@ - + @@ -3309,8 +3243,8 @@ - + @@ -3341,14 +3275,13 @@ - + - + @@ -3384,8 +3317,7 @@ - + @@ -3415,8 +3347,8 @@ - + @@ -3436,8 +3368,7 @@ gint height, GwyOrientation orientation, gint nstats); -

Calculates distribution of slopes in a rectangular part of data field, with -masking.

+

Calculates distribution of slopes in a rectangular part of data field, with masking.

Parameters

below

Upper bound to compare data to. The number of samples less -than or equal to below +

Upper bound to compare data to. The number of samples less than or equal to below is stored in nbelow .

  

above

Lower bound to compare data to. The number of samples greater -than or equal to above -is stored in nabove +

Lower bound to compare data to. The number of samples greater than or equal to above +is stored in +nabove .

  

nbelow

Location to store the number of samples less than or equal -to below +

Location to store the number of samples less than or equal to below , or NULL.

  

nabove

Location to store the number of samples greater than or equal -to above +

Location to store the number of samples greater than or equal to above , or NULL.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -3459,8 +3390,7 @@ - + @@ -3490,8 +3420,8 @@ - + @@ -3524,8 +3454,7 @@ - + @@ -3535,8 +3464,8 @@ - + @@ -3555,8 +3484,7 @@ gint height, GwyOrientation orientation, gint nstats); -

Calculates cumulative distribution of slopes in a rectangular part of data -field.

+

Calculates cumulative distribution of slopes in a rectangular part of data field.

Parameters

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -3573,8 +3501,7 @@ - + @@ -3604,8 +3531,8 @@ - + @@ -3625,8 +3552,7 @@ gint height, GwyOrientation orientation, gint nstats); -

Calculates cumulative distribution of slopes in a rectangular part of data -field, with masking.

+

Calculates cumulative distribution of slopes in a rectangular part of data field, with masking.

Parameters

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -3648,8 +3574,7 @@ - + @@ -3679,8 +3604,8 @@ - + @@ -3713,8 +3638,7 @@ - + @@ -3724,8 +3648,8 @@ - + @@ -5057,11 +4981,9 @@ gint width, gint height, gint nstats); -

Calculates Minkowski volume functional of a rectangular part of a data -field.

-

Volume functional is calculated as the number of values above each -threshold value (,white pixels`) divided by the total number of samples -in the area. Is it's equivalent to 1-CDH.

+

Calculates Minkowski volume functional of a rectangular part of a data field.

+

Volume functional is calculated as the number of values above each threshold value (,white pixels`) divided by the +total number of samples in the area. Is it's equivalent to 1-CDH.

Parameters

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -5078,8 +5000,7 @@ - + @@ -5104,8 +5025,8 @@ - + @@ -5137,14 +5058,13 @@ - + - + @@ -5163,12 +5083,9 @@ gint width, gint height, gint nstats); -

Calculates Minkowski boundary functional of a rectangular part of a data -field.

-

Boundary functional is calculated as the number of boundaries for each -threshold value (the number of pixel sides where of neighouring pixels is -,white and the other ,black) divided by the total number of samples -in the area.

+

Calculates Minkowski boundary functional of a rectangular part of a data field.

+

Boundary functional is calculated as the number of boundaries for each threshold value (the number of pixel sides +where of neighouring pixels is ,white and the other ,black) divided by the total number of samples in the area.

Parameters

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -5185,8 +5102,7 @@ - + @@ -5211,8 +5127,8 @@ - + @@ -5244,14 +5160,13 @@ - + - + @@ -5269,12 +5184,10 @@ gint width, gint height, gint nstats); -

Calculates Minkowski connectivity functional (Euler characteristics) of -a rectangular part of a data field.

-

Connectivity functional is calculated as the number connected areas of -pixels above threhsold (,white) minus the number of connected areas of -pixels below threhsold (,black) for each threshold value, divided by the -total number of samples in the area.

+

Calculates Minkowski connectivity functional (Euler characteristics) of a rectangular part of a data field.

+

Connectivity functional is calculated as the number connected areas of pixels above threhsold (,white) minus the +number of connected areas of pixels below threhsold (,black) for each threshold value, divided by the total number +of samples in the area.

Parameters

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  
@@ -5291,8 +5204,7 @@ - + @@ -5317,8 +5229,8 @@ - + @@ -5332,8 +5244,7 @@ gwy_data_field_minkowski_euler (GwyDataField *data_field, GwyDataLine *target_line, gint nstats); -

Calculates Minkowski connectivity functional (Euler characteristics) of -a data field.

+

Calculates Minkowski connectivity functional (Euler characteristics) of a data field.

See gwy_data_field_area_minkowski_euler() for details.

Parameters

@@ -5351,14 +5262,13 @@
- + - + @@ -5380,15 +5290,13 @@ gdouble *ycenter);

Calculates the dispersion of a data field area, taking it as a distribution.

The function takes data_field - as a distribution, finds the centre of mass -in the area and then calculates the mean squared distance from this centre, -weighted by data_field + as a distribution, finds the centre of mass in the area and then calculates the mean +squared distance from this centre, weighted by data_field values. Normally data_field should contain only non-negative data.

-

The dispersion is measured in real coordinates, so horizontal and vertical -pixel sizes play a role and the units are squared lateral units of -data_field +

The dispersion is measured in real coordinates, so horizontal and vertical pixel sizes play a role and the units +are squared lateral units of data_field . Note, however, that xcenter and ycenter is returned in pixel @@ -5440,14 +5348,12 @@

- + - + @@ -5455,8 +5361,7 @@

Returns

-

Dispersion, i.e. estimated average squared distance from centre of -mass.

+

Dispersion, i.e. estimated average squared distance from centre of mass.

Since: 2.52

@@ -5485,14 +5390,12 @@ - + - + @@ -5500,8 +5403,7 @@

Returns

-

Dispersion, i.e. estimated average squared distance from centre of -mass.

+

Dispersion, i.e. estimated average squared distance from centre of mass.

Since: 2.52

@@ -5529,15 +5431,14 @@ - + - + @@ -5585,8 +5486,8 @@ - + @@ -5658,8 +5559,8 @@ - + @@ -5793,15 +5694,13 @@ - - + @@ -5831,12 +5730,10 @@ - + @@ -5876,30 +5773,25 @@ - - + - + - + @@ -5929,12 +5821,10 @@ - + @@ -5967,8 +5857,7 @@ - diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/libgwyprocess-docs.sgml gwyddion-2.63/devel-docs/libgwyprocess/libgwyprocess-docs.sgml --- gwyddion-2.62/devel-docs/libgwyprocess/libgwyprocess-docs.sgml 2022-11-02 13:45:04.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/libgwyprocess-docs.sgml 2023-06-13 10:15:00.000000000 +0000 @@ -232,5 +232,9 @@ Index of new symbols in 2.62 + + Index of new symbols in 2.63 + + diff -Nru gwyddion-2.62/devel-docs/libgwyprocess/Makefile.in gwyddion-2.63/devel-docs/libgwyprocess/Makefile.in --- gwyddion-2.62/devel-docs/libgwyprocess/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/devel-docs/libgwyprocess/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -336,6 +336,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ # Some combinations of the tools do not give these us automatically. abs_builddir = @abs_builddir@ diff -Nru gwyddion-2.62/devel-docs/Makefile.in gwyddion-2.63/devel-docs/Makefile.in --- gwyddion-2.62/devel-docs/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/devel-docs/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -385,6 +385,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/gwyddion/about.c gwyddion-2.63/gwyddion/about.c --- gwyddion-2.62/gwyddion/about.c 2022-08-24 12:49:06.000000000 +0000 +++ gwyddion-2.63/gwyddion/about.c 2023-02-24 16:04:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: about.c 24928 2022-08-24 12:49:06Z yeti-dn $ + * $Id: about.c 25253 2023-02-24 16:04:30Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -128,6 +128,7 @@ "For full license text see file COPYING included in the source tarball."), g_get_application_name()); gtk_text_buffer_insert(buff, &iter, str->str, str->len); + gtk_text_buffer_insert(buff, &iter, " ", -1); gtk_text_buffer_insert(buff, &iter, _("Or read the license at"), -1); gtk_text_buffer_insert(buff, &iter, " ", -1); gtk_text_buffer_insert_with_tags_by_name(buff, &iter, "https://www.gnu.org/licenses/gpl-2.0.html", -1, "uri", NULL); diff -Nru gwyddion-2.62/gwyddion/Makefile.in gwyddion-2.63/gwyddion/Makefile.in --- gwyddion-2.62/gwyddion/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/gwyddion/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -422,6 +422,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/gwyddion/release.h gwyddion-2.63/gwyddion/release.h --- gwyddion-2.62/gwyddion/release.h 2022-11-03 09:57:30.000000000 +0000 +++ gwyddion-2.63/gwyddion/release.h 2023-06-13 13:22:41.000000000 +0000 @@ -1,2 +1,2 @@ /* This is a GENERATED file. */ -#define RELEASEDATE 20221103u +#define RELEASEDATE 20230613u diff -Nru gwyddion-2.62/gwyddion/toolbox-editor.c gwyddion-2.63/gwyddion/toolbox-editor.c --- gwyddion-2.62/gwyddion/toolbox-editor.c 2022-04-28 15:20:37.000000000 +0000 +++ gwyddion-2.63/gwyddion/toolbox-editor.c 2023-01-10 13:32:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: toolbox-editor.c 24795 2022-04-28 15:20:36Z yeti-dn $ + * $Id: toolbox-editor.c 25198 2023-01-10 13:32:19Z yeti-dn $ * Copyright (C) 2016-2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -1875,6 +1875,7 @@ GWY_STOCK_GRAPH_LEVEL, GWY_STOCK_GRAPH_MEASURE, GWY_STOCK_GRAPH_PALETTE, + GWY_STOCK_GRAPH_PERIOD_MEASURE, GWY_STOCK_GRAPH_POINTER, GWY_STOCK_GRAPH_RULER, GWY_STOCK_GRAPH_STATISTICS, @@ -1884,6 +1885,8 @@ GWY_STOCK_GRAPH_ZOOM_IN, GWY_STOCK_GRAPH_ZOOM_OUT, GWY_STOCK_GWYDDION, + GWY_STOCK_HOLD_SELECTION_CLEAR, + GWY_STOCK_HOLD_SELECTION_REPLACE, GWY_STOCK_HOUGH, GWY_STOCK_IMAGE_RELATION, GWY_STOCK_IMMERSE, @@ -1994,6 +1997,7 @@ GWY_STOCK_SYNTHETIC_DIFFUSION, GWY_STOCK_SYNTHETIC_DISCS, GWY_STOCK_SYNTHETIC_DOMAINS, + GWY_STOCK_SYNTHETIC_DUNES, GWY_STOCK_SYNTHETIC_FIBRES, GWY_STOCK_SYNTHETIC_LATTICE, GWY_STOCK_SYNTHETIC_LINE_NOISE, diff -Nru gwyddion-2.62/gwyddion.spec gwyddion-2.63/gwyddion.spec --- gwyddion-2.62/gwyddion.spec 2022-11-03 09:56:50.000000000 +0000 +++ gwyddion-2.63/gwyddion.spec 2023-06-13 13:22:40.000000000 +0000 @@ -1,6 +1,6 @@ # $Id: gwyddion.spec.in 24810 2022-05-02 10:41:14Z yeti-dn $ Name: gwyddion -Version: 2.62 +Version: 2.63 Release: 1%{?dist} Summary: An SPM data visualization and analysis tool @@ -285,5 +285,5 @@ %dir %{pkgdocdir} %changelog -* Tue Aug 8 2017 Yeti - 2.62-1 +* Tue Aug 8 2017 Yeti - 2.63-1 - hello rpmlint, this package is partially generated diff -Nru gwyddion-2.62/libdraw/gwyselection.c gwyddion-2.63/libdraw/gwyselection.c --- gwyddion-2.62/libdraw/gwyselection.c 2018-11-26 10:39:51.000000000 +0000 +++ gwyddion-2.63/libdraw/gwyselection.c 2022-12-15 16:26:37.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: gwyselection.c 21680 2018-11-26 10:39:39Z yeti-dn $ + * $Id: gwyselection.c 25174 2022-12-15 16:26:37Z yeti-dn $ * Copyright (C) 2003-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -85,9 +81,8 @@ static guint selection_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE_EXTENDED - (GwySelection, gwy_selection, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, - GWY_IMPLEMENT_SERIALIZABLE(gwy_selection_serializable_init)) +G_DEFINE_TYPE_EXTENDED(GwySelection, gwy_selection, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, + GWY_IMPLEMENT_SERIALIZABLE(gwy_selection_serializable_init)) static void gwy_selection_class_init(GwySelectionClass *klass) @@ -108,28 +103,23 @@ klass->crop = gwy_selection_crop_default; klass->move = gwy_selection_move_default; - g_object_class_install_property - (gobject_class, - PROP_OBJECT_SIZE, - g_param_spec_uint("object-size", - "Object size", - "Number of coordinates in one selection object", - 0, 1024, 0, G_PARAM_READABLE)); - - g_object_class_install_property - (gobject_class, - PROP_MAX_OBJECTS, - g_param_spec_uint("max-objects", - "Max. objects", - "Maximum number of objects that can be selected", - 0, 65536, 1, G_PARAM_READWRITE)); + g_object_class_install_property(gobject_class, PROP_OBJECT_SIZE, + g_param_spec_uint("object-size", + "Object size", + "Number of coordinates in one selection object", + 0, 1024, 0, G_PARAM_READABLE)); + + g_object_class_install_property(gobject_class, PROP_MAX_OBJECTS, + g_param_spec_uint("max-objects", + "Max. objects", + "Maximum number of objects that can be selected", + 0, 65536, 1, G_PARAM_READWRITE)); /** * GwySelection::changed: * @gwyselection: The #GwySelection which received the signal. - * @arg1: Changed object position hint. If the value is nonnegative, only - * this object has changed. If it's negative, the selection has - * to be treated as completely changed. + * @arg1: Changed object position hint. If the value is nonnegative, only this object has changed. If it's + * negative, the selection has to be treated as completely changed. * * The ::changed signal is emitted whenever selection changes. **/ @@ -148,9 +138,8 @@ * * The ::finished signal is emitted when selection is finished. * - * What exactly finished means is defined by corresponding - * #GwyVectorLayer, but normally it involves user stopped changing - * a selection object. Selections never emit this signal themselves. + * What exactly finished means is defined by corresponding #GwyVectorLayer, but normally it involves user stopped + * changing a selection object. Selections never emit this signal themselves. **/ selection_signals[FINISHED] = g_signal_new("finished", @@ -267,9 +256,8 @@ * * Limits objects in a selection to a rectangle. * - * Objects that are fully outside specified rectangle are removed. Objects - * partially outside may be removed or cut, depending on what makes sense for - * the specific selection type. If the selection class does not implement this + * Objects that are fully outside specified rectangle are removed. Objects partially outside may be removed or cut, + * depending on what makes sense for the specific selection type. If the selection class does not implement this * method then all objects are removed. * * Since: 2.16 @@ -293,9 +281,8 @@ * * Moves entire selection in plane by given vector. * - * If a selection class does not implement this operation the selection remains - * unchanged. Bult-in selection classes generally implement this operation if - * it is meaningful. For some, such as GwySelectionLattice, it is not + * If a selection class does not implement this operation the selection remains unchanged. Bult-in selection classes + * generally implement this operation if it is meaningful. For some, such as GwySelectionLattice, it is not * meaningful and moving GwySelectionLattice thus does not do anything. * * Since: 2.43 @@ -312,8 +299,7 @@ /** * gwy_selection_filter: * @selection: A selection. - * @filter: Function returning %TRUE for objects that should be kept, %FALSE - * for objects that should be removed. + * @filter: Function returning %TRUE for objects that should be kept, %FALSE for objects that should be removed. * @data: User data passed to @filter. * * Removes selection objects matching certain criteria. @@ -329,8 +315,7 @@ guint len, i, object_size; gdouble *xy; - /* Be careful to work with non-default implementations. Do not assume we - * know much about the internal structure. */ + /* Be careful to work with non-default implementations. Do not assume we know much about the internal structure. */ sel = gwy_selection_duplicate(selection); gwy_selection_clear(sel); len = gwy_selection_get_data(selection, NULL); @@ -351,9 +336,8 @@ * gwy_selection_get_object: * @selection: A selection. * @i: Index of object to get. - * @data: Array to store selection object data to. Object data is an - * array of coordinates whose precise meaning is defined by particular - * selection types. + * @data: Array to store selection object data to. Object data is an array of coordinates whose precise meaning is + * defined by particular selection types. * * Gets one selection object. * @@ -372,14 +356,13 @@ * gwy_selection_set_object: * @selection: A selection. * @i: Index of object to set. - * @data: Object selection data. It's an array of coordinates whose precise - * meaning is defined by particular selection types. + * @data: Object selection data. It's an array of coordinates whose precise meaning is defined by particular selection + * types. * * Sets one selection object. * - * This method can be also used to append objects (if the maximum number is - * not exceeded). Since there cannot be holes in the object list, @i must be - * then equal to either the number of selected objects or special value -1 + * This method can be also used to append objects (if the maximum number is not exceeded). Since there cannot be + * holes in the object list, @i must be then equal to either the number of selected objects or special value -1 * meaning append to end. * * Returns: The index of actually set object (useful namely when @i is -1). @@ -400,8 +383,7 @@ * * Deletes a one selection object. * - * Since there cannot be holes in the object list, the rest of selection - * objects is moved to close the gap. + * Since there cannot be holes in the object list, the rest of selection objects is moved to close the gap. **/ void gwy_selection_delete_object(GwySelection *selection, @@ -414,15 +396,13 @@ /** * gwy_selection_get_data: * @selection: A selection. - * @data: Array to store selection data to. Selection data is an - * array of coordinates whose precise meaning is defined by particular - * selection types. It may be %NULL. + * @data: Array to store selection data to. Selection data is an array of coordinates whose precise meaning is + * defined by particular selection types. It may be %NULL. * * Gets selection data. * - * Returns: The number of selected objects. This is *not* the required size - * of @data, which must be at least gwy_selection_get_object_size() - * times larger. + * Returns: The number of selected objects. This is *not* the required size of @data, which must be at least + * gwy_selection_get_object_size() times larger. **/ gint gwy_selection_get_data(GwySelection *selection, @@ -436,8 +416,7 @@ * gwy_selection_set_data: * @selection: A selection. * @nselected: The number of selected objects. - * @data: Selection data, that is an array @nselected * - * gwy_selection_get_object_size() long with selected object + * @data: Selection data, that is an array @nselected * gwy_selection_get_object_size() long with selected object * coordinates. * * Sets selection data. @@ -472,13 +451,12 @@ /** * gwy_selection_set_max_objects: * @selection: A selection. - * @max_objects: The maximum number of objects allowed to select. Note - * particular selection types may allow only specific values. + * @max_objects: The maximum number of objects allowed to select. Note particular selection types may allow only + * specific values. * * Sets the maximum number of objects allowed to select. * - * When selection reaches this number of selected objects, it emits - * "finished" signal. + * When selection reaches this number of selected objects, it emits "finished" signal. **/ void gwy_selection_set_max_objects(GwySelection *selection, @@ -494,8 +472,7 @@ * * Checks whether the maximum number of objects is selected. * - * Returns: %TRUE when the maximum possible number of objects is selected, - * %FALSE otherwise. + * Returns: %TRUE when the maximum possible number of objects is selected, %FALSE otherwise. **/ gboolean gwy_selection_is_full(GwySelection *selection) @@ -510,8 +487,8 @@ /** * gwy_selection_changed: * @selection: A selection. - * @i: Index of object that changed. Use -1 when not applicable, e.g., when - * complete selection was changed, cleared, or truncated. + * @i: Index of object that changed. Use -1 when not applicable, e.g., when complete selection was changed, cleared, + * or truncated. * * Emits "changed" signal on a selection. **/ @@ -559,8 +536,7 @@ return TRUE; object_size = GWY_SELECTION_GET_CLASS(selection)->object_size; - gwy_assign(data, (gdouble*)selection->objects->data + i*object_size, - object_size); + gwy_assign(data, (gdouble*)selection->objects->data + i*object_size, object_size); return TRUE; } @@ -578,14 +554,12 @@ max_len = selection->objects->len/object_size; g_return_val_if_fail(i < max_len, -1); if (i > selection->n) { - g_warning("Disontinuous selections are not supported. " - "Moving object to first feasible position."); + g_warning("Disontinuous selections are not supported. Moving object to first feasible position."); i = MIN(selection->n, max_len-1); } selection->n = MAX(selection->n, i+1); - gwy_assign((gdouble*)selection->objects->data + i*object_size, data, - object_size); + gwy_assign((gdouble*)selection->objects->data + i*object_size, data, object_size); g_signal_emit(selection, selection_signals[CHANGED], 0, i); return i; @@ -637,8 +611,7 @@ if (nselected) { g_return_if_fail(data); - gwy_assign((gdouble*)selection->objects->data, data, - nselected*object_size); + gwy_assign((gdouble*)selection->objects->data, data, nselected*object_size); } selection->n = nselected; g_signal_emit(selection, selection_signals[CHANGED], 0, -1); @@ -674,8 +647,7 @@ G_GNUC_UNUSED gdouble xmax, G_GNUC_UNUSED gdouble ymax) { - /* If the selection class does not implement crop, we have to remove all - * objects. */ + /* If the selection class does not implement crop, we have to remove all objects. */ gwy_selection_clear(selection); } @@ -708,8 +680,7 @@ { 'D', "data", pdata, &len, }, }; - return gwy_serialize_pack_object_struct(buffer, name, - G_N_ELEMENTS(spec), spec); + return gwy_serialize_pack_object_struct(buffer, name, G_N_ELEMENTS(spec), spec); } } @@ -766,8 +737,7 @@ || !G_TYPE_IS_INSTANTIATABLE(type)) return NULL; - if (!gwy_serialize_unpack_object_struct(buffer, size, position, typename, - G_N_ELEMENTS(spec), spec)) { + if (!gwy_serialize_unpack_object_struct(buffer, size, position, typename, G_N_ELEMENTS(spec), spec)) { g_free(data); return NULL; } @@ -777,8 +747,7 @@ g_array_set_size(selection->objects, 0); if (data && len) { if (len % object_size) - g_warning("Selection data size not multiple of object size. " - "Ignoring it."); + g_warning("Selection data size not multiple of object size. Ignoring it."); else { g_array_append_vals(selection->objects, data, len); selection->n = len/object_size; @@ -802,8 +771,7 @@ object_size = GWY_SELECTION_GET_CLASS(selection)->object_size; duplicate = g_object_new(G_TYPE_FROM_INSTANCE(object), NULL); g_array_set_size(duplicate->objects, 0); - g_array_append_vals(duplicate->objects, - selection->objects->data, selection->n*object_size); + g_array_append_vals(duplicate->objects, selection->objects->data, selection->n*object_size); duplicate->n = selection->n; g_array_set_size(duplicate->objects, selection->objects->len); @@ -825,8 +793,7 @@ object_size = GWY_SELECTION_GET_CLASS(selection)->object_size; g_array_set_size(clone->objects, 0); - g_array_append_vals(clone->objects, - selection->objects->data, selection->n*object_size); + g_array_append_vals(clone->objects, selection->objects->data, selection->n*object_size); clone->n = selection->n; g_array_set_size(clone->objects, selection->objects->len); @@ -842,34 +809,28 @@ * @see_also: #GwyVectorLayer -- uses #GwySelection for selections, * #GwyGraphArea -- uses #GwySelection for selections * - * #GwySelection is an abstract class representing data selections. Particular - * selection types are defined by vector layer modules. + * #GwySelection is an abstract class representing data selections. Particular selection types are defined by vector + * layer modules. * - * Selections behave as flat arrays of coordinates. They are however logically - * split into selection objects (points, lines, rectangles), characteristic for - * each selection type. For example, to describe a horizontal line one needs - * only one coordinate, for a point two coordinates are needed, rectangle or - * arbitrary line need four. gwy_selection_get_object_size() can be used to - * generically determine the number of coordinates used to describe a one - * selection object. - * - * The number of selection objects in a selection can vary, - * gwy_selection_set_max_objects() sets the maximum possible number. Functions - * for getting and setting individual selection objects - * (gwy_selection_get_object(), gwy_selection_set_object()) or complete - * selection (gwy_selection_get_data(), gwy_selection_set_data()) are - * available. The method gwy_selection_set_data() with %NULL second argument - * is also used to determine the number of selected object. + * Selections behave as flat arrays of coordinates. They are however logically split into selection objects (points, + * lines, rectangles), characteristic for each selection type. For example, to describe a horizontal line one needs + * only one coordinate, for a point two coordinates are needed, rectangle or arbitrary line need four. + * gwy_selection_get_object_size() can be used to generically determine the number of coordinates used to describe + * a one selection object. + * + * The number of selection objects in a selection can vary, gwy_selection_set_max_objects() sets the maximum possible + * number. Functions for getting and setting individual selection objects (gwy_selection_get_object(), + * gwy_selection_set_object()) or complete selection (gwy_selection_get_data(), gwy_selection_set_data()) are + * available. The method gwy_selection_set_data() with %NULL second argument is also used to determine the number of + * selected object. **/ /** * GwySelection: - * @objects: Array of object coordinates whose meaning is defined by each - * selection type (subclass). Default #GwySelection virtual methods - * assume each selection object is of the same size, stored in - * class @object_size field at selection class init time. The size - * of array (multiplied with @object_size) determines maximum number - * of selectable objects. + * @objects: Array of object coordinates whose meaning is defined by each selection type (subclass). Default + * #GwySelection virtual methods assume each selection object is of the same size, stored in class + * @object_size field at selection class init time. The size of array (multiplied with @object_size) + * determines maximum number of selectable objects. * @n: The number of actually selected objects. * * The #GwySelection struct describes an abstract selection as a collection @@ -892,17 +853,15 @@ * * The virtual methods and data memebers of #GwySelections. * - * Typically, the only field subclasses set in their class init method is - * @object_size. The methods are implemented generically in #GwySelection - * and need not be overriden. + * Typically, the only field subclasses set in their class init method is @object_size. The methods are implemented + * generically in #GwySelection and need not be overriden. **/ /** * gwy_selection_duplicate: * @selection: An selection to duplicate. * - * Convenience macro doing gwy_serializable_duplicate() with all the necessary - * typecasting. + * Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting. **/ /** @@ -913,8 +872,7 @@ * * Type of selection filtering function. * - * Returns: %TRUE for objects that should be kept, %FALSE for objects that - * should be removed. + * Returns: %TRUE for objects that should be kept, %FALSE for objects that should be removed. * * Since: 2.16 **/ @@ -926,10 +884,11 @@ * * Convenience macro making one selection identical to another. * - * This is just a gwy_serializable_clone() wrapper with all the necessary - * typecasting. + * This is just a gwy_serializable_clone() wrapper with all the necessary typecasting. + * + * Note that it also copies properties like #GwySelection:max-objects, which may or may not be wanted. * * Since: 2.52 **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libdraw/Makefile.in gwyddion-2.63/libdraw/Makefile.in --- gwyddion-2.62/libdraw/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/libdraw/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -433,6 +433,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/libgwyddion/gwymath.c gwyddion-2.63/libgwyddion/gwymath.c --- gwyddion-2.62/libgwyddion/gwymath.c 2022-10-11 13:46:47.000000000 +0000 +++ gwyddion-2.63/libgwyddion/gwymath.c 2023-06-06 14:11:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwymath.c 25074 2022-10-11 13:46:47Z yeti-dn $ + * $Id: gwymath.c 25415 2023-06-06 14:11:08Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -823,7 +823,7 @@ } if (k == n-2) { - GWY_ORDER(gdouble, array[n-1], array[n-2]); + GWY_ORDER(gdouble, array[n-2], array[n-1]); a = array[n-1]; b = array[n-2]; @@ -1678,7 +1678,9 @@ * * Compares two double values, given as pointers. * - * This function is suitable as #GCompareFunc and can be also used with plain qsort(). + * This function is suitable as #GCompareFunc and can be also used with plain qsort(). The typical usage is sorting + * of arrays containing structs where the first item is a floating point value/coordinate, followed by additional + * data. For sorting of plain arrays of doubles use gwy_math_sort(). * * It should only be used to sort normal numbers. The behaviour for NaNs is undefined. * diff -Nru gwyddion-2.62/libgwyddion/gwyresults.c gwyddion-2.63/libgwyddion/gwyresults.c --- gwyddion-2.62/libgwyddion/gwyresults.c 2022-02-16 14:46:00.000000000 +0000 +++ gwyddion-2.63/libgwyddion/gwyresults.c 2023-01-10 12:59:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyresults.c 24606 2022-02-16 14:45:59Z yeti-dn $ + * $Id: gwyresults.c 25196 2023-01-10 12:59:20Z yeti-dn $ * Copyright (C) 2017-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -91,6 +91,7 @@ gshort power_x; gshort power_y; gshort power_z; + gshort precision; guint bind_group; guint label_width; /* Just a cache; varies according to translation. */ guint covar_n; @@ -496,6 +497,8 @@ line->power_y = va_arg(ap, gint); else if (gwy_strequal(propname, "power-z")) line->power_z = va_arg(ap, gint); + else if (gwy_strequal(propname, "precision")) + line->precision = va_arg(ap, gint); else if (gwy_strequal(propname, "is-angle")) line->is_angle = !!va_arg(ap, gint); /* promotion */ else if (gwy_strequal(propname, "is-fitting-param")) @@ -544,6 +547,7 @@ line->parent = priv; line->label = label; line->type = type; + line->precision = -1; priv->n++; return line; @@ -568,6 +572,7 @@ * "power-y", power of unit @y (#gint) * "power-z", power of unit @z (#gint) * "power-w", power of unit @w (#gint) + * "precision", the mininum number of significant digits (#gint, since 2.63) * "is-angle", %TRUE if the quantity should converted to degrees for humans, this overrides any unit powers (#gboolean) * "is-fitting-param", %TRUE if the quantity should be reported as fixed parameter when it does not have error set (#gboolean) * "is-percents", %TRUE if the quantity should converted to percents for humans, this overrides any unit powers (#gboolean) @@ -1783,6 +1788,7 @@ gchar *s = NULL; vf->magnitude = 1.0; + digits = MAX(digits, line->precision); vf->precision = (for_machine ? 5 : digits); if (line->unit_str) { sc = maybe_translate_string(line->unit_str, line->translate_unit, !for_machine); @@ -1794,7 +1800,7 @@ else { gwy_si_unit_value_format_set_units(vf, _("deg")); vf->magnitude = G_PI/180.0; - vf->precision = 2; + vf->precision = MAX(2, line->precision-2); } } else if (line->is_percents) { @@ -1803,7 +1809,7 @@ else { gwy_si_unit_value_format_set_units(vf, "%"); vf->magnitude = 0.01; - vf->precision = 3; + vf->precision = MAX(3, line->precision-1); } } else { diff -Nru gwyddion-2.62/libgwyddion/gwyutils.c gwyddion-2.63/libgwyddion/gwyutils.c --- gwyddion-2.62/libgwyddion/gwyutils.c 2022-10-12 11:56:55.000000000 +0000 +++ gwyddion-2.63/libgwyddion/gwyutils.c 2023-05-26 13:57:06.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: gwyutils.c 25035 2022-09-22 12:23:34Z yeti-dn $ - * Copyright (C) 2003-2021 David Necas (Yeti), Petr Klapetek. + * $Id: gwyutils.c 25373 2023-05-26 13:57:05Z yeti-dn $ + * Copyright (C) 2003-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -1518,7 +1519,7 @@ * * Reports the size of a single raw data item. * - * Returns: The size of a single raw data item of type @datatype. + * Returns: The size (in bytes) of a single raw data item of type @datatype. * * Since: 2.25 **/ @@ -1931,6 +1932,91 @@ } /** + * gwy_get_decimal_separator: + * + * Find the decimal separator for the current locale. + * + * This is a localeconv() wrapper. + * + * Returns: The decimal separator for the current locale as a static string. + * + * Since: 2.63 + **/ +const gchar* +gwy_get_decimal_separator(void) +{ + struct lconv *locale_data; + const gchar *sep; + + /* XXX: The localeconv() man page says that the printf() family of functions may not honour the current locale. + * But we kind of count on them doing so -- and hopefully the g-prefixed do. + * + * Also, localeconv() seems not working in Android? We probably don't care. */ + locale_data = localeconv(); + sep = locale_data->decimal_point; + if (!sep || !strlen(sep)) { + g_warning("Cannot get decimal dot information from localeconv()."); + return "."; + } + return g_intern_string(sep); +} + +/** + * gwy_append_doubles_to_gstring: + * @str: String to append the formated numbers to. + * @values: Array of double values to format. + * @n: Number of values in @values to format. + * @precision: Format precision, within the standard precision of double. + * @field_separator: String to put between each two formatted numbers, usually a space or tab character. + * @force_decimal_dot: %TRUE to ensure the numbers use a decimal dot, regardless of locale. %FALSE to honour the + * current locale. + * + * Formats a sequence of double values to a #GString. + * + * Since: 2.63 + **/ +void +gwy_append_doubles_to_gstring(GString *str, + const gdouble *values, + guint n, + gint precision, + const gchar *field_separator, + gboolean force_decimal_dot) +{ + gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; + gboolean must_fix_decimal_sep; + const gchar *decimal_sep; + guint i, seplen; + gchar *pos; + + /* Do the analysis once. */ + decimal_sep = gwy_get_decimal_separator(); + seplen = strlen(decimal_sep); + must_fix_decimal_sep = (force_decimal_dot && !gwy_strequal(decimal_sep, ".")); + + /* Format a bunch of numbers. */ + for (i = 0; i < n; i++) { + g_snprintf(buf, sizeof(buf), "%.*g", precision, values[i]); + if (must_fix_decimal_sep && (pos = strstr(buf, decimal_sep))) { + pos[0] = '.'; + if (seplen == 1) + g_string_append(str, buf); + else { + pos[1] = '\0'; + g_string_append(str, buf); + g_string_append(str, pos + seplen); + } + } + else + g_string_append(str, buf); + + g_string_append(str, field_separator); + } + if (n) + g_string_truncate(str, str->len - strlen(field_separator)); +} + +/** * gwy_fopen: * @filename: a pathname in the GLib file name encoding (UTF-8 on Windows) * @mode: a string describing the mode in which the file should be opened @@ -2113,7 +2199,7 @@ * * Ensures ascending order of two variables (more precisely lhs and rhs expressions) of type @t in a single statement. * - * The macro makes @y not larger than @x. They may be still equal or their relation can be undefined (if either is + * The macro makes @y not smaller than @x. They may be still equal or their relation can be undefined (if either is * NaN). * * Both @x and @y are evaluated multiple times as both lhs and rhs expressions. If their evaluation has any side diff -Nru gwyddion-2.62/libgwyddion/gwyutils.h gwyddion-2.63/libgwyddion/gwyutils.h --- gwyddion-2.62/libgwyddion/gwyutils.h 2022-09-22 12:23:34.000000000 +0000 +++ gwyddion-2.63/libgwyddion/gwyutils.h 2023-02-23 16:20:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyutils.h 25035 2022-09-22 12:23:34Z yeti-dn $ + * $Id: gwyutils.h 25242 2023-02-23 16:13:10Z yeti-dn $ * Copyright (C) 2003-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -48,87 +48,94 @@ typedef gboolean (*GwySetFractionFunc)(gdouble fraction); typedef gboolean (*GwySetMessageFunc)(const gchar *message); -void gwy_hash_table_to_slist_cb(gpointer unused_key, - gpointer value, - gpointer user_data); -void gwy_hash_table_to_list_cb (gpointer unused_key, - gpointer value, - gpointer user_data); -gchar* gwy_strkill (gchar *s, - const gchar *killchars); -gchar* gwy_strreplace (const gchar *haystack, - const gchar *needle, - const gchar *replacement, - gsize maxrepl) G_GNUC_MALLOC; -gint gwy_strdiffpos (const gchar *s1, - const gchar *s2); -gboolean gwy_strisident (const gchar *s, - const gchar *more, - const gchar *startmore); -gboolean gwy_ascii_strcase_equal (gconstpointer v1, - gconstpointer v2); -guint gwy_ascii_strcase_hash (gconstpointer v); -guint gwy_stramong (const gchar *str, - ...) G_GNUC_NULL_TERMINATED; -gpointer gwy_memmem (gconstpointer haystack, - gsize haystack_len, - gconstpointer needle, - gsize needle_len); -gboolean gwy_file_get_contents (const gchar *filename, - guchar **buffer, - gsize *size, - GError **error); -gboolean gwy_file_abandon_contents (guchar *buffer, - gsize size, - GError **error); -gchar* gwy_find_self_dir (const gchar *dirname); -const gchar* gwy_get_user_dir (void); -const gchar* gwy_get_home_dir (void); -gchar* gwy_canonicalize_path (const gchar *path) G_GNUC_MALLOC; -gboolean gwy_filename_ignore (const gchar *filename_sys); -gchar* gwy_sgettext (const gchar *msgid); -gchar* gwy_str_next_line (gchar **buffer); -guint gwy_str_fixed_font_width (const gchar *str); -guint gwy_gstring_replace (GString *str, - const gchar *old, - const gchar *replacement, - gint count); -void gwy_gstring_to_native_eol (GString *str); -void gwy_memcpy_byte_swap (const guint8 *source, - guint8 *dest, - gsize item_size, - gsize nitems, - gsize byteswap); -void gwy_convert_raw_data (gconstpointer data, - gsize nitems, - gssize stride, - GwyRawDataType datatype, - GwyByteOrder byteorder, - gdouble *target, - gdouble scale, - gdouble offset); -guint gwy_raw_data_size (GwyRawDataType datatype); -gchar* gwy_utf16_to_utf8 (const gunichar2 *str, - glong len, - GwyByteOrder byteorder) G_GNUC_MALLOC; -gchar* gwy_utf8_strescape (const gchar *source, - const gchar *exceptions) G_GNUC_MALLOC; -gboolean gwy_assign_string (gchar **target, - const gchar *newvalue); -void gwy_object_set_or_reset (gpointer object, - GType type, - ...) G_GNUC_NULL_TERMINATED; -gboolean gwy_set_member_object (gpointer instance, - gpointer member_object, - GType expected_type, - gpointer member_field, - ...) G_GNUC_NULL_TERMINATED; +void gwy_hash_table_to_slist_cb (gpointer unused_key, + gpointer value, + gpointer user_data); +void gwy_hash_table_to_list_cb (gpointer unused_key, + gpointer value, + gpointer user_data); +gchar* gwy_strkill (gchar *s, + const gchar *killchars); +gchar* gwy_strreplace (const gchar *haystack, + const gchar *needle, + const gchar *replacement, + gsize maxrepl) G_GNUC_MALLOC; +gint gwy_strdiffpos (const gchar *s1, + const gchar *s2); +gboolean gwy_strisident (const gchar *s, + const gchar *more, + const gchar *startmore); +gboolean gwy_ascii_strcase_equal (gconstpointer v1, + gconstpointer v2); +guint gwy_ascii_strcase_hash (gconstpointer v); +guint gwy_stramong (const gchar *str, + ...) G_GNUC_NULL_TERMINATED; +gpointer gwy_memmem (gconstpointer haystack, + gsize haystack_len, + gconstpointer needle, + gsize needle_len); +gboolean gwy_file_get_contents (const gchar *filename, + guchar **buffer, + gsize *size, + GError **error); +gboolean gwy_file_abandon_contents (guchar *buffer, + gsize size, + GError **error); +gchar* gwy_find_self_dir (const gchar *dirname); +const gchar* gwy_get_user_dir (void); +const gchar* gwy_get_home_dir (void); +gchar* gwy_canonicalize_path (const gchar *path) G_GNUC_MALLOC; +gboolean gwy_filename_ignore (const gchar *filename_sys); +gchar* gwy_sgettext (const gchar *msgid); +gchar* gwy_str_next_line (gchar **buffer); +guint gwy_str_fixed_font_width (const gchar *str); +guint gwy_gstring_replace (GString *str, + const gchar *old, + const gchar *replacement, + gint count); +void gwy_gstring_to_native_eol (GString *str); +const gchar* gwy_get_decimal_separator (void); +void gwy_append_doubles_to_gstring(GString *str, + const gdouble *values, + guint n, + gint precision, + const gchar *field_separator, + gboolean force_decimal_dot); +void gwy_memcpy_byte_swap (const guint8 *source, + guint8 *dest, + gsize item_size, + gsize nitems, + gsize byteswap); +void gwy_convert_raw_data (gconstpointer data, + gsize nitems, + gssize stride, + GwyRawDataType datatype, + GwyByteOrder byteorder, + gdouble *target, + gdouble scale, + gdouble offset); +guint gwy_raw_data_size (GwyRawDataType datatype); +gchar* gwy_utf16_to_utf8 (const gunichar2 *str, + glong len, + GwyByteOrder byteorder) G_GNUC_MALLOC; +gchar* gwy_utf8_strescape (const gchar *source, + const gchar *exceptions) G_GNUC_MALLOC; +gboolean gwy_assign_string (gchar **target, + const gchar *newvalue); +void gwy_object_set_or_reset (gpointer object, + GType type, + ...) G_GNUC_NULL_TERMINATED; +gboolean gwy_set_member_object (gpointer instance, + gpointer member_object, + GType expected_type, + gpointer member_field, + ...) G_GNUC_NULL_TERMINATED; #ifdef G_OS_WIN32 -FILE* gwy_fopen (const gchar *filename, - const gchar *mode); -gint gwy_fprintf (FILE *file, - gchar const *format, - ...); +FILE* gwy_fopen (const gchar *filename, + const gchar *mode); +gint gwy_fprintf (FILE *file, + gchar const *format, + ...); #else #define gwy_fopen fopen #define gwy_fprintf fprintf diff -Nru gwyddion-2.62/libgwyddion/gwyversion.h gwyddion-2.63/libgwyddion/gwyversion.h --- gwyddion-2.62/libgwyddion/gwyversion.h 2022-11-03 09:56:49.000000000 +0000 +++ gwyddion-2.63/libgwyddion/gwyversion.h 2023-06-13 13:22:39.000000000 +0000 @@ -27,8 +27,8 @@ G_BEGIN_DECLS #define GWY_VERSION_MAJOR 2 -#define GWY_VERSION_MINOR 62 -#define GWY_VERSION_STRING "2.62" +#define GWY_VERSION_MINOR 63 +#define GWY_VERSION_STRING "2.63" gint gwy_version_major(void); gint gwy_version_minor(void); diff -Nru gwyddion-2.62/libgwyddion/Makefile.am gwyddion-2.63/libgwyddion/Makefile.am --- gwyddion-2.62/libgwyddion/Makefile.am 2022-11-02 13:59:27.000000000 +0000 +++ gwyddion-2.63/libgwyddion/Makefile.am 2023-06-12 11:56:31.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ libgwyddion2includedir = $(pkgincludedir)/libgwyddion @@ -83,7 +83,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 32:0:32 +libversion = -version-info 33:0:33 #libversion = -release @LIBRARY_RELEASE@ libgwyddion2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ @OPENMP_CFLAGS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyddion2_la_SOURCES = \ diff -Nru gwyddion-2.62/libgwyddion/Makefile.in gwyddion-2.63/libgwyddion/Makefile.in --- gwyddion-2.62/libgwyddion/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/libgwyddion/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ # Generic glib-mkenum rules. # $Id: mkenum.mk 20681 2017-12-18 18:37:24Z yeti-dn $ @@ -445,6 +445,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -584,7 +586,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 32:0:32 +libversion = -version-info 33:0:33 #libversion = -release @LIBRARY_RELEASE@ libgwyddion2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ @OPENMP_CFLAGS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyddion2_la_SOURCES = \ diff -Nru gwyddion-2.62/libgwydgets/gwy3dview.c gwyddion-2.63/libgwydgets/gwy3dview.c --- gwyddion-2.62/libgwydgets/gwy3dview.c 2022-02-25 15:33:15.000000000 +0000 +++ gwyddion-2.63/libgwydgets/gwy3dview.c 2023-04-17 08:38:06.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: gwy3dview.c 24619 2022-02-25 15:33:15Z yeti-dn $ - * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. + * $Id: gwy3dview.c 25304 2023-04-15 20:04:00Z yeti-dn $ + * Copyright (C) 2003-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * Copyright (C) 2004 Martin Siler. * E-mail: silerm@physics.muni.cz. @@ -558,6 +558,36 @@ return widget; } +static void +get_view_data_ranges(Gwy3DView *gwy3dview, + gdouble *data_min, gdouble *data_max, + gdouble *view_min, gdouble *view_max) +{ + Gwy3DViewPrivate *priv = GWY_3D_VIEW_GET_PRIVATE(gwy3dview); + GwyDataField *field = gwy3dview->data_field, *mask = priv->mask_field; + gboolean masking = gwy3dview->setup->hide_masked && mask; + gint xres = gwy_data_field_get_xres(field), yres = gwy_data_field_get_yres(field); + gdouble min, max; + + /* Non-masked quantities are cached so do not be afraid getting them repeatedly. */ + gwy_data_field_get_min_max(field, &min, &max); + if (data_min) + *data_min = min; + if (data_max) + *data_max = max; + + if (!masking) { + if (view_min) + *view_min = min; + if (view_max) + *view_max = max; + return; + } + + if (view_min || view_max) + gwy_data_field_area_get_min_max_mask(field, mask, GWY_MASK_EXCLUDE, 0, 0, xres, yres, view_min, view_max); +} + static GwySIValueFormat* gwy_3d_view_update_label(Gwy3DView *gwy3dview, const gchar *key, @@ -588,22 +618,22 @@ gwy_3d_view_update_labels(Gwy3DView *gwy3dview) { GwySIValueFormat *format; - gdouble xreal, yreal, data_min, data_max, range, maximum; + gdouble xreal, yreal, view_min, view_max, range, maximum; if (!gwy3dview->data_field) return; xreal = gwy_data_field_get_xreal(gwy3dview->data_field); yreal = gwy_data_field_get_yreal(gwy3dview->data_field); - gwy_data_field_get_min_max(gwy3dview->data_field, &data_min, &data_max); - range = fabs(data_max - data_min); - maximum = MAX(fabs(data_min), fabs(data_max)); + get_view_data_ranges(gwy3dview, NULL, NULL, &view_min, &view_max); + range = fabs(view_max - view_min); + maximum = MAX(fabs(view_min), fabs(view_max)); format = NULL; format = gwy_3d_view_update_label(gwy3dview, "x", xreal, xreal, xreal/12.0, FALSE, format); format = gwy_3d_view_update_label(gwy3dview, "y", yreal, yreal, yreal/12.0, FALSE, format); - format = gwy_3d_view_update_label(gwy3dview, "max", data_max, maximum, range/12.0, TRUE, format); - format = gwy_3d_view_update_label(gwy3dview, "min", data_min, maximum, range/12.0, TRUE, format); + format = gwy_3d_view_update_label(gwy3dview, "max", view_max, maximum, range/12.0, TRUE, format); + format = gwy_3d_view_update_label(gwy3dview, "min", view_min, maximum, range/12.0, TRUE, format); gwy_si_unit_value_format_free(format); } @@ -930,6 +960,7 @@ return; } if (gwy_strequal(pspec->name, "hide-masked")) { + gwy_3d_view_update_labels(gwy3dview); gwy_3d_view_update_lists(gwy3dview); return; } @@ -1563,7 +1594,7 @@ gwy_3d_view_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { - g_return_if_fail(allocation != NULL); + g_return_if_fail(allocation); widget->allocation = *allocation; @@ -2037,7 +2068,7 @@ GwyPixmapLayer** ovlays) { gint i, j, xres, yres, rowstride; - gdouble data_min, data_max, res; + gdouble data_min, data_max, view_min, view_max, recenter, res; GLfloat dx, dy; Gwy3DVector *normals; const gdouble *data; @@ -2050,7 +2081,7 @@ xres = gwy_data_field_get_xres(dfield); yres = gwy_data_field_get_yres(dfield); - gwy_data_field_get_min_max(dfield, &data_min, &data_max); + get_view_data_ranges(gwy3dview, &data_min, &data_max, &view_min, &view_max); data = gwy_data_field_get_data_const(dfield); if (GWY_IS_DATA_FIELD(mask_field)) @@ -2100,9 +2131,11 @@ glNewList(gwy3dview->shape_list_base + GWY_3D_SHAPE, GL_COMPILE); glPushMatrix(); glTranslatef(-xres*dx/res, -yres*dy/res, GWY_3D_Z_DISPLACEMENT); + /* The scaling should not change by hide masked and must be given by the actual data range. However, since hiding + * makes the value range smaller we need to recenter the view. */ glScalef(2.0/res, 2.0/res, GWY_3D_Z_TRANSFORMATION/(data_max - data_min)); - glTranslatef(0.0, 0.0, -data_min); - /* zdifr = 1.0/(data_max - data_min); */ + recenter = 0.5*((data_max - data_min) - (view_max - view_min)); + glTranslatef(0.0, 0.0, -view_min + recenter); for (j = 0; j < yres-1; j++) { glBegin(GL_TRIANGLE_STRIP); @@ -2110,7 +2143,7 @@ for (i = 0; i < xres-1; i++) { gdouble z; guchar *color; - if (gwy3dview->setup->hide_masked && mask != NULL) { + if (gwy3dview->setup->hide_masked && mask) { if (mask[(yres-1 - j)*xres + i] == 0.0 && mask[(yres-2 - j)*xres + i] == 0.0 && !glon) { glBegin(GL_TRIANGLE_STRIP); glon = TRUE; @@ -2215,25 +2248,26 @@ } static void -gwy_3d_draw_axes(Gwy3DView *widget, gint width, gint height) +gwy_3d_draw_axes(Gwy3DView *gwy3dview, gint width, gint height) { + GwyDataField *field = gwy3dview->data_field; GLfloat dx, dy, rx, Ax, Ay, Bx, By, Cx, Cy, ticklen, xt, yt; - gdouble data_min, data_max; + gdouble data_min, data_max, view_min, view_max, recenter; gint xres, yres, res; gboolean yfirst; GwyGLMaterial *mat_none; gwy_debug(" "); - xres = gwy_data_field_get_xres(widget->data_field); - yres = gwy_data_field_get_yres(widget->data_field); - gwy_data_field_get_min_max(widget->data_field, &data_min, &data_max); - gwy_3d_calculate_pixel_sizes(widget->data_field, &dx, &dy); + xres = gwy_data_field_get_xres(field); + yres = gwy_data_field_get_yres(field); + get_view_data_ranges(gwy3dview, &data_min, &data_max, &view_min, &view_max); + gwy_3d_calculate_pixel_sizes(field, &dx, &dy); res = MAX(xres*dx, yres*dy); Ax = Ay = Bx = By = Cx = Cy = 0.0f; yfirst = TRUE; - rx = fmod(widget->setup->rotation_x*RAD_2_DEG, 360.0); + rx = fmod(gwy3dview->setup->rotation_x*RAD_2_DEG, 360.0); if (rx < 0.0) rx += 360.0; @@ -2242,6 +2276,8 @@ glPushMatrix(); glTranslatef(-dx*xres/res, -dy*yres/res, GWY_3D_Z_DISPLACEMENT); glScalef(2.0/res, 2.0/res, GWY_3D_Z_TRANSFORMATION/(data_max - data_min)); + recenter = 0.5*((data_max - data_min) - (view_max - view_min)); /* See gwy_3d_make_list(). */ + glTranslatef(0.0, 0.0, recenter); gwy_3d_view_rgba_dv(GL_FRONT, GL_AMBIENT, gwy_gl_material_get_ambient(mat_none)); gwy_3d_view_rgba_dv(GL_FRONT, GL_DIFFUSE, gwy_gl_material_get_diffuse(mat_none)); gwy_3d_view_rgba_dv(GL_FRONT, GL_SPECULAR, gwy_gl_material_get_specular(mat_none)); @@ -2249,7 +2285,7 @@ /* This is optimistic. Hope something reasonable happens when the selected * line width is not actually supported. */ - glLineWidth(widget->setup->line_width); + glLineWidth(gwy3dview->setup->line_width); if (rx >= 0.0 && rx <= 90.0) { Ay = dy*yres; @@ -2283,7 +2319,7 @@ glVertex2f(Ax, Ay); glVertex2f(Bx, By); glVertex2f(Cx, Cy); - glVertex3f(Cx, Cy, data_max - data_min); + glVertex3f(Cx, Cy, view_max - view_min); glEnd(); glBegin(GL_LINES); @@ -2314,21 +2350,16 @@ glVertex2f(Cx + xt, Cy + yt); /* Z-axis ticks */ - glVertex3f(Cx, Cy, data_max - data_min); - glVertex3f(Cx + xt, Cy + yt, data_max - data_min); + glVertex3f(Cx, Cy, view_max - view_min); + glVertex3f(Cx + xt, Cy + yt, view_max - view_min); - glVertex3f(Cx, Cy, (data_max - data_min)/2); - glVertex3f(Cx + xt, Cy + yt, (data_max - data_min)/2); + glVertex3f(Cx, Cy, (view_max - view_min)/2); + glVertex3f(Cx + xt, Cy + yt, (view_max - view_min)/2); glEnd(); - /* - TODO: create bitmaps with labels in the beginning (possibly in init_gl) - into display lists and draw here - */ - /* FIXME: I was able to fix the ticks drawing but this is still terribly - * broken for non-square images. (Yeti) */ - if (widget->setup->labels_visible - && !ugly_hack_globally_disable_axis_drawing) { + /* TODO: create bitmaps with labels in the beginning (possibly in init_gl) into display lists and draw here */ + /* FIXME: I was able to fix the ticks drawing but this is still terribly broken for non-square images. (Yeti) */ + if (gwy3dview->setup->labels_visible && !ugly_hack_globally_disable_axis_drawing) { guint view_size; gint size; GLdouble mM[16], pM[16], mpM[16]; @@ -2358,7 +2389,7 @@ gwy_3d_util_project((Ax+Bx)/2 - (Cx-Bx)*0.1, (Ay+By)/2 - (Cy-By)*0.1, -0.0f, mpM, vpM, &sx, &sy, &sz); gwy_3d_util_project((Bx+Cx)/2 - (Ax-Bx)*0.1, (By+Cy)/2 - (Ay-By)*0.1, -0.0f, mpM, vpM, &tx, &ty, &tz); gwy_3d_util_project(Cx - (Ax-Bx)*0.1, Cy - (Ay-By)*0.1, 0.0f, mpM, vpM, &ux, &uy, &uz); - gwy_3d_util_project(Cx - (Ax-Bx)*0.1, Cy - (Ay-By)*0.1, data_max-data_min, mpM, vpM, &vx, &vy, &vz); + gwy_3d_util_project(Cx - (Ax-Bx)*0.1, Cy - (Ay-By)*0.1, view_max - view_min, mpM, vpM, &vx, &vy, &vz); /* setup 2d */ glMatrixMode(GL_PROJECTION); @@ -2377,16 +2408,16 @@ glEnable(GL_BLEND); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - gwy_3d_texture_text(widget, yfirst ? GWY_3D_VIEW_LABEL_Y : GWY_3D_VIEW_LABEL_X, sx, sy, sz, rotA, + gwy_3d_texture_text(gwy3dview, yfirst ? GWY_3D_VIEW_LABEL_Y : GWY_3D_VIEW_LABEL_X, sx, sy, sz, rotA, size, GWY_3D_JUST_CENTER, GWY_3D_JUST_CENTER); - gwy_3d_texture_text(widget, yfirst ? GWY_3D_VIEW_LABEL_X : GWY_3D_VIEW_LABEL_Y, tx, ty, tz, rotB, + gwy_3d_texture_text(gwy3dview, yfirst ? GWY_3D_VIEW_LABEL_X : GWY_3D_VIEW_LABEL_Y, tx, ty, tz, rotB, size, GWY_3D_JUST_CENTER, GWY_3D_JUST_CENTER); - gwy_3d_texture_text(widget, GWY_3D_VIEW_LABEL_MAX, vx, vy, vz, 0, + gwy_3d_texture_text(gwy3dview, GWY_3D_VIEW_LABEL_MAX, vx, vy, vz, 0, size, GWY_3D_JUST_LEFT_EDGE, GWY_3D_JUST_CENTER); - gwy_3d_texture_text(widget, GWY_3D_VIEW_LABEL_MIN, ux, uy, uz, 0, + gwy_3d_texture_text(gwy3dview, GWY_3D_VIEW_LABEL_MIN, ux, uy, uz, 0, size, GWY_3D_JUST_LEFT_EDGE, GWY_3D_JUST_CENTER); /* unset 2d */ @@ -2407,17 +2438,16 @@ } static void -gwy_3d_draw_light_position(Gwy3DView *widget) +gwy_3d_draw_light_position(Gwy3DView *gwy3dview) { GwyGLMaterial *mat_none; GLfloat plane_z; - gdouble data_min, data_max, data_mean; + gdouble data_min, data_max, view_min, view_max; int i; gwy_debug(" "); - gwy_data_field_get_min_max(widget->data_field, &data_min, &data_max); - data_mean = gwy_data_field_get_avg(widget->data_field); + get_view_data_ranges(gwy3dview, &data_min, &data_max, &view_min, &view_max); mat_none = gwy_gl_materials_get_gl_material(GWY_GL_MATERIAL_NONE); gwy_3d_view_rgba_dv(GL_FRONT, GL_AMBIENT, gwy_gl_material_get_ambient(mat_none)); @@ -2426,11 +2456,11 @@ glMaterialf(GL_FRONT, GL_SHININESS, (GLfloat)gwy_gl_material_get_shininess(mat_none)*128.0f); glPushMatrix(); - plane_z = GWY_3D_Z_TRANSFORMATION*(data_mean - data_min)/(data_max - data_min) + GWY_3D_Z_DISPLACEMENT; + plane_z = 0.5*GWY_3D_Z_TRANSFORMATION*(view_max - view_min)/(data_max - data_min) + GWY_3D_Z_DISPLACEMENT; glTranslatef(0.0f, 0.0f, plane_z); - glRotatef(-widget->setup->light_theta * RAD_2_DEG, 0.0f, 0.0f, 1.0f); - glRotatef(widget->setup->light_phi * RAD_2_DEG, 0.0f, 1.0f, 0.0f); + glRotatef(-gwy3dview->setup->light_theta * RAD_2_DEG, 0.0f, 0.0f, 1.0f); + glRotatef(gwy3dview->setup->light_phi * RAD_2_DEG, 0.0f, 1.0f, 0.0f); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glBegin(GL_QUAD_STRIP); diff -Nru gwyddion-2.62/libgwydgets/gwystock.c gwyddion-2.63/libgwydgets/gwystock.c --- gwyddion-2.62/libgwydgets/gwystock.c 2022-04-28 15:20:37.000000000 +0000 +++ gwyddion-2.63/libgwydgets/gwystock.c 2023-01-10 13:32:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwystock.c 24795 2022-04-28 15:20:36Z yeti-dn $ + * $Id: gwystock.c 25198 2023-01-10 13:32:19Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -979,6 +979,15 @@ **/ /** + * GWY_STOCK_GRAPH_PERIOD_MEASURE: + * + * The "Graph-Period-Measure" stock icon. + * + * + * Since: 2.63 + **/ + +/** * GWY_STOCK_GRAPH_POINTER: * * The "Graph-Pointer" stock icon. @@ -1046,6 +1055,24 @@ **/ /** + * GWY_STOCK_HOLD_SELECTION_CLEAR: + * + * The "Hold-Selection-Clear" stock icon. + * + * + * Since: 2.63 + **/ + +/** + * GWY_STOCK_HOLD_SELECTION_REPLACE: + * + * The "Hold-Selection-Replace" stock icon. + * + * + * Since: 2.63 + **/ + +/** * GWY_STOCK_HOUGH: * * The "Hough" stock icon. @@ -1944,6 +1971,15 @@ **/ /** + * GWY_STOCK_SYNTHETIC_DUNES: + * + * The "Synthetic-Dunes" stock icon. + * + * + * Since: 2.63 + **/ + +/** * GWY_STOCK_SYNTHETIC_FIBRES: * * The "Synthetic-Fibres" stock icon. diff -Nru gwyddion-2.62/libgwydgets/gwystock.h gwyddion-2.63/libgwydgets/gwystock.h --- gwyddion-2.62/libgwydgets/gwystock.h 2022-04-28 15:20:37.000000000 +0000 +++ gwyddion-2.63/libgwydgets/gwystock.h 2023-01-10 13:32:19.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwystock.h 24795 2022-04-28 15:20:36Z yeti-dn $ + * $Id: gwystock.h 25198 2023-01-10 13:32:19Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -113,6 +113,7 @@ #define GWY_STOCK_GRAPH_LEVEL "gwy_graph_level" #define GWY_STOCK_GRAPH_MEASURE "gwy_graph_measure" #define GWY_STOCK_GRAPH_PALETTE "gwy_graph_palette" +#define GWY_STOCK_GRAPH_PERIOD_MEASURE "gwy_graph_period_measure" #define GWY_STOCK_GRAPH_POINTER "gwy_graph_pointer" #define GWY_STOCK_GRAPH_RULER "gwy_graph_ruler" #define GWY_STOCK_GRAPH_STATISTICS "gwy_graph_statistics" @@ -122,6 +123,8 @@ #define GWY_STOCK_GRAPH_ZOOM_IN "gwy_graph_zoom_in" #define GWY_STOCK_GRAPH_ZOOM_OUT "gwy_graph_zoom_out" #define GWY_STOCK_GWYDDION "gwy_gwyddion" +#define GWY_STOCK_HOLD_SELECTION_CLEAR "gwy_hold_selection_clear" +#define GWY_STOCK_HOLD_SELECTION_REPLACE "gwy_hold_selection_replace" #define GWY_STOCK_HOUGH "gwy_hough" #define GWY_STOCK_IMAGE_RELATION "gwy_image_relation" #define GWY_STOCK_IMMERSE "gwy_immerse" @@ -232,6 +235,7 @@ #define GWY_STOCK_SYNTHETIC_DIFFUSION "gwy_synthetic_diffusion" #define GWY_STOCK_SYNTHETIC_DISCS "gwy_synthetic_discs" #define GWY_STOCK_SYNTHETIC_DOMAINS "gwy_synthetic_domains" +#define GWY_STOCK_SYNTHETIC_DUNES "gwy_synthetic_dunes" #define GWY_STOCK_SYNTHETIC_FIBRES "gwy_synthetic_fibres" #define GWY_STOCK_SYNTHETIC_LATTICE "gwy_synthetic_lattice" #define GWY_STOCK_SYNTHETIC_LINE_NOISE "gwy_synthetic_line_noise" diff -Nru gwyddion-2.62/libgwydgets/Makefile.am gwyddion-2.63/libgwydgets/Makefile.am --- gwyddion-2.62/libgwydgets/Makefile.am 2022-11-02 13:59:27.000000000 +0000 +++ gwyddion-2.63/libgwydgets/Makefile.am 2023-06-12 11:56:31.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la libgwyprocess = $(top_builddir)/libprocess/libgwyprocess2.la @@ -117,7 +117,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 35:0:35 +libversion = -version-info 36:0:36 #libversion = -release @LIBRARY_RELEASE@ libgwydgets2_la_LDFLAGS = @GTKGLEXT_LIBS@ @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwydgets2_la_LIBADD = $(libgwydgets_libadd) diff -Nru gwyddion-2.62/libgwydgets/Makefile.in gwyddion-2.63/libgwydgets/Makefile.in --- gwyddion-2.62/libgwydgets/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/libgwydgets/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ # Generic glib-mkenum rules. # $Id: mkenum.mk 20681 2017-12-18 18:37:24Z yeti-dn $ @@ -498,6 +498,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -675,7 +677,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 35:0:35 +libversion = -version-info 36:0:36 #libversion = -release @LIBRARY_RELEASE@ libgwydgets2_la_LDFLAGS = @GTKGLEXT_LIBS@ @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwydgets2_la_LIBADD = $(libgwydgets_libadd) diff -Nru gwyddion-2.62/libgwymodule/Makefile.in gwyddion-2.63/libgwymodule/Makefile.in --- gwyddion-2.62/libgwymodule/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/libgwymodule/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -439,6 +439,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/libprocess/correct.c gwyddion-2.63/libprocess/correct.c --- gwyddion-2.62/libprocess/correct.c 2021-06-10 13:19:17.000000000 +0000 +++ gwyddion-2.63/libprocess/correct.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: correct.c 23824 2021-06-10 13:19:16Z yeti-dn $ + * $Id: correct.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2004-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -32,6 +28,7 @@ #include #include #include "libgwyddion/gwyomp.h" +#include "gwyprocessinternal.h" typedef struct { gdouble max; @@ -65,12 +62,10 @@ * @mask_field: A data field to be filled with mask. * @thresh: Threshold value. * - * Creates mask of data that are above or below @thresh*sigma from average - * height. + * Creates mask of data that are above or below @thresh*sigma from average height. * - * Sigma denotes root-mean square deviation of heights. This criterium - * corresponds to the usual Gaussian distribution outliers detection if - * @thresh is 3. + * Sigma denotes root-mean square deviation of heights. This criterium corresponds to the usual Gaussian distribution + * outliers detection if @thresh is 3. **/ void gwy_data_field_mask_outliers(GwyDataField *data_field, @@ -87,12 +82,10 @@ * @thresh_low: Lower threshold value. * @thresh_high: Upper threshold value. * - * Creates mask of data that are above or below multiples of rms from average - * height. + * Creates mask of data that are above or below multiples of rms from average height. * - * Data that are below @mean-@thresh_low*@sigma or above - * @mean+@thresh_high*@sigma are marked as outliers, where @sigma denotes the - * root-mean square deviation of heights. + * Data that are below @mean-@thresh_low*@sigma or above @mean+@thresh_high*@sigma are marked as outliers, where + * @sigma denotes the root-mean square deviation of heights. * * Since: 2.26 **/ @@ -125,32 +118,28 @@ * * Fills data under mask with the average value. * - * This function simply puts average value of all the @data_field values (both - * masked and unmasked) into points in @data_field lying under points where - * @mask_field values are nonzero. + * This function simply puts average value of all the @data_field values (both masked and unmasked) into points in + * @data_field lying under points where @mask_field values are nonzero. * - * In most cases you probably want to use - * gwy_data_field_correct_average_unmasked() instead. + * In most cases you probably want to use gwy_data_field_correct_average_unmasked() instead. **/ void gwy_data_field_correct_average(GwyDataField *data_field, GwyDataField *mask_field) { gdouble avg; - gint i; g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - g_return_if_fail(!mask_field || (GWY_IS_DATA_FIELD(mask_field) - && mask_field->xres == data_field->xres - && mask_field->yres == data_field->yres)); + g_return_if_fail(GWY_IS_DATA_FIELD(mask_field)); + if (!_gwy_data_field_check_mask(data_field, &mask_field, NULL)) + return; avg = gwy_data_field_get_avg(data_field); - - for (i = 0; i < (data_field->xres * data_field->yres); i++) { - if (mask_field->data[i]) - data_field->data[i] = avg; + if (gwy_isnan(avg) || gwy_isinf(avg)) { + gwy_data_field_clear(data_field); + return; } - - gwy_data_field_invalidate(mask_field); + gwy_data_field_area_fill_mask(data_field, mask_field, GWY_MASK_INCLUDE, + 0, 0, data_field->xres, data_field->yres, avg); } /** @@ -160,9 +149,8 @@ * * Fills data under mask with the average value of unmasked data. * - * This function calculates the average value of all unmasked pixels in - * @data_field and then fills all the masked pixels with this average value. - * It is useful as the first rough step of correction of data under the mask. + * This function calculates the average value of all unmasked pixels in @data_field and then fills all the masked + * pixels with this average value. It is useful as the first rough step of correction of data under the mask. * * If all data are masked the field is filled with zeroes. * @@ -175,30 +163,23 @@ gdouble avg; g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - g_return_if_fail(!mask_field || (GWY_IS_DATA_FIELD(mask_field) - && mask_field->xres == data_field->xres - && mask_field->yres == data_field->yres)); - - avg = gwy_data_field_area_get_avg_mask(data_field, mask_field, - GWY_MASK_EXCLUDE, - 0, 0, - data_field->xres, data_field->yres); + if (!_gwy_data_field_check_mask(data_field, &mask_field, NULL)) + return; + avg = gwy_data_field_area_get_avg_mask(data_field, mask_field, GWY_MASK_INCLUDE, + 0, 0, data_field->xres, data_field->yres); if (gwy_isnan(avg) || gwy_isinf(avg)) { gwy_data_field_clear(data_field); return; } gwy_data_field_area_fill_mask(data_field, mask_field, GWY_MASK_INCLUDE, - 0, 0, data_field->xres, data_field->yres, - avg); + 0, 0, data_field->xres, data_field->yres, avg); } /** * gwy_data_field_unrotate_find_corrections: - * @derdist: Angular derivation distribution (normally obrained from - * gwy_data_field_slope_distribution()). - * @correction: Corrections for particular symmetry types will be stored - * here (indexed by GwyPlaneSymmetry). @correction[0] contains - * the most probable correction. All angles are in radians. + * @derdist: Angular derivation distribution (normally obrained from gwy_data_field_slope_distribution()). + * @correction: Corrections for particular symmetry types will be stored here (indexed by GwyPlaneSymmetry). + * @correction[0] contains the most probable correction. All angles are in radians. * * Finds rotation corrections. * @@ -232,8 +213,7 @@ phi = atan2(-sint[j], cost[j]); total = sqrt(sint[j]*sint[j] + cost[j]*cost[j]); - gwy_debug("sc%d = (%f, %f), total%d = (%f, %f)", - m, sint[j], cost[j], m, total, 180.0/G_PI*phi); + gwy_debug("sc%d = (%f, %f), total%d = (%f, %f)", m, sint[j], cost[j], m, total, 180.0/G_PI*phi); phi /= 2*G_PI*m; phi = unrotate_refine_correction(derdist, m, phi); @@ -250,8 +230,7 @@ * * (*) not counting rhombic */ - switch (m) { - case 2: + if (m == 2) { t = GWY_SYMMETRY_PARALLEL; /* align with any x or y */ if (phi >= 0.25/m) @@ -260,9 +239,8 @@ phi += 0.5/m; correction[t] = phi; total /= 1.25; - break; - - case 3: + } + else if (m == 3) { t = GWY_SYMMETRY_TRIANGULAR; /* align with any x or y */ if (phi >= 0.125/m) @@ -270,9 +248,8 @@ else if (phi <= -0.125/m) phi += 0.25/m; correction[t] = phi; - break; - - case 4: + } + else if (m == 4) { t = GWY_SYMMETRY_SQUARE; correction[t] = phi; /* decide square/rhombic */ @@ -284,16 +261,13 @@ if (fabs(phi) > fabs(correction[GWY_SYMMETRY_SQUARE])) t = GWY_SYMMETRY_SQUARE; total /= 1.4; - break; - - case 6: + } + else if (m == 6) { t = GWY_SYMMETRY_HEXAGONAL; correction[t] = phi; - break; - - default: + } + else { g_assert_not_reached(); - break; } if (total > max) { @@ -364,8 +338,7 @@ ilow = (guint)floor(low*nder); ihigh = (guint)floor(high*nder); - gwy_debug("[%u] peak %u low = %f, high = %f, %u, %u", - m, j, low, high, ilow, ihigh); + gwy_debug("[%u] peak %u low = %f, high = %f, %u, %u", m, j, low, high, ilow, ihigh); s = w = 0.0; for (i = ilow; i <= ihigh; i++) { s += (i + 0.5)*der[i % nder]; @@ -391,17 +364,16 @@ * gwy_data_field_sample_distorted: * @source: Source data field. * @dest: Destination data field. - * @coords: Array of @source coordinates with the same number of items as - * @dest, ordered as data field data. - * See gwy_data_field_distort() for coordinate convention discussion. + * @coords: Array of @source coordinates with the same number of items as @dest, ordered as data field data. See + * gwy_data_field_distort() for coordinate convention discussion. * @interp: Interpolation type to use. * @exterior: Exterior pixels handling. * @fill_value: The value to use with @GWY_EXTERIOR_FIXED_VALUE. * * Resamples a data field in an arbitrarily distorted manner. * - * Each item in @coords corresponds to one pixel in @dest and gives the - * coordinates in @source defining the value to set in this pixel. + * Each item in @coords corresponds to one pixel in @dest and gives the coordinates in @source defining the value to + * set in this pixel. * * The %GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function. * @@ -415,21 +387,18 @@ GwyExteriorType exterior, gdouble fill_value) { - gwy_data_field_distort_internal(source, dest, interp, exterior, fill_value, - coords, NULL, NULL); + gwy_data_field_distort_internal(source, dest, interp, exterior, fill_value, coords, NULL, NULL); } /** * gwy_data_field_distort: * @source: Source data field. * @dest: Destination data field. - * @invtrans: Inverse transform function, that is the transformation from - * new coordinates to old coordinates. It gets - * (@j+0.5, @i+0.5), where @i and @j are the new row and column - * indices, passed as the input coordinates. The output coordinates - * should follow the same convention. Unless a special exterior - * handling is required, the transform function does not need to - * concern itself with coordinates being outside of the data. + * @invtrans: Inverse transform function, that is the transformation from new coordinates to old coordinates. It + * gets (@j+0.5, @i+0.5), where @i and @j are the new row and column indices, passed as the input + * coordinates. The output coordinates should follow the same convention. Unless a special exterior + * handling is required, the transform function does not need to concern itself with coordinates being + * outside of the data. * @user_data: Pointer passed as @user_data to @invtrans. * @interp: Interpolation type to use. * @exterior: Exterior pixels handling. @@ -437,9 +406,8 @@ * * Distorts a data field in the horizontal plane. * - * Note the transform function @invtrans is the inverse transform, in other - * words it calculates the old coordinates from the new coordinates (the - * transform would not be uniquely defined the other way round). + * Note the transform function @invtrans is the inverse transform, in other words it calculates the old coordinates + * from the new coordinates (the transform would not be uniquely defined the other way round). * * The %GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function. * @@ -454,8 +422,7 @@ GwyExteriorType exterior, gdouble fill_value) { - gwy_data_field_distort_internal(source, dest, interp, exterior, fill_value, - NULL, invtrans, user_data); + gwy_data_field_distort_internal(source, dest, interp, exterior, fill_value, NULL, invtrans, user_data); } static void @@ -485,19 +452,14 @@ sf = -((suplen - 1)/2); st = suplen/2; - if (exterior == GWY_EXTERIOR_LAPLACE) { - g_warning("Laplace exterior cannot be used with distortions. " - "Using border extension."); - exterior = GWY_EXTERIOR_BORDER_EXTEND; - } - else if (exterior != GWY_EXTERIOR_BORDER_EXTEND - && exterior != GWY_EXTERIOR_MIRROR_EXTEND - && exterior != GWY_EXTERIOR_PERIODIC - && exterior != GWY_EXTERIOR_FIXED_VALUE - && exterior != GWY_EXTERIOR_UNDEFINED) { + if (gwy_enum_sanitize_value(exterior, GWY_TYPE_EXTERIOR_TYPE) != exterior) { g_critical("Invalid exterior type."); return; } + if (exterior == GWY_EXTERIOR_LAPLACE) { + g_warning("Laplace exterior cannot be used with distortions. Using border extension."); + exterior = GWY_EXTERIOR_BORDER_EXTEND; + } xres = gwy_data_field_get_xres(source); yres = gwy_data_field_get_yres(source); @@ -508,9 +470,7 @@ coeffield = g_object_ref(source); else { coeffield = gwy_data_field_duplicate(source); - gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, - gwy_data_field_get_data(coeffield), - interp); + gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, gwy_data_field_get_data(coeffield), interp); } data = gwy_data_field_get_data(dest); @@ -529,8 +489,7 @@ gint newj, k = newi*newxres; for (newj = 0; newj < newxres; newj++, k++) - invtrans(newj + 0.5, newi + 0.5, - &my_coords[k].x, &my_coords[k].y, user_data); + invtrans(newj + 0.5, newi + 0.5, &my_coords[k].x, &my_coords[k].y, user_data); } coords = my_coords; } @@ -587,8 +546,7 @@ coeff[(i-sf)*suplen + j-sf] = cdata[ii*xres + jj]; } } - v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, - interp); + v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, interp); } data[newj + newxres*newi] = v; } @@ -604,22 +562,18 @@ * gwy_data_field_affine: * @source: Source data field. * @dest: Destination data field. - * @invtrans: Inverse transform, that is the transformation from - * new pixel coordinates to old pixel coordinates, represented as - * (@j+0.5, @i+0.5), where @i and @j are the row and column - * indices. It is represented as a six-element array [@axx, @axy, - * @ayx, @ayy, @bx, @by] where @axy is the coefficient from @x to - * @y. + * @invtrans: Inverse transform, that is the transformation from new pixel coordinates to old pixel coordinates, + * represented as (@j+0.5, @i+0.5), where @i and @j are the row and column indices. It is represented as + * a six-element array [@axx, @axy, @ayx, @ayy, @bx, @by] where @axy is the coefficient from @x to @y. * @interp: Interpolation type to use. * @exterior: Exterior pixels handling. * @fill_value: The value to use with @GWY_EXTERIOR_FIXED_VALUE. * * Performs an affine transformation of a data field in the horizontal plane. * - * Note the transform @invtrans is the inverse transform, in other - * words it calculates the old coordinates from the new coordinates. This - * way even degenerate (non-invertible) transforms can be meaningfully used. - * Also note that the (column, row) coordinate system is left-handed. + * Note the transform @invtrans is the inverse transform, in other words it calculates the old coordinates from the + * new coordinates. This way even degenerate (non-invertible) transforms can be meaningfully used. Also note that the + * (column, row) coordinate system is left-handed. * * The %GWY_EXTERIOR_LAPLACE exterior type cannot be used with this function. * @@ -656,19 +610,14 @@ sf = -((suplen - 1)/2); st = suplen/2; - if (exterior == GWY_EXTERIOR_LAPLACE) { - g_warning("Laplace exterior cannot be used with distortions. " - "Using border extension."); - exterior = GWY_EXTERIOR_BORDER_EXTEND; - } - else if (exterior != GWY_EXTERIOR_BORDER_EXTEND - && exterior != GWY_EXTERIOR_MIRROR_EXTEND - && exterior != GWY_EXTERIOR_PERIODIC - && exterior != GWY_EXTERIOR_FIXED_VALUE - && exterior != GWY_EXTERIOR_UNDEFINED) { + if (gwy_enum_sanitize_value(exterior, GWY_TYPE_EXTERIOR_TYPE) != exterior) { g_critical("Invalid exterior type."); return; } + if (exterior == GWY_EXTERIOR_LAPLACE) { + g_warning("Laplace exterior cannot be used with distortions. Using border extension."); + exterior = GWY_EXTERIOR_BORDER_EXTEND; + } xres = gwy_data_field_get_xres(source); yres = gwy_data_field_get_yres(source); @@ -679,9 +628,7 @@ coeffield = g_object_ref(source); else { coeffield = gwy_data_field_duplicate(source); - gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, - gwy_data_field_get_data(coeffield), - interp); + gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, gwy_data_field_get_data(coeffield), interp); } data = gwy_data_field_get_data(dest); @@ -742,8 +689,7 @@ coeff[(i - sf)*suplen + j - sf] = cdata[ii*xres + jj]; } } - v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, - interp); + v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, interp); } data[newj + newxres*newi] = v; } @@ -838,33 +784,29 @@ * gwy_data_field_affine_prepare: * @source: Source data field. * @dest: Destination data field. - * @a1a2: Lattice vectors (or generally base vectors) in @source, as an array - * of four components: @x1, @y1, @x2 and @y2. - * @a1a2_corr: Correct lattice vectors (or generally base vectors) @dest should - * have after the affine transform, in the same form as @a1a2. - * @invtrans: Inverse transform as an array of six values to be filled - * according to gwy_data_field_affine() specification. + * @a1a2: Lattice vectors (or generally base vectors) in @source, as an array of four components: @x1, @y1, @x2 and + * @y2. + * @a1a2_corr: Correct lattice vectors (or generally base vectors) @dest should have after the affine transform, in + * the same form as @a1a2. + * @invtrans: Inverse transform as an array of six values to be filled according to gwy_data_field_affine() + * specification. * @scaling: How (or if) to scale the correct lattice vectors. - * @prevent_rotation: %TRUE to prevent rotation of the data by rotating - * @a1a2_corr as a whole to a direction preserving the - * data orientation. %FALSE to take @a1a2_corr as given. - * @oversampling: Oversampling factor. Values larger than 1 mean smaller - * pixels (and more of them) in @dest, values smaller than 1 - * the opposite. Pass 1.0 for the default pixel size choice. + * @prevent_rotation: %TRUE to prevent rotation of the data by rotating @a1a2_corr as a whole to a direction + * preserving the data orientation. %FALSE to take @a1a2_corr as given. + * @oversampling: Oversampling factor. Values larger than 1 mean smaller pixels (and more of them) in @dest, values + * smaller than 1 the opposite. Pass 1.0 for the default pixel size choice. * * Resolves an affine transformation of a data field in the horizontal plane. * - * This function calculates suitable arguments for gwy_data_field_affine() - * from given images and lattice vectors (in real coordinates). + * This function calculates suitable arguments for gwy_data_field_affine() from given images and lattice vectors (in + * real coordinates). * - * Data field @dest will be resized and its real dimensions and units set in - * anticipation of gwy_data_field_affine(). Its contents will be destroyed. + * Data field @dest will be resized and its real dimensions and units set in anticipation of gwy_data_field_affine(). + * Its contents will be destroyed. * - * Note that @a1a2_corr is an input-output parameter. In general, the vectors - * will be modified according to @scaling and @prevent_rotation to the actual - * vectors in @dest after the transformation. Only if @prevent_rotation is - * %FALSE and @scaling is %GWY_AFFINE_SCALING_AS_GIVEN the vectors are - * preserved. + * Note that @a1a2_corr is an input-output parameter. In general, the vectors will be modified according to @scaling + * and @prevent_rotation to the actual vectors in @dest after the transformation. Only if @prevent_rotation is %FALSE + * and @scaling is %GWY_AFFINE_SCALING_AS_GIVEN the vectors are preserved. * * Since: 2.49 **/ @@ -896,8 +838,7 @@ sdy = source->yreal/source->yres; gwy_debug("a1a2 %g %g %g %g", a1a2[0], a1a2[1], a1a2[2], a1a2[3]); - gwy_debug("a1a2_corr %g %g %g %g", - a1a2_corr[0], a1a2_corr[1], a1a2_corr[2], a1a2_corr[3]); + gwy_debug("a1a2_corr %g %g %g %g", a1a2_corr[0], a1a2_corr[1], a1a2_corr[2], a1a2_corr[3]); /* This is an approximate rotation correction to get the base more or less * oriented in the plane as expected and not upside down. */ if (prevent_rotation) { @@ -910,8 +851,7 @@ } solve_transform_real(a1a2, a1a2_corr, invtrans); - gwy_debug("invtrans %g %g %g %g", - invtrans[0], invtrans[1], invtrans[2], invtrans[3]); + gwy_debug("invtrans %g %g %g %g", invtrans[0], invtrans[1], invtrans[2], invtrans[3]); /* This is the exact rotation correction. */ if (prevent_rotation) { @@ -963,16 +903,14 @@ gwy_data_field_resample(dest, xres, yres, GWY_INTERPOLATION_NONE); dest->xreal = dx*xres; dest->yreal = dy*yres; - /* We could preserve the centre but that would be strange for the typical - * case when there are no offsets. */ + /* We could preserve the centre but that would be strange for the typical case when there are no offsets. */ dest->xoff = dest->yoff = 0.0; gwy_data_field_copy_units(source, dest); /* So far, we used invtrans as a temporary matrix. Now really fill it with * the inverse transformation. */ invert_matrix2(invtrans, invtrans); - gwy_debug("minv %g %g %g %g", - invtrans[0], invtrans[1], invtrans[2], invtrans[3]); + gwy_debug("minv %g %g %g %g", invtrans[0], invtrans[1], invtrans[2], invtrans[3]); /* Multiply from right by pixel-to-real matrix in the corrected field. */ tmp[0] = dx; @@ -984,8 +922,7 @@ tmp[1] = tmp[2] = 0.0; tmp[3] = 1.0/sdy; matrix2_matrix2(invtrans, tmp, invtrans); - gwy_debug("minvpix %g %g %g %g", - invtrans[0], invtrans[1], invtrans[2], invtrans[3]); + gwy_debug("minvpix %g %g %g %g", invtrans[0], invtrans[1], invtrans[2], invtrans[3]); invtrans[4] = 0.5*xres; invtrans[5] = 0.5*yres; @@ -1000,8 +937,7 @@ { gdouble phi; - phi = fmod(atan2(a1a2[1], a1a2[0]) + 4.0*G_PI - atan2(a1a2[3], a1a2[2]), - 2.0*G_PI); + phi = fmod(atan2(a1a2[1], a1a2[0]) + 4.0*G_PI - atan2(a1a2[3], a1a2[2]), 2.0*G_PI); if (phi > G_PI) { GWY_SWAP(gdouble, a1a2[0], a1a2[2]); GWY_SWAP(gdouble, a1a2[1], a1a2[3]); @@ -1087,9 +1023,7 @@ for (i = 0; i < nquantities; i++) values[i] = g_new(gdouble, ngrains+1); - gwy_data_field_grains_get_quantities(dfield, values, - quantities, nquantities, - ngrains, grains); + gwy_data_field_grains_get_quantities(dfield, values, quantities, nquantities, ngrains, grains); GWY_OBJECT_UNREF(smoothed); maxima = g_new(LatticeMaximumInfo, ngrains); @@ -1125,16 +1059,13 @@ qsort(maxima, ngrains, sizeof(LatticeMaximumInfo), compare_maxima); #ifdef DEBUG for (i = 0; i < ngrains; i++) { - gwy_debug("[%u] (%g, %g) %g :: %g", - i, maxima[i].x, maxima[i].y, maxima[i].max, maxima[i].q); + gwy_debug("[%u] (%g, %g) %g :: %g", i, maxima[i].x, maxima[i].y, maxima[i].max, maxima[i].q); } #endif - /* Remove anything with direction opposite to the first vector. But we - * must carefully accept ortohogonal vectors. This is just a half-plane - * selection though it influences the preferred vectors, of course. */ - gwy_debug("Base-plane selector [%u] (%g, %g) %g", - 0, maxima[0].x, maxima[0].y, maxima[0].max); + /* Remove anything with direction opposite to the first vector. But we must carefully accept ortohogonal vectors. + * This is just a half-plane selection though it influences the preferred vectors, of course. */ + gwy_debug("Base-plane selector [%u] (%g, %g) %g", 0, maxima[0].x, maxima[0].y, maxima[0].max); cphi = maxima[0].x/maxima[0].d; sphi = maxima[0].y/maxima[0].d; i = j = 1; @@ -1171,9 +1102,7 @@ qsort(maxima, ngrains, sizeof(LatticeMaximumInfo), compare_maxima); #ifdef DEBUG for (i = 0; i < ngrains; i++) { - gwy_debug("[%u] (%g, %g) %g #%u", - i, maxima[i].x, maxima[i].y, maxima[i].max, - maxima[i].basecount); + gwy_debug("[%u] (%g, %g) %g #%u", i, maxima[i].x, maxima[i].y, maxima[i].max, maxima[i].basecount); } #endif @@ -1189,8 +1118,7 @@ * otherwise take the next one with the highest basecount. */ for (i = 1; i < ngrains; i++) { for (k = 2; k < 5; k++) { - if (fabs(maxima[i].x/k - a1a2[0]) < 0.2*dh - && fabs(maxima[i].y/k - a1a2[1]) < 0.2*dh) { + if (fabs(maxima[i].x/k - a1a2[0]) < 0.2*dh && fabs(maxima[i].y/k - a1a2[1]) < 0.2*dh) { gwy_debug("Excluding #%u for collinearity (%u).", i, k); break; } @@ -1207,9 +1135,8 @@ if (!ok) return FALSE; - /* Try to choose some sensible vectors among the equivalent choices. It - * does not guarantee the choice a human would make but at least make - * a reasonable one... */ + /* Try to choose some sensible vectors among the equivalent choices. It does not guarantee the choice a human + * would make but at least make a reasonable one... */ for (i = 0; i < 4; i++) a1a2[i] = -a1a2[i]; if (is_psdf) @@ -1266,9 +1193,7 @@ continue; nex++; - if (!gwy_data_field_local_maximum(dfield, - xytmp + 0, xytmp + 1, - xwinsize, ywinsize)) + if (!gwy_data_field_local_maximum(dfield, xytmp + 0, xytmp + 1, xwinsize, ywinsize)) continue; jj = GWY_ROUND(xytmp[0]); @@ -1317,8 +1242,7 @@ gwy_debug("window size: %dx%d", xwinsize, ywinsize); r = refine_from_multiple(dfield, a1a2, 1, 2, xwinsize, ywinsize); - gwy_debug("refine1(%g): (%g, %g) (%g, %g)", - r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); + gwy_debug("refine1(%g): (%g, %g) (%g, %g)", r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); if (is_psdf) return r >= 0.75; @@ -1327,16 +1251,14 @@ xwinsize = 5*xwinsize/6; ywinsize = 5*ywinsize/6; r = refine_from_multiple(dfield, a1a2, 3, 25, xwinsize, ywinsize); - gwy_debug("refine3(%g): (%g, %g) (%g, %g)", - r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); + gwy_debug("refine3(%g): (%g, %g) (%g, %g)", r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); } if (r == 1.0) { xwinsize = 7*xwinsize/8; ywinsize = 7*ywinsize/8; r = refine_from_multiple(dfield, a1a2, 5, 29, xwinsize, ywinsize); - gwy_debug("refine5(%g): (%g, %g) (%g, %g)", - r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); + gwy_debug("refine5(%g): (%g, %g) (%g, %g)", r, a1a2[0], a1a2[1], a1a2[2], a1a2[3]); } return r >= 0.5; @@ -1345,22 +1267,18 @@ /** * gwy_data_field_measure_lattice_acf: * @acf2d: Data field containing two-dimensional autocorrelation function. - * @a1a2: Lattice vectors as an array of four components: @x1, @y1, @x2 and - * @y2 (in real coordinates). + * @a1a2: Lattice vectors as an array of four components: @x1, @y1, @x2 and @y2 (in real coordinates). * * Estimates or improves estimate of lattice vectors from a 2D ACF field. * - * Note that the 2D ACF of a data field has to be passed, not the data field - * itself. The correlation function can be for instance calculated by - * gwy_data_field_2dacf(). However, you can calculate and/or process the - * correlation function in any way you see fit. - * - * When the vectors in @a1a2 are zero the function attempts to estimate the - * lattice from scratch. But if @a1a2 contains two non-zero vectors it takes - * them as approximate lattice vectors to improve. + * Note that the 2D ACF of a data field has to be passed, not the data field itself. The correlation function can be + * for instance calculated by gwy_data_field_2dacf(). However, you can calculate and/or process the correlation + * function in any way you see fit. + * + * When the vectors in @a1a2 are zero the function attempts to estimate the lattice from scratch. But if @a1a2 + * contains two non-zero vectors it takes them as approximate lattice vectors to improve. * - * If the function return %FALSE the array @a1a2 is filled with useless values - * and must be ignored. + * If the function return %FALSE the array @a1a2 is filled with useless values and must be ignored. * * Returns: %TRUE if good lattice vectors were found, %FALSE on failure. * @@ -1372,12 +1290,10 @@ gdouble dx, dy; guint i; - if ((a1a2[0] == 0.0 && a1a2[1] == 0.0) - || (a1a2[2] == 0.0 && a1a2[3] == 0.0)) { + if ((a1a2[0] == 0.0 && a1a2[1] == 0.0) || (a1a2[2] == 0.0 && a1a2[3] == 0.0)) { if (!guess_lattice(acf2d, a1a2, FALSE)) return FALSE; - gwy_debug("guess: (%g, %g) (%g, %g)", - a1a2[0], a1a2[1], a1a2[2], a1a2[3]); + gwy_debug("guess: (%g, %g) (%g, %g)", a1a2[0], a1a2[1], a1a2[2], a1a2[3]); } for (i = 0; i < 4; i++) { @@ -1412,25 +1328,20 @@ /** * gwy_data_field_measure_lattice_psdf: - * @psdf2d: Data field containing two-dimensional power spectrum density - * function (or alternatively Fourier coefficient modulus). - * @a1a2: Lattice vectors as an array of four components: @x1, @y1, @x2 and - * @y2 (in real coordinates). + * @psdf2d: Data field containing two-dimensional power spectrum density function (or alternatively Fourier + * coefficient modulus). + * @a1a2: Lattice vectors as an array of four components: @x1, @y1, @x2 and @y2 (in real coordinates). * * Estimates or improves estimate of lattice vectors from a 2D PSDF field. * - * Note that the 2D PSDF of a data field has to be passed, not the data field - * itself. The spectral density can be for instance calculated by - * gwy_data_field_2dfft() and summing the squares of real and imaginary parts - * However, you can calculate and/or process the spectral density in any way - * you see fit. - * - * When the vectors in @a1a2 are zero the function attempts to estimate the - * lattice from scratch. But if @a1a2 contains two non-zero vectors it takes - * them as approximate lattice vectors to improve. + * Note that the 2D PSDF of a data field has to be passed, not the data field itself. The spectral density can be for + * instance calculated by gwy_data_field_2dfft() and summing the squares of real and imaginary parts However, you can + * calculate and/or process the spectral density in any way you see fit. + * + * When the vectors in @a1a2 are zero the function attempts to estimate the lattice from scratch. But if @a1a2 + * contains two non-zero vectors it takes them as approximate lattice vectors to improve. * - * If the function return %FALSE the array @a1a2 is filled with useless values - * and must be ignored. + * If the function return %FALSE the array @a1a2 is filled with useless values and must be ignored. * * Returns: %TRUE if good lattice vectors were found, %FALSE on failure. * @@ -1443,12 +1354,10 @@ guint i; gwy_debug("input: (%g, %g) (%g, %g)", a1a2[0], a1a2[1], a1a2[2], a1a2[3]); - if ((a1a2[0] == 0.0 && a1a2[1] == 0.0) - || (a1a2[2] == 0.0 && a1a2[3] == 0.0)) { + if ((a1a2[0] == 0.0 && a1a2[1] == 0.0) || (a1a2[2] == 0.0 && a1a2[3] == 0.0)) { if (!guess_lattice(psdf2d, a1a2, TRUE)) return FALSE; - gwy_debug("guess: (%g, %g) (%g, %g)", - a1a2[0], a1a2[1], a1a2[2], a1a2[3]); + gwy_debug("guess: (%g, %g) (%g, %g)", a1a2[0], a1a2[1], a1a2[2], a1a2[3]); } transform_vectors_real_freq(a1a2); @@ -1481,21 +1390,17 @@ /** * gwy_data_field_mark_scars: * @data_field: A data field to find scars in. - * @result: A data field to store the result to (it is resized to match - * @data_field). + * @result: A data field to store the result to (it is resized to match @data_field). * @threshold_high: Miminum relative step for scar marking, must be positive. - * @threshold_low: Definite relative step for scar marking, must be at least - * equal to @threshold_high. - * @min_scar_len: Minimum length of a scar, shorter ones are discarded - * (must be at least one). + * @threshold_low: Definite relative step for scar marking, must be at least equal to @threshold_high. + * @min_scar_len: Minimum length of a scar, shorter ones are discarded (must be at least one). * @max_scar_width: Maximum width of a scar, must be at least one. * @negative: %TRUE to detect negative scars, %FALSE to positive. * * Find and marks scars in a data field. * - * Scars are linear horizontal defects, consisting of shifted values. - * Zero or negative values in @result siginify normal data, positive - * values siginify samples that are part of a scar. + * Scars are linear horizontal defects, consisting of shifted values. Zero or negative values in @result siginify + * normal data, positive values siginify samples that are part of a scar. * * Since: 2.46 **/ @@ -1562,8 +1467,7 @@ gdouble *mrow = m + i*xres + j; while (k) { - mrow[k*xres] = fmax(mrow[k*xres], - (top - row[k*xres])/rms); + mrow[k*xres] = fmax(mrow[k*xres], (top - row[k*xres])/rms); k--; } } @@ -1581,8 +1485,7 @@ gdouble *mrow = m + i*xres + j; while (k) { - mrow[k*xres] = fmax(mrow[k*xres], - (row[k*xres] - bottom)/rms); + mrow[k*xres] = fmax(mrow[k*xres], (row[k*xres] - bottom)/rms); k--; } } @@ -1638,8 +1541,8 @@ * * Shifts entire data field rows as specified by given data line. * - * Data line @shifts must have resolution corresponding to the number of - * @data_field rows. Its values are subtracted from individual field rows. + * Data line @shifts must have resolution corresponding to the number of @data_field rows. Its values are subtracted + * from individual field rows. * * Since: 2.52 **/ @@ -1699,25 +1602,19 @@ /** * gwy_data_field_find_row_shifts_trimmed_mean: * @data_field: A data field. - * @mask: Mask of values to take values into account/exclude, or %NULL for full - * @data_field. - * @masking: Masking mode to use. See the introduction for description of - * masking modes. - * @trimfrac: Fraction of lowest values and highest values to discard when - * trimming. - * @mincount: Minimum number of values in a row necessary for per-row - * calculation. Rows which are essentially completely masked are - * not shifted with respect to a global value. Pass a non-positive - * number to use an automatic minimum count. + * @mask: Mask of values to take values into account/exclude, or %NULL for full @data_field. + * @masking: Masking mode to use. See the introduction for description of masking modes. + * @trimfrac: Fraction of lowest values and highest values to discard when trimming. + * @mincount: Minimum number of values in a row necessary for per-row calculation. Rows which are essentially + * completely masked are not shifted with respect to a global value. Pass a non-positive number to use an + * automatic minimum count. * * Finds row shifts to misaligned row correction using trimmed row means. * - * For zero @trimfrac the function calculates row means. For @trimfrac of 1/2 - * or larger it calculates row medians. Values between correspond to trimmed - * means. + * For zero @trimfrac the function calculates row means. For @trimfrac of 1/2 or larger it calculates row medians. + * Values between correspond to trimmed means. * - * Returns: A newly created data line containing the row shifts, for instance - * row means, medians or trimmed means. + * Returns: A newly created data line containing the row shifts, for instance row means, medians or trimmed means. * * Since: 2.52 **/ @@ -1754,9 +1651,7 @@ shifts = gwy_data_line_new(yres, data_field->yreal, FALSE); shifts->off = data_field->yoff; gwy_data_field_copy_units_to_data_line(data_field, shifts); - total_median = gwy_data_field_area_get_median_mask(data_field, - mask, masking, - 0, 0, xres, yres); + total_median = gwy_data_field_area_get_median_mask(data_field, mask, masking, 0, 0, xres, yres); d = data_field->data; m = mask ? mask->data : NULL; @@ -1810,26 +1705,19 @@ /** * gwy_data_field_find_row_shifts_trimmed_diff: * @data_field: A data field. - * @mask: Mask of values to take values into account/exclude, or %NULL for full - * @data_field. - * @masking: Masking mode to use. See the introduction for description of - * masking modes. - * @trimfrac: Fraction of lowest values and highest values to discard when - * trimming. - * @mincount: Minimum number of values in a row necessary for per-row - * calculation. Rows which are essentially completely masked are - * not shifted with respect to a global value. Pass a non-positive - * number to use an automatic minimum count. - * - * Finds row shifts to misaligned row correction using trimmed means of row - * differences. - * - * For zero @trimfrac the function calculates row means. For @trimfrac of 1/2 - * or larger it calculates row medians. Values between correspond to trimmed - * means. + * @mask: Mask of values to take values into account/exclude, or %NULL for full @data_field. + * @masking: Masking mode to use. See the introduction for description of masking modes. + * @trimfrac: Fraction of lowest values and highest values to discard when trimming. + * @mincount: Minimum number of values in a row necessary for per-row calculation. Rows which are essentially + * completely masked are not shifted with respect to a global value. Pass a non-positive number to use an + * automatic minimum count. + * + * Finds row shifts to misaligned row correction using trimmed means of row differences. + * + * For zero @trimfrac the function calculates row means. For @trimfrac of 1/2 or larger it calculates row medians. + * Values between correspond to trimmed means. * - * Returns: A newly created data line containing the row shifts, for instance - * row means, medians or trimmed means. + * Returns: A newly created data line containing the row shifts, for instance row means, medians or trimmed means. * * Since: 2.52 **/ @@ -1942,4 +1830,4 @@ * Since: 2.5 **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/correct-laplace.c gwyddion-2.63/libprocess/correct-laplace.c --- gwyddion-2.62/libprocess/correct-laplace.c 2022-04-06 11:19:33.000000000 +0000 +++ gwyddion-2.63/libprocess/correct-laplace.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: correct-laplace.c 22748 2020-02-03 17:22:16Z yeti-dn $ + * $Id: correct-laplace.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2004-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -44,11 +40,9 @@ /* * @len: The number of blocks. (The allocated size is usually a bit larger.) - * @n: Start of each neighbour in @k, size @len+1 (one extra item to get - * consistently the size of the last block). - * @k: Indices of neighbours for laplacian calculation, allocated size is a - * multiple of @len but blocks are variable-size, given by @n. These - * indices refer to these arrays, not the original grid. + * @n: Start of each neighbour in @k, size @len+1 (one extra item to get consistently the size of the last block). + * @k: Indices of neighbours for laplacian calculation, allocated size is a multiple of @len but blocks are + * variable-size, given by @n. These indices refer to these arrays, not the original grid. * @w: Unique coefficient blocks, a small array of size @wsize. * @iw: Indices of blocks in @w, size @len. * @nw: Number of unique coefficient blocks. @@ -59,11 +53,9 @@ * @f: The difference between the second derivative and the value, size @len. * @v: Conjugate-gradients auxiliary vector, size @len. * @t: Conjugate-gradients auxiliary vector, size @len. - * @gindex: Where the point is placed in the original data, size @len. Not - * used during iteration. - * @wlen: Lengths of blocks in @w. Only used during construction because - * we take the length from @n (the @n and @w blocks must be of the - * same size). + * @gindex: Where the point is placed in the original data, size @len. Not used during iteration. + * @wlen: Lengths of blocks in @w. Only used during construction because we take the length from @n (the @n and @w + * blocks must be of the same size). */ typedef struct { guint len; @@ -110,14 +102,13 @@ * * Performs one interation of Laplace data correction. * - * Tries to remove all the points in mask off the data by using - * iterative method similar to solving heat flux equation. + * Tries to remove all the points in mask off the data by using iterative method similar to solving heat flux + * equation. * * Use this function repeatedly until reasonable @error is reached. * - * For almost all purposes this function was superseded by - * non-iterative gwy_data_field_laplace_solve() which is simultaneously much - * faster and more accurate. + * For almost all purposes this function was superseded by non-iterative gwy_data_field_laplace_solve() which + * is simultaneously much faster and more accurate. **/ void gwy_data_field_correct_laplace_iteration(GwyDataField *data_field, @@ -134,16 +125,14 @@ g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); g_return_if_fail(GWY_IS_DATA_FIELD(mask_field)); g_return_if_fail(GWY_IS_DATA_FIELD(buffer_field)); - g_return_if_fail(data_field->xres == mask_field->xres - && data_field->yres == mask_field->yres); + g_return_if_fail(data_field->xres == mask_field->xres && data_field->yres == mask_field->yres); xres = data_field->xres; yres = data_field->yres; /* check buffer field */ if (buffer_field->xres != xres || buffer_field->yres != yres) - gwy_data_field_resample(buffer_field, xres, yres, - GWY_INTERPOLATION_NONE); + gwy_data_field_resample(buffer_field, xres, yres, GWY_INTERPOLATION_NONE); gwy_data_field_copy(data_field, buffer_field, FALSE); @@ -181,10 +170,8 @@ for (i = 1; i < yres - 1; i++) { for (j = 1; j < xres - 1; j++) { if (mask[i*xres + j] > 0) { - cor = cf*((data[(i - 1)*xres + j] + data[(i + 1)*xres + j] - - 2*data[i*xres + j]) - + (data[i*xres + j - 1] + data[i*xres + j + 1] - - 2*data[i*xres + j])); + cor = cf*((data[(i - 1)*xres + j] + data[(i + 1)*xres + j] - 2*data[i*xres + j]) + + (data[i*xres + j - 1] + data[i*xres + j + 1] - 2*data[i*xres + j])); buffer[i*xres + j] += cor; cor = fabs(cor); @@ -255,14 +242,9 @@ guint k = (i*xres + j)*step; if (levels[k] == level - && (levels[k-vstep-step] == level-1 - || levels[k-vstep] == level-1 - || levels[k-vstep+step] == level-1 - || levels[k-step] == level-1 - || levels[k+step] == level-1 - || levels[k+vstep-step] == level-1 - || levels[k+vstep] == level-1 - || levels[k+vstep+step] == level-1)) { + && (levels[k-vstep-step] == level-1 || levels[k-vstep] == level-1 || levels[k-vstep+step] == level-1 + || levels[k-step] == level-1 || levels[k+step] == level-1 || levels[k+vstep-step] == level-1 + || levels[k+vstep] == level-1 || levels[k+vstep+step] == level-1)) { if (buffer[k-vstep-step] > level) buffer[k-vstep-step] = level; if (buffer[k-vstep] > level) @@ -356,10 +338,8 @@ guint k = (i*xres + j)*step; if (levels[k] == level) { - guint su = (levels[k-xres*step] == NONE), - sd = (levels[k+xres*step] == NONE), - sl = (levels[k-step] == NONE), - sr = (levels[k+step] == NONE); + guint su = (levels[k-xres*step] == NONE), sd = (levels[k+xres*step] == NONE), + sl = (levels[k-step] == NONE), sr = (levels[k+step] == NONE); if ((su & sd & ~sl & ~sr) || (~su & ~sd & sl & sr)) levels[k] = NONE; @@ -376,8 +356,7 @@ gwy_assign(buffer, levels, xres*yres); while (TRUE) { - // Promote odd levels to one-greater even levels if they do not touch - // lower-values levels. + // Promote odd levels to one-greater even levels if they do not touch lower-values levels. level++; if (!promote(levels, buffer, xres, yres, level, step)) break; @@ -389,16 +368,15 @@ } gwy_assign(levels, buffer, xres*yres); - // Clear the space around even levels and promote them to one-greater - // odd levels if the do not touch lower levels. + // Clear the space around even levels and promote them to one-greater odd levels if the do not touch lower + // levels. level++; step *= 2; if (!reduce(levels, buffer, xres, yres, level, step)) break; - // Remove even levels that would have to be interpolated from two - // opposide sides (they appear when both sides of it are promoted but - // not the point itself). + // Remove even levels that would have to be interpolated from two opposide sides (they appear when both sides + // of it are promoted but not the point itself). if (level > 1) remove_spikes(buffer, xres, yres, level, step/2); @@ -699,8 +677,7 @@ boundary_dir = j; } } - g_assert(!virtual_is_boundary || (boundary_dir == iright - || boundary_dir == ileft)); + g_assert(!virtual_is_boundary || (boundary_dir == iright || boundary_dir == ileft)); if (boundary_dir == NDIRECTIONS) { gdouble s = nd[i].step, ss = nd[ii].step; gdouble sleft = nd[ileft].step, sright = nd[iright].step; @@ -738,15 +715,13 @@ guint i, j, k; gboolean matching = FALSE; - /* Try to find the w block among existing ones. Of course, we only need to - * check blocks of the same size. */ + /* Try to find the w block among existing ones. Of course, we only need to check blocks of the same size. */ for (i = j = 0; i < iterators->nw; i++) { if (iterators->wlen[i] == wlen) { matching = TRUE; for (k = 0; k < wlen; k++) { - /* Do not allow rounding errors to disrupt the matching. - * The weights are simple fractions of unity so we can use a - * fixed epsilon here. */ + /* Do not allow rounding errors to disrupt the matching. The weights are simple fractions of unity so + * we can use a fixed epsilon here. */ if (fabs(iterators->w[j+k] - w[k]) > 1e-14) { matching = FALSE; break; @@ -871,21 +846,16 @@ guint k = gindex[ipt], i = k/xres, j = k % xres; gint step = 1 << ((levels[k] - 1)/2); - analyse_neighbour_direction(levels, data, xres, yres, - 0, -step, j, i, revindex, nd + UP); - analyse_neighbour_direction(levels, data, xres, yres, - step, 0, j, i, revindex, nd + RIGHT); - analyse_neighbour_direction(levels, data, xres, yres, - 0, step, j, i, revindex, nd + DOWN); - analyse_neighbour_direction(levels, data, xres, yres, - -step, 0, j, i, revindex, nd + LEFT); + analyse_neighbour_direction(levels, data, xres, yres, 0, -step, j, i, revindex, nd + UP); + analyse_neighbour_direction(levels, data, xres, yres, step, 0, j, i, revindex, nd + RIGHT); + analyse_neighbour_direction(levels, data, xres, yres, 0, step, j, i, revindex, nd + DOWN); + analyse_neighbour_direction(levels, data, xres, yres, -step, 0, j, i, revindex, nd + LEFT); calculate_weights(nd); build_iterator(nd, iterators, ipt, &nrhs, &rhssum); } - // Initialise with the mean value of right hand sides, including - // multiplicity. + // Initialise with the mean value of right hand sides, including multiplicity. rhssum /= nrhs; for (ipt = 0; ipt < len; ipt++) iterators->z[ipt] = rhssum; @@ -1037,8 +1007,7 @@ static gboolean iterate_conj_grad(LaplaceIterators *iterators) { - gdouble *z = iterators->z, *v = iterators->v, - *t = iterators->t, *f = iterators->f; + gdouble *z = iterators->z, *v = iterators->v, *t = iterators->t, *f = iterators->f; gdouble S, phi, phiS; guint ipt, len = iterators->len; @@ -1084,8 +1053,7 @@ static void interpolate(guint *levels, gdouble *data, guint xres, guint yres, guint step) { - guint nx = (xres + step-1)/step, ny = (yres + step-1)/step, - vstep = xres*step; + guint nx = (xres + step-1)/step, ny = (yres + step-1)/step, vstep = xres*step; guint i, j; if (nx < 3 || ny < 3) @@ -1102,35 +1070,28 @@ if (i >= 2 && i < ny-2 && j < nx-1) { data[k] = (0.375*(data[k-step] + data[k+step]) - + 0.0625*(data[k-2*vstep-step] - + data[k-2*vstep+step] - + data[k+2*vstep-step] - + data[k+2*vstep+step])); + + 0.0625*(data[k-2*vstep-step] + data[k-2*vstep+step] + + data[k+2*vstep-step] + data[k+2*vstep+step])); levels[k] = (levels[k-step] + levels[k+step])/2; } else if (j < nx-1 && i < ny-2) { // Upper boundary is aligned. data[k] = (0.375*(data[k-step] + data[k+step]) - + 0.125*(data[k+2*vstep-step] - + data[k+2*vstep+step])); + + 0.125*(data[k+2*vstep-step] + data[k+2*vstep+step])); levels[k] = (levels[k-step] + levels[k+step])/2; } else if (j < nx-1 && i >= 2) { // Lower boundary can be unaligned. guint bdist = yres-1 - i*step; guint a = 4*bdist + 3*step, b = step, d = 8*(bdist + step); - data[k] = (a*(data[k-step] + data[k+step]) - + b*(data[k-2*vstep-step] - + data[k-2*vstep+step]))/d; + data[k] = (a*(data[k-step] + data[k+step]) + b*(data[k-2*vstep-step] + data[k-2*vstep+step]))/d; levels[k] = (levels[k-step] + levels[k+step])/2; } else if (i >= 2 && i < ny-2) { // Right boundary can be unaligned. guint bdist = xres-1 - j*step; guint a = 6*step - 4*bdist, b = 2*bdist + step, d = 8*step; - data[k] = (a*data[k-step] - + b*(data[k-2*vstep-step] - + data[k+2*vstep-step]))/d; + data[k] = (a*data[k-step] + b*(data[k-2*vstep-step] + data[k+2*vstep-step]))/d; levels[k] = levels[k-step]; } else if (i < ny-2) { @@ -1163,35 +1124,28 @@ if (j >= 2 && j < nx-2 && i < ny-1) { data[k] = (0.375*(data[k-vstep] + data[k+vstep]) - + 0.0625*(data[k-vstep-2*step] - + data[k-vstep+2*step] - + data[k+vstep-2*step] - + data[k+vstep+2*step])); + + 0.0625*(data[k-vstep-2*step] + data[k-vstep+2*step] + + data[k+vstep-2*step] + data[k+vstep+2*step])); levels[k] = (levels[k-vstep] + levels[k+vstep])/2; } else if (j < nx-2 && i < ny-1) { // Left boundary is aligned. data[k] = (0.375*(data[k-vstep] + data[k+vstep]) - + 0.125*(data[k-vstep+2*step] - + data[k+vstep+2*step])); + + 0.125*(data[k-vstep+2*step] + data[k+vstep+2*step])); levels[k] = (levels[k-vstep] + levels[k+vstep])/2; } else if (j >= 2 && i < ny-1) { // Right boundary can be unaligned. guint bdist = xres-1 - j*step; guint a = 4*bdist + 3*step, b = step, d = 8*(bdist + step); - data[k] = (a*(data[k-vstep] + data[k+vstep]) - + b*(data[k-vstep-2*step] - + data[k+vstep-2*step]))/d; + data[k] = (a*(data[k-vstep] + data[k+vstep]) + b*(data[k-vstep-2*step] + data[k+vstep-2*step]))/d; levels[k] = (levels[k-vstep] + levels[k+vstep])/2; } else if (j >= 2 && j < nx-2) { // Lower boundary can be unaligned. guint bdist = yres-1 - i*step; guint a = 6*step - 4*bdist, b = 2*bdist + step, d = 8*step; - data[k] = (a*data[k-vstep] - + b*(data[k-vstep-2*step] - + data[k-vstep+2*step]))/d; + data[k] = (a*data[k-vstep] + b*(data[k-vstep-2*step] + data[k-vstep+2*step]))/d; levels[k] = levels[k-vstep]; } else if (j < nx-2) { @@ -1225,25 +1179,21 @@ continue; if (i < ny-1 && j < nx-1) { - data[k] = 0.25*(data[k-vstep] + data[k+vstep] - + data[k-step] + data[k+step]); - levels[k] = (levels[k-vstep] + levels[k+vstep] - + levels[k-step] + levels[k+step])/4; + data[k] = 0.25*(data[k-vstep] + data[k+vstep] + data[k-step] + data[k+step]); + levels[k] = (levels[k-vstep] + levels[k+vstep] + levels[k-step] + levels[k+step])/4; } else if (i < ny-1) { // Right boundary can be unaligned. guint bdist = xres-1 - j*step; guint a = 2*bdist + step, b = 2*step, d = 4*(bdist + step); - data[k] = (a*(data[k-vstep] + data[k+vstep]) - + b*data[k-step])/d; + data[k] = (a*(data[k-vstep] + data[k+vstep]) + b*data[k-step])/d; levels[k] = (levels[k-vstep] + levels[k+vstep])/2; } else if (j < nx-1) { // Lower boundary can be unaligned. guint bdist = yres-1 - i*step; guint a = 2*bdist + step, b = 2*step, d = 4*(bdist + step); - data[k] = (a*(data[k-step] + data[k+step]) - + b*data[k-vstep])/d; + data[k] = (a*(data[k-step] + data[k+step]) + b*data[k-vstep])/d; levels[k] = (levels[k-step] + levels[k+step])/2; } else { @@ -1330,9 +1280,8 @@ guint iter; if (maxlevel < 3) { - // If the grain is nowhere thick just init the interior using boundary - // conditions and continue with dense iteration. Note for single-pixel - // grains init_data_simple() already produces the solution. + // If the grain is nowhere thick just init the interior using boundary conditions and continue with dense + // iteration. Note for single-pixel grains init_data_simple() already produces the solution. init_data_simple(data, levels, xres, yres); return; } @@ -1396,9 +1345,7 @@ guint *lrow; for (i = 0; i < fpart->height; i++) { - gwy_assign(z + i*fpart->width, - data + (i + fpart->row)*xres + fpart->col, - fpart->width); + gwy_assign(z + i*fpart->width, data + (i + fpart->row)*xres + fpart->col, fpart->width); grow = grains + (i + fpart->row)*xres + fpart->col; lrow = levels + i*fpart->width; for (j = fpart->width; j; j--, lrow++, grow++) @@ -1448,11 +1395,9 @@ /* * Find the largest - * - grain size in the terms of pixels: this is the number of iterators for - * dense iteration - * - grain size in the terms of extended bounding box (i.e. bounding box - * including one more line of pixels to each side, if possible): this is - * the size of levels, revindex and data arrays. + * - grain size in the terms of pixels: this is the number of iterators for dense iteration + * - grain size in the terms of extended bounding box (i.e. bounding box including one more line of pixels to each + * side, if possible): this is the size of levels, revindex and data arrays. */ static void find_largest_sizes(guint xres, guint yres, @@ -1481,32 +1426,23 @@ /** * gwy_data_field_laplace_solve: * @field: A two-dimensional data field. - * @mask: A two-dimensional data field containing mask defining the areas to - * interpolate. - * @grain_id: The id number of the grain to replace with the solution of - * Laplace equation, from 1 to @ngrains (see - * gwy_data_field_grain_numbers()). Passing 0 means to replace the - * entire empty space outside grains while passing a negative value - * means to replace the entire masked area. - * @qprec: Speed-accuracy tuning parameter. Pass 1.0 for the default that is - * fast and sufficiently precise. + * @mask: A two-dimensional data field containing mask defining the areas to interpolate. + * @grain_id: The id number of the grain to replace with the solution of Laplace equation, from 1 to @ngrains (see + * gwy_data_field_grain_numbers()). Passing 0 means to replace the entire empty space outside grains while + * passing a negative value means to replace the entire masked area. + * @qprec: Speed-accuracy tuning parameter. Pass 1.0 for the default that is fast and sufficiently precise. * * Replaces masked areas by the solution of Laplace equation. * - * The boundary conditions on mask boundaries are Dirichlet with values given - * by pixels on the outer boundary of the masked area. Boundary conditions at - * field edges are Neumann conditions ∂z/∂n=0 where n denotes the normal to the - * edge. If entire area of @field is to be replaced the problem is - * underspecified; @field will be filled with zeros. + * The boundary conditions on mask boundaries are Dirichlet with values given by pixels on the outer boundary of the + * masked area. Boundary conditions at field edges are Neumann conditions ∂z/∂n=0 where n denotes the normal to the + * edge. If entire area of @field is to be replaced the problem is underspecified; @field will be filled with zeros. * - * For the default value of @qprec the the result should be good enough for any - * image processing purposes with the typical local error of order 10⁻⁵ for - * very large grains and possibly much smaller for small grains. You can lower - * @qprec down to about 0.3 or even 0.2 if speed is crucial and some precision - * can be sacrificed. Below that the result just starts becoming somewhat - * worse for not much speed increase. Conversely, you may wish to increase - * @qprec up to 3 or even 5 if accuracy is important and you can afford the - * increased computation time. + * For the default value of @qprec the the result should be good enough for any image processing purposes with the + * typical local error of order 10⁻⁵ for very large grains and possibly much smaller for small grains. You can lower + * @qprec down to about 0.3 or even 0.2 if speed is crucial and some precision can be sacrificed. Below that the + * result just starts becoming somewhat worse for not much speed increase. Conversely, you may wish to increase + * @qprec up to 3 or even 5 if accuracy is important and you can afford the increased computation time. * * Since: 2.47 **/ @@ -1531,8 +1467,7 @@ g_return_if_fail(mask->xres == field->xres); g_return_if_fail(mask->yres == field->yres); - // To fill the entire empty space we need to divide it to grains too so - // work with the inverted mask. + // To fill the entire empty space we need to divide it to grains too so work with the inverted mask. if (grain_id == 0) { ourmask = gwy_data_field_duplicate(mask); gwy_data_field_grains_invert(ourmask); @@ -1550,12 +1485,8 @@ g_return_if_fail(grain_id <= ngrains); } - bboxes = (GwyDataFieldPart*)gwy_data_field_get_grain_bounding_boxes(ourmask, - ngrains, - grains, - NULL); - sizes = (guint*)gwy_data_field_get_grain_sizes(ourmask, ngrains, grains, - NULL); + bboxes = (GwyDataFieldPart*)gwy_data_field_get_grain_bounding_boxes(ourmask, ngrains, grains, NULL); + sizes = (guint*)gwy_data_field_get_grain_sizes(ourmask, ngrains, grains, NULL); // The underspecified case. if (ngrains == 1 && sizes[1] == xres*yres) { @@ -1571,8 +1502,7 @@ gto = (grain_id < 0) ? ngrains : grain_id; // Allocate everything at the maximum size to avoid reallocations. - find_largest_sizes(xres, yres, bboxes, sizes, gfrom, gto, - &maxsize, &maxbboxsize); + find_largest_sizes(xres, yres, bboxes, sizes, gfrom, gto, &maxsize, &maxbboxsize); levels = g_new(guint, maxbboxsize); revindex = g_new(guint, maxbboxsize); @@ -1582,11 +1512,9 @@ GwyDataFieldPart bbox = bboxes[grain_id]; enlarge_field_part(&bbox, xres, yres); extract_grain(grains, field->data, xres, &bbox, grain_id, levels, z); - laplace_sparse(iterators, revindex, z, levels, - bbox.width, bbox.height, 60*qprec, 20*qprec); + laplace_sparse(iterators, revindex, z, levels, bbox.width, bbox.height, 60*qprec, 20*qprec); if (sizes[grain_id] > 1) - laplace_dense(iterators, revindex, z, levels, - bbox.width, bbox.height, 60*qprec, 30*qprec); + laplace_dense(iterators, revindex, z, levels, bbox.width, bbox.height, 60*qprec, 30*qprec); insert_grain(grains, field->data, xres, &bbox, grain_id, z); } @@ -1638,12 +1566,11 @@ * * Both data lines must have the same number of values. * - * For one-dimensional data the missing data interpolation is explicit. - * Interior missing segments are filled with linear dependence between the edge - * points. Missing segments with one end open are filled with the edge value. + * For one-dimensional data the missing data interpolation is explicit. Interior missing segments are filled with + * linear dependence between the edge points. Missing segments with one end open are filled with the edge value. * - * Returns: %TRUE if the line contained any data at all. If there are no data - * the %FALSE is returned and @data_line is filled with zeros. + * Returns: %TRUE if the line contained any data at all. If there are no data the %FALSE is returned and @data_line + * is filled with zeros. * * Since: 2.45 **/ @@ -1684,4 +1611,4 @@ return TRUE; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/correlation.c gwyddion-2.63/libprocess/correlation.c --- gwyddion-2.62/libprocess/correlation.c 2022-05-19 13:43:16.000000000 +0000 +++ gwyddion-2.63/libprocess/correlation.c 2023-06-06 09:52:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: correlation.c 24832 2022-05-19 13:43:16Z yeti-dn $ + * $Id: correlation.c 25413 2023-06-06 09:52:30Z yeti-dn $ * Copyright (C) 2003-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1148,15 +1148,14 @@ static void complex_conj_multiply_with(fftw_complex *a, const fftw_complex *b, guint n) { - while (n--) { - gdouble re = (*a)[0]*(*b)[0] + (*a)[1]*(*b)[1]; - gdouble im = (*a)[0]*(*b)[1] - (*a)[1]*(*b)[0]; + guint i; - (*a)[0] = re; - (*a)[1] = im; + for (i = 0; i < n; i++) { + gdouble re = a[i][0]*b[i][0] + a[i][1]*b[i][1]; + gdouble im = a[i][0]*b[i][1] - a[i][1]*b[i][0]; - a++; - b++; + a[i][0] = re; + a[i][1] = im; } } @@ -1164,15 +1163,14 @@ static void complex_multiply_with_conj(fftw_complex *a, const fftw_complex *b, guint n) { - while (n--) { - gdouble re = (*a)[0]*(*b)[0] + (*a)[1]*(*b)[1]; - gdouble im = -(*a)[0]*(*b)[1] + (*a)[1]*(*b)[0]; + guint i; - (*a)[0] = re; - (*a)[1] = im; + for (i = 0; i < n; i++) { + gdouble re = a[i][0]*b[i][0] + a[i][1]*b[i][1]; + gdouble im = -a[i][0]*b[i][1] + a[i][1]*b[i][0]; - a++; - b++; + a[i][0] = re; + a[i][1] = im; } } @@ -1180,17 +1178,38 @@ static void complex_conj_multiply_with_swap(fftw_complex *a, fftw_complex *b, guint n) { - while (n--) { - gdouble re = (*a)[0]*(*b)[0] + (*a)[1]*(*b)[1]; - gdouble im = (*a)[0]*(*b)[1] - (*a)[1]*(*b)[0]; + guint i; - (*b)[0] = (*a)[0]; - (*b)[1] = (*a)[1]; - (*a)[0] = re; - (*a)[1] = im; + for (i = 0; i < n; i++) { + gdouble re = a[i][0]*b[i][0] + a[i][1]*b[i][1]; + gdouble im = a[i][0]*b[i][1] - a[i][1]*b[i][0]; + + b[i][0] = a[i][0]; + b[i][1] = a[i][1]; + a[i][0] = re; + a[i][1] = im; + } +} - a++; - b++; +static void +normalise_fourier_coeffs(fftw_complex *a, guint n, gdouble regcoeff) +{ + gdouble s2 = 0.0; + guint i; + + for (i = 0; i < n; i++) { + gdouble re = a[i][0], im = a[i][1]; + + s2 += re*re + im*im; + } + + s2 = sqrt(s2/n)*regcoeff; + + for (i = 0; i < n; i++) { + gdouble re = a[i][0], im = a[i][1]; + gdouble h = sqrt(re*re + im*im) + s2; + a[i][0] /= h; + a[i][1] /= h; } } @@ -1268,7 +1287,9 @@ regcoeff = MAX(regcoeff, G_MINDOUBLE); is_normal = (method == GWY_CORR_SEARCH_COVARIANCE || method == GWY_CORR_SEARCH_HEIGHT_DIFF); - is_score = (method == GWY_CORR_SEARCH_COVARIANCE_SCORE || method == GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE); + is_score = (method == GWY_CORR_SEARCH_COVARIANCE_SCORE + || method == GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE + || method == GWY_CORR_SEARCH_PHASE_ONLY_SCORE); gwy_data_field_resample(target, xres, yres, GWY_INTERPOLATION_NONE); target->xreal = dfield->xreal; @@ -1376,7 +1397,8 @@ cbufA = gwy_fftw_new_complex(cstride*ysize); cbufB = gwy_fftw_new_complex(cstride*ysize); extdata = gwy_fftw_new_real(xsize*ysize); - t = target->data; + /* Ensure invalidate for gwy_data_field_normalize(). */ + t = gwy_data_field_get_data(target); fplan = gwy_fftw_plan_dft_r2c_2d(ysize, xsize, extdata, cbufB, FFTW_DESTROY_INPUT | FFTW_ESTIMATE); bplan = gwy_fftw_plan_dft_c2r_2d(ysize, xsize, cbufB, extdata, FFTW_DESTROY_INPUT | FFTW_ESTIMATE); @@ -1385,14 +1407,23 @@ extend_left, extend_right, extend_up, extend_down, fill_value); gwy_fftw_execute(fplan); + if (method == GWY_CORR_SEARCH_PHASE_ONLY_SCORE) + normalise_fourier_coeffs(cbufB, cstride*ysize, regcoeff); gwy_assign(cbufA, cbufB, cstride*ysize); extend_kernel_rect(kappa->data, kxres, kyres, extdata, xsize, ysize, xsize); gwy_fftw_execute(fplan); + if (method == GWY_CORR_SEARCH_PHASE_ONLY_SCORE) + normalise_fourier_coeffs(cbufB, cstride*ysize, regcoeff); complex_conj_multiply_with(cbufB, cbufA, cstride*ysize); gwy_fftw_execute(bplan); extract_result(extdata, xsize, extend_left, extend_up, t, xres, yres, wq/(xsize*ysize)); - if (is_score || method == GWY_CORR_SEARCH_HEIGHT_DIFF) { + if (method == GWY_CORR_SEARCH_PHASE_ONLY_SCORE) { + /* The values scale weird for POC. There are obviously field and kernel size dependent factors, but + * that does not seem to capture it and give a nice predictable range. */ + gwy_data_field_normalize(target); + } + else if (is_score || method == GWY_CORR_SEARCH_HEIGHT_DIFF) { /* We need σ²[j] and, therefore, also μ[j]. */ extend_kernel_rect(kernel_weight->data, kxres, kyres, extdata, xsize, ysize, xsize); gwy_fftw_execute(fplan); diff -Nru gwyddion-2.62/libprocess/datafield.c gwyddion-2.63/libprocess/datafield.c --- gwyddion-2.62/libprocess/datafield.c 2022-10-11 13:48:10.000000000 +0000 +++ gwyddion-2.63/libprocess/datafield.c 2023-05-25 16:21:08.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: datafield.c 25076 2022-10-11 13:48:10Z yeti-dn $ + * $Id: datafield.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -63,9 +59,8 @@ static guint data_field_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE_EXTENDED - (GwyDataField, gwy_data_field, G_TYPE_OBJECT, 0, - GWY_IMPLEMENT_SERIALIZABLE(gwy_data_field_serializable_init)) +G_DEFINE_TYPE_EXTENDED(GwyDataField, gwy_data_field, G_TYPE_OBJECT, 0, + GWY_IMPLEMENT_SERIALIZABLE(gwy_data_field_serializable_init)) static void gwy_data_field_serializable_init(GwySerializableIface *iface) @@ -84,22 +79,20 @@ gobject_class->finalize = gwy_data_field_finalize; -/** - * GwyDataField::data-changed: - * @gwydatafield: The #GwyDataField which received the signal. - * - * The ::data-changed signal is never emitted by data field itself. It - * is intended as a means to notify others data field users they should - * update themselves. - */ - data_field_signals[DATA_CHANGED] - = g_signal_new("data-changed", - G_OBJECT_CLASS_TYPE(gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(GwyDataFieldClass, data_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + /** + * GwyDataField::data-changed: + * @gwydatafield: The #GwyDataField which received the signal. + * + * The ::data-changed signal is never emitted by data field itself. It is intended as a means to notify others + * data field users they should update themselves. + */ + data_field_signals[DATA_CHANGED] = g_signal_new("data-changed", + G_OBJECT_CLASS_TYPE(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GwyDataFieldClass, data_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -125,8 +118,7 @@ * @yres: Y-resolution, i.e., the number of rows. * @xreal: Real horizontal physical dimension. * @yreal: Real vertical physical dimension. - * @nullme: Whether the data field should be initialized to zeroes. If %FALSE, - * the data will not be initialized. + * @nullme: Whether the data field should be initialized to zeroes. If %FALSE, the data will not be initialized. * * Creates a new data field. * @@ -147,11 +139,7 @@ data_field->yres = yres; if (nullme) { data_field->data = g_new0(gdouble, data_field->xres*data_field->yres); - /* We can precompute stats */ - data_field->cached = CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) - | CBIT(ARE) | CBIT(VAR); - /* Values cleared implicitely */ + set_cache_for_constant_field(data_field, 0.0); } else data_field->data = g_new(gdouble, data_field->xres*data_field->yres); @@ -162,13 +150,11 @@ /** * gwy_data_field_new_alike: * @model: A data field to take resolutions and units from. - * @nullme: Whether the data field should be initialized to zeroes. If %FALSE, - * the data will not be initialized. + * @nullme: Whether the data field should be initialized to zeroes. If %FALSE, the data will not be initialized. * * Creates a new data field similar to an existing one. * - * Use gwy_data_field_duplicate() if you want to copy a data field including - * data. + * Use gwy_data_field_duplicate() if you want to copy a data field including data. * * Returns: A newly created data field. **/ @@ -189,11 +175,7 @@ data_field->yoff = model->yoff; if (nullme) { data_field->data = g_new0(gdouble, data_field->xres*data_field->yres); - /* We can precompute stats */ - data_field->cached = CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) - | CBIT(ARE) | CBIT(VAR); - /* Values cleared implicitely */ + set_cache_for_constant_field(data_field, 0.0); } else data_field->data = g_new(gdouble, data_field->xres*data_field->yres); @@ -212,8 +194,8 @@ * * Creates a new data field by resampling an existing one. * - * This method is equivalent to gwy_data_field_duplicate() followed by - * gwy_data_field_resample(), but it is more efficient. + * This method is equivalent to gwy_data_field_duplicate() followed by gwy_data_field_resample(), but it is more + * efficient. * * Returns: A newly created data field. **/ @@ -231,9 +213,7 @@ g_return_val_if_fail(xres > 0 && yres > 0, NULL); - result = gwy_data_field_new(xres, yres, - data_field->xreal, data_field->yreal, - FALSE); + result = gwy_data_field_new(xres, yres, data_field->xreal, data_field->yreal, FALSE); result->xoff = data_field->xoff; result->yoff = data_field->yoff; gwy_data_field_copy_units(data_field, result); @@ -280,9 +260,7 @@ { 'o', "si_unit_z", pzunit, NULL, }, { 'D', "data", &data_field->data, &datasize, }, }; - return gwy_serialize_pack_object_struct(buffer, - GWY_DATA_FIELD_TYPE_NAME, - G_N_ELEMENTS(spec), spec); + return gwy_serialize_pack_object_struct(buffer, GWY_DATA_FIELD_TYPE_NAME, G_N_ELEMENTS(spec), spec); } } @@ -311,8 +289,7 @@ { 'o', "si_unit_z", pzunit, NULL, }, { 'D', "data", &data_field->data, &datasize, }, }; - return gwy_serialize_get_struct_size(GWY_DATA_FIELD_TYPE_NAME, - G_N_ELEMENTS(spec), spec); + return gwy_serialize_get_struct_size(GWY_DATA_FIELD_TYPE_NAME, G_N_ELEMENTS(spec), spec); } } @@ -345,8 +322,7 @@ g_return_val_if_fail(buffer, NULL); - if (!gwy_serialize_unpack_object_struct(buffer, size, position, - GWY_DATA_FIELD_TYPE_NAME, + if (!gwy_serialize_unpack_object_struct(buffer, size, position, GWY_DATA_FIELD_TYPE_NAME, G_N_ELEMENTS(spec), spec)) { g_free(data); GWY_OBJECT_UNREF(si_unit_xy); @@ -354,8 +330,7 @@ return NULL; } if (datasize != (gsize)(xres*yres)) { - g_critical("Serialized %s size mismatch %u != %u", - GWY_DATA_FIELD_TYPE_NAME, datasize, xres*yres); + g_critical("Serialized %s size mismatch %u != %u", GWY_DATA_FIELD_TYPE_NAME, datasize, xres*yres); g_free(data); GWY_OBJECT_UNREF(si_unit_xy); GWY_OBJECT_UNREF(si_unit_z); @@ -405,8 +380,7 @@ g_return_val_if_fail(GWY_IS_DATA_FIELD(object), NULL); data_field = GWY_DATA_FIELD(object); duplicate = gwy_data_field_new_alike(data_field, FALSE); - gwy_assign(duplicate->data, data_field->data, - data_field->xres*data_field->yres); + gwy_assign(duplicate->data, data_field->data, data_field->xres*data_field->yres); duplicate->cached = data_field->cached; gwy_assign(duplicate->cache, data_field->cache, GWY_DATA_FIELD_CACHE_SIZE); @@ -455,8 +429,7 @@ * @dest: Destination data field. * @nondata_too: Whether non-data (units) should be copied too. * - * Copies the contents of an already allocated data field to a data field - * of the same size. + * Copies the contents of an already allocated data field to a data field of the same size. **/ void gwy_data_field_copy(GwyDataField *src, @@ -497,12 +470,11 @@ * * Copies a rectangular area from one data field to another. * - * The area starts at (@col, @row) in @src and its dimension is @width*@height. - * It is copied to @dest starting from (@destcol, @destrow). + * The area starts at (@col, @row) in @src and its dimension is @width*@height. It is copied to @dest starting from + * (@destcol, @destrow). * - * The source area has to be completely contained in @src. No assumptions are - * made about destination position, however, parts of the source area sticking - * out the destination data field @dest are cut off. + * The source area has to be completely contained in @src. No assumptions are made about destination position, + * however, parts of the source area sticking out the destination data field @dest are cut off. * * If @src is equal to @dest, the areas may not overlap. **/ @@ -521,10 +493,8 @@ width = src->xres; if (height == -1) height = src->yres; - g_return_if_fail(col >= 0 && row >= 0 - && width >= 0 && height >= 0 - && col + width <= src->xres - && row + height <= src->yres); + g_return_if_fail(col >= 0 && row >= 0 && width >= 0 && height >= 0 + && col + width <= src->xres && row + height <= src->yres); if (destcol + width > dest->xres) width = dest->xres - destcol; @@ -545,17 +515,13 @@ gwy_data_field_invalidate(dest); if (width == src->xres && width == dest->xres) { - /* make it as fast as gwy_data_field_copy() whenever possible (and - * maybe faster, as we don't play with units */ + /* make it as fast as gwy_data_field_copy() whenever possible (and maybe faster, as we don't play with units */ g_assert(col == 0 && destcol == 0); - gwy_assign(dest->data + width*destrow, src->data + width*row, - width*height); + gwy_assign(dest->data + width*destrow, src->data + width*row, width*height); } else { for (i = 0; i < height; i++) - gwy_assign(dest->data + dest->xres*(destrow + i) + destcol, - src->data + src->xres*(row + i) + col, - width); + gwy_assign(dest->data + dest->xres*(destrow + i) + destcol, src->data + src->xres*(row + i) + col, width); } } @@ -568,8 +534,7 @@ * * Resamples a data field using given interpolation method * - * This method may invalidate raw data buffer returned by - * gwy_data_field_get_data(). + * This method may invalidate raw data buffer returned by gwy_data_field_get_data(). **/ void gwy_data_field_resample(GwyDataField *data_field, @@ -588,8 +553,7 @@ gwy_data_field_invalidate(data_field); data_field->xres = xres; data_field->yres = yres; - data_field->data = g_renew(gdouble, data_field->data, - data_field->xres*data_field->yres); + data_field->data = g_renew(gdouble, data_field->data, data_field->xres*data_field->yres); return; } @@ -598,8 +562,7 @@ if (data_field_is_constant(data_field, &z)) { data_field->xres = xres; data_field->yres = yres; - data_field->data = g_renew(gdouble, data_field->data, - data_field->xres*data_field->yres); + data_field->data = g_renew(gdouble, data_field->data, data_field->xres*data_field->yres); gwy_data_field_fill(data_field, z); return; } @@ -632,9 +595,8 @@ } } - /* This check normally either finishes fast (there are different values) - * or goes to the end of the field, but then the caller should save a lot - * of time by knowing the field is constant-valued. */ + /* This check normally either finishes fast (there are different values) or goes to the end of the field, but then + * the caller should save a lot of time by knowing the field is constant-valued. */ for (k = 0; k < n-1; k++) { if (d[k] != d[k+1]) return FALSE; @@ -655,11 +617,9 @@ * * Resizes (crops) a data field. * - * Crops a data field to a rectangle between upper-left and bottom-right - * points, recomputing real size. + * Crops a data field to a rectangle between upper-left and bottom-right points, recomputing real size. * - * This method may invalidate raw data buffer returned by - * gwy_data_field_get_data(). + * This method may invalidate raw data buffer returned by gwy_data_field_get_data(). **/ void gwy_data_field_resize(GwyDataField *data_field, @@ -673,8 +633,7 @@ GWY_ORDER(gint, ulcol, brcol); GWY_ORDER(gint, ulrow, brrow); - g_return_if_fail(ulcol >= 0 && ulrow >= 0 - && brcol <= data_field->xres && brrow <= data_field->yres); + g_return_if_fail(ulcol >= 0 && ulrow >= 0 && brcol <= data_field->xres && brrow <= data_field->yres); yres = brrow - ulrow; xres = brcol - ulcol; @@ -684,11 +643,8 @@ /* FIXME: don't allocate second field, use memmove */ b = gwy_data_field_new(xres, yres, 1.0, 1.0, FALSE); - for (i = ulrow; i < brrow; i++) { - gwy_assign(b->data + (i-ulrow)*xres, - data_field->data + i*data_field->xres + ulcol, - xres); - } + for (i = ulrow; i < brrow; i++) + gwy_assign(b->data + (i-ulrow)*xres, data_field->data + i*data_field->xres + ulcol, xres); data_field->xreal *= (gdouble)xres/data_field->xres; data_field->yreal *= (gdouble)yres/data_field->yres; data_field->xres = xres; @@ -732,11 +688,8 @@ data_field->xreal*width/data_field->xres, data_field->yreal*height/data_field->yres, FALSE); - for (i = 0; i < height; i++) { - gwy_assign(result->data + i*width, - data_field->data + (i + row)*data_field->xres + col, - width); - } + for (i = 0; i < height; i++) + gwy_assign(result->data + i*width, data_field->data + (i + row)*data_field->xres + col, width); gwy_data_field_copy_units(data_field, result); return result; @@ -749,16 +702,12 @@ * @y: Vertical postition in pixel units, in range [0, y-resolution]. * @interpolation: Interpolation method to be used. * - * Gets interpolated value at arbitrary data field point indexed by pixel - * coordinates. + * Gets interpolated value at arbitrary data field point indexed by pixel coordinates. * - * Note pixel values are centered in pixels, so to get the same - * value as gwy_data_field_get_val(@data_field, @j, @i) returns, - * it's necessary to add 0.5: - * gwy_data_field_get_dval(@data_field, @j+0.5, @i+0.5, @interpolation). + * Note pixel values are centered in pixels, so to get the same value as gwy_data_field_get_val(@data_field, @j, @i) + * returns, it's necessary to add 0.5: gwy_data_field_get_dval(@data_field, @j+0.5, @i+0.5, @interpolation). * - * See also gwy_data_field_get_dval_real() that does the same, but takes - * real coordinates. + * See also gwy_data_field_get_dval_real() that does the same, but takes real coordinates. * * Returns: Interpolated value at position (@x,@y). **/ @@ -778,16 +727,15 @@ if (G_UNLIKELY(interp == GWY_INTERPOLATION_NONE)) return 0.0; - switch (interp) { - case GWY_INTERPOLATION_ROUND: + if (interp == GWY_INTERPOLATION_ROUND) { /* floor() centers pixel value */ floorx = floor(x); floory = floor(y); ix = CLAMP(floorx, 0, a->xres - 1); iy = CLAMP(floory, 0, a->yres - 1); return a->data[ix + a->xres*iy]; - - case GWY_INTERPOLATION_LINEAR: + } + if (interp == GWY_INTERPOLATION_LINEAR) { /* To centered pixel value */ x -= 0.5; y -= 0.5; @@ -805,49 +753,47 @@ valpy = restx*(1.0 - resty)*a->data[ixp + a->xres*iy]; valpp = restx*resty*a->data[ixp + a->xres*iyp]; return valxy + valpy + valxp + valpp; + } - default: - /* To centered pixel value */ - x -= 0.5; - y -= 0.5; - floorx = floor(x); - floory = floor(y); - restx = x - floorx; - resty = y - floory; + /* To centered pixel value */ + x -= 0.5; + y -= 0.5; + floorx = floor(x); + floory = floor(y); + restx = x - floorx; + resty = y - floory; + + /* fall back to bilinear for border pixels. */ + if (floorx < 1 || floory < 1 || floorx >= a->xres-2 || floory >= a->yres-2) { + ix = CLAMP(floorx, 0, a->xres - 1); + iy = CLAMP(floory, 0, a->yres - 1); + ixp = CLAMP(floorx + 1, 0, a->xres - 1); + iyp = CLAMP(floory + 1, 0, a->yres - 1); - /* fall back to bilinear for border pixels. */ - if (floorx < 1 || floory < 1 - || floorx >= a->xres-2 || floory >= a->yres-2) { - ix = CLAMP(floorx, 0, a->xres - 1); - iy = CLAMP(floory, 0, a->yres - 1); - ixp = CLAMP(floorx + 1, 0, a->xres - 1); - iyp = CLAMP(floory + 1, 0, a->yres - 1); - - valxy = (1.0 - restx)*(1.0 - resty)*a->data[ix + a->xres*iy]; - valxp = (1.0 - restx)*resty*a->data[ix + a->xres*iyp]; - valpy = restx*(1.0 - resty)*a->data[ixp + a->xres*iy]; - valpp = restx*resty*a->data[ixp + a->xres*iyp]; - return valxy + valpy + valxp + valpp; - } - - /* interpolation in x direction */ - data = a->data + floorx-1 + a->xres*(floory-1); - gwy_assign(intline, data, 4); - va = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); - gwy_assign(intline, data + a->xres, 4); - vb = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); - gwy_assign(intline, data + 2*a->xres, 4); - vc = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); - gwy_assign(intline, data + 3*a->xres, 4); - vd = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); - - /*interpolation in y direction*/ - intline[0] = va; - intline[1] = vb; - intline[2] = vc; - intline[3] = vd; - return gwy_interpolation_get_dval_of_equidists(resty, intline, interp); + valxy = (1.0 - restx)*(1.0 - resty)*a->data[ix + a->xres*iy]; + valxp = (1.0 - restx)*resty*a->data[ix + a->xres*iyp]; + valpy = restx*(1.0 - resty)*a->data[ixp + a->xres*iy]; + valpp = restx*resty*a->data[ixp + a->xres*iyp]; + return valxy + valpy + valxp + valpp; } + + /* interpolation in x direction */ + data = a->data + floorx-1 + a->xres*(floory-1); + gwy_assign(intline, data, 4); + va = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); + gwy_assign(intline, data + a->xres, 4); + vb = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); + gwy_assign(intline, data + 2*a->xres, 4); + vc = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); + gwy_assign(intline, data + 3*a->xres, 4); + vd = gwy_interpolation_get_dval_of_equidists(restx, intline, interp); + + /*interpolation in y direction*/ + intline[0] = va; + intline[1] = vb; + intline[2] = vc; + intline[3] = vd; + return gwy_interpolation_get_dval_of_equidists(resty, intline, interp); } /** @@ -856,19 +802,16 @@ * * Gets the raw data buffer of a data field. * - * The returned buffer is not guaranteed to be valid through whole data - * field life time. Some function may change it, most notably - * gwy_data_field_resize() and gwy_data_field_resample(). + * The returned buffer is not guaranteed to be valid through whole data field life time. Some function may change it, + * most notably gwy_data_field_resize() and gwy_data_field_resample(). * - * This function invalidates any cached information, use - * gwy_data_field_get_data_const() if you are not going to change the data. + * This function invalidates any cached information, use gwy_data_field_get_data_const() if you are not going to + * change the data. * * See gwy_data_field_invalidate() for some discussion. * - * Returns: The data field as a pointer to an array of - * gwy_data_field_get_xres()*gwy_data_field_get_yres() #gdouble's, - * ordered by lines. I.e., they are to be accessed as - * data[row*xres + column]. + * Returns: The data field as a pointer to an array of gwy_data_field_get_xres()*gwy_data_field_get_yres() #gdouble's, + * ordered by lines. I.e., they are to be accessed as data[row*xres + column]. **/ gdouble* gwy_data_field_get_data(GwyDataField *data_field) @@ -884,18 +827,15 @@ * * Gets the raw data buffer of a data field, read-only. * - * The returned buffer is not guaranteed to be valid through whole data - * field life time. Some function may change it, most notably - * gwy_data_field_resize() and gwy_data_field_resample(). + * The returned buffer is not guaranteed to be valid through whole data field life time. Some function may change it, + * most notably gwy_data_field_resize() and gwy_data_field_resample(). * * Use gwy_data_field_get_data() if you want to change the data. * * See gwy_data_field_invalidate() for some discussion. * - * Returns: The data field as a pointer to an array of - * gwy_data_field_get_xres()*gwy_data_field_get_yres() #gdouble's, - * ordered by lines. I.e., they are to be accessed as - * data[row*xres + column]. + * Returns: The data field as a pointer to an array of gwy_data_field_get_xres()*gwy_data_field_get_yres() #gdouble's, + * ordered by lines. I.e., they are to be accessed as data[row*xres + column]. **/ const gdouble* gwy_data_field_get_data_const(GwyDataField *data_field) @@ -1037,8 +977,7 @@ * * Sets the X offset of a data field origin. * - * Note offsets don't affect any calculation, nor functions like - * gwy_data_field_rtoj(). + * Note offsets don't affect any calculation, nor functions like gwy_data_field_rtoj(). **/ void gwy_data_field_set_xoffset(GwyDataField *data_field, gdouble xoff) @@ -1054,8 +993,7 @@ * * Sets the Y offset of a data field origin. * - * Note offsets don't affect any calculation, nor functions like - * gwy_data_field_rtoi(). + * Note offsets don't affect any calculation, nor functions like gwy_data_field_rtoi(). **/ void gwy_data_field_set_yoffset(GwyDataField *data_field, gdouble yoff) @@ -1070,8 +1008,7 @@ * * Gets the horizontal pixel size of a data field in real units. * - * The result is the same as - * gwy_data_field_get_xreal(data_field)/gwy_data_field_get_xres(data_field). + * The result is the same as gwy_data_field_get_xreal(data_field)/gwy_data_field_get_xres(data_field). * * Returns: Horizontal pixel size. * @@ -1090,8 +1027,7 @@ * * Gets the vertical pixel size of a data field in real units. * - * The result is the same as - * gwy_data_field_get_yreal(data_field)/gwy_data_field_get_yres(data_field). + * The result is the same as gwy_data_field_get_yreal(data_field)/gwy_data_field_get_yres(data_field). * * Returns: Vertical pixel size. * @@ -1110,8 +1046,8 @@ * * Returns lateral SI unit of a data field. * - * Returns: SI unit corresponding to the lateral (XY) dimensions of the data - * field. Its reference count is not incremented. + * Returns: SI unit corresponding to the lateral (XY) dimensions of the data field. Its reference count is not + * incremented. **/ GwySIUnit* gwy_data_field_get_si_unit_xy(GwyDataField *data_field) @@ -1130,8 +1066,8 @@ * * Returns value SI unit of a data field. * - * Returns: SI unit corresponding to the "height" (Z) dimension of the data - * field. Its reference count is not incremented. + * Returns: SI unit corresponding to the "height" (Z) dimension of the data field. Its reference count is not + * incremented. **/ GwySIUnit* gwy_data_field_get_si_unit_z(GwyDataField *data_field) @@ -1149,11 +1085,9 @@ * @data_field: A data field. * @si_unit: SI unit to be set. * - * Sets the SI unit corresponding to the lateral (XY) dimensions of a data - * field. + * Sets the SI unit corresponding to the lateral (XY) dimensions of a data field. * - * It does not assume a reference on @si_unit, instead it adds its own - * reference. + * It does not assume a reference on @si_unit, instead it adds its own reference. **/ void gwy_data_field_set_si_unit_xy(GwyDataField *data_field, @@ -1168,11 +1102,9 @@ * @data_field: A data field. * @si_unit: SI unit to be set. * - * Sets the SI unit corresponding to the "height" (Z) dimension of a data - * field. + * Sets the SI unit corresponding to the "height" (Z) dimension of a data field. * - * It does not assume a reference on @si_unit, instead it adds its own - * reference. + * It does not assume a reference on @si_unit, instead it adds its own reference. **/ void gwy_data_field_set_si_unit_z(GwyDataField *data_field, @@ -1190,8 +1122,8 @@ * * Finds value format good for displaying coordinates of a data field. * - * Returns: The value format. If @format is %NULL, a newly allocated format - * is returned, otherwise (modified) @format itself is returned. + * Returns: The value format. If @format is %NULL, a newly allocated format is returned, otherwise (modified) @format + * itself is returned. **/ GwySIValueFormat* gwy_data_field_get_value_format_xy(GwyDataField *data_field, @@ -1205,9 +1137,7 @@ max = MAX(data_field->xreal, data_field->yreal); unit = MIN(data_field->xreal/data_field->xres, data_field->yreal/data_field->yres); - return gwy_si_unit_get_format_with_resolution - (gwy_data_field_get_si_unit_xy(data_field), - style, max, unit, format); + return gwy_si_unit_get_format_with_resolution(gwy_data_field_get_si_unit_xy(data_field), style, max, unit, format); } /** @@ -1218,8 +1148,8 @@ * * Finds value format good for displaying values of a data field. * - * Returns: The value format. If @format is %NULL, a newly allocated format - * is returned, otherwise (modified) @format itself is returned. + * Returns: The value format. If @format is %NULL, a newly allocated format is returned, otherwise (modified) @format + * itself is returned. **/ GwySIValueFormat* gwy_data_field_get_value_format_z(GwyDataField *data_field, @@ -1239,8 +1169,7 @@ } siunit = gwy_data_field_get_si_unit_z(data_field); - return gwy_si_unit_get_format_with_digits(siunit, style, max - min, 3, - format); + return gwy_si_unit_get_format_with_digits(siunit, style, max - min, 3, format); } /** @@ -1250,9 +1179,8 @@ * * Transforms vertical pixel coordinate to real (physical) Y coordinate. * - * That is it maps range [0..y-resolution] to range [0..real-y-size]. - * It is not suitable for conversion of matrix indices to physical coordinates, - * you have to use gwy_data_field_itor(@data_field, @row + 0.5) for that. + * That is it maps range [0..y-resolution] to range [0..real-y-size]. It is not suitable for conversion of matrix + * indices to physical coordinates, you have to use gwy_data_field_itor(@data_field, @row + 0.5) for that. * * Returns: Real Y coordinate. **/ @@ -1270,9 +1198,8 @@ * * Transforms horizontal pixel coordinate to real (physical) X coordinate. * - * That is it maps range [0..x-resolution] to range [0..real-x-size]. - * It is not suitable for conversion of matrix indices to physical coordinates, - * you have to use gwy_data_field_jtor(@data_field, @col + 0.5) for that. + * That is it maps range [0..x-resolution] to range [0..real-x-size]. It is not suitable for conversion of matrix + * indices to physical coordinates, you have to use gwy_data_field_jtor(@data_field, @col + 0.5) for that. * * Returns: Real X coordinate. **/ @@ -1338,9 +1265,8 @@ * * Gets value at given position in a data field. * - * Do not access data with this function inside inner loops, it's slow. - * Get the raw data buffer with gwy_data_field_get_data_const() and access it - * directly instead. + * Do not access data with this function inside inner loops, it's slow. Get the raw data buffer with + * gwy_data_field_get_data_const() and access it directly instead. * * Returns: Value at (@col, @row). **/ @@ -1361,9 +1287,8 @@ * * Sets value at given position in a data field. * - * Do not set data with this function inside inner loops, it's slow. Get the - * raw data buffer with gwy_data_field_get_data() and write to it directly - * instead. + * Do not set data with this function inside inner loops, it's slow. Get the raw data buffer with + * gwy_data_field_get_data() and write to it directly instead. **/ void gwy_data_field_set_val(GwyDataField *data_field, @@ -1383,11 +1308,9 @@ * @y: Y postition in real coordinates. * @interpolation: Interpolation method to use. * - * Gets interpolated value at arbitrary data field point indexed by real - * coordinates. + * Gets interpolated value at arbitrary data field point indexed by real coordinates. * - * See also gwy_data_field_get_dval() that does the same, but takes pixel - * coordinates. + * See also gwy_data_field_get_dval() that does the same, but takes pixel coordinates. * * Returns: Value at position (@x,@y). **/ @@ -1397,8 +1320,7 @@ { g_return_val_if_fail(GWY_IS_DATA_FIELD(data_field), 0.0); return gwy_data_field_get_dval(data_field, - gwy_data_field_rtoj(data_field, x), - gwy_data_field_rtoi(data_field, y), + gwy_data_field_rtoj(data_field, x), gwy_data_field_rtoi(data_field, y), interpolation); } @@ -1410,15 +1332,13 @@ * * Rotates a data field by a given angle. * - * This function is mostly obsolete. See gwy_data_field_new_rotated() - * and gwy_data_field_new_rotated_90(). + * This function is mostly obsolete. See gwy_data_field_new_rotated() and gwy_data_field_new_rotated_90(). * - * Values that get outside of data field by the rotation are lost. - * Undefined values from outside of data field that get inside are set to - * data field minimum value. + * Values that get outside of data field by the rotation are lost. Undefined values from outside of data field that + * get inside are set to data field minimum value. * - * The rotation is performed in pixel space, i.e. it can be in fact a more - * general affine transform in the real coordinates when pixels are not square. + * The rotation is performed in pixel space, i.e. it can be in fact a more general affine transform in the real + * coordinates when pixels are not square. **/ void gwy_data_field_rotate(GwyDataField *a, @@ -1466,12 +1386,10 @@ sf = -((suplen - 1)/2); st = suplen/2; - /* FIXME: Shouldn't we implement this in terms of - * gwy_data_field_distort()? */ + /* FIXME: Shouldn't we implement this in terms of gwy_data_field_distort()? */ val = gwy_data_field_get_min(a); b = gwy_data_field_duplicate(a); - gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, b->data, - interpolation); + gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, b->data, interpolation); for (newi = 0; newi < yres; newi++) { for (newj = 0; newj < xres; newj++) { @@ -1495,8 +1413,7 @@ coeff[(i - sf)*suplen + j - sf] = b->data[ii*xres + jj]; } } - v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, - interpolation); + v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, interpolation); } a->data[newj + xres*newi] = v; } @@ -1546,9 +1463,8 @@ if (resize == GWY_ROTATE_RESIZE_SAME_SIZE) { gdouble q; - /* FIXME: This should be same area or something like that. We really - * do not want to cut the ~π/2-rotated field to the original rectangle - * for non-square fields! */ + /* FIXME: This should be same area or something like that. We really do not want to cut the ~π/2-rotated + * field to the original rectangle for non-square fields! */ sphi = fabs(sin(phi)); cphi = fabs(cos(phi)); q = sqrt(1.0 + (xreal/yreal + yreal/xreal)*cphi*sphi); @@ -1597,27 +1513,23 @@ /** * gwy_data_field_new_rotated: * @dfield: A data field. - * @exterior_mask: Optional data field where pixels corresponding to exterior - * will be set to 1. It will be resized to match the returned - * field. + * @exterior_mask: Optional data field where pixels corresponding to exterior will be set to 1. It will be resized to + * match the returned field. * @angle: Rotation angle (in radians). * @interp: Interpolation type to use. * @resize: Controls how the result size is determined. * * Creates a new data field by rotating a data field by an atribtrary angle. * - * The returned data field can have pixel corresponding to exterior in @dfield - * (unless @resize is %GWY_ROTATE_RESIZE_CUT). They are filled with a neutral - * value; pass @exterior_mask and replace them as you wish if you need more - * control. - * - * The rotation is performed in real space, i.e. it is a more general affine - * transform in the pixel space for data field with non-square pixels. - * See gwy_data_field_rotate() which rotates in the pixel space. - * - * The returned data field has always square pixels. If you want to rotate - * by a multiple of %G_PI/2 while preserving non-square pixels, you must use - * explicitly a function such as gwy_data_field_new_rotated_90(). + * The returned data field can have pixel corresponding to exterior in @dfield (unless @resize is + * %GWY_ROTATE_RESIZE_CUT). They are filled with a neutral value; pass @exterior_mask and replace them as you wish if + * you need more control. + * + * The rotation is performed in real space, i.e. it is a more general affine transform in the pixel space for data + * field with non-square pixels. See gwy_data_field_rotate() which rotates in the pixel space. + * + * The returned data field has always square pixels. If you want to rotate by a multiple of %G_PI/2 while preserving + * non-square pixels, you must use explicitly a function such as gwy_data_field_new_rotated_90(). * * Returns: A newly created data field. * @@ -1640,8 +1552,7 @@ const gdouble *src; g_return_val_if_fail(GWY_IS_DATA_FIELD(dfield), NULL); - g_return_val_if_fail(!exterior_mask || GWY_IS_DATA_FIELD(exterior_mask), - NULL); + g_return_val_if_fail(!exterior_mask || GWY_IS_DATA_FIELD(exterior_mask), NULL); angle = gwy_canonicalize_angle(angle, TRUE, TRUE); if (!rotate_find_out_dimensions(dfield, angle, resize, @@ -1658,9 +1569,7 @@ coeffield = g_object_ref(dfield); else { coeffield = gwy_data_field_duplicate(dfield); - gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, - gwy_data_field_get_data(coeffield), - interp); + gwy_interpolation_resolve_coeffs_2d(xres, yres, xres, gwy_data_field_get_data(coeffield), interp); } src = coeffield->data; @@ -1766,8 +1675,7 @@ coeff[(i - sf)*suplen + j - sf] = src[ii*xres + jj]; } } - v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, - interp); + v = gwy_interpolation_interpolate_2d(x, y, suplen, coeff, interp); avg += v; n++; } @@ -1818,11 +1726,9 @@ * * In the case of value reflection, it's inverted about the mean value. * - * Note that the axis parameter convention is confusing and different from - * gwy_brick_invert() and gwy_data_line_invert(). Parameters @x an @y - * correspond the axes around which to flip (which themselves stay unchanged). - * You may need to swap @x and @y arguments compared what you would pass - * naturally. + * Note that the axis parameter convention is confusing and different from gwy_brick_invert() and + * gwy_data_line_invert(). Parameters @x an @y correspond the axes around which to flip (which themselves stay + * unchanged). You may need to swap @x and @y arguments compared what you would pass naturally. **/ void gwy_data_field_invert(GwyDataField *data_field, @@ -1846,9 +1752,8 @@ data[i] = 2.0 * avg - data[i]; /* We can transform stats */ - data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) - | CBIT(VAR); + data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) | CBIT(MED) | CBIT(ARF) | CBIT(ART) + | CBIT(ARE) | CBIT(VAR); CVAL(data_field, MIN) = 2.0 * avg - CVAL(data_field, MIN); CVAL(data_field, MAX) = 2.0 * avg - CVAL(data_field, MAX); GWY_SWAP(gdouble, CVAL(data_field, MIN), CVAL(data_field, MAX)); @@ -1880,8 +1785,7 @@ return; /* No cached value changes */ - data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) + data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) | CBIT(VAR); } @@ -1922,11 +1826,9 @@ #endif for (ib = 0; ib < imax; ib += BLOCK_SIZE) { for (jb = 0; jb < jmax; jb += BLOCK_SIZE) - swap_block(sbase + (jb*sxres + ib), dbase + (ib*dxres + jb), - BLOCK_SIZE, BLOCK_SIZE, dxres, sxres); + swap_block(sbase + (jb*sxres + ib), dbase + (ib*dxres + jb), BLOCK_SIZE, BLOCK_SIZE, dxres, sxres); if (jmax != height) - swap_block(sbase + (jmax*sxres + ib), dbase + (ib*dxres + jmax), - height - jmax, BLOCK_SIZE, dxres, sxres); + swap_block(sbase + (jmax*sxres + ib), dbase + (ib*dxres + jmax), height - jmax, BLOCK_SIZE, dxres, sxres); } if (imax != width) { #ifdef _OPENMP @@ -1935,12 +1837,11 @@ shared(sbase,dbase,sxres,dxres,imax,jmax,width) #endif for (jb = 0; jb < jmax; jb += BLOCK_SIZE) - swap_block(sbase + (jb*sxres + imax), dbase + (imax*dxres + jb), - BLOCK_SIZE, width - imax, dxres, sxres); - if (jmax != height) - swap_block(sbase + (jmax*sxres + imax), - dbase + (imax*dxres + jmax), + swap_block(sbase + (jb*sxres + imax), dbase + (imax*dxres + jb), BLOCK_SIZE, width - imax, dxres, sxres); + if (jmax != height) { + swap_block(sbase + (jmax*sxres + imax), dbase + (imax*dxres + jmax), height - jmax, width - imax, dxres, sxres); + } } } @@ -1953,9 +1854,8 @@ * * Copies data from one data field to another with transposition. * - * The destination data field is resized as necessary, its real dimensions set - * to transposed @src dimensions and its offsets are reset. Units are not - * updated. + * The destination data field is resized as necessary, its real dimensions set to transposed @src dimensions and its + * offsets are reset. Units are not updated. * * Since: 2.49 **/ @@ -1989,12 +1889,10 @@ * @minor: %TRUE to mirror about the minor diagonal; %FALSE to mirror about * major diagonal. * - * Copies data from a rectangular part of one data field to another with - * transposition. + * Copies data from a rectangular part of one data field to another with transposition. * - * The destination data field is resized as necessary, its real dimensions set - * to transposed @src area dimensions and its offsets are reset. Units are not - * updated. + * The destination data field is resized as necessary, its real dimensions set to transposed @src area dimensions and + * its offsets are reset. Units are not updated. * * Since: 2.49 **/ @@ -2042,8 +1940,7 @@ static void set_cache_for_constant_field(GwyDataField *data_field, gdouble value) { - data_field->cached = CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) + data_field->cached = CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) | CBIT(VAR) | CBIT(MSQ); CVAL(data_field, MIN) = value; CVAL(data_field, MAX) = value; @@ -2092,8 +1989,7 @@ * gwy_data_field_area_fill_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -2128,8 +2024,7 @@ mrow = mask->data + (row + i)*mask->xres + col; for (j = 0; j < width; j++) { - if ((mode == GWY_MASK_INCLUDE && *mrow > 0.0) - || (mode == GWY_MASK_EXCLUDE && *mrow < 1.0)) + if ((mode == GWY_MASK_INCLUDE && *mrow > 0.0) || (mode == GWY_MASK_EXCLUDE && *mrow < 1.0)) *drow = value; drow++; mrow++; @@ -2176,14 +2071,13 @@ gwy_data_field_invalidate(data_field); if (height == 1 || (col == 0 && width == data_field->xres)) { - memset(data_field->data + data_field->xres*row + col, 0, - width*height*sizeof(gdouble)); + gwy_clear(data_field->data + data_field->xres*row + col, width*height); return; } for (i = 0; i < height; i++) { drow = data_field->data + (row + i)*data_field->xres + col; - memset(drow, 0, width*sizeof(gdouble)); + gwy_clear(drow, width); } } @@ -2207,8 +2101,7 @@ *p *= value; /* We can transform stats */ - data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(MSQ); + data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(MSQ); CVAL(data_field, MIN) *= value; CVAL(data_field, MAX) *= value; CVAL(data_field, SUM) *= value; @@ -2243,10 +2136,8 @@ gdouble *drow; g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - g_return_if_fail(col >= 0 && row >= 0 - && width >= 0 && height >= 0 - && col + width <= data_field->xres - && row + height <= data_field->yres); + g_return_if_fail(col >= 0 && row >= 0 && width >= 0 && height >= 0 + && col + width <= data_field->xres && row + height <= data_field->yres); for (i = 0; i < height; i++) { drow = data_field->data + (row + i)*data_field->xres + col; @@ -2277,8 +2168,7 @@ *p += value; /* We can transform stats */ - data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) - | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) + data_field->cached &= CBIT(MIN) | CBIT(MAX) | CBIT(SUM) | CBIT(RMS) | CBIT(MED) | CBIT(ARF) | CBIT(ART) | CBIT(ARE) | CBIT(VAR); CVAL(data_field, MIN) += value; CVAL(data_field, MAX) += value; @@ -2288,8 +2178,7 @@ CVAL(data_field, ARF) += value; CVAL(data_field, ART) += value; /* Area doesn't change */ - /* There is transformation formula for MSQ, but it can be prone to ugly - * cancellation errors. */ + /* There is transformation formula for MSQ, but it can be prone to ugly cancellation errors. */ } /** @@ -2312,8 +2201,7 @@ for (i = data_field->xres * data_field->yres; i; i--, p++) *p = fabs(*p); - /* The only cached stat we could transform is the maximum. That's probably - * not worth the fuss. */ + /* The only cached stat we could transform is the maximum. That's probably not worth the fuss. */ gwy_data_field_invalidate(data_field); } @@ -2337,10 +2225,8 @@ gdouble *drow; g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - g_return_if_fail(col >= 0 && row >= 0 - && width >= 0 && height >= 0 - && col + width <= data_field->xres - && row + height <= data_field->yres); + g_return_if_fail(col >= 0 && row >= 0 && width >= 0 && height >= 0 + && col + width <= data_field->xres && row + height <= data_field->yres); for (i = 0; i < height; i++) { drow = data_field->data + (row + i)*data_field->xres + col; @@ -2401,9 +2287,7 @@ gwy_data_line_resample(data_line, data_field->xres, GWY_INTERPOLATION_NONE); data_line->real = data_field->xreal; - gwy_assign(data_line->data, - data_field->data + row*data_field->xres, - data_field->xres); + gwy_assign(data_line->data, data_field->data + row*data_field->xres, data_field->xres); gwy_data_field_copy_units_to_data_line(data_field, data_line); } @@ -2462,9 +2346,7 @@ gwy_data_line_resample(data_line, to - from, GWY_INTERPOLATION_NONE); data_line->real = data_field->xreal*(to - from)/data_field->xres; - gwy_assign(data_line->data, - data_field->data + row*data_field->xres + from, - to - from); + gwy_assign(data_line->data, data_field->data + row*data_field->xres + from, to - from); gwy_data_field_copy_units_to_data_line(data_field, data_line); } @@ -2528,9 +2410,7 @@ if (data_line->res != (to - from)) gwy_data_line_resample(data_line, to-from, GWY_INTERPOLATION_LINEAR); - gwy_assign(data_field->data + row*data_field->xres + from, - data_line->data, - to - from); + gwy_assign(data_field->data + row*data_field->xres + from, data_line->data, to - from); gwy_data_field_invalidate(data_field); } @@ -2589,9 +2469,7 @@ g_return_if_fail(row >= 0 && row < data_field->yres); g_return_if_fail(data_field->xres == data_line->res); - gwy_assign(data_field->data + row*data_field->xres, - data_line->data, - data_field->xres); + gwy_assign(data_field->data + row*data_field->xres, data_line->data, data_field->xres); gwy_data_field_invalidate(data_field); } @@ -2628,22 +2506,20 @@ /** * gwy_data_field_get_profile: * @data_field: A data field. - * @data_line: A data line. It will be resized to @res samples. It is - * possible to pass %NULL to instantiate and return a new - * #GwyDataLine. + * @data_line: A data line. It will be resized to @res samples. It is possible to pass %NULL to instantiate and + * return a new #GwyDataLine. * @scol: The column the line starts at (inclusive). * @srow: The row the line starts at (inclusive). * @ecol: The column the line ends at (inclusive). * @erow: The row the line ends at (inclusive). - * @res: Requested resolution of data line (the number of samples to take). - * If nonpositive, data line resolution is chosen to match @data_field's. + * @res: Requested resolution of data line (the number of samples to take). If nonpositive, data line resolution is + * chosen to match @data_field's. * @thickness: Thickness of line to be averaged. * @interpolation: Interpolation type to use. * * Extracts a possibly averaged profile from data field to a data line. * - * Returns: @data_line itself if it was not %NULL, otherwise a newly created - * data line. + * Returns: @data_line itself if it was not %NULL, otherwise a newly created data line. **/ GwyDataLine* gwy_data_field_get_profile(GwyDataField *data_field, @@ -2663,10 +2539,8 @@ g_return_val_if_fail(!data_line || GWY_IS_DATA_LINE(data_line), NULL); xres = data_field->xres; yres = data_field->yres; - g_return_val_if_fail(scol >= 0 && srow >= 0 - && ecol >= 0 && erow >= 0 - && srow < yres && scol < xres - && erow < yres && ecol < xres, + g_return_val_if_fail(scol >= 0 && srow >= 0 && ecol >= 0 && erow >= 0 + && srow < yres && scol < xres && erow < yres && ecol < xres, NULL); size = hypot(abs(scol - ecol) + 1, abs(srow - erow) + 1); @@ -2684,12 +2558,9 @@ data_line = gwy_data_line_new(res, 1.0, FALSE); for (k = 0; k < res; k++) - data_line->data[k] = gwy_data_field_get_dval(data_field, - scol + 0.5 + k*cosa, - srow + 0.5 + k*sina, + data_line->data[k] = gwy_data_field_get_dval(data_field, scol + 0.5 + k*cosa, srow + 0.5 + k*sina, interpolation); - data_line->real = hypot(abs(scol - ecol)*data_field->xreal/xres, - abs(srow - erow)*data_field->yreal/yres); + data_line->real = hypot(abs(scol - ecol)*data_field->xreal/xres, abs(srow - erow)*data_field->yreal/yres); data_line->real *= res/(res - 1.0); gwy_data_field_copy_units_to_data_line(data_field, data_line); @@ -2705,12 +2576,8 @@ for (j = -thickness/2; j < thickness - thickness/2; j++) { col = srcol + j*sina; row = srrow - j*cosa; - if (col >= 0 && col < (xres-1) - && row >= 0 && row < (yres-1)) { - sum += gwy_data_field_get_dval(data_field, - col, row, - interpolation); - } + if (col >= 0 && col < (xres-1) && row >= 0 && row < (yres-1)) + sum += gwy_data_field_get_dval(data_field, col, row, interpolation); else sum += mid; } @@ -2723,30 +2590,28 @@ /** * gwy_data_field_get_profile_mask: * @data_field: A data field. - * @ndata: Location where to store the actual number of extracted points, which - * may differ from @res. + * @ndata: Location where to store the actual number of extracted points, which may differ from @res. * @mask: Mask specifying which values to take into account/exclude, or %NULL. * @masking: Masking mode to use. * @xfrom: The real @x-coordinate where the line starts. * @yfrom: The real @y-coordinate where line starts. * @xto: The real @x-coordinate where the line ends. * @yto: The real @y-coordinate where line ends. - * @res: Requested resolution, i.e. the number of samples to take. - * If nonpositive, sampling is chosen to match @data_field's. + * @res: Requested resolution, i.e. the number of samples to take. If nonpositive, sampling is chosen to match + * @data_field's. * @thickness: Thickness of line to be averaged. * @interpolation: Interpolation type to use. * * Extracts a possibly averaged profile from data field, with masking. * - * The extracted profile can contain holes due to masking. It can also contain - * no points at all if the all data values along the profile were excluded due - * to masking – in this case %NULL is returned. + * The extracted profile can contain holes due to masking. It can also contain no points at all if the all data + * values along the profile were excluded due to masking – in this case %NULL is returned. * - * Unlike gwy_data_field_get_profile(), this function takes real coordinates - * (without offsets), not row and column indices. + * Unlike gwy_data_field_get_profile(), this function takes real coordinates (without offsets), not row and column + * indices. * - * Returns: A newly allocated array of #GwyXY coordinare pairs, or %NULL. - * The caller must free the returned array with g_free(). + * Returns: A newly allocated array of #GwyXY coordinare pairs, or %NULL. The caller must free the returned array with + * g_free(). * * Since: 2.49 **/ @@ -2869,18 +2734,14 @@ * * Creates a new data field by binning an existing one. * - * The data field is divided into rectangles of dimensions @binw×@binh, offset - * by (@xoff, @yoff). The values in each complete rectangle are averaged and - * the average becomes the pixel value in the newly created, smaller data - * field. - * - * Note that the result is the average – not sum – of the individual values. - * Multiply the returned data field with @binw×@binh if you want sum. - * - * By giving non-zero @trimlowest and @trimhighest you can change the plain - * average to a trimmed one (even turning it to median in the extreme case). - * It must always hold that @trimlowest + @trimhighest is smaller than - * @binw×@binh. + * The data field is divided into rectangles of dimensions @binw×@binh, offset by (@xoff, @yoff). The values in each + * complete rectangle are averaged and the average becomes the pixel value in the newly created, smaller data field. + * + * Note that the result is the average – not sum – of the individual values. Multiply the returned data field with + * @binw×@binh if you want sum. + * + * By giving non-zero @trimlowest and @trimhighest you can change the plain average to a trimmed one (even turning it + * to median in the extreme case). It must always hold that @trimlowest + @trimhighest is smaller than @binw×@binh. * * Returns: A newly created data field. * @@ -2901,10 +2762,8 @@ g_return_val_if_fail(binw > 0, NULL); g_return_val_if_fail(binh > 0, NULL); binsize = binw*binh; - g_return_val_if_fail(trimlowest >= 0 - && trimlowest < binsize, NULL); - g_return_val_if_fail(trimhighest >= 0 - && trimhighest < binsize - trimlowest, NULL); + g_return_val_if_fail(trimlowest >= 0 && trimlowest < binsize, NULL); + g_return_val_if_fail(trimhighest >= 0 && trimhighest < binsize - trimlowest, NULL); if (binsize == 1) return gwy_data_field_duplicate(data_field); @@ -2929,10 +2788,7 @@ newxres = (xres - xoff)/binw; newyres = (yres - yoff)/binh; - result = gwy_data_field_new(newxres, newyres, - newxres*xreal*binw/xres, - newyres*yreal*binh/yres, - FALSE); + result = gwy_data_field_new(newxres, newyres, newxres*xreal*binw/xres, newyres*yreal*binh/yres, FALSE); result->xoff = xoffset + xoff*xreal/xres; result->yoff = yoffset + yoff*yreal/yres; gwy_data_field_copy_units(data_field, result); @@ -2952,8 +2808,7 @@ for (k = 0; k < binh; k++) { gwy_assign(buf + k*binw, d + (i*binh + k)*xres + j*binw, binw); } - r[i*newxres + j] = gwy_math_trimmed_mean(binsize, buf, - trimlowest, trimhighest); + r[i*newxres + j] = gwy_math_trimmed_mean(binsize, buf, trimlowest, trimhighest); } } g_free(buf); @@ -3044,8 +2899,7 @@ for (k = 0; k < binh; k++) { gwy_assign(buf + k*binw, d + (i*binh + k)*xres + j*binw, binw); } - r[i*newxres + j] = gwy_math_trimmed_mean(binsize, buf, - trimlowest, trimhighest); + r[i*newxres + j] = gwy_math_trimmed_mean(binsize, buf, trimlowest, trimhighest); } } g_free(buf); @@ -3083,9 +2937,8 @@ * * On border points, one-side derivative is returned. * - * Note the derivative is for legacy reasons calulcated for the opposite - * y direction than is usual elsewhere in Gwyddion, i.e. if values increase - * with increasing row number, the returned value is negative. + * Note the derivative is for legacy reasons calulcated for the opposite y direction than is usual elsewhere in + * Gwyddion, i.e. if values increase with increasing row number, the returned value is negative. * * Returns: Derivative in Y direction **/ @@ -3182,9 +3035,8 @@ GwyDataField **mask, GwyMaskingType *masking) { - /* NULL @mask is a direct caller error. We allow NULL @masking for old - * functions that do not have mode so masking is implicitly done in INCLUDE - * mode. */ + /* NULL @mask is a direct caller error. We allow NULL @masking for old functions that do not have mode so masking + * is implicitly done in INCLUDE mode. */ g_assert(mask); if (!*mask) { if (masking) @@ -3196,8 +3048,7 @@ *mask = NULL; return TRUE; } - g_return_val_if_fail(*masking == GWY_MASK_INCLUDE - || *masking == GWY_MASK_EXCLUDE, FALSE); + g_return_val_if_fail(*masking == GWY_MASK_INCLUDE || *masking == GWY_MASK_EXCLUDE, FALSE); } g_return_val_if_fail(GWY_IS_DATA_FIELD(data_field), FALSE); g_return_val_if_fail((*mask)->xres == data_field->xres, FALSE); @@ -3240,9 +3091,7 @@ /* This physically touches the mask data but does not change their * interpretation. */ - gwy_data_field_grain_simple_dist_trans(mask, - GWY_DISTANCE_TRANSFORM_EUCLIDEAN, - FALSE); + gwy_data_field_grain_simple_dist_trans(mask, GWY_DISTANCE_TRANSFORM_EUCLIDEAN, FALSE); mpts = g_new(MaskedPoint, nmissing); k = 0; @@ -3338,24 +3187,21 @@ /** * gwy_data_field_average_xyz: * @data_field: A data field to fill with regularised XYZ data. - * @density_map: Optional data field to fill with XYZ point density map. It can - * be %NULL. - * @points: Array of XYZ points. Coordinates X and Y represent positions in - * the plane; the Z-coordinate represents values. + * @density_map: Optional data field to fill with XYZ point density map. It can be %NULL. + * @points: Array of XYZ points. Coordinates X and Y represent positions in the plane; the Z-coordinate represents + * values. * @npoints: Number of points. * * Fills a data field with regularised XYZ data using a simple method. * - * The real dimensions and offsets of @field determine the rectangle in the XY - * plane that will be regularised. The regularisation method is fast but - * simple and there are no absolute guarantees of quality, even though the - * result will be usually quite acceptable. - * - * This especially applies to reasonable views of the XYZ data. Unreasonable - * views can be rendered unreasonably. In particular if the rectangle does not - * contain any point from @points (either due to high zoom to an empty region - * or by just being completely off) @data_field will be filled entirely with - * the value of the closest point or something similar. + * The real dimensions and offsets of @field determine the rectangle in the XY plane that will be regularised. The + * regularisation method is fast but simple and there are no absolute guarantees of quality, even though the result + * will be usually quite acceptable. + * + * This especially applies to reasonable views of the XYZ data. Unreasonable views can be rendered unreasonably. In + * particular if the rectangle does not contain any point from @points (either due to high zoom to an empty region or + * by just being completely off) @data_field will be filled entirely with the value of the closest point or something + * similar. * * Since: 2.44 **/ @@ -3420,8 +3266,8 @@ imax = i; } - /* Honour exterior if it is not too far away. We do not want to construct - * useless huge data fields for zoom-in scenarios. */ + /* Honour exterior if it is not too far away. We do not want to construct useless huge data fields for zoom-in + * scenarios. */ gwy_debug("true extrange [%d,%d)x[%d,%d)", jmin, jmax, imin, imax); imin = CLAMP(imin, -(yres/4 + 16), 0); imax = CLAMP(imax, yres-1, yres + yres/4 + 15); @@ -3432,10 +3278,8 @@ extxres = jmax+1 - jmin; extyres = imax+1 - imin; gwy_debug("extfield %dx%d", extxres, extyres); - extfield = gwy_data_field_new(extxres, extyres, qx*extxres, qy*extyres, - TRUE); - extweights = gwy_data_field_new(extxres, extyres, qx*extxres, qy*extyres, - TRUE); + extfield = gwy_data_field_new(extxres, extyres, qx*extxres, qy*extyres, TRUE); + extweights = gwy_data_field_new(extxres, extyres, qx*extxres, qy*extyres, TRUE); d = gwy_data_field_get_data(extfield); w = gwy_data_field_get_data(extweights); @@ -3486,10 +3330,8 @@ } } - if (densitymap) { - gwy_data_field_area_copy(extweights, densitymap, - -jmin, -imin, xres, yres, 0, 0); - } + if (densitymap) + gwy_data_field_area_copy(extweights, densitymap, -jmin, -imin, xres, yres, 0, 0); ninside = 0; #ifdef _OPENMP @@ -3515,8 +3357,7 @@ gwy_debug("nfilled: %d, nmissing: %d", ninside, extxres*extyres - ninside); if (ninside) { fill_missing_points(extfield, extweights); - gwy_data_field_area_copy(extfield, dfield, - -jmin, -imin, xres, yres, 0, 0); + gwy_data_field_area_copy(extfield, dfield, -jmin, -imin, xres, yres, 0, 0); } else { fill_missing_points_all(dfield, points, npoints); @@ -3533,17 +3374,14 @@ * @title: GwyDataField * @short_description: Two-dimensional data representation * - * #GwyDataField is an object that is used for representation of all - * two-dimensional data matrices. Most of the basic data handling and - * processing functions in Gwyddion are declared here as they are connected - * with #GwyDataField. + * #GwyDataField is an object that is used for representation of all two-dimensional data matrices. Most of the basic + * data handling and processing functions in Gwyddion are declared here as they are connected with #GwyDataField. **/ /** * GwyDataField: * - * The #GwyDataField struct contains private data only and should be accessed - * using the functions below. + * The #GwyDataField struct contains private data only and should be accessed using the functions below. **/ /** @@ -3552,25 +3390,21 @@ * * Invalidates cached data field stats. * - * User code should rarely need this macro, as all #GwyDataField methods do - * proper invalidation when they change data, as well as - * gwy_data_field_get_data() does. - * - * However, if you get raw data with gwy_data_field_get_data() and then mix - * direct changes to it with calls to methods like gwy_data_field_get_max(), - * you may need to explicitely invalidate cached values to let - * gwy_data_field_get_max() know it has to recompute the maximum. + * User code should rarely need this macro, as all #GwyDataField methods do proper invalidation when they change data, + * as well as gwy_data_field_get_data() does. + * + * However, if you get raw data with gwy_data_field_get_data() and then mix direct changes to it with calls to methods + * like gwy_data_field_get_max(), you may need to explicitely invalidate cached values to let gwy_data_field_get_max() + * know it has to recompute the maximum. **/ /** * gwy_data_field_duplicate: * @data_field: A data field to duplicate. * - * Convenience macro doing gwy_serializable_duplicate() with all the necessary - * typecasting. + * Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting. * - * Use gwy_data_field_new_alike() if you don't want to copy data, only - * resolutions and units. + * Use gwy_data_field_new_alike() if you don't want to copy data, only resolutions and units. **/ /** @@ -3580,8 +3414,7 @@ * * Convenience macro making one data field identical to another. * - * This is just a gwy_serializable_clone() wrapper with all the necessary - * typecasting. + * This is just a gwy_serializable_clone() wrapper with all the necessary typecasting. * * Since: 2.52 **/ @@ -3600,4 +3433,4 @@ * Alias for gwy_data_field_get_dy(). **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/dataline.c gwyddion-2.63/libprocess/dataline.c --- gwyddion-2.62/libprocess/dataline.c 2022-08-26 15:24:57.000000000 +0000 +++ gwyddion-2.63/libprocess/dataline.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: dataline.c 24952 2022-08-26 15:24:56Z yeti-dn $ + * $Id: dataline.c 25306 2023-04-21 13:15:51Z yeti-dn $ * Copyright (C) 2003-2020 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -53,9 +49,8 @@ static guint data_line_signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE_EXTENDED - (GwyDataLine, gwy_data_line, G_TYPE_OBJECT, 0, - GWY_IMPLEMENT_SERIALIZABLE(gwy_data_line_serializable_init)) +G_DEFINE_TYPE_EXTENDED(GwyDataLine, gwy_data_line, G_TYPE_OBJECT, 0, + GWY_IMPLEMENT_SERIALIZABLE(gwy_data_line_serializable_init)) static void gwy_data_line_serializable_init(GwySerializableIface *iface) @@ -74,22 +69,20 @@ gobject_class->finalize = gwy_data_line_finalize; -/** - * GwyDataLine::data-changed: - * @gwydataline: The #GwyDataLine which received the signal. - * - * The ::data-changed signal is never emitted by data line itself. It - * is intended as a means to notify others data line users they should - * update themselves. - */ - data_line_signals[DATA_CHANGED] - = g_signal_new("data-changed", - G_OBJECT_CLASS_TYPE(gobject_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(GwyDataLineClass, data_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + /** + * GwyDataLine::data-changed: + * @gwydataline: The #GwyDataLine which received the signal. + * + * The ::data-changed signal is never emitted by data line itself. It is intended as a means to notify others + * data line users they should update themselves. + */ + data_line_signals[DATA_CHANGED] = g_signal_new("data-changed", + G_OBJECT_CLASS_TYPE(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GwyDataLineClass, data_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void @@ -113,8 +106,7 @@ * gwy_data_line_new: * @res: Resolution, i.e., the number of samples. * @real: Real physical dimension. - * @nullme: Whether the data line should be initialized to zeroes. If %FALSE, - * the data will not be initialized. + * @nullme: Whether the data line should be initialized to zeroes. If %FALSE, the data will not be initialized. * * Creates a new data line. * @@ -140,13 +132,11 @@ /** * gwy_data_line_new_alike: * @model: A data line to take resolutions and units from. - * @nullme: Whether the data line should be initialized to zeroes. If %FALSE, - * the data will not be initialized. + * @nullme: Whether the data line should be initialized to zeroes. If %FALSE, the data will not be initialized. * * Creates a new data line similar to an existing one. * - * Use gwy_data_line_duplicate() if you want to copy a data line including - * data. + * Use gwy_data_line_duplicate() if you want to copy a data line including data. * * Returns: A newly created data line. **/ @@ -180,8 +170,8 @@ * * Creates a new data line by resampling an existing one. * - * This method is equivalent to gwy_data_line_duplicate() followed by - * gwy_data_line_resample(), but it is more efficient. + * This method is equivalent to gwy_data_line_duplicate() followed by gwy_data_line_resample(), but it is more + * efficient. * * Returns: A newly created data line. * @@ -203,9 +193,8 @@ result = gwy_data_line_new(res, data_line->real, FALSE); result->off = data_line->off; gwy_data_line_copy_units(data_line, result); - gwy_interpolation_resample_block_1d(data_line->res, data_line->data, - result->res, result->data, - interpolation, TRUE); + gwy_interpolation_resample_block_1d(data_line->res, data_line->data, result->res, result->data, interpolation, + TRUE); return result; } @@ -231,9 +220,7 @@ { 'D', "data", &data_line->data, &data_line->res, }, }; - return gwy_serialize_pack_object_struct(buffer, - GWY_DATA_LINE_TYPE_NAME, - G_N_ELEMENTS(spec), spec); + return gwy_serialize_pack_object_struct(buffer, GWY_DATA_LINE_TYPE_NAME, G_N_ELEMENTS(spec), spec); } } @@ -257,8 +244,7 @@ { 'D', "data", &data_line->data, &data_line->res, }, }; - return gwy_serialize_get_struct_size(GWY_DATA_LINE_TYPE_NAME, - G_N_ELEMENTS(spec), spec); + return gwy_serialize_get_struct_size(GWY_DATA_LINE_TYPE_NAME, G_N_ELEMENTS(spec), spec); } } @@ -283,8 +269,7 @@ g_return_val_if_fail(buffer, NULL); - if (!gwy_serialize_unpack_object_struct(buffer, size, position, - GWY_DATA_LINE_TYPE_NAME, + if (!gwy_serialize_unpack_object_struct(buffer, size, position, GWY_DATA_LINE_TYPE_NAME, G_N_ELEMENTS(spec), spec)) { g_free(data); GWY_OBJECT_UNREF(si_unit_x); @@ -292,8 +277,7 @@ return NULL; } if (fsize != (guint)res) { - g_critical("Serialized %s size mismatch %u != %u", - GWY_DATA_LINE_TYPE_NAME, fsize, res); + g_critical("Serialized %s size mismatch %u != %u", GWY_DATA_LINE_TYPE_NAME, fsize, res); g_free(data); GWY_OBJECT_UNREF(si_unit_x); GWY_OBJECT_UNREF(si_unit_y); @@ -374,9 +358,8 @@ * * Resamples a data line. * - * In other words changes the size of one dimensional field related with data - * line. The original values are used for resampling using a requested - * interpolation alorithm. + * In other words changes the size of one dimensional field related with data line. The original values are used for + * resampling using a requested interpolation alorithm. **/ void gwy_data_line_resample(GwyDataLine *data_line, @@ -397,9 +380,7 @@ } bdata = g_new(gdouble, res); - gwy_interpolation_resample_block_1d(data_line->res, data_line->data, - res, bdata, - interpolation, FALSE); + gwy_interpolation_resample_block_1d(data_line->res, data_line->data, res, bdata, interpolation, FALSE); g_free(data_line->data); data_line->data = bdata; data_line->res = res; @@ -447,9 +428,7 @@ GwyDataLine *result; g_return_val_if_fail(GWY_IS_DATA_LINE(data_line), NULL); - g_return_val_if_fail(from >= 0 - && len > 0 - && from + len <= data_line->res, NULL); + g_return_val_if_fail(from >= 0 && len > 0 && from + len <= data_line->res, NULL); if (from == 0 && len == data_line->res) return gwy_data_line_duplicate(data_line); @@ -466,11 +445,10 @@ * @data_line: Source data line. * @target: Destination data line. * - * Copies the contents of a data line to another already allocated data line - * of the same size. + * Copies the contents of a data line to another already allocated data line of the same size. * - * Semantic of method differs from gwy_data_field_copy(), it copies - * only data. It will be probably changed. + * Semantic of method differs from gwy_data_field_copy(), it copies only data. It will be probably + * changed. **/ void gwy_data_line_copy(GwyDataLine *a, GwyDataLine *b) @@ -488,20 +466,17 @@ /** * gwy_data_line_get_dval: * @data_line: A data line. - * @x: Position in data line in range [0, resolution]. If the value is outside - * this range, the nearest border value is returned. + * @x: Position in data line in range [0, resolution]. If the value is outside this range, the nearest border value + * is returned. * @interpolation: Interpolation method to use. * - * Gets interpolated value at arbitrary data line point indexed by pixel - * coordinates. + * Gets interpolated value at arbitrary data line point indexed by pixel coordinates. * - * Note pixel values are centered in intervals [@j, @j+1], so to get the same - * value as gwy_data_line_get_val(@data_line, @j) returns, - * it's necessary to add 0.5: - * gwy_data_line_get_dval(@data_line, @j+0.5, @interpolation). + * Note pixel values are centered in intervals [@j, @j+1], so to get the same value as + * gwy_data_line_get_val(@data_line, @j) returns, it's necessary to add 0.5: + * gwy_data_line_get_dval(@data_line, * @j+0.5, @interpolation). * - * See also gwy_data_line_get_dval_real() that does the same, but takes - * real coordinates. + * See also gwy_data_line_get_dval_real() that does the same, but takes real coordinates. * * Returns: Value interpolated in the data line. **/ @@ -543,8 +518,7 @@ intline[1] = a->data[l]; intline[2] = a->data[l+1]; intline[3] = a->data[l+2]; - return gwy_interpolation_get_dval_of_equidists(rest, intline, - interpolation); + return gwy_interpolation_get_dval_of_equidists(rest, intline, interpolation); break; } } @@ -555,12 +529,11 @@ * * Gets the raw data buffer of a data line. * - * The returned buffer is not guaranteed to be valid through whole data - * line life time. Some function may change it, most notably - * gwy_data_line_resize() and gwy_data_line_resample(). + * The returned buffer is not guaranteed to be valid through whole data line life time. Some function may change it, + * most notably gwy_data_line_resize() and gwy_data_line_resample(). * - * This function invalidates any cached information, use - * gwy_data_line_get_data_const() if you are not going to change the data. + * This function invalidates any cached information, use gwy_data_line_get_data_const() if you are not going to change + * the data. * * Returns: The data as an array of doubles of length gwy_data_line_get_res(). **/ @@ -577,9 +550,8 @@ * * Gets the raw data buffer of a data line, read-only. * - * The returned buffer is not guaranteed to be valid through whole data - * line life time. Some function may change it, most notably - * gwy_data_line_resize() and gwy_data_line_resample(). + * The returned buffer is not guaranteed to be valid through whole data line life time. Some function may change it, + * most notably gwy_data_line_resize() and gwy_data_line_resample(). * * Use gwy_data_line_get_data() if you want to change the data. * @@ -659,8 +631,7 @@ * * Sets the offset of a data line origin. * - * Note offsets don't affect any calculation, nor functions like - * gwy_data_line_rtoi(). + * Note offsets don't affect any calculation, nor functions like gwy_data_line_rtoi(). **/ void gwy_data_line_set_offset(GwyDataLine *data_line, @@ -676,8 +647,7 @@ * * Gets the sample distance (pixel size) of a data line in real units. * - * The result is the same as - * gwy_data_line_get_real(data_line)/gwy_data_line_get_res(data_line). + * The result is the same as gwy_data_line_get_real(data_line)/gwy_data_line_get_res(data_line). * * Returns: Sampling step size. * @@ -696,8 +666,8 @@ * * Returns lateral SI unit of a data line. * - * Returns: SI unit corresponding to the lateral (X) dimension of the data - * line. Its reference count is not incremented. + * Returns: SI unit corresponding to the lateral (X) dimension of the data line. Its reference count is not + * incremented. **/ GwySIUnit* gwy_data_line_get_si_unit_x(GwyDataLine *data_line) @@ -716,8 +686,8 @@ * * Returns value SI unit of a data line. * - * Returns: SI unit corresponding to the "height" (Z) dimension of the data - * line. Its reference count is not incremented. + * Returns: SI unit corresponding to the "height" (Z) dimension of the data line. Its reference count is not + * incremented. **/ GwySIUnit* gwy_data_line_get_si_unit_y(GwyDataLine *data_line) @@ -735,11 +705,9 @@ * @data_line: A data line. * @si_unit: SI unit to be set. * - * Sets the SI unit corresponding to the lateral (X) dimension of a data - * line. + * Sets the SI unit corresponding to the lateral (X) dimension of a data line. * - * It does not assume a reference on @si_unit, instead it adds its own - * reference. + * It does not assume a reference on @si_unit, instead it adds its own reference. **/ void gwy_data_line_set_si_unit_x(GwyDataLine *data_line, @@ -754,11 +722,9 @@ * @data_line: A data line. * @si_unit: SI unit to be set. * - * Sets the SI unit corresponding to the "height" (Y) dimension of a data - * line. + * Sets the SI unit corresponding to the "height" (Y) dimension of a data line. * - * It does not assume a reference on @si_unit, instead it adds its own - * reference. + * It does not assume a reference on @si_unit, instead it adds its own reference. **/ void gwy_data_line_set_si_unit_y(GwyDataLine *data_line, @@ -776,8 +742,8 @@ * * Finds value format good for displaying coordinates of a data line. * - * Returns: The value format. If @format is %NULL, a newly allocated format - * is returned, otherwise (modified) @format itself is returned. + * Returns: The value format. If @format is %NULL, a newly allocated format is returned, otherwise (modified) @format + * itself is returned. **/ GwySIValueFormat* gwy_data_line_get_value_format_x(GwyDataLine *data_line, @@ -790,9 +756,7 @@ max = data_line->real; unit = data_line->real/data_line->res; - return gwy_si_unit_get_format_with_resolution - (gwy_data_line_get_si_unit_x(data_line), - style, max, unit, format); + return gwy_si_unit_get_format_with_resolution(gwy_data_line_get_si_unit_x(data_line), style, max, unit, format); } /** @@ -803,11 +767,10 @@ * * Finds value format good for displaying values of a data line. * - * Note this functions searches for minimum and maximum value in @data_line, - * therefore it's relatively slow. + * Note this functions searches for minimum and maximum value in @data_line, therefore it's relatively slow. * - * Returns: The value format. If @format is %NULL, a newly allocated format - * is returned, otherwise (modified) @format itself is returned. + * Returns: The value format. If @format is %NULL, a newly allocated format is returned, otherwise (modified) @format + * itself is returned. **/ GwySIValueFormat* gwy_data_line_get_value_format_y(GwyDataLine *data_line, @@ -825,8 +788,7 @@ min = 0.0; } - return gwy_si_unit_get_format(gwy_data_line_get_si_unit_y(data_line), - style, max - min, format); + return gwy_si_unit_get_format(gwy_data_line_get_si_unit_y(data_line), style, max - min, format); } /** @@ -874,9 +836,8 @@ * * Transforms pixel coordinate to real (physical) coordinate. * - * That is it maps range [0..resolution] to range [0..real-size]. It is not - * suitable for conversion of matrix indices to physical coordinates, you - * have to use gwy_data_line_itor(@data_line, @pixpos + 0.5) for that. + * That is it maps range [0..resolution] to range [0..real-size]. It is not suitable for conversion of matrix indices + * to physical coordinates, you have to use gwy_data_line_itor(@data_line, @pixpos + 0.5) for that. * * Returns: @pixpos in real coordinates. **/ @@ -910,9 +871,8 @@ * * Gets value at given position in a data line. * - * Do not access data with this function inside inner loops, it's slow. - * Get raw data buffer with gwy_data_line_get_data_const() and access it - * directly instead. + * Do not access data with this function inside inner loops, it's slow. Get raw data buffer with + * gwy_data_line_get_data_const() and access it directly instead. * * Returns: Value at given index. **/ @@ -933,8 +893,8 @@ * * Sets the value at given position in a data line. * - * Do not set data with this function inside inner loops, it's slow. Get raw - * data buffer with gwy_data_line_get_data() and write to it directly instead. + * Do not set data with this function inside inner loops, it's slow. Get raw data buffer with + * gwy_data_line_get_data() and write to it directly instead. **/ void gwy_data_line_set_val(GwyDataLine *data_line, @@ -953,8 +913,7 @@ * @x: real coordinates position * @interpolation: interpolation method used * - * Gets interpolated value at arbitrary data line point indexed by real - * coordinates. + * Gets interpolated value at arbitrary data line point indexed by real coordinates. * * See also gwy_data_line_get_dval() for interpolation explanation. * @@ -1068,8 +1027,7 @@ /** * gwy_data_line_sum_lines: - * @result: A data line to put the result to. May be one of @operand1, - * @operand2. + * @result: A data line to put the result to. May be one of @operand1, @operand2. * @operand1: First data line operand. * @operand2: Second data line operand. * @@ -1102,8 +1060,7 @@ /** * gwy_data_line_subtract_lines: - * @result: A data line to put the result to. May be one of @operand1, - * @operand2. + * @result: A data line to put the result to. May be one of @operand1, @operand2. * @operand1: First data line operand. * @operand2: Second data line operand. * @@ -1136,8 +1093,7 @@ /** * gwy_data_line_multiply_lines: - * @result: A data line to put the result to. May be one of @operand1, - * @operand2. + * @result: A data line to put the result to. May be one of @operand1, @operand2. * @operand1: First data line operand. * @operand2: Second data line operand. * @@ -1343,9 +1299,8 @@ * @bottom: Lower replacement value. * @top: Upper replacement value. * - * Sets all the values within interval to @bottom or @top value - * depending on whether the original values are - * below or above @threshold value. + * Sets all the values within interval to @bottom or @top value depending on whether the original values are below or + * above @threshold value. * * Returns: total number of values above threshold within interval **/ @@ -1381,7 +1336,8 @@ * Finds line leveling coefficients. * * The coefficients can be used for line leveling using relation - * data[i] := data[i] - (av + bv*i); + * + * data[i] := data[i] - (av + bv*i) **/ void gwy_data_line_get_line_coeffs(GwyDataLine *a, gdouble *av, gdouble *bv) @@ -1458,9 +1414,8 @@ * * Performs line rotation. * - * This is operation similar to leveling, but it does not change the angles - * between line segments (on the other hand it introduces other deformations - * due to discretization). + * This is operation similar to leveling, but it does not change the angles between line segments (on the other hand + * it introduces other deformations due to discretization). * * Since: 2.7 **/ @@ -1478,8 +1433,7 @@ if (angle == 0.0 || data_line->res < 2) return; - /* INTERPOLATION: not checked, I'm not sure how this all relates to - * interpolation */ + /* INTERPOLATION: not checked, I'm not sure how this all relates to interpolation */ res = data_line->res; dx = g_new(gdouble, data_line->res); dy = g_new(gdouble, data_line->res); @@ -1514,12 +1468,8 @@ yl1 = dy[k-1]; yl2 = dy[k]; - if (interpolation == GWY_INTERPOLATION_ROUND - || interpolation == GWY_INTERPOLATION_LINEAR) { - data_line->data[i] = gwy_interpolation_get_dval(x, - xl1, yl1, xl2, yl2, - interpolation); - } + if (interpolation == GWY_INTERPOLATION_ROUND || interpolation == GWY_INTERPOLATION_LINEAR) + data_line->data[i] = gwy_interpolation_get_dval(x, xl1, yl1, xl2, yl2, interpolation); else g_warning("Interpolation not implemented yet.\n"); } @@ -1563,8 +1513,7 @@ * gwy_data_line_part_fit_polynom: * @data_line: A data line. * @n: Polynom degree. - * @coeffs: An array of size @n+1 to store the coefficients to, or %NULL - * (a fresh array is allocated then). + * @coeffs: An array of size @n+1 to store the coefficients to, or %NULL (a fresh array is allocated then). * @from: Index the line part starts at. * @to: Index the line part ends at + 1. * @@ -1572,8 +1521,7 @@ * * Please see gwy_data_line_fit_polynom() for more details. * - * Returns: The coefficients of the polynomial (@coeffs when it was not %NULL, - * otherwise a newly allocated array). + * Returns: The coefficients of the polynomial (@coeffs when it was not %NULL, otherwise a newly allocated array). **/ gdouble* gwy_data_line_part_fit_polynom(GwyDataLine *data_line, @@ -1636,29 +1584,24 @@ * gwy_data_line_fit_polynom: * @data_line: A data line. * @n: Polynom degree. - * @coeffs: An array of size @n+1 to store the coefficients to, or %NULL - * (a fresh array is allocated then). + * @coeffs: An array of size @n+1 to store the coefficients to, or %NULL (a fresh array is allocated then). * * Fits a polynomial through a data line. * - * Note @n is polynomial degree, so the size of @coeffs is @n+1. X-values - * are indices in the data line. + * Note @n is polynomial degree, so the size of @coeffs is @n+1. X-values are indices in the data line. * - * For polynomials of degree 0 and 1 it's better to use gwy_data_line_get_avg() - * and gwy_data_line_get_line_coeffs() because they are faster. + * For polynomials of degree 0 and 1 it's better to use gwy_data_line_get_avg() and gwy_data_line_get_line_coeffs() + * because they are faster. * - * Returns: The coefficients of the polynomial (@coeffs when it was not %NULL, - * otherwise a newly allocated array). + * Returns: The coefficients of the polynomial (@coeffs when it was not %NULL, otherwise a newly allocated array). **/ gdouble* gwy_data_line_fit_polynom(GwyDataLine *data_line, gint n, gdouble *coeffs) { - return gwy_data_line_part_fit_polynom(data_line, n, coeffs, - 0, gwy_data_line_get_res(data_line)); + return gwy_data_line_part_fit_polynom(data_line, n, coeffs, 0, gwy_data_line_get_res(data_line)); } - /** * gwy_data_line_part_subtract_polynom: * @data_line: A data line. @@ -1709,8 +1652,7 @@ gint n, const gdouble *coeffs) { - gwy_data_line_part_subtract_polynom(data_line, n, coeffs, - 0, gwy_data_line_get_res(data_line)); + gwy_data_line_part_subtract_polynom(data_line, n, coeffs, 0, gwy_data_line_get_res(data_line)); } /** @@ -1740,6 +1682,50 @@ } /** + * gwy_data_line_der: + * @data_line: A data line. + * @der: Data line where the derivative is to be stored. It will be resized to match @data_line. + * + * Calculated the derivative for an entire data line. + * + * The derivatives are in physical units (not pixel-wise) and calculated from simple symmetrical differences, except at + * the edges where the differences are one-sided. + * + * Since: 2.63 + **/ +void +gwy_data_line_filter_slope(GwyDataLine *data_line, + GwyDataLine *der) +{ + gint res, i; + gdouble dx; + const gdouble *d; + gdouble *b; + + g_return_if_fail(GWY_IS_DATA_LINE(data_line)); + g_return_if_fail(GWY_IS_DATA_LINE(der)); + res = data_line->res; + gwy_data_line_resample(der, res, GWY_INTERPOLATION_NONE); + der->real = data_line->real; + der->off = data_line->off; + gwy_si_unit_assign(gwy_data_line_get_si_unit_x(der), gwy_data_line_get_si_unit_x(data_line)); + gwy_si_unit_divide(gwy_data_line_get_si_unit_y(data_line), gwy_data_line_get_si_unit_x(data_line), + gwy_data_line_get_si_unit_y(der)); + if (res == 1) { + gwy_data_line_clear(der); + } + else { + d = data_line->data; + b = der->data; + dx = gwy_data_line_get_dx(data_line); + b[0] = (d[1] - d[0])/dx; + for (i = 1; i < res-1; i++) + b[i] = 0.5*(d[i+1] - d[i-1])/dx; + b[res-1] = (d[res-1] - d[res-2])/dx; + } +} + +/** * gwy_data_line_sqrt: * @data_line: A data line. * @@ -1766,23 +1752,21 @@ * @title: GwyDataLine * @short_description: One-dimensional data representation * - * #GwyDataLine represents 1D data arrays in Gwyddion. It is used for most of - * the data processing functions connected with 1D data, graphs, etc. + * #GwyDataLine represents 1D data arrays in Gwyddion. It is used for most of the data processing functions connected + * with 1D data, graphs, etc. **/ /** * GwyDataLine: * - * The #GwyDataLine struct contains private data only and should be accessed - * using the functions below. + * The #GwyDataLine struct contains private data only and should be accessed using the functions below. **/ /** * gwy_data_line_duplicate: * @data_line: A data line to duplicate. * - * Convenience macro doing gwy_serializable_duplicate() with all the necessary - * typecasting. + * Convenience macro doing gwy_serializable_duplicate() with all the necessary typecasting. **/ /** @@ -1792,10 +1776,9 @@ * * Convenience macro making one data line identical to another. * - * This is just a gwy_serializable_clone() wrapper with all the necessary - * typecasting. + * This is just a gwy_serializable_clone() wrapper with all the necessary typecasting. * * Since: 2.52 **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/dataline.h gwyddion-2.63/libprocess/dataline.h --- gwyddion-2.62/libprocess/dataline.h 2022-04-06 11:41:24.000000000 +0000 +++ gwyddion-2.63/libprocess/dataline.h 2023-04-24 18:36:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dataline.h 24757 2022-04-06 11:41:24Z yeti-dn $ + * $Id: dataline.h 25306 2023-04-21 13:15:51Z yeti-dn $ * Copyright (C) 2003-2020 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -211,6 +211,8 @@ gint n, const gdouble *coeffs); void gwy_data_line_cumulate (GwyDataLine *data_line); +void gwy_data_line_filter_slope (GwyDataLine *data_line, + GwyDataLine *der); void gwy_data_line_sqrt (GwyDataLine *data_line); G_END_DECLS diff -Nru gwyddion-2.62/libprocess/filters.c gwyddion-2.63/libprocess/filters.c --- gwyddion-2.62/libprocess/filters.c 2021-11-12 15:43:28.000000000 +0000 +++ gwyddion-2.63/libprocess/filters.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: filters.c 24518 2021-11-12 15:43:28Z yeti-dn $ + * $Id: filters.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -870,12 +870,14 @@ /** * gwy_data_field_filter_slope: * @data_field: A data field to apply the filter to. - * @xder: Data field where the x-derivarive is to be stored, or %NULL if you are only interested in the y-derivarive. - * @yder: Data field where the y-derivarive is to be stored, or %NULL if you are only interested in the x-derivarive. + * @xder: Data field where the x-derivative is to be stored, or %NULL if you are only interested in the y-derivative. + * It will be resized to match @data_field. + * @yder: Data field where the y-derivative is to be stored, or %NULL if you are only interested in the x-derivative. + * It will be resized to match @data_field. * * Calculates x and y derivaties for an entire field. * - * The derivatives are calculated as the simple symmetrical differences (in physical units, not pixel-wise), except at + * The derivatives are in physical units (not pixel-wise) and calculated from simple symmetrical differences, except at * the edges where the differences are one-sided. * * Since: 2.37 @@ -898,10 +900,26 @@ xres = data_field->xres; yres = data_field->yres; - if (xder) + if (xder) { gwy_data_field_resample(xder, xres, yres, GWY_INTERPOLATION_NONE); - if (yder) + xder->xreal = data_field->xreal; + xder->yreal = data_field->yreal; + xder->xoff = data_field->xoff; + xder->yoff = data_field->yoff; + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(xder), gwy_data_field_get_si_unit_xy(data_field)); + gwy_si_unit_divide(gwy_data_field_get_si_unit_z(data_field), gwy_data_field_get_si_unit_xy(data_field), + gwy_data_field_get_si_unit_z(xder)); + } + if (yder) { gwy_data_field_resample(yder, xres, yres, GWY_INTERPOLATION_NONE); + yder->xreal = data_field->xreal; + yder->yreal = data_field->yreal; + yder->xoff = data_field->xoff; + yder->yoff = data_field->yoff; + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(xder), gwy_data_field_get_si_unit_xy(data_field)); + gwy_si_unit_divide(gwy_data_field_get_si_unit_z(data_field), gwy_data_field_get_si_unit_xy(data_field), + gwy_data_field_get_si_unit_z(xder)); + } dx = gwy_data_field_get_dx(data_field); dy = gwy_data_field_get_dy(data_field); d = data_field->data; @@ -915,8 +933,8 @@ #endif for (i = 0; i < yres; i++) { const gdouble *row = d + i*xres, *prev = row - xres, *next = row + xres; - gdouble *bxrow = bx ? bx + i*xres : NULL; - gdouble *byrow = by ? by + i*xres : NULL; + gdouble *bxrow = (bx && xres > 1) ? bx + i*xres : NULL; + gdouble *byrow = (by && yres > 1) ? by + i*xres : NULL; for (j = 0; j < xres; j++) { gdouble xd, yd; @@ -945,10 +963,18 @@ } } - if (xder) - gwy_data_field_invalidate(xder); - if (yder) - gwy_data_field_invalidate(yder); + if (xder) { + if (xres == 1) + gwy_data_field_clear(xder); + else + gwy_data_field_invalidate(xder); + } + if (yder) { + if (yres == 1) + gwy_data_field_clear(yder); + else + gwy_data_field_invalidate(yder); + } } /** diff -Nru gwyddion-2.62/libprocess/filters.h gwyddion-2.63/libprocess/filters.h --- gwyddion-2.62/libprocess/filters.h 2021-11-12 15:43:28.000000000 +0000 +++ gwyddion-2.63/libprocess/filters.h 2023-01-05 16:34:34.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: filters.h 24518 2021-11-12 15:43:28Z yeti-dn $ + * $Id: filters.h 25188 2023-01-05 16:34:34Z yeti-dn $ * Copyright (C) 2003-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -221,6 +221,11 @@ gint height, gint k, GwySetFractionFunc set_fraction); +void gwy_data_line_part_filter_kth_rank (GwyDataLine *data_line, + gint klen, + gint from, + gint to, + gint k); gboolean gwy_data_field_area_filter_trimmed_mean (GwyDataField *data_field, GwyDataField *kernel, gint col, diff -Nru gwyddion-2.62/libprocess/filters-minmax.c gwyddion-2.63/libprocess/filters-minmax.c --- gwyddion-2.62/libprocess/filters-minmax.c 2021-03-18 11:09:03.000000000 +0000 +++ gwyddion-2.63/libprocess/filters-minmax.c 2023-01-05 16:34:34.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: filters-minmax.c 23296 2021-03-18 00:17:54Z yeti-dn $ + * $Id: filters-minmax.c 25188 2023-01-05 16:34:34Z yeti-dn $ * Copyright (C) 2003-2020 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -48,8 +44,8 @@ /* Resolved set of required block lengths and the rules how to compute them. */ typedef struct { - /* NB: The array sizes are maxlen_even+1 and maxlen_each+1 because maxlen - * is really the maximum length, inclusive. */ + /* NB: The array sizes are maxlen_even+1 and maxlen_each+1 because maxlen is really the maximum length, inclusive. + */ MinMaxPrecomputedLen *each; MinMaxPrecomputedLen *even; guint maxlen_each; @@ -87,26 +83,24 @@ guint blocklen, gboolean is_even); -/* K-th rank filter tree. Number of levels with special storage; the rest - * is in ucount[][]. */ +/* K-th rank filter tree. Number of levels with special storage; the rest is in ucount[][]. */ enum { MEDIAN_RADIX_TREE_BASE_LEVELS = 8 }; -/* This needs somewhat less than 2n bits, i.e. n/4 bytes. We actually never - * use the last element in each quadruple – but having it enables making - * add/remove branch-free, using just shifts and increments/decrements. */ +/* This needs somewhat less than 2n bits, i.e. n/4 bytes. We actually never use the last element in each quadruple + * – but having it enables making add/remove branch-free, using just shifts and increments/decrements. */ typedef struct { guint n; guint levels; - guint8 *bits; /* Bits: 1 = number is present in the set. */ - guint8 *bcount8; /* Nibbles: total bits set in corresponding bits[] */ - guint8 *bcount32; /* Bytes: sum of quadruple of bcount8[]. */ - guint8 *bcount128; /* Bytes: sum of quadruple of bcount32[]. */ - guint16 *scount512; /* Shorts: sum of quadruple of bcount128[]. */ - guint16 *scount2048; /* Shorts: sum of quadruple of scount512[]. */ - guint16 *scount8192; /* Shorts: sum of quadruple of scount2048[]. */ - guint16 *scount32768; /* Shorts: sum of quadruple of scount8192[]. */ - guint32 **ucount; /* Ints: sums of quadruples of lower levels. */ - guint len; /* Plain number of values. */ + guint8 *bits; /* Bits: 1 = number is present in the set. */ + guint8 *bcount8; /* Nibbles: total bits set in corresponding bits[] */ + guint8 *bcount32; /* Bytes: sum of quadruple of bcount8[]. */ + guint8 *bcount128; /* Bytes: sum of quadruple of bcount32[]. */ + guint16 *scount512; /* Shorts: sum of quadruple of bcount128[]. */ + guint16 *scount2048; /* Shorts: sum of quadruple of scount512[]. */ + guint16 *scount8192; /* Shorts: sum of quadruple of scount2048[]. */ + guint16 *scount32768; /* Shorts: sum of quadruple of scount8192[]. */ + guint32 **ucount; /* Ints: sums of quadruples of lower levels. */ + guint len; /* Plain number of values. */ } MedianRadixTree; typedef struct { @@ -141,9 +135,8 @@ * * This operation is often called erosion filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_min_max() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_area_filter_minimum(GwyDataField *data_field, @@ -216,8 +209,7 @@ d *= 3; } - /* Now we have to overlay the neighbourhoods carefully to get exactly - * @size-sized squares. There are two cases: + /* Now we have to overlay the neighbourhoods carefully to get exactly @size-sized squares. There are two cases: * 1. @size <= 2*d, it's enough to take four corner representants * 2. @size > 2*d, it's necessary to take all nine representants */ @@ -262,8 +254,7 @@ buffer->data = buf; buffer2->data = buf2; - gwy_data_field_area_copy(buffer2, data_field, - 0, 0, width, height, col, row); + gwy_data_field_area_copy(buffer2, data_field, 0, 0, width, height, col, row); g_object_unref(buffer2); g_object_unref(buffer); @@ -276,17 +267,15 @@ * * Filters a data field with minimum filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_min_max() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_filter_minimum(GwyDataField *data_field, gint size) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_filter_minimum(data_field, size, 0, 0, - data_field->xres, data_field->yres); + gwy_data_field_area_filter_minimum(data_field, size, 0, 0, data_field->xres, data_field->yres); } /** @@ -302,9 +291,8 @@ * * This operation is often called dilation filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_min_max() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_area_filter_maximum(GwyDataField *data_field, @@ -377,8 +365,7 @@ d *= 3; } - /* Now we have to overlay the neighbourhoods carefully to get exactly - * @size-sized squares. There are two cases: + /* Now we have to overlay the neighbourhoods carefully to get exactly @size-sized squares. There are two cases: * 1. @size <= 2*d, it's enough to take four corner representants * 2. @size > 2*d, it's necessary to take all nine representants */ @@ -423,8 +410,7 @@ buffer->data = buf; buffer2->data = buf2; - gwy_data_field_area_copy(buffer2, data_field, - 0, 0, width, height, col, row); + gwy_data_field_area_copy(buffer2, data_field, 0, 0, width, height, col, row); g_object_unref(buffer2); g_object_unref(buffer); @@ -437,17 +423,15 @@ * * Filters a data field with maximum filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_min_max() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_min_max() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_filter_maximum(GwyDataField *data_field, gint size) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_filter_maximum(data_field, size, 0, 0, - data_field->xres, data_field->yres); + gwy_data_field_area_filter_maximum(data_field, size, 0, 0, data_field->xres, data_field->yres); } static inline gboolean @@ -635,8 +619,8 @@ g_free(req); } -/* Allocate data buffers for all lengths. Do not allocate the Each(1) buffer, - * we use a direct pointer to the data row for that. */ +/* Allocate data buffers for all lengths. Do not allocate the Each(1) buffer, we use a direct pointer to the data row + * for that. */ static MinMaxPrecomputedRow* min_max_precomputed_row_alloc(const MinMaxPrecomputedReq *req, guint rowlen) @@ -787,9 +771,8 @@ } } -/* Precomputes maxima for row. Minimum is always computed from given index - * blocklen values *forwards*, i.e. the block is not symmetrical it starts at - * the given index. */ +/* Precomputes maxima for row. Minimum is always computed from given index blocklen values *forwards*, i.e. the block + * is not symmetrical it starts at the given index. */ static void max_precomputed_row_fill(const MinMaxPrecomputedReq *req, MinMaxPrecomputedRow *prow, @@ -809,18 +792,14 @@ g_assert(!precomp->even_even); if (precomp->even_odd) { compose_max_row_data_even_odd(prow->each[blen], - prow->even[precomp->sublen1], - precomp->sublen1, - prow->each[precomp->sublen2], - precomp->sublen2, + prow->even[precomp->sublen1], precomp->sublen1, + prow->each[precomp->sublen2], precomp->sublen2, rowlen); } else { compose_max_row_data_each(prow->each[blen], - prow->each[precomp->sublen1], - precomp->sublen1, - prow->each[precomp->sublen2], - precomp->sublen2, + prow->each[precomp->sublen1], precomp->sublen1, + prow->each[precomp->sublen2], precomp->sublen2, rowlen); } } @@ -833,18 +812,14 @@ g_assert(!precomp->even_odd); if (precomp->even_even) { compose_max_row_data_even(prow->even[blen], - prow->even[precomp->sublen1], - precomp->sublen1, - prow->even[precomp->sublen2], - precomp->sublen2, + prow->even[precomp->sublen1], precomp->sublen1, + prow->even[precomp->sublen2], precomp->sublen2, rowlen); } else { g_assert(blen == 2); g_assert(precomp->sublen1 == 1); - compose_max_row_data_two(prow->even[blen], - prow->each[precomp->sublen1], - rowlen); + compose_max_row_data_two(prow->even[blen], prow->each[precomp->sublen1], rowlen); } } } @@ -971,9 +946,8 @@ } } -/* Precomputes minima for row. Minimum is always computed from given index - * blocklen values *forwards*, i.e. the block is not symmetrical it starts at - * the given index. */ +/* Precomputes minima for row. Minimum is always computed from given index blocklen values *forwards*, i.e. the block + * is not symmetrical it starts at the given index. */ static void min_precomputed_row_fill(const MinMaxPrecomputedReq *req, MinMaxPrecomputedRow *prow, @@ -993,18 +967,14 @@ g_assert(!precomp->even_even); if (precomp->even_odd) { compose_min_row_data_even_odd(prow->each[blen], - prow->even[precomp->sublen1], - precomp->sublen1, - prow->each[precomp->sublen2], - precomp->sublen2, + prow->even[precomp->sublen1], precomp->sublen1, + prow->each[precomp->sublen2], precomp->sublen2, rowlen); } else { compose_min_row_data_each(prow->each[blen], - prow->each[precomp->sublen1], - precomp->sublen1, - prow->each[precomp->sublen2], - precomp->sublen2, + prow->each[precomp->sublen1], precomp->sublen1, + prow->each[precomp->sublen2], precomp->sublen2, rowlen); } } @@ -1017,17 +987,13 @@ g_assert(!precomp->even_odd); if (precomp->even_even) { compose_min_row_data_even(prow->even[blen], - prow->even[precomp->sublen1], - precomp->sublen1, - prow->even[precomp->sublen2], - precomp->sublen2, + prow->even[precomp->sublen1], precomp->sublen1, + prow->even[precomp->sublen2], precomp->sublen2, rowlen); } else { g_assert(blen == 2); - compose_min_row_data_two(prow->even[blen], - prow->each[precomp->sublen1], - rowlen); + compose_min_row_data_two(prow->even[blen], prow->each[precomp->sublen1], rowlen); } } } @@ -1191,8 +1157,7 @@ mmp->kxres = kxres; mmp->kyres = kyres; - /* Run-length encode the mask, i.e. transform it to a set of segments - * and their positions. */ + /* Run-length encode the mask, i.e. transform it to a set of segments and their positions. */ mmp->mrle = run_length_encode_mask(kernel); if (!mmp->mrle->nsegments) { mask_rle_free(mmp->mrle); @@ -1227,9 +1192,8 @@ return 0; } -/* Rotate the RLE data by pi. The set of block lengths does not change. - * Therefore, the decompositions do not change either. The only thing that - * changes is the positions of the RLE segments. */ +/* Rotate the RLE data by pi. The set of block lengths does not change. Therefore, the decompositions do not change + * either. The only thing that changes is the positions of the RLE segments. */ static void gwy_data_field_area_rle_flip(MaskRLE *mrle, guint kxres, guint kyres) { @@ -1241,8 +1205,7 @@ seg->row = kyres-1 - seg->row; } - qsort(mrle->segments, mrle->nsegments, sizeof(MaskSegment), - compare_segment); + qsort(mrle->segments, mrle->nsegments, sizeof(MaskSegment), compare_segment); } static void @@ -1278,13 +1241,10 @@ xres = dfield->xres; yres = dfield->yres; - precomp_row_fill = (maximum - ? max_precomputed_row_fill - : min_precomputed_row_fill); - - /* Initialise the buffers for the zeroth row of the area. For the maximum - * operation we even-sized kernels to the other direction to obtain - * morphological operation according to definitions. */ + precomp_row_fill = (maximum ? max_precomputed_row_fill : min_precomputed_row_fill); + + /* Initialise the buffers for the zeroth row of the area. For the maximum operation we even-sized kernels to the + * other direction to obtain morphological operation according to definitions. */ if (maximum) { extend_up = mmp->kyres/2; extend_down = (mmp->kyres - 1)/2; @@ -1301,34 +1261,25 @@ for (i = 0; i <= extend_down; i++) { ii = i + extend_up; if (row + i < yres) { - row_extend_border(d + xres*(row + i), extrowbuf, - col, width, xres, - extend_left, extend_right, - 0.0); + row_extend_border(d + xres*(row + i), extrowbuf, col, width, xres, extend_left, extend_right, 0.0); precomp_row_fill(req, prows[ii], extrowbuf, rowbuflen); } else { - min_max_precomputed_row_copy(prows[ii], prows[ii-1], - req, rowbuflen); + min_max_precomputed_row_copy(prows[ii], prows[ii-1], req, rowbuflen); } } for (i = 1; i <= extend_up; i++) { ii = extend_up - i; if (i <= (guint)row) { - row_extend_border(d + xres*(row - i), extrowbuf, - col, width, xres, - extend_left, extend_right, - 0.0); + row_extend_border(d + xres*(row - i), extrowbuf, col, width, xres, extend_left, extend_right, 0.0); precomp_row_fill(req, prows[ii], extrowbuf, rowbuflen); } else { - min_max_precomputed_row_copy(prows[ii], prows[ii+1], - req, rowbuflen); + min_max_precomputed_row_copy(prows[ii], prows[ii+1], req, rowbuflen); } } - /* Go through the rows and extract the minima or maxima from the - * precomputed segment data. */ + /* Go through the rows and extract the minima or maxima from the precomputed segment data. */ i = 0; while (TRUE) { mask_rle_execute_min_max(mrle, prows, outbuf + i*width, width, maximum); @@ -1336,10 +1287,9 @@ if (i == (guint)height) break; - /* Rotate physically prows[] so that the current row is at the zeroth - * position. We could use cyclic buffers but then all subordinate - * functions would know how to handle them and calculating mod() for - * all indexing is inefficient anyway. */ + /* Rotate physically prows[] so that the current row is at the zeroth position. We could use cyclic buffers + * but then all subordinate functions would know how to handle them and calculating mod() for all indexing is + * inefficient anyway. */ prow = prows[0]; for (ii = 0; ii < mmp->kyres-1; ii++) prows[ii] = prows[ii+1]; @@ -1348,16 +1298,12 @@ /* Precompute the new row at the bottom. */ ii = row + i + extend_down; if (ii < yres) { - row_extend_border(d + xres*ii, extrowbuf, - col, width, xres, - extend_left, extend_right, - 0.0); + row_extend_border(d + xres*ii, extrowbuf, col, width, xres, extend_left, extend_right, 0.0); precomp_row_fill(req, prow, extrowbuf, rowbuflen); } else { g_assert(mmp->kyres >= 2); - min_max_precomputed_row_copy(prow, prows[mmp->kyres-2], - req, rowbuflen); + min_max_precomputed_row_copy(prow, prows[mmp->kyres-2], req, rowbuflen); } } } @@ -1395,29 +1341,24 @@ kxres = kernel->xres; kyres = kernel->yres; - if (filtertype == GWY_MIN_MAX_FILTER_MINIMUM - || filtertype == GWY_MIN_MAX_FILTER_MAXIMUM) { + if (filtertype == GWY_MIN_MAX_FILTER_MINIMUM || filtertype == GWY_MIN_MAX_FILTER_MAXIMUM) { gboolean is_max = (filtertype == GWY_MIN_MAX_FILTER_MAXIMUM); gwy_data_field_area_rle_analyse(kernel, width, &mmp); if (is_max) gwy_data_field_area_rle_flip(mmp.mrle, kxres, kyres); - gwy_data_field_area_min_max_execute(data_field, outbuf, &mmp, is_max, - col, row, width, height); + gwy_data_field_area_min_max_execute(data_field, outbuf, &mmp, is_max, col, row, width, height); gwy_data_field_area_rle_free(&mmp); } - else if (filtertype == GWY_MIN_MAX_FILTER_RANGE - || filtertype == GWY_MIN_MAX_FILTER_NORMALIZATION) { + else if (filtertype == GWY_MIN_MAX_FILTER_RANGE || filtertype == GWY_MIN_MAX_FILTER_NORMALIZATION) { gdouble *outbuf2 = g_new(gdouble, width*height); gdouble *d = data_field->data + row*xres + col; gwy_data_field_area_rle_analyse(kernel, width, &mmp); - gwy_data_field_area_min_max_execute(data_field, outbuf2, &mmp, FALSE, - col, row, width, height); + gwy_data_field_area_min_max_execute(data_field, outbuf2, &mmp, FALSE, col, row, width, height); gwy_data_field_area_rle_flip(mmp.mrle, kxres, kyres); - gwy_data_field_area_min_max_execute(data_field, outbuf, &mmp, TRUE, - col, row, width, height); + gwy_data_field_area_min_max_execute(data_field, outbuf, &mmp, TRUE, col, row, width, height); gwy_data_field_area_rle_free(&mmp); if (filtertype == GWY_MIN_MAX_FILTER_RANGE) { @@ -1439,12 +1380,10 @@ } g_free(outbuf2); } - else if (filtertype == GWY_MIN_MAX_FILTER_OPENING - || filtertype == GWY_MIN_MAX_FILTER_CLOSING) { + else if (filtertype == GWY_MIN_MAX_FILTER_OPENING || filtertype == GWY_MIN_MAX_FILTER_CLOSING) { gboolean is_closing = (filtertype == GWY_MIN_MAX_FILTER_CLOSING); - /* To limit the area of application but keep the influence of - * surrouding pixels as if we did erosion and dilation on the entire - * field, we must perform the first operation in an extended area. */ + /* To limit the area of application but keep the influence of surrouding pixels as if we did erosion and + * dilation on the entire field, we must perform the first operation in an extended area. */ gint extcol = MAX(0, col - kxres/2); gint extrow = MAX(0, row - kyres/2); gint extwidth = MIN(xres, col + width + kxres/2) - extcol; @@ -1454,15 +1393,11 @@ gwy_data_field_area_rle_analyse(kernel, extwidth, &mmp); if (is_closing) gwy_data_field_area_rle_flip(mmp.mrle, kxres, kyres); - tmpfield = gwy_data_field_new(extwidth, extheight, extwidth, extheight, - FALSE); - gwy_data_field_area_min_max_execute(data_field, tmpfield->data, &mmp, - is_closing, - extcol, extrow, - extwidth, extheight); + tmpfield = gwy_data_field_new(extwidth, extheight, extwidth, extheight, FALSE); + gwy_data_field_area_min_max_execute(data_field, tmpfield->data, &mmp, is_closing, + extcol, extrow, extwidth, extheight); - if (extcol == col && extrow == row - && extwidth == width && extheight == height) { + if (extcol == col && extrow == row && extwidth == width && extheight == height) { /* Avoid repeating the analysis for full-field application. */ gwy_data_field_area_rle_flip(mmp.mrle, kxres, kyres); } @@ -1472,10 +1407,8 @@ if (!is_closing) gwy_data_field_area_rle_flip(mmp.mrle, kxres, kyres); } - gwy_data_field_area_min_max_execute(tmpfield, outbuf, &mmp, - !is_closing, - col - extcol, row - extrow, - width, height); + gwy_data_field_area_min_max_execute(tmpfield, outbuf, &mmp, !is_closing, + col - extcol, row - extrow, width, height); gwy_data_field_area_rle_free(&mmp); g_object_unref(tmpfield); } @@ -1494,31 +1427,24 @@ * @width: Area width (number of columns). * @height: Area height (number of rows). * - * Applies a morphological operation with a flat structuring element to a - * part of a data field. + * Applies a morphological operation with a flat structuring element to a part of a data field. * - * Morphological operations with flat structuring elements can be expressed - * using minimum (erosion) and maximum (dilation) filters that are the basic - * operations this function can perform. - * - * The kernel field is a mask that defines the shape of the flat structuring - * element. It is reflected for all maximum operations (dilation). For - * symmetrical kernels this does not matter. You can use - * gwy_data_field_elliptic_area_fill() to create a true circular (or - * elliptical) kernel. - * - * The kernel is implicitly centered, i.e. it will be applied symmetrically to - * avoid unexpected data movement. Even-sized kernels (generally not - * recommended) will extend farther towards the top left image corner for - * minimum (erosion) and towards the bottom right corner for maximum (dilation) - * operations due to the reflection. If you need off-center structuring - * elements you can add empty rows or columns to one side of the kernel to - * counteract the symmetrisation. - * - * The operation is linear-time in kernel size for any convex kernel. Note - * gwy_data_field_area_filter_minimum() and - * gwy_data_field_area_filter_maximum(), which are limited to square - * structuring elements, are much faster for large sizes of the squares. + * Morphological operations with flat structuring elements can be expressed using minimum (erosion) and maximum + * (dilation) filters that are the basic operations this function can perform. + * + * The kernel field is a mask that defines the shape of the flat structuring element. It is reflected for all maximum + * operations (dilation). For symmetrical kernels this does not matter. You can use + * gwy_data_field_elliptic_area_fill() to create a true circular (or elliptical) kernel. + * + * The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement. + * Even-sized kernels (generally not recommended) will extend farther towards the top left image corner for minimum + * (erosion) and towards the bottom right corner for maximum (dilation) operations due to the reflection. If you need + * off-center structuring elements you can add empty rows or columns to one side of the kernel to counteract the + * symmetrisation. + * + * The operation is linear-time in kernel size for any convex kernel. Note gwy_data_field_area_filter_minimum() and + * gwy_data_field_area_filter_maximum(), which are limited to square structuring elements, are much faster for large + * sizes of the squares. * * The exterior is always handled as %GWY_EXTERIOR_BORDER_EXTEND. * @@ -1551,10 +1477,8 @@ gint ifrom = row + i, ito = row + gwy_omp_chunk_end(height); gdouble *b = buf->data + i*width; - gwy_data_field_area_filter_min_max_real(data_field, redkernel, b, - filtertype, - col, ifrom, - width, ito - ifrom); + gwy_data_field_area_filter_min_max_real(data_field, redkernel, b, filtertype, + col, ifrom, width, ito - ifrom); } } @@ -1566,24 +1490,22 @@ /** * gwy_data_field_area_filter_disc_asf: * @data_field: A data field to apply the filter to. - * @radius: Maximum radius of the circular structuring element, in pixels. - * For radius 0 and smaller the filter is no-op. - * @closing: %TRUE requests an opening-closing filter (i.e. ending with - * closing), %FALSE requests a closing-opening filter (i.e. ending - * with opening). + * @radius: Maximum radius of the circular structuring element, in pixels. For radius 0 and smaller the filter is + * no-op. + * @closing: %TRUE requests an opening-closing filter (i.e. ending with closing), %FALSE requests a closing-opening + * filter (i.e. ending with opening). * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * - * Applies an alternating sequential morphological filter with a flat disc - * structuring element to a part of a data field. + * Applies an alternating sequential morphological filter with a flat disc structuring element to a part of a data + * field. * - * Alternating sequential filter is a filter consisting of repeated opening and - * closing (or closing and opening) with progressively larger structuring - * elements. This function performs such filtering for sequence of structuring - * elements consisting of true Euclidean discs with increasing radii. The - * largest disc in the sequence fits into a (2@size + 1) × (2@size + 1) square. + * Alternating sequential filter is a filter consisting of repeated opening and closing (or closing and opening) with + * progressively larger structuring elements. This function performs such filtering for sequence of structuring + * elements consisting of true Euclidean discs with increasing radii. The largest disc in the sequence fits into + * a (2@size + 1) × (2@size + 1) square. * * Since: 2.43 **/ @@ -1628,13 +1550,9 @@ gint ifrom = row + i, ito = row + gwy_omp_chunk_end(height); gdouble *b = buf->data + i*width; - gwy_data_field_area_filter_min_max_real(data_field, kernel, b, - filtertype1, - col, ifrom, - width, ito - ifrom); + gwy_data_field_area_filter_min_max_real(data_field, kernel, b, filtertype1, col, ifrom, width, ito - ifrom); } - gwy_data_field_area_copy(buf, data_field, - 0, 0, width, height, col, row); + gwy_data_field_area_copy(buf, data_field, 0, 0, width, height, col, row); #ifdef _OPENMP #pragma omp parallel if (gwy_threads_are_enabled()) default(none) \ @@ -1645,13 +1563,9 @@ gint ifrom = row + i, ito = row + gwy_omp_chunk_end(height); gdouble *b = buf->data + i*width; - gwy_data_field_area_filter_min_max_real(data_field, kernel, b, - filtertype2, - col, ifrom, - width, ito - ifrom); + gwy_data_field_area_filter_min_max_real(data_field, kernel, b, filtertype2, col, ifrom, width, ito - ifrom); } - gwy_data_field_area_copy(buf, data_field, - 0, 0, width, height, col, row); + gwy_data_field_area_copy(buf, data_field, 0, 0, width, height, col, row); g_object_unref(kernel); } g_object_unref(buf); @@ -1668,9 +1582,8 @@ * * Filters a rectangular part of a data field with median filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_kth_rank() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_kth_rank() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_area_filter_median(GwyDataField *data_field, @@ -1710,12 +1623,9 @@ gint xto = MIN(width-1, j + size/2); gint len = xto - xfrom + 1; for (k = yfrom; k <= yto; k++) { - gwy_assign(kernel + len*(k - yfrom), - data + k*xres + xfrom, - len); + gwy_assign(kernel + len*(k - yfrom), data + k*xres + xfrom, len); } - buffer[i*width + j] = gwy_math_median(len*(yto - yfrom + 1), - kernel); + buffer[i*width + j] = gwy_math_median(len*(yto - yfrom + 1), kernel); } } g_free(kernel); @@ -1734,17 +1644,15 @@ * * Filters a data field with median filter. * - * This method uses a simple square kernel. Use the general function - * gwy_data_field_area_filter_kth_rank() to perform filtering with different, - * for instance circular, kernel. + * This method uses a simple square kernel. Use the general function gwy_data_field_area_filter_kth_rank() to perform + * filtering with a different kernel, for instance circular. **/ void gwy_data_field_filter_median(GwyDataField *data_field, gint size) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_filter_median(data_field, size, 0, 0, - data_field->xres, data_field->yres); + gwy_data_field_area_filter_median(data_field, size, 0, 0, data_field->xres, data_field->yres); } static void @@ -1833,8 +1741,7 @@ g_free(mrtree->bits); } -/* The compiler should be clever enough to avoid repeated comparison of levels - * with the constants. GCC seems to be. */ +/* The compiler should be clever enough to avoid repeated comparison of levels with the constants. GCC seems to be. */ static void median_radix_tree_add(MedianRadixTree *mrtree, guint v) { @@ -2032,8 +1939,8 @@ return v << 2; } -/* This can be relatively complicated compared to add/remove because we run - * add/remove twenty or hundred times per one k-th rank invocation. */ +/* This can be relatively complicated compared to add/remove because we run add/remove twenty or hundred times per one + * k-th rank invocation. */ static guint median_radix_tree_kth_rank(const MedianRadixTree *mrtree, guint k) { @@ -2124,8 +2031,7 @@ if (data[k] <= 0.0) continue; - /* Use xres from the image, not the kernel. This means the indices - * are directly usable with the image. */ + /* Use xres from the image, not the kernel. This means the indices are directly usable with the image. */ if (!i || data[k-kxres] <= 0.0) g_array_append_val(up, kk); if (!j || data[k-1] <= 0.0) @@ -2193,27 +2099,20 @@ extyend = extrow + exth; /* Crop-only; also reduces to plain duplicate() for exact size match. */ - if (extcol >= 0 && extrow >= 0 && extxend <= xres && extyend <= yres) { - return gwy_data_field_area_extract(dfield, - extcol, extrow, extw, exth); - } + if (extcol >= 0 && extrow >= 0 && extxend <= xres && extyend <= yres) + return gwy_data_field_area_extract(dfield, extcol, extrow, extw, exth); /* Extend-only */ if (extcol <= 0 && extrow <= 0 && extxend >= xres && extyend >= yres) { - return gwy_data_field_extend(dfield, - -extcol, extxend-xres, - -extrow, extyend-yres, + return gwy_data_field_extend(dfield, -extcol, extxend-xres, -extrow, extyend-yres, GWY_EXTERIOR_BORDER_EXTEND, 0.0, FALSE); } - /* When we both crop and extend, crop first, then border-extend the - * parts we need to extend. */ - tmp = gwy_data_field_area_extract(dfield, - MAX(extcol, 0), MAX(extrow, 0), + /* When we both crop and extend, crop first, then border-extend the parts we need to extend. */ + tmp = gwy_data_field_area_extract(dfield, MAX(extcol, 0), MAX(extrow, 0), MIN(extxend, xres) - MAX(extcol, 0), MIN(extyend, yres) - MAX(extrow, 0)); - dfield = gwy_data_field_extend(tmp, - MAX(-extcol, 0), MAX(extxend-xres, 0), + dfield = gwy_data_field_extend(tmp, MAX(-extcol, 0), MAX(extxend-xres, 0), MAX(-extrow, 0), MAX(extyend-yres, 0), GWY_EXTERIOR_BORDER_EXTEND, 0.0, FALSE); g_object_unref(tmp); @@ -2257,8 +2156,7 @@ for (i = 0; i < extn; i++) ranks[revindex[i]] = i; - /* Initialise the tree with ranks corresponding to kernel in top left - * corner. */ + /* Initialise the tree with ranks corresponding to kernel in top left corner. */ median_radix_tree_alloc(&mrtree, extn); kd = kernel->data; kn = 0; @@ -2274,8 +2172,8 @@ /* Analyse kernel boundaries. */ filter_kernel_boundaries_create(kernel, &kbound, extxres); - /* Go vertically in the inner loop because then we tend to access ranks[] - * in contiguous blocks. Recycle the revindex[] array as filtered[]. */ + /* Go vertically in the inner loop because then we tend to access ranks[] in contiguous blocks. Recycle the + * revindex[] array as filtered[]. */ filtered = revindex; workdone = 0; j = 0; @@ -2323,8 +2221,7 @@ median_radix_tree_add(&mrtree, rr[kbound.right[n]]); workdone += kn*h; - /* Check for cancellation in the master thread because set_fraction() - * can make GTK+ calls. + /* Check for cancellation in the master thread because set_fraction() can make GTK+ calls. * XXX: This slows down only the master thread, harming scaling. */ if (set_fraction && workdone >= 1000000 && !gwy_omp_thread_num()) { if (!set_fraction(j/(gdouble)w)) @@ -2422,27 +2319,18 @@ * * Applies a @k-th rank filter to a part of a data field. * - * Pass half the number of non-zero values in @kernel as @k for a median - * filter. + * Pass half the number of non-zero values in @kernel as @k for a median filter. + * + * The kernel field is a mask that defines the shape of the kernel. You can use gwy_data_field_elliptic_area_fill() + * to create a true circular (or elliptical) kernel. The kernel must be non-empty. * - * The kernel field is a mask that defines the shape of the kernel. You can - * use gwy_data_field_elliptic_area_fill() to create a true circular (or - * elliptical) kernel. The kernel must be non-empty. - * - * The kernel is implicitly centered, i.e. it will be applied symmetrically to - * avoid unexpected data movement. Even-sized kernels (generally not - * recommended) will extend farther towards the top left image corner for - * minimum (erosion) and towards the bottom right corner for maximum (dilation) - * operations due to the reflection. If you need off-center structuring - * elements you can add empty rows or columns to one side of the kernel to - * counteract the symmetrisation. + * The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement. * * The exterior is always handled as %GWY_EXTERIOR_BORDER_EXTEND. * * If the operation is aborted the contents of @data_field is untouched. * - * Returns: %TRUE if the operation was not aborted via @set_fraction - * returning %FALSE; %FALSE if it was aborted. + * Returns: %TRUE if the operation was not aborted via @set_fraction returning %FALSE; %FALSE if it was aborted. * * Since: 2.51 **/ @@ -2470,30 +2358,24 @@ n++; } /* This also fails for an empty kernel. */ - g_return_val_if_fail(k < n, FALSE); + g_return_val_if_fail(k >= 0 && k < n, FALSE); /* Catch some simpler cases (currently cannot be aborted). */ if (k == 0) { - gwy_data_field_area_filter_min_max(data_field, kernel, - GWY_MIN_MAX_FILTER_MINIMUM, - col, row, width, height); + gwy_data_field_area_filter_min_max(data_field, kernel, GWY_MIN_MAX_FILTER_MINIMUM, col, row, width, height); return TRUE; } if (k == n-1) { - gwy_data_field_area_filter_min_max(data_field, kernel, - GWY_MIN_MAX_FILTER_MAXIMUM, - col, row, width, height); + gwy_data_field_area_filter_min_max(data_field, kernel, GWY_MIN_MAX_FILTER_MAXIMUM, col, row, width, height); return TRUE; } redkernel = gwy_data_field_duplicate(kernel); - /* FIXME: It seems there is no way to counteract the autocrop so off-centre - * kernel do not work! */ + /* FIXME: It seems there is no way to counteract the autocrop so off-centre kernel do not work! */ gwy_data_field_grains_autocrop(redkernel, TRUE, NULL, NULL, NULL, NULL); if (n <= 25) { /* The filter should be fast for tiny kernels. */ - area_rank_filter_kernel_direct(data_field, col, row, width, height, - redkernel, k, n); + area_rank_filter_kernel_direct(data_field, col, row, width, height, redkernel, k, n); g_object_unref(redkernel); return TRUE; } @@ -2508,17 +2390,103 @@ gint ito = row + gwy_omp_chunk_end(height); /* XXX: We do all the kernel analysis repeatedly. */ - area_rank_filter_kernel_radixtree(data_field, - col, ifrom, width, ito - ifrom, - redkernel, k, set_fraction, &ok); + area_rank_filter_kernel_radixtree(data_field, col, ifrom, width, ito - ifrom, redkernel, k, set_fraction, &ok); } g_object_unref(redkernel); return ok; } -/* Add a value, updating integer value interval boundaries f1 and f2 and the - * running sum. */ +/** + * gwy_data_line_part_filter_kth_rank: + * @data_line: A data line. + * @klen: Kernel size. The kernel is symmetrical segment of @klen pixels. + * @from: The index in @data_line to start from (inclusive). + * @to: The index in @data_line to stop (noninclusive). + * @k: Rank of the value to store as the output (from lowest to highest). It must be between 0 and @klen-1 + * (inclusive). + * + * Applies a @k-th rank filter to a part of a data line. + * + * The exterior is always handled as %GWY_EXTERIOR_BORDER_EXTEND. + * + * Since: 2.63 + **/ +void +gwy_data_line_part_filter_kth_rank(GwyDataLine *data_line, + gint klen, + gint from, + gint to, + gint k) +{ + MedianRadixTree mrtree; + gint extfrom = from - (klen-1 - klen/2), extto = to + klen/2, extres = extto - extfrom; + gdouble *data, *datacopy; + guint *revindex, *ranks; + gint i, j, res; + + g_return_if_fail(GWY_IS_DATA_LINE(data_line)); + g_return_if_fail(klen > 0); + g_return_if_fail(k >= 0 && k < klen); + + if (klen == 1) + return; + + res = data_line->res; + data = data_line->data; + datacopy = g_new(gdouble, extres); + j = 0; + + /* Crop-extend the line segment. */ + for (i = extfrom; i < 0; i++) + datacopy[j++] = data[0]; + gwy_assign(datacopy + j, data + MAX(0, extfrom), MIN(res, extto) - MAX(0, extfrom)); + j += MIN(res, extto) - MAX(0, extfrom); + while (j < extres) + datacopy[j++] = data[res-1]; + + /* TODO: There are other cases we might want to handle specially: + * k == 0 (minimum), and generally small k (use direct method) + * k == klen-1 (maximum), and generally small klen-1 - k (use direct method) + * small klen (use direct method) + * + * The threshold is given by doing at least log(extres) work per pixel just because of sorting. The radix tree + * work is only log(klen) (or actually a fixed constant here), so that is not a major cost. + **/ + + revindex = g_new(guint, extres); + ranks = g_new(guint, extres); + for (i = 0; i < extres; i++) + revindex[i] = i; + gwy_math_sort_with_index(extres, datacopy, revindex); + for (i = 0; i < extres; i++) + ranks[revindex[i]] = i; + g_free(revindex); + + median_radix_tree_alloc(&mrtree, extres); + for (i = 0; i < klen; i++) + median_radix_tree_add(&mrtree, ranks[i]); + + i = 0; + while (TRUE) { + j = median_radix_tree_kth_rank(&mrtree, k); + data[from + i] = datacopy[j]; + + if (i == extres - klen) + break; + + median_radix_tree_remove(&mrtree, ranks[i]); + median_radix_tree_add(&mrtree, ranks[i+klen]); + i++; + } + + median_radix_tree_free(&mrtree); + + g_free(ranks); + g_free(datacopy); +} + +/* Add a value, updating integer value interval boundaries f1 and f2 and the running sum. */ static void median_radix_tree_add_tmean(MedianRadixTree *mrtree, TrimmedMeanState *tmstate, @@ -2538,8 +2506,7 @@ tmstate->runningsum += values[v]; } -/* Remove a value, updating integer value interval boundaries f1 and f2 and the - * running sum. */ +/* Remove a value, updating integer value interval boundaries f1 and f2 and the running sum. */ static void median_radix_tree_remove_tmean(MedianRadixTree *mrtree, TrimmedMeanState *tmstate, @@ -2562,15 +2529,12 @@ } } -/* Assume strictly k1 < n-1 - k2. This allows assuming strictly f1 < f2 all - * the time. Value within the rank interval [k1, n-1 - k2] (inclusive) are used - * for averaging. - * - * This filter algorithm is written for the case of small k1 and k2, i.e. - * trimming of the tails. If the filter output is calculated just from a small - * interval of ranks, it would be more efficient to calculate the average value - * directly from the tree (and updating f1 and f2 just once per output pixel). - * */ +/* Assume strictly k1 < n-1 - k2. This allows assuming strictly f1 < f2 all the time. Values within the rank interval + * [k1, n-1 - k2] (inclusive) are used for averaging. + * + * This filter algorithm is written for the case of small k1 and k2, i.e. trimming of the tails. If the filter output + * is calculated just from a small interval of ranks, it would be more efficient to calculate the average value + * directly from the tree (and updating f1 and f2 just once per output pixel). */ static void area_tmean_filter_kernel_radixtree(GwyDataField *dfield, guint col, guint row, guint w, guint h, @@ -2611,8 +2575,7 @@ ranks[revindex[i]] = i; g_free(revindex); - /* Initialise the tree with ranks corresponding to kernel in top left - * corner. */ + /* Initialise the tree with ranks corresponding to kernel in top left corner. */ median_radix_tree_alloc(&mrtree, extn); kd = kernel->data; kn = 0; @@ -2647,12 +2610,10 @@ /* Analyse kernel boundaries. */ filter_kernel_boundaries_create(kernel, &kbound, extxres); - /* Go vertically in the inner loop because then we tend to access ranks[] - * in contiguous blocks. + /* Go vertically in the inner loop because then we tend to access ranks[] in contiguous blocks. * - * We must not cause violation of f1 < f2, which would occur if we removed - * to many values. So instead of doiing add/remove in block, we always add - * one, remove one, add one, remove one, etc. And keep tmstate consistent + * We must not cause violation of f1 < f2, which would occur if we removed to many values. So instead of doiing + * add/remove in block, we always add one, remove one, add one, remove one, etc. And keep tmstate consistent * during the procedure. */ workdone = 0; j = 0; @@ -2663,10 +2624,8 @@ while (i < h-1) { rr = ranks + i*extxres + j; for (n = 0; n < kbound.ndown; n++) { - median_radix_tree_add_tmean(&mrtree, &tmstate, e, - rr[kbound.down[n] + extxres]); - median_radix_tree_remove_tmean(&mrtree, &tmstate, e, - rr[kbound.up[n]]); + median_radix_tree_add_tmean(&mrtree, &tmstate, e, rr[kbound.down[n] + extxres]); + median_radix_tree_remove_tmean(&mrtree, &tmstate, e, rr[kbound.up[n]]); } i++; out[i*w + j] = tmstate.runningsum; @@ -2678,10 +2637,8 @@ while (i) { rr = ranks + i*extxres + j; for (n = 0; n < kbound.nup; n++) { - median_radix_tree_add_tmean(&mrtree, &tmstate, e, - *(rr + kbound.up[n] - extxres)); - median_radix_tree_remove_tmean(&mrtree, &tmstate, e, - rr[kbound.down[n]]); + median_radix_tree_add_tmean(&mrtree, &tmstate, e, *(rr + kbound.up[n] - extxres)); + median_radix_tree_remove_tmean(&mrtree, &tmstate, e, rr[kbound.down[n]]); } i--; out[i*w + j] = tmstate.runningsum; @@ -2694,33 +2651,29 @@ rr = ranks + i*extxres + j; for (n = 0; n < kbound.nright; n++) { - median_radix_tree_add_tmean(&mrtree, &tmstate, e, - rr[kbound.right[n] + 1]); - median_radix_tree_remove_tmean(&mrtree, &tmstate, e, - rr[kbound.left[n]]); + median_radix_tree_add_tmean(&mrtree, &tmstate, e, rr[kbound.right[n] + 1]); + median_radix_tree_remove_tmean(&mrtree, &tmstate, e, rr[kbound.left[n]]); } j++; out[i*w + j] = tmstate.runningsum; workdone += kn*h; - /* Check for cancellation in the master thread because set_fraction() - * can make GTK+ calls. + /* Check for cancellation in the master thread because set_fraction() can make GTK+ calls. * XXX: This slows down only the master thread, harming scaling. */ if (set_fraction && workdone >= 1000000 && !gwy_omp_thread_num()) { if (!set_fraction(j/(gdouble)w)) gwy_omp_atomic_write_boolean(ok, FALSE); workdone = 0; } - /* In all threads, including the master one for consistency, we read - * back the ok flag and cancel if requested. */ + /* In all threads, including the master one for consistency, we read back the ok flag and cancel if requested. + */ cancelled = !gwy_omp_atomic_read_boolean(ok); } if (!cancelled) { for (i = 0; i < h; i++) gwy_assign(dfield->data + (row + i)*xres + col, out + i*w, w); - gwy_data_field_area_multiply(dfield, col, row, w, h, - 1.0/(kn - nlowest - nhighest)); + gwy_data_field_area_multiply(dfield, col, row, w, h, 1.0/(kn - nlowest - nhighest)); } g_free(ranks); @@ -2776,8 +2729,7 @@ gdouble *e = ed + i*extxres + j; for (n = 0; n < ksize; n++) buf[n] = e[kindex[n]]; - d[i*xres + j] = gwy_math_trimmed_mean(ksize, buf, - nlowest, nhighest); + d[i*xres + j] = gwy_math_trimmed_mean(ksize, buf, nlowest, nhighest); } } @@ -2803,29 +2755,24 @@ * * Applies a trimmed mean filter to a part of a data field. * - * At least one value must remain after the trimming, i.e. @nlowest + @nhighest - * must be smaller than the number of non-zero values in @kernel. Usually one - * passes the same number as both @nlowest and @nhighest, but it is not + * At least one value must remain after the trimming, i.e. @nlowest + @nhighest must be smaller than the number of + * non-zero values in @kernel. Usually one passes the same number as both @nlowest and @nhighest, but it is not * a requirement. * - * The kernel field is a mask that defines the shape of the kernel. You can - * use gwy_data_field_elliptic_area_fill() to create a true circular (or - * elliptical) kernel. The kernel must be non-empty. - * - * The kernel is implicitly centered, i.e. it will be applied symmetrically to - * avoid unexpected data movement. Even-sized kernels (generally not - * recommended) will extend farther towards the top left image corner for - * minimum (erosion) and towards the bottom right corner for maximum (dilation) - * operations due to the reflection. If you need off-center structuring - * elements you can add empty rows or columns to one side of the kernel to - * counteract the symmetrisation. + * The kernel field is a mask that defines the shape of the kernel. You can use gwy_data_field_elliptic_area_fill() + * to create a true circular (or elliptical) kernel. The kernel must be non-empty. + * + * The kernel is implicitly centered, i.e. it will be applied symmetrically to avoid unexpected data movement. + * Even-sized kernels (generally not recommended) will extend farther towards the top left image corner for minimum + * (erosion) and towards the bottom right corner for maximum (dilation) operations due to the reflection. If you need + * off-center structuring elements you can add empty rows or columns to one side of the kernel to counteract the + * symmetrisation. * * The exterior is always handled as %GWY_EXTERIOR_BORDER_EXTEND. * * If the operation is aborted the contents of @data_field is untouched. * - * Returns: %TRUE if the operation was not aborted via @set_fraction - * returning %FALSE; %FALSE if it was aborted. + * Returns: %TRUE if the operation was not aborted via @set_fraction returning %FALSE; %FALSE if it was aborted. * * Since: 2.53 **/ @@ -2860,9 +2807,7 @@ * NB: This one is important to catch in order to satisfy that the trimmed * mean filter gets strictly k1 < k2! */ if (nlowest + nhighest + 1 == n) { - return gwy_data_field_area_filter_kth_rank(data_field, kernel, - col, row, width, height, - nlowest, set_fraction); + return gwy_data_field_area_filter_kth_rank(data_field, kernel, col, row, width, height, nlowest, set_fraction); } redkernel = gwy_data_field_duplicate(kernel); @@ -2873,10 +2818,8 @@ if (!nhighest && !nlowest) { /* Preserve units updated by ext_convolve(). */ gwy_data_field_copy_units(data_field, redkernel); - gwy_data_field_area_ext_convolve(data_field, col, row, width, height, - data_field, redkernel, - GWY_EXTERIOR_BORDER_EXTEND, 0.0, - FALSE); + gwy_data_field_area_ext_convolve(data_field, col, row, width, height, data_field, redkernel, + GWY_EXTERIOR_BORDER_EXTEND, 0.0, FALSE); gwy_data_field_copy_units(redkernel, data_field); g_object_unref(redkernel); return TRUE; @@ -2884,8 +2827,7 @@ if (n <= 40) { /* The filter should be fast for tiny kernels. */ - area_tmean_filter_kernel_direct(data_field, col, row, width, height, - redkernel, nlowest, nhighest, n); + area_tmean_filter_kernel_direct(data_field, col, row, width, height, redkernel, nlowest, nhighest, n); g_object_unref(redkernel); return TRUE; } @@ -2900,13 +2842,11 @@ gint ito = row + gwy_omp_chunk_end(height); /* XXX: We do all the kernel analysis repeatedly. */ - area_tmean_filter_kernel_radixtree(data_field, - col, ifrom, width, ito - ifrom, - redkernel, nlowest, nhighest, - set_fraction, &ok); + area_tmean_filter_kernel_radixtree(data_field, col, ifrom, width, ito - ifrom, + redkernel, nlowest, nhighest, set_fraction, &ok); } return ok; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/gwycalibration.c gwyddion-2.63/libprocess/gwycalibration.c --- gwyddion-2.62/libprocess/gwycalibration.c 2021-03-08 15:31:59.000000000 +0000 +++ gwyddion-2.63/libprocess/gwycalibration.c 2023-05-25 12:11:03.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwycalibration.c 23204 2021-03-08 15:31:59Z yeti-dn $ + * $Id: gwycalibration.c 25360 2023-05-25 12:11:02Z yeti-dn $ * Copyright (C) 2010,2011 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -278,9 +278,11 @@ else g_warning("Unknown field `%s'.", key); } + g_free(str); calibration = gwy_calibration_new(filename, filename); gwy_calibration_sanitize(calibration); + return (GwyResource*)calibration; } diff -Nru gwyddion-2.62/libprocess/gwyprocessenums.c gwyddion-2.63/libprocess/gwyprocessenums.c --- gwyddion-2.62/libprocess/gwyprocessenums.c 2021-10-06 11:25:19.000000000 +0000 +++ gwyddion-2.63/libprocess/gwyprocessenums.c 2023-06-02 13:50:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyprocessenums.c 24254 2021-10-06 11:25:18Z yeti-dn $ + * $Id: gwyprocessenums.c 25400 2023-06-02 13:50:51Z yeti-dn $ * Copyright (C) 2005-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -617,6 +617,7 @@ * @GWY_CORR_SEARCH_HEIGHT_DIFF_RAW: Raw mean square difference between data and kernel values. * @GWY_CORR_SEARCH_HEIGHT_DIFF: Mean values of data and kernel are adjusted before summing the squared differences. * @GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE: In addition, result is normalised by dividing by the local variance. + * @GWY_CORR_SEARCH_PHASE_ONLY_SCORE: Score from phase-only correlation (since 2.63). * * Type of correlation search output. * diff -Nru gwyddion-2.62/libprocess/gwyprocessenums.h gwyddion-2.63/libprocess/gwyprocessenums.h --- gwyddion-2.62/libprocess/gwyprocessenums.h 2021-10-06 11:25:19.000000000 +0000 +++ gwyddion-2.63/libprocess/gwyprocessenums.h 2023-06-02 13:50:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyprocessenums.h 24254 2021-10-06 11:25:18Z yeti-dn $ + * $Id: gwyprocessenums.h 25400 2023-06-02 13:50:51Z yeti-dn $ * Copyright (C) 2005-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -183,6 +183,7 @@ GWY_CORR_SEARCH_HEIGHT_DIFF_RAW = 3, GWY_CORR_SEARCH_HEIGHT_DIFF = 4, GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE = 5, + GWY_CORR_SEARCH_PHASE_ONLY_SCORE = 6, } GwyCorrSearchType; /* The values should not grow over 62 (to be usable as bit positions) */ diff -Nru gwyddion-2.62/libprocess/gwyprocesstypes.c gwyddion-2.63/libprocess/gwyprocesstypes.c --- gwyddion-2.62/libprocess/gwyprocesstypes.c 2021-10-22 16:33:05.000000000 +0000 +++ gwyddion-2.63/libprocess/gwyprocesstypes.c 2023-06-05 08:59:35.000000000 +0000 @@ -368,6 +368,7 @@ { GWY_CORR_SEARCH_HEIGHT_DIFF_RAW, "GWY_CORR_SEARCH_HEIGHT_DIFF_RAW", "height-diff-raw" }, { GWY_CORR_SEARCH_HEIGHT_DIFF, "GWY_CORR_SEARCH_HEIGHT_DIFF", "height-diff" }, { GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE, "GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE", "height-diff-score" }, + { GWY_CORR_SEARCH_PHASE_ONLY_SCORE, "GWY_CORR_SEARCH_PHASE_ONLY_SCORE", "phase-only-score" }, { 0, NULL, NULL } }; etype = g_enum_register_static("GwyCorrSearchType", values); diff -Nru gwyddion-2.62/libprocess/inttrans.c gwyddion-2.63/libprocess/inttrans.c --- gwyddion-2.62/libprocess/inttrans.c 2022-06-22 08:49:13.000000000 +0000 +++ gwyddion-2.63/libprocess/inttrans.c 2023-01-06 12:32:34.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: inttrans.c 24844 2022-06-22 06:36:15Z yeti-dn $ + * $Id: inttrans.c 25190 2023-01-06 12:32:34Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -593,7 +593,9 @@ /* Transform premultiplied data. */ make_cexp(cs, n, 2.0*G_PI*f0/n); - for (k = 0; k < n; k++) { + gwycreal(x[0]) = rein[0]; + gwycimag(x[0]) = imin ? imin[0] : 0.0; + for (k = 1; k < n; k++) { fftw_complex t, d; gwycreal(t) = cjmulre(cs[k], w[size - k]); gwycimag(t) = cjmulim(cs[k], w[size - k]); diff -Nru gwyddion-2.62/libprocess/linestats.c gwyddion-2.63/libprocess/linestats.c --- gwyddion-2.62/libprocess/linestats.c 2022-08-26 15:24:57.000000000 +0000 +++ gwyddion-2.63/libprocess/linestats.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: linestats.c 24952 2022-08-26 15:24:56Z yeti-dn $ + * $Id: linestats.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -82,8 +78,7 @@ * * Finds the minimum pixel position of a data line. * - * For historical reasons the value is returned as double, but it is always - * an integer. + * For historical reasons the value is returned as double, but it is always an integer. * * Returns: The minimum pixel position. * @@ -114,8 +109,7 @@ * * Finds the maximum pixel position of a data line. * - * For historical reasons the value is returned as double, but it is always - * an integer. + * For historical reasons the value is returned as double, but it is always an integer. * * Returns: The maximum pixel position. * @@ -472,8 +466,8 @@ * * Returns: The kurtosis of height values. * - * Note the kurtosis returned by this function returns is the excess kurtosis - * which is zero for the Gaussian distribution (not 3). + * Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian + * distribution (not 3). * * Since: 2.42 **/ @@ -555,8 +549,8 @@ * * Computes kurtosis value of a part of a data line. * - * Note the kurtosis returned by this function returns is the excess kurtosis - * which is zero for the Gaussian distribution (not 3). + * Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian + * distribution (not 3). * * Returns: Kurtosis of heights within a given interval. **/ @@ -610,8 +604,8 @@ * * Computes root mean square slope in a part of a data line. * - * This is the root mean square of value derivatives, it is also proportional - * to the second derivative of both HHCF and ACF at zero. + * This is the root mean square of value derivatives, it is also proportional to the second derivative of both HHCF + * and ACF at zero. * * This roughness quantity is also known as Dq. * @@ -647,11 +641,9 @@ * * Computes the total variation of a part of a data line. * - * The total variation is estimated as the integral of the absolute value of - * local gradient. For one dimensional data, the variation reduces to the - * integral of absolute value of the derivative. Its units are thus the same - * as the value units of the line. See also - * gwy_data_field_area_get_variation() for some more discussion. + * The total variation is estimated as the integral of the absolute value of local gradient. For one dimensional + * data, the variation reduces to the integral of absolute value of the derivative. Its units are thus the same as + * the value units of the line. See also gwy_data_field_area_get_variation() for some more discussion. * * Returns: The total variation within a given interval. * @@ -742,8 +734,7 @@ din = gwy_data_line_new(res, 1.0, FALSE); dout = gwy_data_line_new(res, 1.0, FALSE); - plan = gwy_fftw_plan_r2r_1d(res, din->data, dout->data, - FFTW_R2HC, FFTW_ESTIMATE); + plan = gwy_fftw_plan_r2r_1d(res, din->data, dout->data, FFTW_R2HC, FFTW_ESTIMATE); /* In principle, we only need this for ACF, but removing constant offset * never hurts. */ @@ -759,10 +750,8 @@ target_line->real = data_line->real; target_line->off = 0.0; gwy_data_line_multiply(target_line, 1.0/res); - gwy_si_unit_assign(gwy_data_line_get_si_unit_x(target_line), - gwy_data_line_get_si_unit_x(data_line)); - gwy_si_unit_power(gwy_data_line_get_si_unit_y(data_line), 2, - gwy_data_line_get_si_unit_y(target_line)); + gwy_si_unit_assign(gwy_data_line_get_si_unit_x(target_line), gwy_data_line_get_si_unit_x(data_line)); + gwy_si_unit_power(gwy_data_line_get_si_unit_y(data_line), 2, gwy_data_line_get_si_unit_y(target_line)); } /** @@ -771,8 +760,7 @@ * @target_line: Data line to store autocorrelation function to. It will be * resized to @data_line size. * - * Coputes autocorrelation function and stores the values in - * @target_line + * Coputes autocorrelation function and stores the values in @target_line * * Up to version 2.53 it did not set the output units properly. **/ @@ -785,11 +773,9 @@ /** * gwy_data_line_hhcf: * @data_line: A data line. - * @target_line: Data line to store height-height function to. It will be - * resized to @data_line size. + * @target_line: Data line to store height-height function to. It will be resized to @data_line size. * - * Computes height-height correlation function and stores results in - * @target_line. + * Computes height-height correlation function and stores results in @target_line. * * Up to version 2.53 it did not set the output units properly. **/ @@ -802,16 +788,13 @@ /** * gwy_data_line_psdf: * @data_line: A data line. - * @target_line: Data line to store power spectral density function to. - * It will be resized to @data_line size. + * @target_line: Data line to store power spectral density function to. It will be resized to @data_line size. * @windowing: Windowing method to use. - * @interpolation: Interpolation type. - * Ignored since 2.8 as no resampling is performed. + * @interpolation: Interpolation type. Ignored since 2.8 as no resampling is performed. * * Calculates the power spectral density function of a data line. * - * Up to version 2.45 it destroyed the input data and did not set the output - * units properly. + * Up to version 2.45 it destroyed the input data and did not set the output units properly. **/ void gwy_data_line_psdf(GwyDataLine *data_line, @@ -833,12 +816,7 @@ rout = gwy_data_line_new_alike(data_line, FALSE); iout = gwy_data_line_new_alike(data_line, FALSE); gwy_data_line_resample(target_line, res/2, GWY_INTERPOLATION_NONE); - - gwy_data_line_fft(data_line, iin, rout, iout, - windowing, - GWY_TRANSFORM_DIRECTION_FORWARD, - interpolation, - TRUE, 2); + gwy_data_line_fft(data_line, iin, rout, iout, windowing, GWY_TRANSFORM_DIRECTION_FORWARD, interpolation, TRUE, 2); data = target_line->data; rdata = rout->data; @@ -869,31 +847,25 @@ /** * gwy_data_line_distribution: * @data_line: A data line. - * @distribution: Data line to put the distribution of @data_line values to. - * It will be resampled to @nstats samples (or the automatically - * chosen number of bins). + * @distribution: Data line to put the distribution of @data_line values to. It will be resampled to @nstats samples + * (or the automatically chosen number of bins). * @ymin: Start of value range, pass @ymin = @ymax = 0.0 for the full range. * @ymax: End of value range. - * @normalize_to_unity: %TRUE to normalize the integral to unity (including - * setting y-units of output to the inverse of x-units), - * %FALSE to keep plain counts in the output (and set - * y-units to none). - * @nstats: The requested number of histogram bins, pass a non-positive number - * to automatically choose a suitable number of bins. + * @normalize_to_unity: %TRUE to normalize the integral to unity (including setting y-units of output to the inverse + * of x-units), %FALSE to keep plain counts in the output (and set y-units to none). + * @nstats: The requested number of histogram bins, pass a non-positive number to automatically choose a suitable + * number of bins. * * Calculates the distribution of data line values. * - * This function is quite similar to gwy_data_line_dh(), the differences are: - * output normalization (chosen to make the integral unity), output units - * (again set to make the integral unity), automated binning. - * - * Note the @i-th bin is [@i*@dx+@off,(@i+1)*@dx+@off] so the central value - * you probably want to use for plotting is (@i+0.5)*@dx+@off (where @dx is - * the @distribution data line pixel size, @off is its offset). - * - * If all values are equal and @ymin, @ymax are not explictly specified, the - * range is chosen as [@v-|@v|/2,@v+|@v/2] where @v is the unique value, - * except when @v=0, in which case the range is set to [-1,1]. + * This function is quite similar to gwy_data_line_dh(), the differences are: output normalization (chosen to make the + * integral unity), output units (again set to make the integral unity), automated binning. + * + * Note the @i-th bin is [@i*@dx+@off,(@i+1)*@dx+@off] so the central value you probably want to use for plotting is + * (@i+0.5)*@dx+@off (where @dx is the @distribution data line pixel size, @off is its offset). + * + * If all values are equal and @ymin, @ymax are not explictly specified, the range is chosen as [@v-|@v|/2,@v+|@v/2] + * where @v is the unique value, except when @v=0, in which case the range is set to [-1,1]. * * Since: 2.8 **/ @@ -981,16 +953,14 @@ /** * gwy_data_line_dh: * @data_line: A data line. - * @target_line: Data line to store height distribution function to. - * It will be resized to @nsteps. + * @target_line: Data line to store height distribution function to. It will be resized to @nsteps. * @ymin: Height distribution minimum value. * @ymax: Height distribution maximum value. * @nsteps: Number of histogram steps. * * Computes distribution of heights in interval [@ymin, @ymax). * - * If the interval is (0, 0) it computes the distribution from - * real data minimum and maximum value. + * If the interval is (0, 0) it computes the distribution from real data minimum and maximum value. **/ void gwy_data_line_dh(GwyDataLine *data_line, @@ -1030,16 +1000,14 @@ /** * gwy_data_line_cdh: * @data_line: A data line. - * @target_line: Data line to store height distribution function to. - * It will be resized to @nsteps. + * @target_line: Data line to store height distribution function to. It will be resized to @nsteps. * @ymin: Height distribution minimum value. * @ymax: Height distribution maximum value. * @nsteps: Number of histogram steps. * * Computes cumulative distribution of heighs in interval [@ymin, @ymax). * - * If the interval is (0, 0) it computes the distribution from - * real data minimum and maximum value. + * If the interval is (0, 0) it computes the distribution from real data minimum and maximum value. **/ void gwy_data_line_cdh(GwyDataLine *data_line, @@ -1065,8 +1033,7 @@ * * Computes distribution of angles in interval [@ymin, @ymax). * - * If the interval is (0, 0) it computes the distribution from - * real data minimum and maximum angle value. + * If the interval is (0, 0) it computes the distribution from real data minimum and maximum angle value. **/ void gwy_data_line_da(GwyDataLine *data_line, @@ -1114,16 +1081,14 @@ /** * gwy_data_line_cda: * @data_line: A data line. - * @target_line: Data line to store angle distribution function to. - * It will be resized to @nsteps. + * @target_line: Data line to store angle distribution function to. It will be resized to @nsteps. * @ymin: Angle distribution minimum value. * @ymax: Angle distribution maximum value. * @nsteps: Number of angular histogram steps. * * Computes cumulative distribution of angles in interval [@ymin, @ymax). * - * If the interval is (0, 0) it computes the distribution from - * real data minimum and maximum angle value. + * If the interval is (0, 0) it computes the distribution from real data minimum and maximum angle value. **/ void gwy_data_line_cda(GwyDataLine *data_line, @@ -1145,8 +1110,7 @@ * * Calculates physical length of a data line. * - * The length is calculated from approximation by straight segments between - * values. + * The length is calculated from approximation by straight segments between values. * * Returns: The line length. **/ @@ -1167,9 +1131,8 @@ for (i = 1; i < n; i++) sum += hypot(q, data_line->data[i] - data_line->data[i-1]); - /* We calculate length of inner part of a segment. If we assume the - * average properties of border are the same as of the inner part, - * we can simply multiply the sum with the total/inner length ratio */ + /* We calculate length of inner part of a segment. If we assume the average properties of border are the same as + * of the inner part, we can simply multiply the sum with the total/inner length ratio */ sum *= n/(n - 1.0); return sum; @@ -1180,13 +1143,12 @@ * @data_line: A data line. * @from: The index in @data_line to start from (inclusive). * @to: The index in @data_line to stop (noninclusive). - * @histogram_steps: Number of histogram steps used for modus searching, - * pass a nonpositive number to autosize. + * @histogram_steps: Number of histogram steps used for modus searching, pass a nonpositive number to autosize. * * Finds approximate modus of a data line part. * - * As each number in the data line is usually unique, this function does not - * return modus of the data itself, but modus of a histogram. + * As each number in the data line is usually unique, this function does not return modus of the data itself, but + * modus of a histogram. * * Returns: The modus. **/ @@ -1256,8 +1218,7 @@ /** * gwy_data_line_get_modus: * @data_line: A data line. - * @histogram_steps: Number of histogram steps used for modus searching, - * pass a nonpositive number to autosize. + * @histogram_steps: Number of histogram steps used for modus searching, pass a nonpositive number to autosize. * * Finds approximate modus of a data line. * @@ -1271,8 +1232,7 @@ { g_return_val_if_fail(GWY_IS_DATA_LINE(data_line), 0); - return gwy_data_line_part_get_modus(data_line, 0, data_line->res, - histogram_steps); + return gwy_data_line_part_get_modus(data_line, 0, data_line->res, histogram_steps); } /** @@ -1347,37 +1307,26 @@ * gwy_data_line_get_kth_peaks: * @data_line: A data line. * @m: Number of sampling lengths the line is split into. - * @rank: Rank of the peak to find. One means the highest peak, three the - * third highers, etc. - * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap - * the meanings of peaks and valleys in the description. Valley - * depths are positive. - * @average: Calculate the average of the first @rank peaks instead of the - * height of @rank-th peak. + * @rank: Rank of the peak to find. One means the highest peak, three the third highers, etc. + * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap the meanings of peaks and valleys in the + * description. Valley depths are positive. + * @average: Calculate the average of the first @rank peaks instead of the height of @rank-th peak. * @pthreshold: Peak height threshold. Peaks must stick above this threshold. - * @vthreshold: Valley depth threshold. Valleys must fall below this - * threshold. The depth is a positive value. - * @peakvalues: Array of length at least @m where the peak heights in each - * sampling length should be stored. - * - * Calculate k-th largers peaks or valleys in a data line split into given - * number of sampling lengths. - * - * This is a general function that can be used as the base for various standard - * roughness quantities such as Rp, Rpm, Rv, Rvm or R3z. It is assumed - * the line is already levelled, the form removed, etc. - * - * See gwy_data_line_count_peaks() for the description what is considered - * a peak. - * - * For larger thresholds and/or short lines some sampling lengths may not - * contain the requested number of peaks. If there are any peaks at all, the - * smallest peak height (even though it is not @rank-th) is used. If there - * are no peaks, a large negative value is stored in the corresponding - * @peakvalues item. + * @vthreshold: Valley depth threshold. Valleys must fall below this threshold. The depth is a positive value. + * @peakvalues: Array of length at least @m where the peak heights in each sampling length should be stored. + * + * Calculate k-th largers peaks or valleys in a data line split into given number of sampling lengths. + * + * This is a general function that can be used as the base for various standard roughness quantities such as Rp, Rpm, + * Rv, Rvm or R3z. It is assumed the line is already levelled, the form removed, etc. + * + * See gwy_data_line_count_peaks() for the description what is considered a peak. + * + * For larger thresholds and/or short lines some sampling lengths may not contain the requested number of peaks. If + * there are any peaks at all, the smallest peak height (even though it is not @rank-th) is used. If there are no + * peaks, a large negative value is stored in the corresponding @peakvalues item. * - * Returns: The actual number of peaks found (i.e. number of positive values - * in @peakvalues). + * Returns: The actual number of peaks found (i.e. number of positive values in @peakvalues). * * Since: 2.50 **/ @@ -1411,10 +1360,8 @@ i = mm*res/m; len = (mm + 1)*res/m - i; data = data_line->data + i; - /* Peak is a segment of the line that goes above the positive - * threshold, separated segments that go below the negative threshold. - * Valley is the opposite. Between them there can be things that - * are neither. */ + /* Peak is a segment of the line that goes above the positive threshold, separated segments that go below the + * negative threshold. Valley is the opposite. Between them there can be things that are neither. */ seen_valley = FALSE; currpeak = 0.0; n = 0; @@ -1463,23 +1410,19 @@ /** * gwy_data_line_count_peaks: * @data_line: A data line. - * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap - * the meanings of peaks and valleys in the description. Valley - * depths are positive. + * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap the meanings of peaks and valleys in the + * description. Valley depths are positive. * @pthreshold: Peak height threshold. Peaks must stick above this threshold. - * @vthreshold: Valley depth threshold. Valleys must fall below this - * threshold. + * @vthreshold: Valley depth threshold. Valleys must fall below this threshold. * * Counts peaks or valleys defined by thresholds in a data line. * - * Peak is defined as a part of the profile that extends above the peak - * threshold and is separarted by valleys that extend below the valley - * threshold. For non-zero thresholds there may be parts between that are - * neither peaks not valleys because the local maxima in them are - * insignificant. + * Peak is defined as a part of the profile that extends above the peak threshold and is separarted by valleys that + * extend below the valley threshold. For non-zero thresholds there may be parts between that are neither peaks not + * valleys because the local maxima in them are insignificant. * - * In either case, values of @pthreshold and @vthreshold must be non-negative. - * Usually one passes the same value for both. + * In either case, values of @pthreshold and @vthreshold must be non-negative. Usually one passes the same value for + * both. * * Returns: The number of peaks found. * @@ -1534,9 +1477,8 @@ * * Calculates a peak roughness quantity for a data line. * - * Depending on @m and @k, the function can calculate - * Average Maximum Profile Peak Height @Rpm - * or Maximum Profile Peak Height @Rp, @Pp, @Wp. + * Depending on @m and @k, the function can calculate Average Maximum Profile Peak Height @Rpm or Maximum Profile Peak + * Height @Rp, @Pp, @Wp. * * Returns: The peak roughness quantity defined by @m and @k. * @@ -1574,9 +1516,8 @@ * * Calculates a valley roughness quantity for a data line. * - * Depending on @m and @k, the function can calculate - * Average Maximum Profile Valley Depth @Rvm - * or Maximum Profile Peak Depth @Rv, @Pv, @Wv. + * Depending on @m and @k, the function can calculate Average Maximum Profile Valley Depth @Rvm or Maximum Profile + * Peak Depth @Rv, @Pv, @Wv. * * Returns: The valley roughness quantity defined by @m and @k. * @@ -1614,8 +1555,8 @@ * * Calculates a total roughness quantity for a data line. * - * The total quantity is just the sum of the corresponding quantities obtained - * by gwy_data_line_get_xpm() and gwy_data_line_get_xvm(). + * The total quantity is just the sum of the corresponding quantities obtained by gwy_data_line_get_xpm() and + * gwy_data_line_get_xvm(). * * Returns: The total roughness quantity defined by @m and @k. * @@ -1624,8 +1565,7 @@ gdouble gwy_data_line_get_xtm(GwyDataLine *data_line, gint m, gint k) { - return (gwy_data_line_get_xpm(data_line, m, k) - + gwy_data_line_get_xvm(data_line, m, k)); + return gwy_data_line_get_xpm(data_line, m, k) + gwy_data_line_get_xvm(data_line, m, k); } /************************** Documentation ****************************/ @@ -1636,4 +1576,4 @@ * @short_description: One-dimensional statistical functions **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/Makefile.am gwyddion-2.63/libprocess/Makefile.am --- gwyddion-2.62/libprocess/Makefile.am 2022-11-02 13:59:27.000000000 +0000 +++ gwyddion-2.63/libprocess/Makefile.am 2023-06-12 11:56:31.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la @@ -93,7 +93,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 45:0:45 +libversion = -version-info 46:0:46 #libversion = -release @LIBRARY_RELEASE@ libgwyprocess2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ @OPENMP_CFLAGS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyprocess2_la_LIBADD = $(libgwyprocess_libadd) diff -Nru gwyddion-2.62/libprocess/Makefile.in gwyddion-2.63/libprocess/Makefile.in --- gwyddion-2.62/libprocess/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/libprocess/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25133 2022-11-02 13:59:26Z yeti-dn $ +# $Id: Makefile.am 25423 2023-06-12 11:56:30Z yeti-dn $ # Generic glib-mkenum rules. # $Id: mkenum.mk 20681 2017-12-18 18:37:24Z yeti-dn $ @@ -464,6 +464,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -611,7 +613,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 45:0:45 +libversion = -version-info 46:0:46 #libversion = -release @LIBRARY_RELEASE@ libgwyprocess2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ @OPENMP_CFLAGS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyprocess2_la_LIBADD = $(libgwyprocess_libadd) diff -Nru gwyddion-2.62/libprocess/stats-acfpsdf.c gwyddion-2.63/libprocess/stats-acfpsdf.c --- gwyddion-2.62/libprocess/stats-acfpsdf.c 2022-06-28 10:24:47.000000000 +0000 +++ gwyddion-2.63/libprocess/stats-acfpsdf.c 2023-05-09 12:00:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: stats-acfpsdf.c 24832 2022-05-19 13:43:16Z yeti-dn $ + * $Id: stats-acfpsdf.c 25319 2023-05-09 12:00:36Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -2137,7 +2137,7 @@ g_free(accum_data); gwy_data_line_multiply(line, gwy_data_field_get_dx(field)/(2*G_PI)); - line->real = 2.0*G_PI/gwy_data_field_get_dx(field); + line->real = G_PI/gwy_data_field_get_dx(field); /* line->off = -0.5*line->real/line->res; */ gwy_si_unit_power(gwy_data_field_get_si_unit_xy(field), -1, gwy_data_line_get_si_unit_x(line)); diff -Nru gwyddion-2.62/libprocess/stats.c gwyddion-2.63/libprocess/stats.c --- gwyddion-2.62/libprocess/stats.c 2020-06-15 14:22:37.000000000 +0000 +++ gwyddion-2.63/libprocess/stats.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: stats.c 22839 2020-06-15 14:22:37Z yeti-dn $ + * $Id: stats.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2020 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -75,8 +71,7 @@ * * Finds the maximum value in a rectangular part of a data field. * - * Returns: The maximum value. When the number of samples to calculate - * maximum of is zero, -%G_MAXDOUBLE is returned. + * Returns: The maximum value. When the number of samples to calculate maximum of is zero, -%G_MAXDOUBLE is returned. **/ gdouble gwy_data_field_area_get_max(GwyDataField *dfield, @@ -88,7 +83,8 @@ gdouble max = -G_MAXDOUBLE; const gdouble *datapos, *mpos; - if (!width || !height) /* Compatibility */ + /* Compatibility */ + if (!width || !height) return max; if (!_gwy_data_field_check_area(dfield, col, row, width, height) || !_gwy_data_field_check_mask(dfield, &mask, NULL)) @@ -175,8 +171,7 @@ * * Finds the minimum value in a rectangular part of a data field. * - * Returns: The minimum value. When the number of samples to calculate - * minimum of is zero, -%G_MAXDOUBLE is returned. + * Returns: The minimum value. When the number of samples to calculate minimum of is zero, -%G_MAXDOUBLE is returned. **/ gdouble gwy_data_field_area_get_min(GwyDataField *dfield, @@ -217,8 +212,7 @@ return min; } - if (col == 0 && width == xres - && row == 0 && height == dfield->yres) + if (col == 0 && width == xres && row == 0 && height == dfield->yres) return gwy_data_field_get_min(dfield); datapos = dfield->data + row*xres + col; @@ -307,9 +301,7 @@ * * Finds minimum and maximum values in a rectangular part of a data field. * - * This function is equivalent to calling - * @gwy_data_field_area_get_min_max_mask() - * with masking mode %GWY_MASK_INCLUDE. + * This function is equivalent to calling @gwy_data_field_area_get_min_max_mask() with masking mode %GWY_MASK_INCLUDE. **/ void gwy_data_field_area_get_min_max(GwyDataField *data_field, @@ -319,17 +311,14 @@ gdouble *min, gdouble *max) { - gwy_data_field_area_get_min_max_mask(data_field, mask, GWY_MASK_INCLUDE, - col, row, width, height, - min, max); + gwy_data_field_area_get_min_max_mask(data_field, mask, GWY_MASK_INCLUDE, col, row, width, height, min, max); } /** * gwy_data_field_area_get_min_max_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -360,7 +349,8 @@ *min = min1; if (max) *max = max1; - if (!width || !height) /* Compatibility */ + /* Compatibility */ + if (!width || !height) return; if (!_gwy_data_field_check_area(data_field, col, row, width, height) || !_gwy_data_field_check_mask(data_field, &mask, &mode)) @@ -406,22 +396,18 @@ return; } - if (col == 0 && width == xres - && row == 0 && height == data_field->yres) { + if (col == 0 && width == xres && row == 0 && height == data_field->yres) { gwy_data_field_get_min_max(data_field, min, max); return; } - /* Static code analysis: sod off. We ensure just above that at most one - * pointer is NULL. */ + /* Static code analysis: sod off. We ensure just above that at most one pointer is NULL. */ if (!min) { - *max = gwy_data_field_area_get_max(data_field, NULL, - col, row, width, height); + *max = gwy_data_field_area_get_max(data_field, NULL, col, row, width, height); return; } if (!max) { - *min = gwy_data_field_area_get_min(data_field, NULL, - col, row, width, height); + *min = gwy_data_field_area_get_min(data_field, NULL, col, row, width, height); return; } @@ -483,8 +469,7 @@ * * Sums values of a rectangular part of a data field. * - * This function is equivalent to calling @gwy_data_field_area_get_sum_mask() - * with masking mode %GWY_MASK_INCLUDE. + * This function is equivalent to calling @gwy_data_field_area_get_sum_mask() with masking mode %GWY_MASK_INCLUDE. * * Returns: The sum of all values inside area. **/ @@ -502,8 +487,7 @@ * gwy_data_field_area_get_sum_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -586,9 +570,9 @@ gdouble gwy_data_field_get_avg(GwyDataField *data_field) { - return gwy_data_field_get_sum(data_field)/((data_field->xres - * data_field->yres)); + return gwy_data_field_get_sum(data_field)/((data_field->xres * data_field->yres)); } + /** * gwy_data_field_area_get_avg: * @data_field: A data field @@ -619,8 +603,7 @@ * gwy_data_field_area_get_avg_mask: * @data_field: A data field * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -647,11 +630,8 @@ if (!_gwy_data_field_check_area(dfield, col, row, width, height) || !_gwy_data_field_check_mask(dfield, &mask, &mode)) return sum; - if (!mask) { - return gwy_data_field_area_get_sum_mask(dfield, NULL, GWY_MASK_IGNORE, - col, row, - width, height)/(width*height); - } + if (!mask) + return gwy_data_field_area_get_sum_mask(dfield, NULL, GWY_MASK_IGNORE, col, row, width, height)/(width*height); xres = dfield->xres; datapos = dfield->data + row*xres + col; @@ -692,9 +672,8 @@ * * Computes root mean square value of a data field. * - * The root mean square value is calculated with respect to the mean value. - * See gwy_data_field_get_mean_square() for a similar function which does not - * subtract the mean value. + * The root mean square value is calculated with respect to the mean value. See gwy_data_field_get_mean_square() for + * a similar function which does not subtract the mean value. * * This quantity is cached. * @@ -737,8 +716,7 @@ * * The root mean square value is calculated with respect to the mean value. * - * This function is equivalent to calling @gwy_data_field_area_get_rms_mask() - * with masking mode %GWY_MASK_INCLUDE. + * This function is equivalent to calling @gwy_data_field_area_get_rms_mask() with masking mode %GWY_MASK_INCLUDE. * * Returns: The root mean square value. **/ @@ -749,23 +727,20 @@ gint col, gint row, gint width, gint height) { - return gwy_data_field_area_get_rms_mask(dfield, mask, GWY_MASK_INCLUDE, - col, row, width, height); + return gwy_data_field_area_get_rms_mask(dfield, mask, GWY_MASK_INCLUDE, col, row, width, height); } /** * gwy_data_field_area_get_rms_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * - * Computes root mean square value of deviations of a rectangular part of a - * data field. + * Computes root mean square value of deviations of a rectangular part of a data field. * * The root mean square value is calculated with respect to the mean value. * @@ -785,7 +760,8 @@ const gdouble *datapos, *mpos; guint nn; - if (!width || !height) /* Compatibility */ + /* Compatibility */ + if (!width || !height) return 0.0; if (!_gwy_data_field_check_area(dfield, col, row, width, height) || !_gwy_data_field_check_mask(dfield, &mask, &mode)) @@ -793,8 +769,7 @@ xres = dfield->xres; if (mask) { - sum = gwy_data_field_area_get_sum_mask(dfield, mask, mode, - col, row, width, height); + sum = gwy_data_field_area_get_sum_mask(dfield, mask, mode, col, row, width, height); datapos = dfield->data + row*xres + col; mpos = mask->data + row*xres + col; nn = 0; @@ -848,19 +823,16 @@ * gwy_data_field_area_get_grainwise_rms: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * - * Computes grain-wise root mean square value of deviations of a rectangular - * part of a data field. + * Computes grain-wise root mean square value of deviations of a rectangular part of a data field. * - * Grain-wise means that the mean value is determined for each grain (i.e. - * cotinguous part of the mask or inverted mask) separately and the deviations - * are calculated from these mean values. + * Grain-wise means that the mean value is determined for each grain (i.e. cotinguous part of the mask or inverted + * mask) separately and the deviations are calculated from these mean values. * * Returns: The root mean square value of deviations from the mean value. * @@ -891,17 +863,14 @@ xres = dfield->xres; yres = dfield->yres; - if (!mask) { - return gwy_data_field_area_get_rms_mask(dfield, NULL, GWY_MASK_IGNORE, - col, row, width, height); - } + if (!mask) + return gwy_data_field_area_get_rms_mask(dfield, NULL, GWY_MASK_IGNORE, col, row, width, height); if (mode == GWY_MASK_INCLUDE) { if (col == 0 && row == 0 && width == xres && height == yres) grainmask = (GwyDataField*)g_object_ref(mask); else - grainmask = gwy_data_field_area_extract(mask, - col, row, width, height); + grainmask = gwy_data_field_area_extract(mask, col, row, width, height); } else { grainmask = gwy_data_field_area_extract(mask, col, row, width, height); @@ -998,8 +967,7 @@ * gwy_data_field_area_get_mean_square: * @data_field: A two-dimensional data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -1007,10 +975,9 @@ * * Computes mean square value of a rectangular part of a data field. * - * Unlike gwy_data_field_get_rms(), this function does not - * subtract the mean value beforehand. Therefore, it is useful to sum the - * squared values of data fields which can have the zero level set differently, - * for instance when the field contains a distribution. + * Unlike gwy_data_field_get_rms(), this function does not subtract the mean value beforehand. + * Therefore, it is useful to sum the squared values of data fields which can have the zero level set differently, for + * instance when the field contains a distribution. * * Returns: The mean square value. * @@ -1075,8 +1042,7 @@ return msq; } - if (col == 0 && width == xres - && row == 0 && height == dfield->yres) + if (col == 0 && width == xres && row == 0 && height == dfield->yres) return gwy_data_field_get_mean_square(dfield); /* Too trivial to parallelise. */ @@ -1134,8 +1100,7 @@ * gwy_data_field_area_get_autorange: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @masking: Masking mode to use. See the introduction for description of - * masking modes. + * @masking: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -1166,8 +1131,7 @@ || !_gwy_data_field_check_mask(data_field, &mask, &masking)) return; - gwy_data_field_area_get_min_max_mask(data_field, mask, masking, - col, row, width, height, &min, &max); + gwy_data_field_area_get_min_max_mask(data_field, mask, masking, col, row, width, height, &min, &max); if (!(min < max)) { rmin = min; rmax = max; @@ -1218,9 +1182,8 @@ * * Computes data field value range with outliers cut-off. * - * The purpose of this function is to find a range is suitable for false color - * mapping. The precise method how it is calculated is unspecified and may be - * subject to changes. + * The purpose of this function is to find a range is suitable for false color mapping. The precise method how it is + * calculated is unspecified and may be subject to changes. * * However, it is guaranteed minimum <= @from <= @to <= maximum. * @@ -1246,8 +1209,7 @@ } gwy_data_field_get_min_max(data_field, &min, &max); - compute_autorange(data_field->data, data_field->xres*data_field->yres, - min, max, &rmin, &rmax); + compute_autorange(data_field->data, data_field->xres*data_field->yres, min, max, &rmin, &rmax); if (from) *from = rmin; @@ -1264,12 +1226,9 @@ * @data_field: A data field. * @avg: Where average height value of the surface should be stored, or %NULL. * @ra: Where average value of irregularities should be stored, or %NULL. - * @rms: Where root mean square value of irregularities (Rq) should be stored, - * or %NULL. - * @skew: Where skew (symmetry of height distribution) should be stored, or - * %NULL. - * @kurtosis: Where kurtosis (peakedness of height ditribution) should be - * stored, or %NULL. + * @rms: Where root mean square value of irregularities (Rq) should be stored, or %NULL. + * @skew: Where skew (symmetry of height distribution) should be stored, or %NULL. + * @kurtosis: Where kurtosis (peakedness of height ditribution) should be stored, or %NULL. * * Computes basic statistical quantities of a data field. * @@ -1346,20 +1305,16 @@ * @height: Area height (number of rows). * @avg: Where average height value of the surface should be stored, or %NULL. * @ra: Where average value of irregularities should be stored, or %NULL. - * @rms: Where root mean square value of irregularities (Rq) should be stored, - * or %NULL. - * @skew: Where skew (symmetry of height distribution) should be stored, or - * %NULL. - * @kurtosis: Where kurtosis (peakedness of height ditribution) should be - * stored, or %NULL. + * @rms: Where root mean square value of irregularities (Rq) should be stored, or %NULL. + * @skew: Where skew (symmetry of height distribution) should be stored, or %NULL. + * @kurtosis: Where kurtosis (peakedness of height ditribution) should be stored, or %NULL. * * Computes basic statistical quantities of a rectangular part of a data field. * - * This function is equivalent to calling @gwy_data_field_area_get_stats_mask() - * with masking mode %GWY_MASK_INCLUDE. + * This function is equivalent to calling @gwy_data_field_area_get_stats_mask() with masking mode %GWY_MASK_INCLUDE. * - * Note the kurtosis returned by this function returns is the excess kurtosis - * which is zero for the Gaussian distribution (not 3). + * Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian + * distribution (not 3). **/ void gwy_data_field_area_get_stats(GwyDataField *dfield, @@ -1372,8 +1327,7 @@ gdouble *skew, gdouble *kurtosis) { - gwy_data_field_area_get_stats_mask(dfield, mask, GWY_MASK_INCLUDE, - col, row, width, height, + gwy_data_field_area_get_stats_mask(dfield, mask, GWY_MASK_INCLUDE, col, row, width, height, avg, ra, rms, skew, kurtosis); } @@ -1381,25 +1335,21 @@ * gwy_data_field_area_get_stats_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @avg: Where average height value of the surface should be stored, or %NULL. * @ra: Where average value of irregularities should be stored, or %NULL. - * @rms: Where root mean square value of irregularities (Rq) should be stored, - * or %NULL. - * @skew: Where skew (symmetry of height distribution) should be stored, or - * %NULL. - * @kurtosis: Where kurtosis (peakedness of height ditribution) should be - * stored, or %NULL. + * @rms: Where root mean square value of irregularities (Rq) should be stored, or %NULL. + * @skew: Where skew (symmetry of height distribution) should be stored, or %NULL. + * @kurtosis: Where kurtosis (peakedness of height ditribution) should be stored, or %NULL. * * Computes basic statistical quantities of a rectangular part of a data field. * - * Note the kurtosis returned by this function returns is the excess kurtosis - * which is zero for the Gaussian distribution (not 3). + * Note the kurtosis returned by this function returns is the excess kurtosis which is zero for the Gaussian + * distribution (not 3). * * Since: 2.18 **/ @@ -1425,8 +1375,7 @@ || !_gwy_data_field_check_mask(dfield, &mask, &mode)) return; - myavg = gwy_data_field_area_get_avg_mask(dfield, mask, mode, - col, row, width, height); + myavg = gwy_data_field_area_get_avg_mask(dfield, mask, mode, col, row, width, height); c_sz2 = c_sz3 = c_sz4 = c_abs1 = 0.0; xres = dfield->xres; if (mask) { @@ -1520,24 +1469,19 @@ * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @below: Upper bound to compare data to. The number of samples less - * than or equal to @below is stored in @nbelow. - * @above: Lower bound to compare data to. The number of samples greater - * than or equal to @above is stored in @nabove. - * @nbelow: Location to store the number of samples less than or equal - * to @below, or %NULL. - * @nabove: Location to store the number of samples greater than or equal - * to @above, or %NULL. + * @below: Upper bound to compare data to. The number of samples less than or equal to @below is stored in @nbelow. + * @above: Lower bound to compare data to. The number of samples greater than or equal to @above is stored in + * @nabove. + * @nbelow: Location to store the number of samples less than or equal to @below, or %NULL. + * @nabove: Location to store the number of samples greater than or equal to @above, or %NULL. * * Counts data samples in given range. * - * No assertion is made about the values of @above and @below, in other words - * @above may be larger than @below. To count samples in an open interval - * instead of a closed interval, exchange @below and @above and then subtract - * the @nabove and @nbelow from @width*@height to get the complementary counts. + * No assertion is made about the values of @above and @below, in other words @above may be larger than @below. To + * count samples in an open interval instead of a closed interval, exchange @below and @above and then subtract the + * @nabove and @nbelow from @width*@height to get the complementary counts. * - * With this trick the common task of counting positive values can be - * realized: + * With this trick the common task of counting positive values can be realized: * * gwy_data_field_area_count_in_range(data_field, NULL, * col, row, width, height, @@ -1615,14 +1559,13 @@ * gwy_data_field_area_dh: * @data_field: A data field. * @mask: Mask specifying which values to take into account, or %NULL. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates distribution of heights in a rectangular part of data field. **/ @@ -1666,9 +1609,8 @@ } gwy_data_line_resample(target_line, nstats, GWY_INTERPOLATION_NONE); - gwy_data_field_area_get_min_max(data_field, nn ? mask : NULL, - col, row, width, height, - &min, &max); + gwy_data_field_area_get_min_max_mask(data_field, nn ? mask : NULL, GWY_MASK_INCLUDE, + col, row, width, height, &min, &max); /* Set proper units */ fieldunit = gwy_data_field_get_si_unit_z(data_field); @@ -1734,10 +1676,9 @@ /** * gwy_data_field_dh: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates distribution of heights in a data field. **/ @@ -1747,23 +1688,20 @@ gint nstats) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_dh(data_field, NULL, target_line, - 0, 0, data_field->xres, data_field->yres, - nstats); + gwy_data_field_area_dh(data_field, NULL, target_line, 0, 0, data_field->xres, data_field->yres, nstats); } /** * gwy_data_field_area_cdh: * @data_field: A data field. * @mask: Mask specifying which values to take into account, or %NULL. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates cumulative distribution of heights in a rectangular part of data * field. @@ -1778,9 +1716,7 @@ { GwySIUnit *rhounit, *lineunit; - gwy_data_field_area_dh(data_field, mask, target_line, - col, row, width, height, - nstats); + gwy_data_field_area_dh(data_field, mask, target_line, col, row, width, height, nstats); gwy_data_line_cumulate(target_line); gwy_data_line_multiply(target_line, gwy_data_line_itor(target_line, 1)); target_line->data[target_line->res-1] = 1.0; /* Fix rounding errors. */ @@ -1794,10 +1730,9 @@ /** * gwy_data_field_cdh: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates cumulative distribution of heights in a data field. **/ @@ -1807,27 +1742,23 @@ gint nstats) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_cdh(data_field, NULL, target_line, - 0, 0, data_field->xres, data_field->yres, - nstats); + gwy_data_field_area_cdh(data_field, NULL, target_line, 0, 0, data_field->xres, data_field->yres, nstats); } /** * gwy_data_field_area_da_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account, or %NULL. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates distribution of slopes in a rectangular part of data field, with - * masking. + * Calculates distribution of slopes in a rectangular part of data field, with masking. * * Since: 2.49 **/ @@ -1967,9 +1898,7 @@ /* Set proper units */ lineunit = gwy_data_line_get_si_unit_x(target_line); - gwy_si_unit_divide(gwy_data_field_get_si_unit_z(data_field), - gwy_data_field_get_si_unit_xy(data_field), - lineunit); + gwy_si_unit_divide(gwy_data_field_get_si_unit_z(data_field), gwy_data_field_get_si_unit_xy(data_field), lineunit); rhounit = gwy_data_line_get_si_unit_y(target_line); gwy_si_unit_power(lineunit, -1, rhounit); } @@ -1977,15 +1906,14 @@ /** * gwy_data_field_area_da: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates distribution of slopes in a rectangular part of data field. **/ @@ -1997,18 +1925,16 @@ GwyOrientation orientation, gint nstats) { - gwy_data_field_area_da_mask(data_field, NULL, target_line, - col, row, width, height, orientation, nstats); + gwy_data_field_area_da_mask(data_field, NULL, target_line, col, row, width, height, orientation, nstats); } /** * gwy_data_field_da: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates distribution of slopes in a data field. **/ @@ -2018,26 +1944,22 @@ GwyOrientation orientation, gint nstats) { - gwy_data_field_area_da(data_field, target_line, - 0, 0, data_field->xres, data_field->yres, - orientation, nstats); + gwy_data_field_area_da(data_field, target_line, 0, 0, data_field->xres, data_field->yres, orientation, nstats); } /** * gwy_data_field_area_cda: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates cumulative distribution of slopes in a rectangular part of data - * field. + * Calculates cumulative distribution of slopes in a rectangular part of data field. **/ void gwy_data_field_area_cda(GwyDataField *data_field, @@ -2047,26 +1969,23 @@ GwyOrientation orientation, gint nstats) { - gwy_data_field_area_cda_mask(data_field, NULL, target_line, - col, row, width, height, orientation, nstats); + gwy_data_field_area_cda_mask(data_field, NULL, target_line, col, row, width, height, orientation, nstats); } /** * gwy_data_field_area_cda_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account, or %NULL. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates cumulative distribution of slopes in a rectangular part of data - * field, with masking. + * Calculates cumulative distribution of slopes in a rectangular part of data field, with masking. * * Since: 2.49 **/ @@ -2081,9 +2000,7 @@ { GwySIUnit *lineunit, *rhounit; - gwy_data_field_area_da_mask(data_field, mask, target_line, - col, row, width, height, - orientation, nstats); + gwy_data_field_area_da_mask(data_field, mask, target_line, col, row, width, height, orientation, nstats); gwy_data_line_cumulate(target_line); gwy_data_line_multiply(target_line, gwy_data_line_itor(target_line, 1)); target_line->data[target_line->res-1] = 1.0; /* Fix rounding errors. */ @@ -2097,11 +2014,10 @@ /** * gwy_data_field_cda: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @orientation: Orientation to compute the slope distribution in. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates cumulative distribution of slopes in a data field. **/ @@ -2112,29 +2028,24 @@ gint nstats) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_cda(data_field, target_line, - 0, 0, data_field->xres, data_field->yres, - orientation, nstats); + gwy_data_field_area_cda(data_field, target_line, 0, 0, data_field->xres, data_field->yres, orientation, nstats); } /** * gwy_data_field_area_minkowski_volume: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates Minkowski volume functional of a rectangular part of a data - * field. + * Calculates Minkowski volume functional of a rectangular part of a data field. * - * Volume functional is calculated as the number of values above each - * threshold value (,white pixels`) divided by the total number of samples - * in the area. Is it's equivalent to 1-CDH. + * Volume functional is calculated as the number of values above each threshold value (,white pixels`) divided by the + * total number of samples in the area. Is it's equivalent to 1-CDH. **/ void gwy_data_field_area_minkowski_volume(GwyDataField *data_field, @@ -2143,9 +2054,7 @@ gint width, gint height, gint nstats) { - gwy_data_field_area_cdh(data_field, NULL, target_line, - col, row, width, height, - nstats); + gwy_data_field_area_cdh(data_field, NULL, target_line, col, row, width, height, nstats); gwy_data_line_multiply(target_line, -1.0); gwy_data_line_add(target_line, 1.0); } @@ -2153,10 +2062,9 @@ /** * gwy_data_field_minkowski_volume: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates Minkowski volume functional of a data field. * @@ -2175,22 +2083,18 @@ /** * gwy_data_field_area_minkowski_boundary: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates Minkowski boundary functional of a rectangular part of a data - * field. + * Calculates Minkowski boundary functional of a rectangular part of a data field. * - * Boundary functional is calculated as the number of boundaries for each - * threshold value (the number of pixel sides where of neighouring pixels is - * ,white` and the other ,black`) divided by the total number of samples - * in the area. + * Boundary functional is calculated as the number of boundaries for each threshold value (the number of pixel sides + * where of neighouring pixels is ,white` and the other ,black`) divided by the total number of samples in the area. **/ void gwy_data_field_area_minkowski_boundary(GwyDataField *data_field, @@ -2216,9 +2120,7 @@ gwy_data_line_resample(target_line, nstats, GWY_INTERPOLATION_NONE); gwy_data_line_clear(target_line); - gwy_data_field_area_get_min_max(data_field, NULL, - col, row, width, height, - &min, &max); + gwy_data_field_area_get_min_max_mask(data_field, NULL, GWY_MASK_INCLUDE, col, row, width, height, &min, &max); /* There are no boundaries on a totally flat sufrace */ if (min == max || width == 0 || height == 0) return; @@ -2276,10 +2178,9 @@ /** * gwy_data_field_minkowski_boundary: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * * Calculates Minkowski boundary functional of a data field. * @@ -2291,31 +2192,25 @@ gint nstats) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_minkowski_boundary(data_field, target_line, - 0, 0, - data_field->xres, data_field->yres, - nstats); + gwy_data_field_area_minkowski_boundary(data_field, target_line, 0, 0, data_field->xres, data_field->yres, nstats); } /** * gwy_data_field_area_minkowski_euler: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates Minkowski connectivity functional (Euler characteristics) of - * a rectangular part of a data field. + * Calculates Minkowski connectivity functional (Euler characteristics) of a rectangular part of a data field. * - * Connectivity functional is calculated as the number connected areas of - * pixels above threhsold (,white`) minus the number of connected areas of - * pixels below threhsold (,black`) for each threshold value, divided by the - * total number of samples in the area. + * Connectivity functional is calculated as the number connected areas of pixels above threhsold (,white`) minus the + * number of connected areas of pixels below threhsold (,black`) for each threshold value, divided by the total number + * of samples in the area. **/ void gwy_data_field_area_minkowski_euler(GwyDataField *data_field, @@ -2340,12 +2235,8 @@ gwy_data_line_resample(target_line, nstats, GWY_INTERPOLATION_NONE); tmp_line = gwy_data_line_new_alike(target_line, FALSE); - gwy_data_field_area_grains_tgnd(data_field, target_line, - col, row, width, height, - FALSE, nstats); - gwy_data_field_area_grains_tgnd(data_field, tmp_line, - col, row, width, height, - TRUE, nstats); + gwy_data_field_area_grains_tgnd(data_field, target_line, col, row, width, height, FALSE, nstats); + gwy_data_field_area_grains_tgnd(data_field, tmp_line, col, row, width, height, TRUE, nstats); for (i = 0; i < nstats; i++) target_line->data[i] -= tmp_line->data[nstats-1 - i]; @@ -2365,13 +2256,11 @@ /** * gwy_data_field_minkowski_euler: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to requested width. - * @nstats: The number of samples to take on the distribution function. If - * nonpositive, a suitable resolution is determined automatically. + * @target_line: A data line to store the distribution to. It will be resampled to requested width. + * @nstats: The number of samples to take on the distribution function. If nonpositive, a suitable resolution is + * determined automatically. * - * Calculates Minkowski connectivity functional (Euler characteristics) of - * a data field. + * Calculates Minkowski connectivity functional (Euler characteristics) of a data field. * * See gwy_data_field_area_minkowski_euler() for details. **/ @@ -2381,20 +2270,16 @@ gint nstats) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_minkowski_euler(data_field, target_line, - 0, 0, - data_field->xres, data_field->yres, - nstats); + gwy_data_field_area_minkowski_euler(data_field, target_line, 0, 0, data_field->xres, data_field->yres, nstats); } /** * gwy_data_field_slope_distribution: * @data_field: A data field. - * @derdist: A data line to fill with angular slope distribution. Its - * resolution determines resolution of the distribution. - * @kernel_size: If positive, local plane fitting will be used for slope - * computation; if nonpositive, plain central derivations - * will be used. + * @derdist: A data line to fill with angular slope distribution. Its resolution determines resolution of the + * distribution. + * @kernel_size: If positive, local plane fitting will be used for slope computation; if nonpositive, plain central + * derivations will be used. * * Computes angular slope distribution. **/ @@ -2418,9 +2303,7 @@ lineunit = gwy_data_line_get_si_unit_x(derdist); gwy_si_unit_set_from_string(lineunit, NULL); lineunit = gwy_data_line_get_si_unit_y(derdist); - gwy_si_unit_divide(gwy_data_field_get_si_unit_z(dfield), - gwy_data_field_get_si_unit_xy(dfield), - lineunit); + gwy_si_unit_divide(gwy_data_field_get_si_unit_z(dfield), gwy_data_field_get_si_unit_xy(dfield), lineunit); nder = derdist->res; der = derdist->data; @@ -2434,8 +2317,7 @@ bfields[0] = gwy_data_field_new_alike(dfield, FALSE); bfields[1] = gwy_data_field_new_alike(dfield, FALSE); if (kernel_size > 0) { - gwy_data_field_fit_local_planes(dfield, kernel_size, - 2, quantities, bfields); + gwy_data_field_fit_local_planes(dfield, kernel_size, 2, quantities, bfields); gwy_data_field_multiply(bfields[0], xres/dfield->xreal); gwy_data_field_multiply(bfields[1], yres/dfield->yreal); } @@ -2485,9 +2367,7 @@ * * Computes median value of a data field area. * - * This function is equivalent to calling - * @gwy_data_field_area_get_median_mask() - * with masking mode %GWY_MASK_INCLUDE. + * This function is equivalent to calling @gwy_data_field_area_get_median_mask() with masking mode %GWY_MASK_INCLUDE. * * Returns: The median value. **/ @@ -2497,16 +2377,14 @@ gint col, gint row, gint width, gint height) { - return gwy_data_field_area_get_median_mask(dfield, mask, GWY_MASK_INCLUDE, - col, row, width, height); + return gwy_data_field_area_get_median_mask(dfield, mask, GWY_MASK_INCLUDE, col, row, width, height); } /** * gwy_data_field_area_get_median_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -2531,7 +2409,8 @@ gint i, j, xres; guint n; - if (!width || !height) /* Compatibility */ + /* Compatibility */ + if (!width || !height) return median; if (!_gwy_data_field_check_area(dfield, col, row, width, height) || !_gwy_data_field_check_mask(dfield, &mask, &mode)) @@ -2632,8 +2511,7 @@ * @nx: Where x-component of average normal vector should be stored, or %NULL. * @ny: Where y-component of average normal vector should be stored, or %NULL. * @nz: Where z-component of average normal vector should be stored, or %NULL. - * @normalize1: true to normalize the normal vector to 1, false to normalize - * the vector so that z-component is 1. + * @normalize1: %TRUE to normalize the normal vector to 1, %FALSE to normalize the vector so that @z-component is 1. * * Computes average normal vector of an area of a data field. **/ @@ -2712,15 +2590,13 @@ *nz = avgdz; } - /** * gwy_data_field_get_normal_coeffs: * @data_field: A data field. * @nx: Where x-component of average normal vector should be stored, or %NULL. * @ny: Where y-component of average normal vector should be stored, or %NULL. * @nz: Where z-component of average normal vector should be stored, or %NULL. - * @normalize1: true to normalize the normal vector to 1, false to normalize - * the vector so that z-component is 1. + * @normalize1: %TRUE to normalize the normal vector to 1, %FALSE to normalize the vector so that @z-component is 1. * * Computes average normal vector of a data field. **/ @@ -2730,13 +2606,9 @@ gboolean normalize1) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_get_normal_coeffs(data_field, - 0, 0, - data_field->xres, data_field->yres, - nx, ny, nz, normalize1); + gwy_data_field_area_get_normal_coeffs(data_field, 0, 0, data_field->xres, data_field->yres, nx, ny, nz, normalize1); } - /** * gwy_data_field_area_get_inclination: * @data_field: A data field. @@ -2758,9 +2630,7 @@ { gdouble nx, ny, nz, nr; - gwy_data_field_area_get_normal_coeffs(data_field, - col, row, width, height, - &nx, &ny, &nz, TRUE); + gwy_data_field_area_get_normal_coeffs(data_field, col, row, width, height, &nx, &ny, &nz, TRUE); nr = hypot(nx, ny); if (theta) @@ -2784,11 +2654,7 @@ gdouble *phi) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_get_inclination(data_field, - 0, 0, - data_field->xres, data_field->yres, - theta, - phi); + gwy_data_field_area_get_inclination(data_field, 0, 0, data_field->xres, data_field->yres, theta, phi); } static gint @@ -2926,8 +2792,7 @@ gint i, n; for (i = ifrom; i < ito; i++) { - n = extract_field_row_masked(dfield, mask, masking, bufdata, - col, row + i, width, + n = extract_field_row_masked(dfield, mask, masking, bufdata, col, row + i, width, replace_masked, filler_value); if (n) { /* Temporarily shorten the dataline to avoid reallocations. */ @@ -2989,8 +2854,7 @@ gint i, n; for (i = ifrom; i < ito; i++) { - n = extract_field_column_masked(dfield, mask, masking, bufdata, - col + i, row, height, + n = extract_field_column_masked(dfield, mask, masking, bufdata, col + i, row, height, replace_masked, filler_value); if (n) { /* Temporarily shorten the dataline to avoid reallocations. */ @@ -3051,25 +2915,18 @@ /** * gwy_data_field_get_line_stats_mask: * @data_field: A data field. - * @mask: Mask of values to take values into account, or %NULL for full - * @data_field. - * @masking: Masking mode to use. See the introduction for description of - * masking modes. - * @target_line: A data line to store the distribution to. It will be - * resampled to the number of rows (columns). - * @weights: A data line to store number of data points contributing to each - * value in @target_line, or %NULL. It is useful when masking is - * used to possibly exclude values calculated from too few data - * points. + * @mask: Mask of values to take values into account, or %NULL for full @data_field. + * @masking: Masking mode to use. See the introduction for description of masking modes. + * @target_line: A data line to store the distribution to. It will be resampled to the number of rows (columns). + * @weights: A data line to store number of data points contributing to each value in @target_line, or %NULL. It is + * useful when masking is used to possibly exclude values calculated from too few data points. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @quantity: The line quantity to calulate for each row (column). - * @orientation: Line orientation. For %GWY_ORIENTATION_HORIZONTAL each - * @target_line point corresponds to a row of the area, - * for %GWY_ORIENTATION_VERTICAL each @target_line point - * corresponds to a column of the area. + * @orientation: Line orientation. For %GWY_ORIENTATION_HORIZONTAL each @target_line point corresponds to a row of + * the area, for %GWY_ORIENTATION_VERTICAL each @target_line point corresponds to a column of the area. * * Calculates a line quantity for each row or column in a data field area. * @@ -3128,16 +2985,12 @@ } if (orientation == GWY_ORIENTATION_VERTICAL) { - calc_field_column_linestat_masked(data_field, mask, masking, - target_line, weights, func, - replace_masked, filler_value, - col, row, width, height); + calc_field_column_linestat_masked(data_field, mask, masking, target_line, weights, func, + replace_masked, filler_value, col, row, width, height); } else { - calc_field_row_linestat_masked(data_field, mask, masking, - target_line, weights, func, - replace_masked, filler_value, - col, row, width, height); + calc_field_row_linestat_masked(data_field, mask, masking, target_line, weights, func, + replace_masked, filler_value, col, row, width, height); } xyunit = gwy_data_field_get_si_unit_xy(data_field); @@ -3150,8 +3003,7 @@ switch (quantity) { case GWY_LINE_STAT_LENGTH: if (!gwy_si_unit_equal(xyunit, zunit)) - g_warning("Length makes no sense when lateral and value units " - "differ"); + g_warning("Length makes no sense when lateral and value units differ"); case GWY_LINE_STAT_MEAN: case GWY_LINE_STAT_MEDIAN: case GWY_LINE_STAT_MINIMUM: @@ -3193,19 +3045,15 @@ /** * gwy_data_field_area_get_line_stats: * @data_field: A data field. - * @mask: Mask of values to take values into account, or %NULL for full - * @data_field. - * @target_line: A data line to store the distribution to. It will be - * resampled to the number of rows (columns). + * @mask: Mask of values to take values into account, or %NULL for full @data_field. + * @target_line: A data line to store the distribution to. It will be resampled to the number of rows (columns). * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * @quantity: The line quantity to calulate for each row (column). - * @orientation: Line orientation. For %GWY_ORIENTATION_HORIZONTAL each - * @target_line point corresponds to a row of the area, - * for %GWY_ORIENTATION_VERTICAL each @target_line point - * corresponds to a column of the area. + * @orientation: Line orientation. For %GWY_ORIENTATION_HORIZONTAL each @target_line point corresponds to a row of + * the area, for %GWY_ORIENTATION_VERTICAL each @target_line point corresponds to a column of the area. * * Calculates a line quantity for each row or column in a data field area. * @@ -3222,17 +3070,14 @@ GwyLineStatQuantity quantity, GwyOrientation orientation) { - gwy_data_field_get_line_stats_mask(data_field, mask, GWY_MASK_INCLUDE, - target_line, NULL, - col, row, width, height, + gwy_data_field_get_line_stats_mask(data_field, mask, GWY_MASK_INCLUDE, target_line, NULL, col, row, width, height, quantity, orientation); } /** * gwy_data_field_get_line_stats: * @data_field: A data field. - * @target_line: A data line to store the distribution to. It will be - * resampled to @data_field height (width). + * @target_line: A data line to store the distribution to. It will be resampled to @data_field height (width). * @quantity: The line quantity to calulate for each row (column). * @orientation: Line orientation. See gwy_data_field_area_get_line_stats(). * @@ -3247,9 +3092,7 @@ GwyOrientation orientation) { g_return_if_fail(GWY_IS_DATA_FIELD(data_field)); - gwy_data_field_area_get_line_stats(data_field, NULL, target_line, - 0, 0, - data_field->xres, data_field->yres, + gwy_data_field_area_get_line_stats(data_field, NULL, target_line, 0, 0, data_field->xres, data_field->yres, quantity, orientation); } @@ -3318,16 +3161,12 @@ * @title: stats * @short_description: Two-dimensional statistical functions * - * Many statistical functions permit to pass masks that determine which values - * in the data field to take into account or ignore when calculating the - * statistical characteristics. Masking mode %GWY_MASK_INCLUDE means that - * maks values equal to 0.0 and below cause corresponding data field samples - * to be ignored, values equal to 1.0 and above cause inclusion of - * corresponding data field samples. The behaviour for values inside interval - * (0.0, 1.0) is undefined. In mode @GWY_MASK_EXCLUDE, the meaning of mask is - * inverted, as if all mask values x were replaced with 1-x. The - * mask field is ignored in mode @GWY_MASK_IGNORE, i.e. the same behaviour - * occurs as with %NULL mask argument. + * Many statistical functions permit to pass masks that determine which values in the data field to take into account + * or ignore when calculating the statistical characteristics. Masking mode %GWY_MASK_INCLUDE means that maks values + * equal to 0.0 and below cause corresponding data field samples to be ignored, values equal to 1.0 and above cause + * inclusion of corresponding data field samples. The behaviour for values inside interval (0.0, 1.0) is undefined. + * In mode @GWY_MASK_EXCLUDE, the meaning of mask is inverted, as if all mask values x were replaced with 1-x. The + * mask field is ignored in mode @GWY_MASK_IGNORE, i.e. the same behaviour occurs as with %NULL mask argument. **/ -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/stats-entropy.c gwyddion-2.63/libprocess/stats-entropy.c --- gwyddion-2.62/libprocess/stats-entropy.c 2019-09-16 16:14:55.000000000 +0000 +++ gwyddion-2.63/libprocess/stats-entropy.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: stats-entropy.c 21661 2018-11-21 13:28:44Z yeti-dn $ + * $Id: stats-entropy.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2017 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -30,8 +26,7 @@ typedef struct _QuadTreeNode QuadTreeNode; struct _BinTreeNode { - /* This optimally uses memory on 64bit architectures where pt and - * children have the same size (16 bytes). */ + /* This optimally uses memory on 64bit architectures where pt and children have the same size (16 bytes). */ union { /* The at most two points inside for non-max-depth leaves. */ struct { @@ -55,8 +50,7 @@ } BinTree; struct _QuadTreeNode { - /* This optimally uses memory on 64bit architectures where pt and - * children have the same size (32 bytes). */ + /* This optimally uses memory on 64bit architectures where pt and children have the same size (32 bytes). */ union { /* The at most two points inside for non-max-depth leaves. */ struct { @@ -79,24 +73,20 @@ gdouble degenerateS; } QuadTree; -/* Find the flattest part of the curve representing scaling histogram-based - * entropy on scale and use the value there as the entropy estimate. Handle - * the too-few-pixels cases gracefully. +/* Find the flattest part of the curve representing scaling histogram-based entropy on scale and use the value there + * as the entropy estimate. Handle the too-few-pixels cases gracefully. * * NB: We assume - * (1) ecurve beings from large scales. This is important only when it has - * lots of points because we may skip a few at the beginning then to avoid - * mistaking the flat part of the curve there for the inflexion point. + * (1) ecurve beings from large scales. This is important only when it has lots of points because we may skip a few + * at the beginning then to avoid mistaking the flat part of the curve there for the inflexion point. * (2) ecurve goes by powers of 2 scales, this is for the mindiff filtering. */ static gdouble calculate_entropy_from_scaling(const gdouble *ecurve, guint maxdiv) { - /* Initialise S to the δ-function entropy and mindiff to the half of the - * asymptotic value for distribution that is sum of δ-functions. - * This means only if the differences drops substantially from this - * asymptotic value we will consider is as potential inflexion point. - * If we get ecurve[] essentially corresponding to a set of δ-functions + /* Initialise S to the δ-function entropy and mindiff to the half of the asymptotic value for distribution that is + * sum of δ-functions. This means only if the differences drops substantially from this asymptotic value we will + * consider is as potential inflexion point. If we get ecurve[] essentially corresponding to a set of δ-functions * then we return -G_MAXDOUBLE. */ gdouble S = -G_MAXDOUBLE, mindiff = 0.6*G_LN2; guint i, from = (maxdiv >= 12) + (maxdiv >= 36); @@ -106,10 +96,8 @@ if (maxdiv < 5) { for (i = from; i <= maxdiv-2; i++) { - gdouble diff = 0.5*(fabs(ecurve[i+1] - ecurve[i]) - + fabs(ecurve[i+2] - ecurve[i+1]))/G_LN2; - gdouble diff2 = 0.5*(fabs(ecurve[i] + ecurve[i+2] - - 2.0*ecurve[i+1]))/(G_LN2*G_LN2); + gdouble diff = 0.5*(fabs(ecurve[i+1] - ecurve[i]) + fabs(ecurve[i+2] - ecurve[i+1]))/G_LN2; + gdouble diff2 = 0.5*(fabs(ecurve[i] + ecurve[i+2] - 2.0*ecurve[i+1]))/(G_LN2*G_LN2); if (diff + diff2 < mindiff) { S = ecurve[i+1]; mindiff = diff + diff2; @@ -118,12 +106,9 @@ } else { for (i = from; i <= maxdiv-4; i++) { - gdouble diff = 0.25*(fabs(ecurve[i+1] - ecurve[i]) - + fabs(ecurve[i+2] - ecurve[i+1]) - + fabs(ecurve[i+3] - ecurve[i+2]) - + fabs(ecurve[i+4] - ecurve[i+3])); - gdouble diff2 = 0.5*(fabs(ecurve[i+1] + ecurve[i+4] - - 2.0*ecurve[i+2]))/(G_LN2*G_LN2); + gdouble diff = 0.25*(fabs(ecurve[i+1] - ecurve[i]) + fabs(ecurve[i+2] - ecurve[i+1]) + + fabs(ecurve[i+3] - ecurve[i+2]) + fabs(ecurve[i+4] - ecurve[i+3])); + gdouble diff2 = 0.5*(fabs(ecurve[i+1] + ecurve[i+4] - 2.0*ecurve[i+2]))/(G_LN2*G_LN2); if (diff + diff2 < mindiff) { S = (ecurve[i+1] + ecurve[i+2] + ecurve[i+3])/3.0; mindiff = diff + diff2; @@ -134,9 +119,8 @@ return S; } -/* This is what we get on average from all possible two-point configurations if - * they are randomly distributed. A fairly good estimate that in practice - * seems to result in some deviation on the 5th significant digit, which is +/* This is what we get on average from all possible two-point configurations if they are randomly distributed. + * A fairly good estimate that in practice seems to result in some deviation on the 5th significant digit, which is * hardly significant at all. The contribution is the same in 1D and 2D. */ static void add_estimated_unsplit_node_entropy(gdouble *S, guint maxdepth, gdouble w) @@ -185,8 +169,7 @@ return; } - /* We will be recursing. So if this node is a leaf start by making it - * non-leaf. */ + /* We will be recursing. So if this node is a leaf start by making it non-leaf. */ if (btnode->count == 2) { gdouble pta = btnode->u.pt.a; gdouble ptb = btnode->u.pt.b; @@ -195,8 +178,7 @@ gwy_clear(&btnode->u, 1); child = btnode->u.children[ia] = bin_tree_node_new(pta); - /* Must distinguish between creating two child nodes and creating one - * two-point child node. */ + /* Must distinguish between creating two child nodes and creating one two-point child node. */ if (ia == ib) { child->u.pt.b = ptb; child->count = 2; @@ -211,8 +193,8 @@ btnode->count++; if ((child = btnode->u.children[i])) { - /* Recurse. This will end either by reaching maxdepth=0 or by - * successful separation in the other branch of this conditon. */ + /* Recurse. This will end either by reaching maxdepth=0 or by successful separation in the other branch of + * this conditon. */ if (i == 0) bin_tree_add_node(child, pt, min, centre, maxdepth); else @@ -227,10 +209,8 @@ static void bin_tree_add(BinTree *btree, const gdouble pt) { - if (G_LIKELY(btree->root)) { - bin_tree_add_node(btree->root, pt, - btree->min, btree->max, btree->maxdepth); - } + if (G_LIKELY(btree->root)) + bin_tree_add_node(btree->root, pt, btree->min, btree->max, btree->maxdepth); else btree->root = bin_tree_node_new(pt); } @@ -296,8 +276,8 @@ return btree; } - /* Return explicit estimates for n < 4, making maxdiv at least 1 (with - * half-scales included, ecurve will have at least 3 points then). */ + /* Return explicit estimates for n < 4, making maxdiv at least 1 (with half-scales included, ecurve will have at + * least 3 points then). */ if (n == 2) { btree->degenerate = TRUE; btree->degenerateS = log(btree->max - btree->min); @@ -305,8 +285,7 @@ } if (n == 3) { btree->degenerate = TRUE; - btree->degenerateS = (log(btree->max - btree->min) - + 0.5*log(1.5) - G_LN2/3.0); + btree->degenerateS = (log(btree->max - btree->min) + 0.5*log(1.5) - G_LN2/3.0); return btree; } @@ -325,8 +304,8 @@ BinTreeNode *child; guint i; - /* Singular points contribute to p*ln(p) always with zero. So we can stop - * recursion to finer subdivisions when count == 1. */ + /* Singular points contribute to p*ln(p) always with zero. So we can stop recursion to finer subdivisions when + * count == 1. */ if (btnode->count <= 1) return; @@ -373,9 +352,7 @@ } unsplit = g_new0(guint, maxdepth); - bin_tree_node_entropies_at_scales(btree->root, - MIN(maxdepth, btree->maxdepth), - S, unsplit); + bin_tree_node_entropies_at_scales(btree->root, MIN(maxdepth, btree->maxdepth), S, unsplit); for (i = 0; i < maxdepth; i++) { if (unsplit[i]) @@ -409,8 +386,7 @@ BinTree *btree; if (mask) { - gwy_data_field_area_count_in_range(mask, NULL, col, row, width, height, - G_MAXDOUBLE, 1.0, NULL, &n); + gwy_data_field_area_count_in_range(mask, NULL, col, row, width, height, G_MAXDOUBLE, 1.0, NULL, &n); if (mode == GWY_MASK_EXCLUDE) n = width*height - n; } @@ -467,33 +443,26 @@ } /* FIXME: How can we parallelise this mess? - * Trees covering overlapping (or the same) intervals are lots of work to - * merge. Processing them separately is possible, but then we hit - * different number of add_estimated_unsplit_node_entropy() depending on - * the number of threads. + * Trees covering overlapping (or the same) intervals are lots of work to merge. Processing them separately is + * possible, but then we hit different number of add_estimated_unsplit_node_entropy() depending on the number of + * threads. * - * So one option is add a gwy_math_kth_ranks() preprocessing. It finds the - * values that split the data to equal chunks. And not only that, it also - * physically splits them, so each chunk becomes a continuous block in the + * So one option is add a gwy_math_kth_ranks() preprocessing. It finds the values that split the data to equal + * chunks. And not only that, it also physically splits them, so each chunk becomes a continuous block in the * array. Neat! * - * So each thread can construct its own, independent tree. However, the - * result still depends on the number of threads because the bin boundaries - * are not the same as for serial processing. + * So each thread can construct its own, independent tree. However, the result still depends on the number of + * threads because the bin boundaries are not the same as for serial processing. * - * For deterministic results each thread must essentially construct - * exactly one branch of the tree. We must assign an interval of the - * input of length (max-min)/2^n for some n and also at position - * corresponding to a branch. Then we just merge the branches to form - * a common root. + * For deterministic results each thread must essentially construct exactly one branch of the tree. We must + * assign an interval of the input of length (max-min)/2^n for some n and also at position corresponding to + * a branch. Then we just merge the branches to form a common root. * - * Splitting the work reasonably requires a fair amount of initial - * analysis. The result could be for instance that if we have 6 threads - * they should process 1/4, 1/4, 1/16, 1/16, 1/8 and 1/4 of the entire - * interval of values. + * Splitting the work reasonably requires a fair amount of initial analysis. The result could be for instance + * that if we have 6 threads they should process 1/4, 1/4, 1/16, 1/16, 1/8 and 1/4 of the entire interval of + * values. * - * For a key commonly used function it may be woth implementing this. - * Here, it is hardly a priority. */ + * For a key commonly used function it may be woth implementing this. Here, it is hardly a priority. */ btree = bin_tree_new(xdata, n, *maxdiv); if (must_free_xdata) g_free(xdata); @@ -513,17 +482,14 @@ /** * gwy_data_field_area_get_entropy_at_scales: * @data_field: A data field. - * @target_line: A data line to store the result to. It will be resampled to - * @maxdiv+1 items. + * @target_line: A data line to store the result to. It will be resampled to @maxdiv+1 items. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @maxdiv: Maximum number of divisions of the value range. Pass zero to - * choose it automatically. + * @maxdiv: Maximum number of divisions of the value range. Pass zero to choose it automatically. * * Calculates estimates of value distribution entropy at various scales. * @@ -551,9 +517,7 @@ return S; g_return_val_if_fail(GWY_IS_DATA_LINE(target_line), S); - ecurve = calculate_entropy_at_scales(data_field, mask, mode, - col, row, width, height, - &umaxdiv, &S); + ecurve = calculate_entropy_at_scales(data_field, mask, mode, col, row, width, height, &umaxdiv, &S); maxdiv = maxdiv ? maxdiv : umaxdiv + 1; gwy_data_line_resample(target_line, maxdiv, GWY_INTERPOLATION_NONE); target_line->real = maxdiv*G_LN2; @@ -561,9 +525,7 @@ target_line->data[maxdiv-1 - i] = ecurve[i]; g_free(ecurve); - gwy_data_field_area_get_min_max_mask(data_field, mask, mode, - col, row, width, height, - &min, &max); + gwy_data_field_area_get_min_max_mask(data_field, mask, mode, col, row, width, height, &min, &max); if (max > min) target_line->off = log(max - min) - (maxdiv - 0.5)*G_LN2; @@ -602,9 +564,7 @@ if (CTEST(data_field, ENT)) return CVAL(data_field, ENT); - ecurve = calculate_entropy_at_scales(data_field, NULL, GWY_MASK_IGNORE, - 0, 0, - data_field->xres, data_field->yres, + ecurve = calculate_entropy_at_scales(data_field, NULL, GWY_MASK_IGNORE, 0, 0, data_field->xres, data_field->yres, &maxdiv, &S); g_free(ecurve); @@ -618,8 +578,7 @@ * gwy_data_field_area_get_entropy: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -627,18 +586,15 @@ * * Estimates the entropy of field data distribution. * - * The estimate is calculated as @S = ln(@n Δ) − 1/@n ∑ @n_i ln(@n_i), where - * @n is the number of pixels considered, Δ the bin size and @n_i the count in - * the @i-th bin. If @S is plotted as a function of the bin size Δ, it is, - * generally, a growing function with a plateau for ‘reasonable’ bin sizes. - * The estimate is taken at the plateau. If no plateau is found, which means - * the distribution is effectively a sum of δ-functions, -%G_MAXDOUBLE is - * returned. + * The estimate is calculated as @S = ln(@n Δ) − 1/@n ∑ @n_i ln(@n_i), where @n is the number of pixels considered, + * Δ the bin size and @n_i the count in the @i-th bin. If @S is plotted as a function of the bin size Δ, it is, + * generally, a growing function with a plateau for ‘reasonable’ bin sizes. The estimate is taken at the plateau. If + * no plateau is found, which means the distribution is effectively a sum of δ-functions, -%G_MAXDOUBLE is returned. * * It should be noted that this estimate may be biased. * - * Returns: The estimated entropy of the data values. The entropy of no data - * or a single single is returned as -%G_MAXDOUBLE. + * Returns: The estimated entropy of the data values. The entropy of no data or a single single is returned as + * -%G_MAXDOUBLE. * * Since: 2.42 **/ @@ -658,14 +614,10 @@ return S; /* The result is the same, but it can be cached. */ - if (!mask - && row == 0 && col == 0 - && width == data_field->xres && height == data_field->yres) + if (!mask && row == 0 && col == 0 && width == data_field->xres && height == data_field->yres) return gwy_data_field_get_entropy(data_field); - ecurve = calculate_entropy_at_scales(data_field, mask, mode, - col, row, width, height, - &maxdiv, &S); + ecurve = calculate_entropy_at_scales(data_field, mask, mode, col, row, width, height, &maxdiv, &S); g_free(ecurve); return S; } @@ -732,8 +684,8 @@ qtnode->count++; if ((child = qtnode->u.children[i])) { - /* Recurse. This will end either by reaching maxdepth=0 or by - * successful separation in the other branch of this conditon. */ + /* Recurse. This will end either by reaching maxdepth=0 or by successful separation in the other branch of + * this conditon. */ if (i == 0) quad_tree_add_node(child, pt, min, centre, maxdepth); else if (i == 1) { @@ -758,10 +710,8 @@ static void quad_tree_add(QuadTree *qtree, const GwyXY *pt) { - if (G_LIKELY(qtree->root)) { - quad_tree_add_node(qtree->root, pt, - qtree->min, qtree->max, qtree->maxdepth); - } + if (G_LIKELY(qtree->root)) + quad_tree_add_node(qtree->root, pt, qtree->min, qtree->max, qtree->maxdepth); else qtree->root = quad_tree_node_new(pt); } @@ -833,19 +783,17 @@ return qtree; } - /* Return explicit estimates for n < 4, making maxdiv at least 1 (with - * half-scales included, ecurve will have at least 3 points then). */ + /* Return explicit estimates for n < 4, making maxdiv at least 1 (with half-scales included, ecurve will have at + * least 3 points then). */ if (n == 2) { qtree->degenerate = TRUE; - qtree->degenerateS = (log(qtree->max.x - qtree->min.x) - + log(qtree->max.y - qtree->min.y)); + qtree->degenerateS = (log(qtree->max.x - qtree->min.x) + log(qtree->max.y - qtree->min.y)); return qtree; } if (n == 3) { qtree->degenerate = TRUE; - qtree->degenerateS = (log(qtree->max.x - qtree->min.x) - + log(qtree->max.y - qtree->min.y) - + 0.5*log(1.5) - 2.0*G_LN2/3.0); + qtree->degenerateS = (log(qtree->max.x - qtree->min.x) + log(qtree->max.y - qtree->min.y) + + 0.5*log(1.5) - 2.0*G_LN2/3.0); return qtree; } @@ -868,10 +816,8 @@ if ((child = qtnode->u.children[i])) cnt[i] = child->count; } - return 0.5*(gwy_xlnx_int(cnt[0] + cnt[1]) - + gwy_xlnx_int(cnt[2] + cnt[3]) - + gwy_xlnx_int(cnt[0] + cnt[2]) - + gwy_xlnx_int(cnt[1] + cnt[3])); + return 0.5*(gwy_xlnx_int(cnt[0] + cnt[1]) + gwy_xlnx_int(cnt[2] + cnt[3]) + + gwy_xlnx_int(cnt[0] + cnt[2]) + gwy_xlnx_int(cnt[1] + cnt[3])); } static void @@ -881,8 +827,8 @@ QuadTreeNode *child; guint i; - /* Singular points contribute to p*ln(p) always with zero. So we can stop - * recursion to finer subdivisions when count == 1. */ + /* Singular points contribute to p*ln(p) always with zero. So we can stop recursion to finer subdivisions when + * count == 1. */ if (qtnode->count <= 1) return; @@ -899,8 +845,7 @@ S[0] += gwy_xlnx_int(qtnode->count); S++; - // Half-scale entropies we estimate as averages of horizontal and vertical - // binning. + /* Half-scale entropies we estimate as averages of horizontal and vertical binning. */ S[0] += quad_tree_node_half_scale_entropy(qtnode); S++; @@ -926,20 +871,16 @@ n = 2*maxdepth + 1; S = g_new0(gdouble, n); unsplit = g_new0(guint, maxdepth); - quad_tree_node_entropies_at_scales(qtree->root, - MIN(maxdepth, qtree->maxdepth), - S, unsplit); + quad_tree_node_entropies_at_scales(qtree->root, MIN(maxdepth, qtree->maxdepth), S, unsplit); for (i = 0; i < maxdepth; i++) { if (unsplit[i]) - add_estimated_unsplit_node_entropy(S + 2*i, 2*(maxdepth - i), - unsplit[i]); + add_estimated_unsplit_node_entropy(S + 2*i, 2*(maxdepth - i), unsplit[i]); } g_free(unsplit); npts = qtree->root->count; - Sscale = log(npts - *(qtree->max.x - qtree->min.x)*(qtree->max.y - qtree->min.y)); + Sscale = log(npts*(qtree->max.x - qtree->min.x)*(qtree->max.y - qtree->min.y)); for (i = 0; i < n; i++) S[i] = Sscale - i*G_LN2 - S[i]/npts; @@ -996,13 +937,10 @@ * gwy_data_field_get_entropy_2d_at_scales: * @xfield: A data field containing the @x-coordinates. * @yfield: A data field containing the @y-coordinates. - * @target_line: A data line to store the result to. It will be resampled to - * @maxdiv+1 items. - * @maxdiv: Maximum number of divisions of the value range. Pass zero to - * choose it automatically. + * @target_line: A data line to store the result to. It will be resampled to @maxdiv+1 items. + * @maxdiv: Maximum number of divisions of the value range. Pass zero to choose it automatically. * - * Calculates estimates of entropy of two-dimensional point cloud at various - * scales. + * Calculates estimates of entropy of two-dimensional point cloud at various scales. * * Returns: The best estimate, as gwy_data_field_get_entropy_2d(). * @@ -1037,8 +975,7 @@ gwy_data_field_get_min_max(xfield, &xmin, &xmax); gwy_data_field_get_min_max(xfield, &ymin, &ymax); if ((xmax > xmin) && (ymax > ymin)) - target_line->off = (log((xmax - xmin)*(ymax - ymin)) - - (maxdiv - 0.5)*G_LN2); + target_line->off = (log((xmax - xmin)*(ymax - ymin)) - (maxdiv - 0.5)*G_LN2); lineunit = gwy_data_line_get_si_unit_x(target_line); gwy_si_unit_set_from_string(lineunit, NULL); @@ -1055,9 +992,8 @@ * * Computes the entropy of a two-dimensional point cloud. * - * Each pair of corresponding @xfield and @yfield pixels is assumed to - * represent the coordinates (@x,@y) of a point in plane. Hence they must have - * the same dimensions. + * Each pair of corresponding @xfield and @yfield pixels is assumed to represent the coordinates (@x,@y) of a point in + * plane. Hence they must have the same dimensions. * * Returns: The two-dimensional distribution entropy. * @@ -1082,4 +1018,4 @@ return S; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/libprocess/stats-sum.c gwyddion-2.63/libprocess/stats-sum.c --- gwyddion-2.62/libprocess/stats-sum.c 2021-02-26 17:29:59.000000000 +0000 +++ gwyddion-2.63/libprocess/stats-sum.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: stats-sum.c 23050 2021-01-11 11:22:44Z yeti-dn $ + * $Id: stats-sum.c 25308 2023-04-21 13:16:28Z yeti-dn $ * Copyright (C) 2003-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -51,10 +47,8 @@ z3 -= c; z4 -= c; - return (sqrt(1.0 + 2.0*(z1*z1 + z2*z2)/q) - + sqrt(1.0 + 2.0*(z2*z2 + z3*z3)/q) - + sqrt(1.0 + 2.0*(z3*z3 + z4*z4)/q) - + sqrt(1.0 + 2.0*(z4*z4 + z1*z1)/q)); + return (sqrt(1.0 + 2.0*(z1*z1 + z2*z2)/q) + sqrt(1.0 + 2.0*(z2*z2 + z3*z3)/q) + + sqrt(1.0 + 2.0*(z3*z3 + z4*z4)/q) + sqrt(1.0 + 2.0*(z4*z4 + z1*z1)/q)); } /** @@ -69,8 +63,7 @@ * @w4: Weight of fourth corner (0 or 1). * @q: One fourth of rectangle projected area (x-size * ysize). * - * Calculates approximate area of a one square pixel with some corners possibly - * missing. + * Calculates approximate area of a one square pixel with some corners possibly missing. * * Returns: The area. **/ @@ -114,14 +107,10 @@ c = (z1 + z2 + z3 + z4)/2.0; - return (sqrt(1.0 + (z1 - z2)*(z1 - z2)/x - + (z1 + z2 - c)*(z1 + z2 - c)/y) - + sqrt(1.0 + (z2 - z3)*(z2 - z3)/y - + (z2 + z3 - c)*(z2 + z3 - c)/x) - + sqrt(1.0 + (z3 - z4)*(z3 - z4)/x - + (z3 + z4 - c)*(z3 + z4 - c)/y) - + sqrt(1.0 + (z1 - z4)*(z1 - z4)/y - + (z1 + z4 - c)*(z1 + z4 - c)/x)); + return (sqrt(1.0 + (z1 - z2)*(z1 - z2)/x + (z1 + z2 - c)*(z1 + z2 - c)/y) + + sqrt(1.0 + (z2 - z3)*(z2 - z3)/y + (z2 + z3 - c)*(z2 + z3 - c)/x) + + sqrt(1.0 + (z3 - z4)*(z3 - z4)/x + (z3 + z4 - c)*(z3 + z4 - c)/y) + + sqrt(1.0 + (z1 - z4)*(z1 - z4)/y + (z1 + z4 - c)*(z1 + z4 - c)/x)); } /** @@ -151,26 +140,20 @@ c = (z1 + z2 + z3 + z4)/2.0; - return ((w1 + w2)*sqrt(1.0 + (z1 - z2)*(z1 - z2)/x - + (z1 + z2 - c)*(z1 + z2 - c)/y) - + (w2 + w3)*sqrt(1.0 + (z2 - z3)*(z2 - z3)/y - + (z2 + z3 - c)*(z2 + z3 - c)/x) - + (w3 + w4)*sqrt(1.0 + (z3 - z4)*(z3 - z4)/x - + (z3 + z4 - c)*(z3 + z4 - c)/y) - + (w4 + w1)*sqrt(1.0 + (z1 - z4)*(z1 - z4)/y - + (z1 + z4 - c)*(z1 + z4 - c)/x))/2.0; + return ((w1 + w2)*sqrt(1.0 + (z1 - z2)*(z1 - z2)/x + (z1 + z2 - c)*(z1 + z2 - c)/y) + + (w2 + w3)*sqrt(1.0 + (z2 - z3)*(z2 - z3)/y + (z2 + z3 - c)*(z2 + z3 - c)/x) + + (w3 + w4)*sqrt(1.0 + (z3 - z4)*(z3 - z4)/x + (z3 + z4 - c)*(z3 + z4 - c)/y) + + (w4 + w1)*sqrt(1.0 + (z1 - z4)*(z1 - z4)/y + (z1 + z4 - c)*(z1 + z4 - c)/x))/2.0; } /** * stripe_area1: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * @mode: Masking mode. * @q: One fourth of rectangle projected area (x-size * ysize). * @@ -192,28 +175,23 @@ if (m && mode != GWY_MASK_IGNORE) { if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_area1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, - 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_area1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0, q); + } } else { - for (j = 0; j < n-1; j++) - sum += square_area1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, - 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_area1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, 0, 0, q); + } } } else { - for (j = 0; j < n-1; j++) - sum += square_area1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - 1, 1, 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_area1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + 1, 1, 0, 0, q); + } } return sum; @@ -223,12 +201,10 @@ * stripe_area2: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * @x: One fourth of square of rectangle width (x-size). * @y: One fourth of square of rectangle height (y-size). * @@ -250,27 +226,22 @@ gint j; if (m && mode == GWY_MASK_INCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_area2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, - 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_area2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0, x, y); + } } else if (m && mode == GWY_MASK_EXCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_area2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, - 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_area2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, 0, 0, x, y); + } } else { - for (j = 0; j < n-1; j++) - sum += square_area2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - 1, 1, 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_area2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + 1, 1, 0, 0, x, y); + } } return sum; @@ -314,27 +285,22 @@ r = dataul + xres*i; m = maskul + xres*i; if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < width-1; j++) - sum += square_area1w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] > 0.0, m[j+1] > 0.0, - m[j+xres+1] > 0.0, m[j+xres] > 0.0, - q); + for (j = 0; j < width-1; j++) { + sum += square_area1w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0, q); + } } else { - for (j = 0; j < width-1; j++) - sum += square_area1w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] < 1.0, m[j+1] < 1.0, - m[j+xres+1] < 1.0, m[j+xres] < 1.0, - q); + for (j = 0; j < width-1; j++) { + sum += square_area1w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] < 1.0, m[j+1] < 1.0, m[j+xres+1] < 1.0, m[j+xres] < 1.0, q); + } } } /* Top row */ s = !(row == 0); - sum += stripe_area1(width, 1, dataul, dataul - s*xres, - maskul, mode, q); + sum += stripe_area1(width, 1, dataul, dataul - s*xres, maskul, mode, q); /* Bottom row */ s = !(row + height == yres); @@ -345,13 +311,10 @@ /* Left column */ s = !(col == 0); - sum += stripe_area1(height, xres, dataul, dataul - s, - maskul, mode, q); + sum += stripe_area1(height, xres, dataul, dataul - s, maskul, mode, q); /* Right column */ s = !(col + width == xres); - sum += stripe_area1(height, xres, - dataul + width-1, dataul + width-1 + s, - maskul + width-1, mode, q); + sum += stripe_area1(height, xres, dataul + width-1, dataul + width-1 + s, maskul + width-1, mode, q); } else { /* Inside */ @@ -365,27 +328,22 @@ r = dataul + xres*i; m = maskul + xres*i; if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < width-1; j++) - sum += square_area2w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] > 0.0, m[j+1] > 0.0, - m[j+xres+1] > 0.0, m[j+xres] > 0.0, - x, y); + for (j = 0; j < width-1; j++) { + sum += square_area2w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0, x, y); + } } else { - for (j = 0; j < width-1; j++) - sum += square_area2w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] < 1.0, m[j+1] < 1.0, - m[j+xres+1] < 1.0, m[j+xres] < 1.0, - x, y); + for (j = 0; j < width-1; j++) { + sum += square_area2w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] < 1.0, m[j+1] < 1.0, m[j+xres+1] < 1.0, m[j+xres] < 1.0, x, y); + } } } /* Top row */ s = !(row == 0); - sum += stripe_area2(width, 1, dataul, dataul - s*xres, maskul, - mode, x, y); + sum += stripe_area2(width, 1, dataul, dataul - s*xres, maskul, mode, x, y); /* Bottom row */ s = !(row + height == yres); @@ -397,29 +355,21 @@ /* Left column */ s = !(col == 0); - sum += stripe_area2(height, xres, dataul, dataul - s, maskul, - mode, y, x); + sum += stripe_area2(height, xres, dataul, dataul - s, maskul, mode, y, x); /* Right column */ s = !(col + width == xres); - sum += stripe_area2(height, xres, - dataul + width-1, dataul + width-1 + s, - maskul + width-1, - mode, y, x); + sum += stripe_area2(height, xres, dataul + width-1, dataul + width-1 + s, maskul + width-1, mode, y, x); } /* Just take the four corner quater-pixels as flat. */ if (mode == GWY_MASK_INCLUDE) { - sum += ((maskul[0] > 0.0) + - + (maskul[width-1] > 0.0) - + (maskul[xres*(height-1)] > 0.0) - + (maskul[xres*(height-1) + width-1] > 0.0)); + sum += ((maskul[0] > 0.0) + + (maskul[width-1] > 0.0) + + (maskul[xres*(height-1)] > 0.0) + (maskul[xres*(height-1) + width-1] > 0.0)); } else { - sum += ((maskul[0] < 1.0) - + (maskul[width-1] < 1.0) - + (maskul[xres*(height-1)] < 1.0) - + (maskul[xres*(height-1) + width-1] < 1.0)); + sum += ((maskul[0] < 1.0) + (maskul[width-1] < 1.0) + + (maskul[xres*(height-1)] < 1.0) + (maskul[xres*(height-1) + width-1] < 1.0)); } } else { @@ -434,32 +384,25 @@ for (i = 0; i < height-1; i++) { r = dataul + xres*i; for (j = 0; j < width-1; j++) - sum += square_area1(r[j], r[j+1], r[j+xres+1], r[j+xres], - q); + sum += square_area1(r[j], r[j+1], r[j+xres+1], r[j+xres], q); } /* Top row */ s = !(row == 0); - sum += stripe_area1(width, 1, dataul, dataul - s*xres, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_area1(width, 1, dataul, dataul - s*xres, NULL, GWY_MASK_IGNORE, q); /* Bottom row */ s = !(row + height == yres); - sum += stripe_area1(width, 1, - dataul + xres*(height-1), - dataul + xres*(height-1 + s), + sum += stripe_area1(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), NULL, GWY_MASK_IGNORE, q); /* Left column */ s = !(col == 0); - sum += stripe_area1(height, xres, dataul, dataul - s, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_area1(height, xres, dataul, dataul - s, NULL, GWY_MASK_IGNORE, q); /* Right column */ s = !(col + width == xres); - sum += stripe_area1(height, xres, - dataul + width-1, dataul + width-1 + s, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_area1(height, xres, dataul + width-1, dataul + width-1 + s, NULL, GWY_MASK_IGNORE, q); } else { #ifdef _OPENMP @@ -471,33 +414,25 @@ for (i = 0; i < height-1; i++) { r = dataul + xres*i; for (j = 0; j < width-1; j++) - sum += square_area2(r[j], r[j+1], r[j+xres+1], r[j+xres], - x, y); + sum += square_area2(r[j], r[j+1], r[j+xres+1], r[j+xres], x, y); } /* Top row */ s = !(row == 0); - sum += stripe_area2(width, 1, dataul, dataul - s*xres, NULL, - GWY_MASK_IGNORE, x, y); + sum += stripe_area2(width, 1, dataul, dataul - s*xres, NULL, GWY_MASK_IGNORE, x, y); /* Bottom row */ s = !(row + height == yres); - sum += stripe_area2(width, 1, - dataul + xres*(height-1), - dataul + xres*(height-1 + s), - NULL, + sum += stripe_area2(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), NULL, GWY_MASK_IGNORE, x, y); /* Left column */ s = !(col == 0); - sum += stripe_area2(height, xres, dataul, dataul - s, NULL, - GWY_MASK_IGNORE, y, x); + sum += stripe_area2(height, xres, dataul, dataul - s, NULL, GWY_MASK_IGNORE, y, x); /* Right column */ s = !(col + width == xres); - sum += stripe_area2(height, xres, - dataul + width-1, dataul + width-1 + s, NULL, - GWY_MASK_IGNORE, y, x); + sum += stripe_area2(height, xres, dataul + width-1, dataul + width-1 + s, NULL, GWY_MASK_IGNORE, y, x); } /* Just take the four corner quater-pixels as flat. */ @@ -528,8 +463,7 @@ if (CTEST(data_field, ARE)) return CVAL(data_field, ARE); - area = calculate_surface_area(data_field, NULL, GWY_MASK_IGNORE, - 0, 0, data_field->xres, data_field->yres); + area = calculate_surface_area(data_field, NULL, GWY_MASK_IGNORE, 0, 0, data_field->xres, data_field->yres); CVAL(data_field, ARE) = area; data_field->cached |= CBIT(ARE); @@ -548,8 +482,7 @@ * * Computes surface area of a rectangular part of a data field. * - * This function is equivalent to calling - * @gwy_data_field_area_get_surface_area_mask() with masking mode + * This function is equivalent to calling @gwy_data_field_area_get_surface_area_mask() with masking mode * %GWY_MASK_INCLUDE. * * Returns: The surface area. @@ -560,17 +493,14 @@ gint col, gint row, gint width, gint height) { - return gwy_data_field_area_get_surface_area_mask(data_field, mask, - GWY_MASK_INCLUDE, - col, row, width, height); + return gwy_data_field_area_get_surface_area_mask(data_field, mask, GWY_MASK_INCLUDE, col, row, width, height); } /** * gwy_data_field_area_get_surface_area_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -578,8 +508,8 @@ * * Computes surface area of a rectangular part of a data field. * - * This quantity makes sense only if the lateral dimensions and values of - * @data_field are the same physical quantities. + * This quantity makes sense only if the lateral dimensions and values of @data_field are the same physical + * quantities. * * Returns: The surface area. * @@ -599,13 +529,10 @@ return area; /* The result is the same, but it can be cached. */ - if (!mask - && row == 0 && col == 0 - && width == data_field->xres && height == data_field->yres) + if (!mask && row == 0 && col == 0 && width == data_field->xres && height == data_field->yres) return gwy_data_field_get_surface_area(data_field); - return calculate_surface_area(data_field, mask, mode, - col, row, width, height); + return calculate_surface_area(data_field, mask, mode, col, row, width, height); } static gdouble @@ -630,12 +557,10 @@ sumv = sumh = 0.0; n = 0; - /* The gradient has two contributions, from horizontal derivatives and - * from vertical derivatives. We could require both to be calculable for - * masked areas, but we do not. Each gradient is calculate separately - * for each pixels where it is defined, regardless whether the orthogonal - * one can be calculated. This can give uneven contributions for some - * odd mask shapes… */ + /* The gradient has two contributions, from horizontal derivatives and from vertical derivatives. We could + * require both to be calculable for masked areas, but we do not. Each gradient is calculate separately for each + * pixels where it is defined, regardless whether the orthogonal one can be calculated. This can give uneven + * contributions for some odd mask shapes… */ if (mask && mode != GWY_MASK_IGNORE) { maskul = mask->data + xres*row + col; #ifdef _OPENMP @@ -752,15 +677,13 @@ * gwy_data_field_area_get_surface_slope_mask: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). * - * Computes root mean square surface slope (Sdq) of a rectangular part of - * a data field. + * Computes root mean square surface slope (Sdq) of a rectangular part of a data field. * * Returns: The root mean square surface slope. * @@ -779,8 +702,7 @@ || !_gwy_data_field_check_mask(data_field, &mask, &mode)) return Sdq; - return calculate_rms_surface_slope(data_field, mask, mode, - col, row, width, height); + return calculate_rms_surface_slope(data_field, mask, mode, col, row, width, height); } /** @@ -798,9 +720,7 @@ { g_return_val_if_fail(GWY_IS_DATA_FIELD(data_field), 0.0); - return calculate_rms_surface_slope(data_field, NULL, GWY_MASK_IGNORE, - 0, 0, - data_field->xres, data_field->yres); + return calculate_rms_surface_slope(data_field, NULL, GWY_MASK_IGNORE, 0, 0, data_field->xres, data_field->yres); } /** @@ -821,10 +741,8 @@ { gdouble z12 = z1 - z2, z23 = z2 - z3, z34 = z3 - z4, z41 = z4 - z1; - return (sqrt((z12*z12 + z41*z41)/q) - + sqrt((z23*z23 + z12*z12)/q) - + sqrt((z34*z34 + z23*z23)/q) - + sqrt((z41*z41 + z34*z34)/q)); + return (sqrt((z12*z12 + z41*z41)/q) + sqrt((z23*z23 + z12*z12)/q) + + sqrt((z34*z34 + z23*z23)/q) + sqrt((z41*z41 + z34*z34)/q)); } /** @@ -839,8 +757,7 @@ * @w4: Weight of fourth corner (0 or 1). * @q: One fourth of rectangle projected var (x-size * ysize). * - * Calculates approximate variation of a one square pixel with some corners - * possibly missing. + * Calculates approximate variation of a one square pixel with some corners possibly missing. * * Returns: The variation. **/ @@ -851,10 +768,8 @@ { gdouble z12 = z1 - z2, z23 = z2 - z3, z34 = z3 - z4, z41 = z4 - z1; - return (w1*sqrt((z12*z12 + z41*z41)/q) - + w2*sqrt((z23*z23 + z12*z12)/q) - + w3*sqrt((z34*z34 + z23*z23)/q) - + w4*sqrt((z41*z41 + z34*z34)/q)); + return (w1*sqrt((z12*z12 + z41*z41)/q) + w2*sqrt((z23*z23 + z12*z12)/q) + + w3*sqrt((z34*z34 + z23*z23)/q) + w4*sqrt((z41*z41 + z34*z34)/q)); } /** @@ -876,10 +791,8 @@ { gdouble z12 = z1 - z2, z23 = z2 - z3, z34 = z3 - z4, z41 = z4 - z1; - return (sqrt(z12*z12/x + z41*z41/y) - + sqrt(z23*z23/y + z12*z12/x) - + sqrt(z34*z34/x + z23*z23/y) - + sqrt(z41*z41/y + z34*z34/x)); + return (sqrt(z12*z12/x + z41*z41/y) + sqrt(z23*z23/y + z12*z12/x) + + sqrt(z34*z34/x + z23*z23/y) + sqrt(z41*z41/y + z34*z34/x)); } /** @@ -895,8 +808,7 @@ * @x: One fourth of square of rectangle width (x-size). * @y: One fourth of square of rectangle height (y-size). * - * Calculates approximate variation of a one general rectangular pixel with - * some corners possibly missing. + * Calculates approximate variation of a one general rectangular pixel with some corners possibly missing. * * Returns: The variation. **/ @@ -907,22 +819,18 @@ { gdouble z12 = z1 - z2, z23 = z2 - z3, z34 = z3 - z4, z41 = z4 - z1; - return (w1*sqrt(z12*z12/x + z41*z41/y) - + w2*sqrt(z23*z23/y + z12*z12/x) - + w3*sqrt(z34*z34/x + z23*z23/y) - + w4*sqrt(z41*z41/y + z34*z34/x)); + return (w1*sqrt(z12*z12/x + z41*z41/y) + w2*sqrt(z23*z23/y + z12*z12/x) + + w3*sqrt(z34*z34/x + z23*z23/y) + w4*sqrt(z41*z41/y + z34*z34/x)); } /** * stripe_var1: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * @mode: Masking mode. * @q: One fourth of rectangle projected var (x-size * ysize). * @@ -944,28 +852,23 @@ if (m && mode != GWY_MASK_IGNORE) { if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_var1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, - 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_var1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0, q); + } } else { - for (j = 0; j < n-1; j++) - sum += square_var1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, - 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_var1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, 0, 0, q); + } } } else { - for (j = 0; j < n-1; j++) - sum += square_var1w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - 1, 1, 0, 0, - q); + for (j = 0; j < n-1; j++) { + sum += square_var1w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + 1, 1, 0, 0, q); + } } return sum; @@ -975,12 +878,10 @@ * stripe_var2: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * @x: One fourth of square of rectangle width (x-size). * @y: One fourth of square of rectangle height (y-size). * @@ -1002,27 +903,22 @@ gint j; if (m && mode == GWY_MASK_INCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_var2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, - 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_var2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0, x, y); + } } else if (m && mode == GWY_MASK_EXCLUDE) { - for (j = 0; j < n-1; j++) - sum += square_var2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, - 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_var2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] < 1.0, m[(j + 1)*stride] < 1.0, 0, 0, x, y); + } } else { - for (j = 0; j < n-1; j++) - sum += square_var2w(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - 1, 1, 0, 0, - x, y); + for (j = 0; j < n-1; j++) { + sum += square_var2w(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + 1, 1, 0, 0, x, y); + } } return sum; @@ -1066,27 +962,22 @@ r = dataul + xres*i; m = maskul + xres*i; if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < width-1; j++) - sum += square_var1w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] > 0.0, m[j+1] > 0.0, - m[j+xres+1] > 0.0, m[j+xres] > 0.0, - q); + for (j = 0; j < width-1; j++) { + sum += square_var1w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0, q); + } } else { - for (j = 0; j < width-1; j++) - sum += square_var1w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] < 1.0, m[j+1] < 1.0, - m[j+xres+1] < 1.0, m[j+xres] < 1.0, - q); + for (j = 0; j < width-1; j++) { + sum += square_var1w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] < 1.0, m[j+1] < 1.0, m[j+xres+1] < 1.0, m[j+xres] < 1.0, q); + } } } /* Top row */ s = !(row == 0); - sum += stripe_var1(width, 1, dataul, dataul - s*xres, - maskul, mode, q); + sum += stripe_var1(width, 1, dataul, dataul - s*xres, maskul, mode, q); /* Bottom row */ s = !(row + height == yres); @@ -1097,13 +988,10 @@ /* Left column */ s = !(col == 0); - sum += stripe_var1(height, xres, dataul, dataul - s, - maskul, mode, q); + sum += stripe_var1(height, xres, dataul, dataul - s, maskul, mode, q); /* Right column */ s = !(col + width == xres); - sum += stripe_var1(height, xres, - dataul + width-1, dataul + width-1 + s, - maskul + width-1, mode, q); + sum += stripe_var1(height, xres, dataul + width-1, dataul + width-1 + s, maskul + width-1, mode, q); } else { /* Inside */ @@ -1117,27 +1005,22 @@ r = dataul + xres*i; m = maskul + xres*i; if (mode == GWY_MASK_INCLUDE) { - for (j = 0; j < width-1; j++) - sum += square_var2w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] > 0.0, m[j+1] > 0.0, - m[j+xres+1] > 0.0, m[j+xres] > 0.0, - x, y); + for (j = 0; j < width-1; j++) { + sum += square_var2w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0, x, y); + } } else { - for (j = 0; j < width-1; j++) - sum += square_var2w(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] < 1.0, m[j+1] < 1.0, - m[j+xres+1] < 1.0, m[j+xres] < 1.0, - x, y); + for (j = 0; j < width-1; j++) { + sum += square_var2w(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] < 1.0, m[j+1] < 1.0, m[j+xres+1] < 1.0, m[j+xres] < 1.0, x, y); + } } } /* Top row */ s = !(row == 0); - sum += stripe_var2(width, 1, dataul, dataul - s*xres, maskul, - mode, x, y); + sum += stripe_var2(width, 1, dataul, dataul - s*xres, maskul, mode, x, y); /* Bottom row */ s = !(row + height == yres); @@ -1149,15 +1032,11 @@ /* Left column */ s = !(col == 0); - sum += stripe_var2(height, xres, dataul, dataul - s, maskul, - mode, y, x); + sum += stripe_var2(height, xres, dataul, dataul - s, maskul, mode, y, x); /* Right column */ s = !(col + width == xres); - sum += stripe_var2(height, xres, - dataul + width-1, dataul + width-1 + s, - maskul + width-1, - mode, y, x); + sum += stripe_var2(height, xres, dataul + width-1, dataul + width-1 + s, maskul + width-1, mode, y, x); } } else { @@ -1177,26 +1056,20 @@ /* Top row */ s = !(row == 0); - sum += stripe_var1(width, 1, dataul, dataul - s*xres, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_var1(width, 1, dataul, dataul - s*xres, NULL, GWY_MASK_IGNORE, q); /* Bottom row */ s = !(row + height == yres); - sum += stripe_var1(width, 1, - dataul + xres*(height-1), - dataul + xres*(height-1 + s), + sum += stripe_var1(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), NULL, GWY_MASK_IGNORE, q); /* Left column */ s = !(col == 0); - sum += stripe_var1(height, xres, dataul, dataul - s, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_var1(height, xres, dataul, dataul - s, NULL, GWY_MASK_IGNORE, q); /* Right column */ s = !(col + width == xres); - sum += stripe_var1(height, xres, - dataul + width-1, dataul + width-1 + s, - NULL, GWY_MASK_IGNORE, q); + sum += stripe_var1(height, xres, dataul + width-1, dataul + width-1 + s, NULL, GWY_MASK_IGNORE, q); } else { #ifdef _OPENMP @@ -1208,33 +1081,25 @@ for (i = 0; i < height-1; i++) { r = dataul + xres*i; for (j = 0; j < width-1; j++) - sum += square_var2(r[j], r[j+1], r[j+xres+1], r[j+xres], - x, y); + sum += square_var2(r[j], r[j+1], r[j+xres+1], r[j+xres], x, y); } /* Top row */ s = !(row == 0); - sum += stripe_var2(width, 1, dataul, dataul - s*xres, NULL, - GWY_MASK_IGNORE, x, y); + sum += stripe_var2(width, 1, dataul, dataul - s*xres, NULL, GWY_MASK_IGNORE, x, y); /* Bottom row */ s = !(row + height == yres); - sum += stripe_var2(width, 1, - dataul + xres*(height-1), - dataul + xres*(height-1 + s), - NULL, + sum += stripe_var2(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), NULL, GWY_MASK_IGNORE, x, y); /* Left column */ s = !(col == 0); - sum += stripe_var2(height, xres, dataul, dataul - s, NULL, - GWY_MASK_IGNORE, y, x); + sum += stripe_var2(height, xres, dataul, dataul - s, NULL, GWY_MASK_IGNORE, y, x); /* Right column */ s = !(col + width == xres); - sum += stripe_var2(height, xres, - dataul + width-1, dataul + width-1 + s, NULL, - GWY_MASK_IGNORE, y, x); + sum += stripe_var2(height, xres, dataul + width-1, dataul + width-1 + s, NULL, GWY_MASK_IGNORE, y, x); } } @@ -1266,8 +1131,7 @@ if (CTEST(data_field, VAR)) return CVAL(data_field, VAR); - var = calculate_variation(data_field, NULL, GWY_MASK_IGNORE, - 0, 0, data_field->xres, data_field->yres); + var = calculate_variation(data_field, NULL, GWY_MASK_IGNORE, 0, 0, data_field->xres, data_field->yres); CVAL(data_field, VAR) = var; data_field->cached |= CBIT(VAR); @@ -1279,8 +1143,7 @@ * gwy_data_field_area_get_variation: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. - * @mode: Masking mode to use. See the introduction for description of - * masking modes. + * @mode: Masking mode to use. See the introduction for description of masking modes. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. * @width: Area width (number of columns). @@ -1288,17 +1151,13 @@ * * Computes the total variation of a rectangular part of a data field. * - * The total variation is estimated as the integral of the absolute value of - * local gradient. + * The total variation is estimated as the integral of the absolute value of local gradient. * - * This quantity has the somewhat odd units of value unit times lateral unit. - * It can be envisioned as follows. If the surface has just two height levels - * (upper and lower planes) then the quantity is the length of the boundary - * between the upper and lower part, multiplied by the step height. If the - * surface is piece-wise constant, then the variation is the step height - * integrated along the boundaries between the constant parts. Therefore, for - * non-fractal surfaces it scales with the linear dimension of the image, not - * with its area, despite being an area integral. + * This quantity has the somewhat odd units of value unit times lateral unit. It can be envisioned as follows. If the + * surface has just two height levels (upper and lower planes) then the quantity is the length of the boundary between + * the upper and lower part, multiplied by the step height. If the surface is piece-wise constant, then the variation + * is the step height integrated along the boundaries between the constant parts. Therefore, for non-fractal surfaces + * it scales with the linear dimension of the image, not with its area, despite being an area integral. * * Returns: The variation. * @@ -1318,13 +1177,10 @@ return var; /* The result is the same, but it can be cached. */ - if (!mask - && row == 0 && col == 0 - && width == data_field->xres && height == data_field->yres) + if (!mask && row == 0 && col == 0 && width == data_field->xres && height == data_field->yres) return gwy_data_field_get_variation(data_field); - return calculate_variation(data_field, mask, mode, - col, row, width, height); + return calculate_variation(data_field, mask, mode, col, row, width, height); } /** @@ -1359,8 +1215,7 @@ * @w3: Weight of third corner (0 or 1). * @w4: Weight of fourth corner (0 or 1). * - * Calculates approximate volume of a one square pixel with some corners - * possibly missing. + * Calculates approximate volume of a one square pixel with some corners possibly missing. * * Returns: The volume. **/ @@ -1372,22 +1227,18 @@ c = (z1 + z2 + z3 + z4)/4.0; - return (w1*(3.0*z1 + z2 + z4 + c) - + w2*(3.0*z2 + z1 + z3 + c) - + w3*(3.0*z3 + z2 + z4 + c) - + w4*(3.0*z4 + z3 + z1 + c))/24.0; + return (w1*(3.0*z1 + z2 + z4 + c) + w2*(3.0*z2 + z1 + z3 + c) + + w3*(3.0*z3 + z2 + z4 + c) + w4*(3.0*z4 + z3 + z1 + c))/24.0; } /** * stripe_volume: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * * Calculates approximate volume of a half-pixel stripe. * @@ -1404,17 +1255,16 @@ gint j; if (m) { - for (j = 0; j < n-1; j++) - sum += square_volumew(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], - m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, - 0, 0); + for (j = 0; j < n-1; j++) { + sum += square_volumew(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], + m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0); + } } else { - for (j = 0; j < n-1; j++) - sum += square_volumew(r[j*stride], r[(j + 1)*stride], - rr[(j + 1)*stride], rr[j*stride], + for (j = 0; j < n-1; j++) { + sum += square_volumew(r[j*stride], r[(j + 1)*stride], rr[(j + 1)*stride], rr[j*stride], 1, 1, 0, 0); + } } return sum; @@ -1424,16 +1274,12 @@ * stripe_volumeb: * @n: The number of values in @r, @rr, @m. * @stride: Stride in @r, @rr, @m. - * @r: Array of @n z-values of vertices, this row of vertices is considered - * inside. - * @rr: Array of @n z-values of vertices, this row of vertices is considered - * outside. - * @b: Array of @n z-values of basis, this row of vertices is considered - * inside. - * @br: Array of @n z-values of basis, this row of vertices is considered - * outside. - * @m: Mask for @r (@rr does not need mask since it has zero weight by - * definition), or %NULL to sum over all @r vertices. + * @r: Array of @n z-values of vertices, this row of vertices is considered inside. + * @rr: Array of @n z-values of vertices, this row of vertices is considered outside. + * @b: Array of @n z-values of basis, this row of vertices is considered inside. + * @br: Array of @n z-values of basis, this row of vertices is considered outside. + * @m: Mask for @r (@rr does not need mask since it has zero weight by definition), or %NULL to sum over all @r + * vertices. * * Calculates approximate volume of a half-pixel stripe, taken from basis. * @@ -1452,7 +1298,7 @@ gint j; if (m) { - for (j = 0; j < n-1; j++) + for (j = 0; j < n-1; j++) { sum += square_volumew(r[j*stride] - b[j*stride], r[(j + 1)*stride] - b[(j + 1)*stride], rr[(j + 1)*stride] - br[(j + 1)*stride], @@ -1460,14 +1306,16 @@ m[j*stride] > 0.0, m[(j + 1)*stride] > 0.0, 0, 0); + } } else { - for (j = 0; j < n-1; j++) + for (j = 0; j < n-1; j++) { sum += square_volumew(r[j*stride] - b[j*stride], r[(j + 1)*stride] - b[(j + 1)*stride], rr[(j + 1)*stride] - br[(j + 1)*stride], rr[j*stride] - br[j*stride], 1, 1, 0, 0); + } } return sum; @@ -1505,11 +1353,10 @@ for (i = 0; i < height-1; i++) { r = dataul + xres*i; m = maskul + xres*i; - for (j = 0; j < width-1; j++) - sum += square_volumew(r[j], r[j+1], - r[j+xres+1], r[j+xres], - m[j] > 0.0, m[j+1] > 0.0, - m[j+xres+1] > 0.0, m[j+xres] > 0.0); + for (j = 0; j < width-1; j++) { + sum += square_volumew(r[j], r[j+1], r[j+xres+1], r[j+xres], + m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0); + } } /* Top row */ @@ -1518,8 +1365,7 @@ /* Bottom row */ s = !(row + height == yres); - sum += stripe_volume(width, 1, - dataul + xres*(height-1), + sum += stripe_volume(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), maskul + xres*(height-1)); @@ -1529,9 +1375,7 @@ /* Right column */ s = !(col + width == xres); - sum += stripe_volume(height, xres, - dataul + width-1, dataul + width-1 + s, - maskul + width-1); + sum += stripe_volume(height, xres, dataul + width-1, dataul + width-1 + s, maskul + width-1); /* Just take the four corner quater-pixels as flat. */ if (maskul[0]) @@ -1557,21 +1401,19 @@ r = dataul + xres*i; m = maskul + xres*i; b = basisul + xres*i; - for (j = 0; j < width-1; j++) + for (j = 0; j < width-1; j++) { sum += square_volumew(r[j] - b[j], r[j+1] - b[j+1], r[j+xres+1] - b[j+xres+1], r[j+xres] - b[j+xres], m[j] > 0.0, m[j+1] > 0.0, m[j+xres+1] > 0.0, m[j+xres] > 0.0); + } } /* Top row */ s = !(row == 0); - sum += stripe_volumeb(width, 1, - dataul, dataul - s*xres, - basisul, basisul - s*xres, - maskul); + sum += stripe_volumeb(width, 1, dataul, dataul - s*xres, basisul, basisul - s*xres, maskul); /* Bottom row */ s = !(row + height == yres); @@ -1584,10 +1426,7 @@ /* Left column */ s = !(col == 0); - sum += stripe_volumeb(height, xres, - dataul, dataul - s, - basisul, basisul - s, - maskul); + sum += stripe_volumeb(height, xres, dataul, dataul - s, basisul, basisul - s, maskul); /* Right column */ s = !(col + width == xres); @@ -1604,8 +1443,7 @@ if (maskul[xres*(height-1)]) sum += (dataul[xres*(height-1)] - basisul[xres*(height-1)])/4.0; if (maskul[xres*(height-1) + width-1]) - sum += (dataul[xres*(height-1) + width-1] - - basisul[xres*(height-1) + width-1])/4.0; + sum += (dataul[xres*(height-1) + width-1] - basisul[xres*(height-1) + width-1])/4.0; } } else { @@ -1629,10 +1467,7 @@ /* Bottom row */ s = !(row + height == yres); - sum += stripe_volume(width, 1, - dataul + xres*(height-1), - dataul + xres*(height-1 + s), - NULL); + sum += stripe_volume(width, 1, dataul + xres*(height-1), dataul + xres*(height-1 + s), NULL); /* Left column */ s = !(col == 0); @@ -1640,9 +1475,7 @@ /* Right column */ s = !(col + width == xres); - sum += stripe_volume(height, xres, - dataul + width-1, dataul + width-1 + s, - NULL); + sum += stripe_volume(height, xres, dataul + width-1, dataul + width-1 + s, NULL); /* Just take the four corner quater-pixels as flat. */ sum += dataul[0]/4.0; @@ -1663,19 +1496,17 @@ for (i = 0; i < height-1; i++) { r = dataul + xres*i; b = basisul + xres*i; - for (j = 0; j < width-1; j++) + for (j = 0; j < width-1; j++) { sum += square_volume(r[j] - b[j], r[j+1] - b[j+1], r[j+xres+1] - b[j+xres+1], r[j+xres] - b[j+xres]); + } } /* Top row */ s = !(row == 0); - sum += stripe_volumeb(width, 1, - dataul, dataul - s*xres, - basisul, basisul - s*xres, - NULL); + sum += stripe_volumeb(width, 1, dataul, dataul - s*xres, basisul, basisul - s*xres, NULL); /* Bottom row */ s = !(row + height == yres); @@ -1688,10 +1519,7 @@ /* Left column */ s = !(col == 0); - sum += stripe_volumeb(height, xres, - dataul, dataul - s, - basisul, basisul - s, - NULL); + sum += stripe_volumeb(height, xres, dataul, dataul - s, basisul, basisul - s, NULL); /* Right column */ s = !(col + width == xres); @@ -1704,8 +1532,7 @@ sum += (dataul[0] - basisul[0])/4.0; sum += (dataul[width-1] - basisul[width-1])/4.0; sum += (dataul[xres*(height-1)] - basisul[xres*(height-1)])/4.0; - sum += (dataul[xres*(height-1) + width-1] - - basisul[xres*(height-1) + width-1])/4.0; + sum += (dataul[xres*(height-1) + width-1] - basisul[xres*(height-1) + width-1])/4.0; } } @@ -1718,10 +1545,9 @@ /** * gwy_data_field_area_get_volume: * @data_field: A data field. - * @basis: The basis or background for volume calculation if not %NULL. - * The height of each vertex is then the difference between - * @data_field value and @basis value. Value %NULL is the same - * as passing all zeroes for the basis. + * @basis: The basis or background for volume calculation if not %NULL. The height of each vertex is then the + * difference between @data_field value and @basis value. Value %NULL is the same as passing all zeroes for + * the basis. * @mask: Mask specifying which values to take into account/exclude, or %NULL. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. @@ -1763,25 +1589,20 @@ * @row: Upper-left row coordinate. * @width: Area width (number of columns). * @height: Area height (number of rows). - * @xcenter: Location where to store the horizontal position of centre of mass - * (in pixel coordinates), or %NULL. - * @ycenter: Location where to store the vertical position of centre of mass - * (in pixel coordinates), or %NULL. + * @xcenter: Location where to store the horizontal position of centre of mass (in pixel coordinates), or %NULL. + * @ycenter: Location where to store the vertical position of centre of mass (in pixel coordinates), or %NULL. * * Calculates the dispersion of a data field area, taking it as a distribution. * - * The function takes @data_field as a distribution, finds the centre of mass - * in the area and then calculates the mean squared distance from this centre, - * weighted by @data_field values. Normally @data_field should contain only + * The function takes @data_field as a distribution, finds the centre of mass in the area and then calculates the mean + * squared distance from this centre, weighted by @data_field values. Normally @data_field should contain only * non-negative data. * - * The dispersion is measured in real coordinates, so horizontal and vertical - * pixel sizes play a role and the units are squared lateral units of - * @data_field. Note, however, that @xcenter and @ycenter is returned in pixel + * The dispersion is measured in real coordinates, so horizontal and vertical pixel sizes play a role and the units + * are squared lateral units of @data_field. Note, however, that @xcenter and @ycenter is returned in pixel * coordinates since it is usually more convenient. * - * Returns: Dispersion, i.e. estimated average squared distance from centre of - * mass. + * Returns: Dispersion, i.e. estimated average squared distance from centre of mass. * * Since: 2.52 **/ @@ -1904,17 +1725,14 @@ /** * gwy_data_field_get_dispersion: * @data_field: A data field. - * @xcenter: Location where to store the horizontal position of centre of mass - * (in pixel coordinates), or %NULL. - * @ycenter: Location where to store the vertical position of centre of mass - * (in pixel coordinates), or %NULL. + * @xcenter: Location where to store the horizontal position of centre of mass (in pixel coordinates), or %NULL. + * @ycenter: Location where to store the vertical position of centre of mass (in pixel coordinates), or %NULL. * * Calculates the dispersion of a data field, taking it as a distribution. * * See gwy_data_field_area_get_dispersion() for discussion. * - * Returns: Dispersion, i.e. estimated average squared distance from centre of - * mass. + * Returns: Dispersion, i.e. estimated average squared distance from centre of mass. * * Since: 2.52 **/ @@ -1924,12 +1742,8 @@ gdouble *ycenter) { g_return_val_if_fail(GWY_IS_DATA_FIELD(data_field), 0.0); - return gwy_data_field_area_get_dispersion(data_field, - NULL, GWY_MASK_IGNORE, - 0, 0, - data_field->xres, - data_field->yres, - xcenter, ycenter); + return gwy_data_field_area_get_dispersion(data_field, NULL, GWY_MASK_IGNORE, 0, 0, + data_field->xres, data_field->yres, xcenter, ycenter); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/m4/Makefile.in gwyddion-2.63/m4/Makefile.in --- gwyddion-2.62/m4/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/m4/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -329,6 +329,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/Makefile.in gwyddion-2.63/Makefile.in --- gwyddion-2.62/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/Makefile.in 2023-06-13 13:22:35.000000000 +0000 @@ -441,6 +441,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/cmap/Makefile.in gwyddion-2.63/modules/cmap/Makefile.in --- gwyddion-2.62/modules/cmap/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/modules/cmap/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -509,6 +509,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/file/accurexii-txt.c gwyddion-2.63/modules/file/accurexii-txt.c --- gwyddion-2.62/modules/file/accurexii-txt.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/accurexii-txt.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: accurexii-txt.c 21300 2018-08-08 14:08:32Z yeti-dn $ + * $Id: accurexii-txt.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -99,12 +95,10 @@ if (only_name) return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION) ? 10 : 0; - if (fileinfo->file_size < MAGIC_SIZE - || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) + if (fileinfo->file_size < MAGIC_SIZE || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) return 0; - if (!strstr(fileinfo->head, MAGIC2) - || !strstr(fileinfo->head, MAGIC3)) + if (!strstr(fileinfo->head, MAGIC2) || !strstr(fileinfo->head, MAGIC3)) return 0; return 90; @@ -145,13 +139,11 @@ goto fail; } - header = g_convert(buffer + MAGIC_SIZE, p - buffer - MAGIC_SIZE, - "UTF-8", "ISO-8859-1", NULL, NULL, &err); + header = g_convert(buffer + MAGIC_SIZE, p - buffer - MAGIC_SIZE, "UTF-8", "ISO-8859-1", NULL, NULL, &err); if (!header) { /* XXX: Can this actually happen? */ g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("File header cannot be converted from ISO-8859-1 " - "character set: %s"), + _("File header cannot be converted from ISO-8859-1 character set: %s"), err->message); g_clear_error(&err); goto fail; @@ -164,7 +156,6 @@ if (!require_keys(hash, error, "Image Size", "Image Resolution", NULL)) goto fail; - value = (gchar*)g_hash_table_lookup(hash, "Image Resolution"); gwy_debug("imgres <%s>", value); if (sscanf(value, "%u x %u", &xres, &yres) != 2) { @@ -187,16 +178,8 @@ yreal = g_ascii_strtod(dims[1], &end); yunit = gwy_si_unit_new_parse(end, &power10y); g_strfreev(dims); - - /* Use negated positive conditions to catch NaNs */ - if (!(xreal > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!(yreal > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); if (!gwy_si_unit_equal(xunit, yunit)) { g_warning("X and Y units differ, using X"); } @@ -236,8 +219,7 @@ g_object_unref(dfield); if ((value = g_hash_table_lookup(hash, "Data Type"))) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(value)); + gwy_container_set_const_string_by_name(container, "/0/data/title", value); meta = gwy_container_new(); g_hash_table_foreach(hash, add_meta, meta); @@ -258,9 +240,7 @@ static void add_meta(gpointer hkey, gpointer hvalue, gpointer user_data) { - gwy_container_set_string_by_name(GWY_CONTAINER(user_data), - (gchar*)hkey, - g_strdup((gchar*)hvalue)); + gwy_container_set_const_string_by_name(GWY_CONTAINER(user_data), (gchar*)hkey, hvalue); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/afmw-spec.c gwyddion-2.63/modules/file/afmw-spec.c --- gwyddion-2.62/modules/file/afmw-spec.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/afmw-spec.c 2023-05-26 13:43:29.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: afmw-spec.c 21495 2018-10-19 16:11:08Z yeti-dn $ + * $Id: afmw-spec.c 25371 2023-05-26 13:43:29Z yeti-dn $ * Copyright (C) 2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -476,6 +476,7 @@ g_free(afmwfile->columns[i].name); GWY_OBJECT_UNREF(afmwfile->columns[i].unit); } + g_free(afmwfile->columns); g_free(afmwfile->data); g_free(afmwfile); } @@ -626,6 +627,7 @@ g_match_info_free(info); continue; } + g_free(cname); gwy_debug("seems matching"); make_file_info(info, is_map, &finfo); finfo.filename = g_build_filename(dirname, fname, NULL); @@ -636,7 +638,7 @@ g_free(dirname); g_free(basename); g_free(commonname); - g_free(name_regex); + g_regex_unref(name_regex); /* This should not normally happen, but something might be changing files * on disk... */ diff -Nru gwyddion-2.62/modules/file/aistfile.c gwyddion-2.63/modules/file/aistfile.c --- gwyddion-2.62/modules/file/aistfile.c 2021-09-15 12:21:10.000000000 +0000 +++ gwyddion-2.63/modules/file/aistfile.c 2023-05-26 14:39:22.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: aistfile.c 24136 2021-09-15 12:21:10Z yeti-dn $ + * $Id: aistfile.c 25376 2023-05-26 14:39:22Z yeti-dn $ * Copyright (C) 2009-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -281,7 +281,7 @@ GwyDataField *dfield, *mfield; GwySIUnit *xyunit, *zunit; gboolean ok = FALSE; - guint i, j, n, len; + guint i, n, len; const guchar *data; gchar *s; gdouble *d; @@ -328,10 +328,9 @@ d = gwy_data_field_get_data(dfield); for (i = 0; i < raster.yres; i++) { - for (j = 0; j < raster.xres; j++) { - d[(raster.yres-1 - i)*raster.xres + j] - = qz*gwy_get_gdouble_le(&data); - } + gwy_convert_raw_data(data + i*raster.xres*sizeof(gdouble), raster.xres, 1, + GWY_RAW_DATA_DOUBLE, GWY_BYTE_ORDER_LITTLE_ENDIAN, + d + (raster.yres-1 - i)*raster.xres, qz, 0.0); } gwy_container_set_object(context->container, gwy_app_get_data_key_for_id(context->channel_id), dfield); diff -Nru gwyddion-2.62/modules/file/alicona.c gwyddion-2.63/modules/file/alicona.c --- gwyddion-2.62/modules/file/alicona.c 2021-04-28 21:47:27.000000000 +0000 +++ gwyddion-2.63/modules/file/alicona.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: alicona.c 23594 2021-04-28 20:02:16Z yeti-dn $ + * $Id: alicona.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2011-2019 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -174,8 +170,7 @@ if (only_name) return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION) ? 10 : 0; - if (fileinfo->buffer_len > MAGIC_SIZE - && memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) == 0) + if (fileinfo->buffer_len > MAGIC_SIZE && memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) == 0) return 100; return 0; @@ -203,8 +198,7 @@ if (!al3d_load_header(&afile, buffer, size, error)) goto fail; - if (!read_uint_tag(&afile, "Cols", &afile.xres, error) - || !read_uint_tag(&afile, "Rows", &afile.yres, error)) + if (!read_uint_tag(&afile, "Cols", &afile.xres, error) || !read_uint_tag(&afile, "Rows", &afile.yres, error)) goto fail; if (err_DIMENSION(error, afile.xres) || err_DIMENSION(error, afile.yres)) @@ -214,15 +208,8 @@ || !read_float_tag(&afile, "PixelSizeYMeter", &afile.dy, error)) goto fail; - if (!((afile.dx = fabs(afile.dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - afile.dx = 1.0/afile.xres; - } - if (!((afile.dy = fabs(afile.dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - afile.dy = 1.0/afile.yres; - } - + sanitise_real_size(&afile.dx, "x step"); + sanitise_real_size(&afile.dy, "y step"); firstfreepos = MAGIC_SIZE + (TAG_SIZE + 2)*afile.ntags + COMMENT_SIZE; read_uint_tag(&afile, "IconOffset", &afile.iconoffset, NULL); if (afile.iconoffset) { @@ -248,8 +235,8 @@ firstfreepos += imagesize; } - /* XXX: Some files apparently do not give NumberOfPlanes but they have - * 3 planes. Try to guess the number from TexturePtr? */ + /* XXX: Some files apparently do not give NumberOfPlanes but they have 3 planes. Try to guess the number from + * TexturePtr? */ read_uint_tag(&afile, "NumberOfPlanes", &afile.nplanes, NULL); read_uint_tag(&afile, "TextureImageOffset", &afile.textureoffset, NULL); if (afile.nplanes && afile.textureoffset) { @@ -264,8 +251,7 @@ firstfreepos += planesize*afile.nplanes; } - if (firstfreepos - == MAGIC_SIZE + (TAG_SIZE + 2)*afile.ntags + COMMENT_SIZE) { + if (firstfreepos == MAGIC_SIZE + (TAG_SIZE + 2)*afile.ntags + COMMENT_SIZE) { err_NO_DATA(error); goto fail; } @@ -276,12 +262,10 @@ GwyDataField *badmask = NULL; field = read_depth_image(&afile, buffer, &badmask); - gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), - field); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), field); if (badmask) { gwy_app_channel_remove_bad_data(field, badmask); - gwy_container_set_object(container, gwy_app_get_mask_key_for_id(id), - badmask); + gwy_container_set_object(container, gwy_app_get_mask_key_for_id(id), badmask); g_object_unref(badmask); } g_object_unref(field); @@ -308,8 +292,7 @@ g_free(name); continue; } - gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), - field); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), field); set_title(container, id, name, -1); add_meta(container, id, &afile); g_free(name); @@ -330,13 +313,10 @@ g_clear_error(&err); continue; } - gwy_container_set_object(container, - gwy_app_get_data_key_for_id(id), - field); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), field); set_title(container, id, name, nplanes > 1 ? j : -1); add_meta(container, id, &afile); - gwy_file_channel_import_log_add(container, id, NULL, - filename); + gwy_file_channel_import_log_add(container, id, NULL, filename); id++; } g_strfreev(planes); @@ -404,10 +384,9 @@ const Al3DTag *tag = afile->tags + i; if (gwy_stramong(tag->key, - "DirSpacer", "PlaceHolder", - "Cols", "Rows", "NumberOfPlanes", "ImageCode", - "PixelSizeXMeter", "PixelSizeYMeter", - "InvalidPixelValue", NULL) + "DirSpacer", "PlaceHolder", "Cols", "Rows", "NumberOfPlanes", "ImageCode", + "PixelSizeXMeter", "PixelSizeYMeter", "InvalidPixelValue", + NULL) || strstr(tag->key, "Ptr") || g_str_has_suffix(tag->key, "Offset")) continue; @@ -416,8 +395,7 @@ } if (strlen(afile->comment)) { - gchar *p = g_convert(afile->comment, strlen(afile->comment), - "UTF-8", "ISO-8859-1", NULL, NULL, NULL); + gchar *p = g_convert(afile->comment, strlen(afile->comment), "UTF-8", "ISO-8859-1", NULL, NULL, NULL); if (p) gwy_container_set_string_by_name(meta, "Comment", p); } @@ -460,41 +438,36 @@ GwyDataField *field, *mask = NULL; guint rowstride = (afile->xres*sizeof(gfloat) + 7)/8*8; gdouble *d, *m = NULL; - guint i, j; + guint i; gdouble invalid_value = NAN, invalid_eps; gboolean invalid_is_nan; guint xres = afile->xres, yres = afile->yres; read_float_tag(afile, "InvalidPixelValue", &invalid_value, NULL); invalid_is_nan = gwy_isnan(invalid_value); - /* If InvalidPixelValue is finite it does not have full double precision. - * After all, the raw data are single precision. Use a loose comparison to - * catch invalid pixels. */ + /* If InvalidPixelValue is finite it does not have full double precision. After all, the raw data are single + * precision. Use a loose comparison to catch invalid pixels. */ if (!invalid_is_nan) invalid_eps = 1.5e-7 * invalid_value; - field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, - FALSE); + field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(field), "m"); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(field), "m"); - d = field->data; + d = gwy_data_field_get_data(field); for (i = 0; i < yres; i++) { - const guchar *p = buffer + afile->depthoffset + i*rowstride; - - for (j = 0; j < xres; j++, d++, m++) { - *d = gwy_get_gfloat_le(&p); - if (gwy_isnan(*d) - || (!invalid_is_nan - && fabs(*d - invalid_value) < invalid_eps)) { - if (!mask) { - mask = gwy_data_field_new_alike(field, FALSE); - gwy_data_field_fill(mask, 1.0); - m = mask->data + i*xres + j; - } - *d = 0.0; - *m = 0.0; + gwy_convert_raw_data(buffer + afile->depthoffset + i*rowstride, xres, 1, + GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, d + i*xres, 1.0, 0.0); + } + for (i = 0; i < xres*yres; i++) { + if (gwy_isnan(d[i]) || (!invalid_is_nan && fabs(d[i] - invalid_value) < invalid_eps)) { + if (!mask) { + mask = gwy_data_field_new_alike(field, FALSE); + gwy_data_field_fill(mask, 1.0); + m = gwy_data_field_get_data(mask); } + d[i] = 0.0; + m[i] = 0.0; } } @@ -513,8 +486,7 @@ return TRUE; g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Invalid plane number %u in tag ‘%s’."), - planeno, key); + _("Invalid plane number %u in tag ‘%s’."), planeno, key); return FALSE; } @@ -538,17 +510,13 @@ || !check_plane_no(afile, lotag->key, loplaneno, error)) return NULL; - field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, - FALSE); + field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(field), "m"); - d = field->data; - + d = gwy_data_field_get_data(field); for (i = 0; i < yres; i++) { - const guchar *phi = (buffer + afile->textureoffset - + hiplaneno*planesize + i*rowstride); - const guchar *plo = (buffer + afile->textureoffset - + loplaneno*planesize + i*rowstride); + const guchar *phi = (buffer + afile->textureoffset + hiplaneno*planesize + i*rowstride); + const guchar *plo = (buffer + afile->textureoffset + loplaneno*planesize + i*rowstride); for (j = 0; j < xres; j++, d++, plo++, phi++) *d = (*plo | ((guint)*phi << 8))/65536.0; @@ -574,15 +542,12 @@ if (!check_plane_no(afile, tag->key, planeno, error)) return NULL; - field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, - FALSE); + field = gwy_data_field_new(xres, yres, afile->dx*xres, afile->dy*yres, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(field), "m"); - d = field->data; - + d = gwy_data_field_get_data(field); for (i = 0; i < yres; i++) { - const guchar *p = (buffer + afile->textureoffset - + planeno*planesize + i*rowstride); + const guchar *p = (buffer + afile->textureoffset + planeno*planesize + i*rowstride); for (j = 0; j < xres; j++, d++, p++) *d = *p/256.0; @@ -610,8 +575,7 @@ } for (i = strlen(tag->key); i < KEY_SIZE-1; i++) { if (tag->key[i]) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Header tag ‘%s’ key is not nul-padded."), tag->key); return FALSE; @@ -633,8 +597,7 @@ return TRUE; for (i = strlen(tag->value); i < VALUE_SIZE-1; i++) { if (tag->value[i]) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Header tag ‘%s’ value is not nul-padded."), tag->key); return FALSE; @@ -763,4 +726,4 @@ return TRUE; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/anfatec.c gwyddion-2.63/modules/file/anfatec.c --- gwyddion-2.62/modules/file/anfatec.c 2022-04-26 15:03:27.000000000 +0000 +++ gwyddion-2.63/modules/file/anfatec.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: anfatec.c 24775 2022-04-26 15:03:27Z yeti-dn $ + * $Id: anfatec.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2010-2022 David Necas (Yeti) * E-mail: yeti@gwyddion.net * @@ -38,7 +38,7 @@ * [FILE-MAGIC-USERGUIDE] * Anfatec * .par, .int - * Read + * Read Curvemap **/ #include "config.h" @@ -440,16 +440,9 @@ } xreal = g_ascii_strtod(g_hash_table_lookup(hash, "XScanRange"), NULL); - xreal = fabs(xreal); - if (!(xreal > 0.0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); yreal = g_ascii_strtod(g_hash_table_lookup(hash, "YScanRange"), NULL); - if (!(yreal > 0.0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&yreal, "y size"); unitx = gwy_si_unit_new_parse(g_hash_table_lookup(hash, "XPhysUnit"), &power10x); unity = gwy_si_unit_new_parse(g_hash_table_lookup(hash, "YPhysUnit"), &power10y); @@ -461,8 +454,8 @@ g_free(key); dfield = gwy_data_field_new(xres, yres, xreal*pow10(power10x), yreal*pow10(power10y), FALSE); - gwy_data_field_set_si_unit_xy(dfield, unitx); - gwy_data_field_set_si_unit_z(dfield, unitz); + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(dfield), unitx); + gwy_si_unit_assign(gwy_data_field_get_si_unit_z(dfield), unitz); if ((value = g_hash_table_lookup(hash, "xCenter"))) { offset = (g_ascii_strtod(value, NULL) - 0.5*xreal)*pow10(power10x); gwy_data_field_set_xoffset(dfield, offset); @@ -478,8 +471,7 @@ q *= g_ascii_strtod(value, NULL); g_free(key); - gwy_convert_raw_data(buffer, xres*yres, 1, - GWY_RAW_DATA_SINT32, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_convert_raw_data(buffer, xres*yres, 1, GWY_RAW_DATA_SINT32, GWY_BYTE_ORDER_LITTLE_ENDIAN, gwy_data_field_get_data(dfield), q, 0.0); fail: diff -Nru gwyddion-2.62/modules/file/apefile.c gwyddion-2.63/modules/file/apefile.c --- gwyddion-2.62/modules/file/apefile.c 2019-11-11 08:53:36.000000000 +0000 +++ gwyddion-2.63/modules/file/apefile.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,24 +1,20 @@ /* - * $Id: apefile.c 22665 2019-11-10 10:11:19Z yeti-dn $ + * $Id: apefile.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * Date conversion code copied from Wine, see below. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -143,10 +139,9 @@ gdouble range_x; gdouble range_y; guint subversion; - /* The new fields change the conversion rules, however, the simple factor - * above are written so that old software performs the conversion - * corerectly (they contain pre-multiplied or pre-divided values). So we - * use that and do not care about hv_gain_z or fast2_* */ + /* The new fields change the conversion rules, however, the simple factor above are written so that old software + * performs the conversion corerectly (they contain pre-multiplied or pre-divided values). So we use that and do + * not care about hv_gain_z or fast2_* */ /* Since 2.1 */ gdouble hv_gain_z; /* Since 2.2 */ @@ -233,9 +228,8 @@ version = *(buffer++); mode = *(buffer++); vbtype = gwy_get_guint16_le(&buffer); - if (version >= 1 && version <= 2 - && mode < SPM_MODE_LAST+2 /* reserve */ - && vbtype == 7) { + /* reserve */ + if (version >= 1 && version <= 2 && mode < SPM_MODE_LAST+2 && vbtype == 7) { score = 60; /* This works for new file format only */ if (!strncmp(fileinfo->head + 234, "APERES", 6)) @@ -264,6 +258,7 @@ return NULL; } p = buffer; + gwy_clear(&apefile, 1); apefile.version = *(p++); if (size < 1294) { err_TOO_SHORT(error); @@ -320,8 +315,8 @@ apefile.range_x = gwy_get_gfloat_le(&p); apefile.range_y = gwy_get_gfloat_le(&p); apefile.subversion = gwy_get_guint16_le(&p); - /* Read everything since the header is long enough, check the version - * later when we decide whether to use these values or not. */ + /* Read everything since the header is long enough, check the version later when we decide whether to use these + * values or not. */ /* Since 2.1 */ apefile.hv_gain_z = gwy_get_gfloat_le(&p); /* Since 2.2 */ @@ -337,51 +332,32 @@ /* reserved */ p += 2; - apefile.xreal = apefile.maxr_x * apefile.x_piezo_factor * apefile.range_x - * apefile.hv_gain/65535.0 * 1e-9; - apefile.yreal = apefile.maxr_y * apefile.y_piezo_factor * apefile.range_y - * apefile.hv_gain/65535.0 * 1e-9; - /* Use negated positive conditions to catch NaNs */ - if (!((apefile.xreal = fabs(apefile.xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - apefile.xreal = 1.0; - } - if (!((apefile.yreal = fabs(apefile.yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - apefile.yreal = 1.0; - } + apefile.xreal = apefile.maxr_x * apefile.x_piezo_factor * apefile.range_x * apefile.hv_gain/65535.0 * 1e-9; + apefile.yreal = apefile.maxr_y * apefile.y_piezo_factor * apefile.range_y * apefile.hv_gain/65535.0 * 1e-9; + sanitise_real_size(&apefile.xreal, "x size"); + sanitise_real_size(&apefile.yreal, "y size"); - gwy_debug("version = %u.%u, spm_mode = %u", - apefile.version, apefile.subversion, apefile.spm_mode); + gwy_debug("version = %u.%u, spm_mode = %u", apefile.version, apefile.subversion, apefile.spm_mode); gwy_debug("scan_date = %f", apefile.scan_date); gwy_debug("maxr_x = %g, maxr_y = %g", apefile.maxr_x, apefile.maxr_y); - gwy_debug("x_offset = %u, y_offset = %u", - apefile.x_offset, apefile.y_offset); + gwy_debug("x_offset = %u, y_offset = %u", apefile.x_offset, apefile.y_offset); gwy_debug("size_flag = %u", apefile.size_flag); gwy_debug("acquire_delay = %g, raster_delay = %g, tip_dist = %g", apefile.acquire_delay, apefile.raster_delay, apefile.tip_dist); - gwy_debug("v_ref = %g, vpmt1 = %g, vpmt2 = %g", - apefile.v_ref, apefile.vpmt1, apefile.vpmt2); + gwy_debug("v_ref = %g, vpmt1 = %g, vpmt2 = %g", apefile.v_ref, apefile.vpmt1, apefile.vpmt2); gwy_debug("x_piezo_factor = %u, y_piezo_factor = %u, z_piezo_factor = %u", - apefile.x_piezo_factor, apefile.y_piezo_factor, - apefile.z_piezo_factor); - gwy_debug("hv_gain = %g, freq_osc_tip = %g, rotate = %g", - apefile.hv_gain, apefile.freq_osc_tip, apefile.rotate); - gwy_debug("slope_x = %g, slope_y = %g", - apefile.slope_x, apefile.slope_y); + apefile.x_piezo_factor, apefile.y_piezo_factor, apefile.z_piezo_factor); + gwy_debug("hv_gain = %g, freq_osc_tip = %g, rotate = %g", apefile.hv_gain, apefile.freq_osc_tip, apefile.rotate); + gwy_debug("slope_x = %g, slope_y = %g", apefile.slope_x, apefile.slope_y); gwy_debug("topo_means = %u, optical_means = %u, error_means = %u", apefile.topo_means, apefile.optical_means, apefile.error_means); - gwy_debug("channel bitmask = %03x, ndata = %u", - apefile.channels, apefile.ndata); - gwy_debug("range_x = %g, range_y = %g", - apefile.range_x, apefile.range_y); + gwy_debug("channel bitmask = %03x, ndata = %u", apefile.channels, apefile.ndata); + gwy_debug("range_x = %g, range_y = %g", apefile.range_x, apefile.range_y); n = (apefile.res + 1)*(apefile.res + 1)*sizeof(float); if (size - (p - buffer) != n*apefile.ndata) { - g_warning("Expected data size %u, but it's %u.", - n*apefile.ndata, (guint)(size - (p - buffer))); - gwy_debug("original ndata %u, corrected ndata %u (n = %u)", - apefile.ndata, (guint)(size - (p - buffer))/n, n); + g_warning("Expected data size %u, but it's %u.", n*apefile.ndata, (guint)(size - (p - buffer))); + gwy_debug("original ndata %u, corrected ndata %u (n = %u)", apefile.ndata, (guint)(size - (p - buffer))/n, n); apefile.ndata = MIN(apefile.ndata, (size - (p - buffer))/n); } if (!apefile.ndata) { @@ -418,18 +394,18 @@ switch (apefile.spm_mode) { case SPM_MODE_SNOM: title = gwy_enuml_to_string(i, - "Height", APE_HEIGHT, - "Height-R", APE_HEIGHT_R, - "NSOM", APE_NSOM, - "NSOM-R", APE_NSOM_R, - "Error", APE_ERROR, - "Error-R", APE_ERROR_R, - "NSOM2", APE_NSOM2, - "NSOM2-R", APE_NSOM2_R, - "Lateral", APE_AUX1, - "Z-Z0", APE_AUX2, - "Lateral-R", APE_AUX1_R, - "Z-Z0-R", APE_AUX2_R, + "Height", APE_HEIGHT, + "Height-R", APE_HEIGHT_R, + "NSOM", APE_NSOM, + "NSOM-R", APE_NSOM_R, + "Error", APE_ERROR, + "Error-R", APE_ERROR_R, + "NSOM2", APE_NSOM2, + "NSOM2-R", APE_NSOM2_R, + "Lateral", APE_AUX1, + "Z-Z0", APE_AUX2, + "Lateral-R", APE_AUX1_R, + "Z-Z0-R", APE_AUX2_R, NULL); break; @@ -437,18 +413,18 @@ case SPM_MODE_AFM_CONTACT: case SPM_MODE_PHASE_DETECT_AFM: title = gwy_enuml_to_string(i, - "Height", APE_HEIGHT, - "Height-R", APE_HEIGHT_R, - "IN1", APE_NSOM, - "IN1-R", APE_NSOM_R, - "Error", APE_ERROR, - "Error-R", APE_ERROR_R, - "IN2", APE_NSOM2, - "IN2-R", APE_NSOM2_R, - "Lateral", APE_AUX1, - "Z-Z0", APE_AUX2, - "Lateral-R", APE_AUX1_R, - "Z-Z0-R", APE_AUX2_R, + "Height", APE_HEIGHT, + "Height-R", APE_HEIGHT_R, + "IN1", APE_NSOM, + "IN1-R", APE_NSOM_R, + "Error", APE_ERROR, + "Error-R", APE_ERROR_R, + "IN2", APE_NSOM2, + "IN2-R", APE_NSOM2_R, + "Lateral", APE_AUX1, + "Z-Z0", APE_AUX2, + "Lateral-R", APE_AUX1_R, + "Z-Z0-R", APE_AUX2_R, NULL); break; @@ -456,12 +432,12 @@ title = gwy_enuml_to_string(i, "Height", APE_HEIGHT, "Height-R", APE_HEIGHT_R, - "IN1", APE_NSOM, - "IN1-R", APE_NSOM_R, + "IN1", APE_NSOM, + "IN1-R", APE_NSOM_R, "Error", APE_ERROR, "Error-R", APE_ERROR_R, - "IN2", APE_NSOM2, - "IN2-R", APE_NSOM2_R, + "IN2", APE_NSOM2, + "IN2-R", APE_NSOM2_R, "Aux1", APE_AUX1, "Z-Z0", APE_AUX2, "Aux1-R", APE_AUX1_R, @@ -483,6 +459,7 @@ } g_object_unref(meta); + g_free(apefile.data); g_free(apefile.remark); return container; @@ -507,8 +484,7 @@ break; gwy_debug("reading field %u (bit 0x%08x)", n, (1 << k)); - dfield = gwy_data_field_new(apefile->res, apefile->res, - apefile->xreal, apefile->yreal, FALSE); + dfield = gwy_data_field_new(apefile->res, apefile->res, apefile->xreal, apefile->yreal, FALSE); unit = gwy_data_field_get_si_unit_xy(dfield); gwy_si_unit_set_from_string(unit, "m"); @@ -541,9 +517,7 @@ for (i = 0; i < apefile->res; i++) { /* There is always one ignored record, do not ask me why... */ buffer += sizeof(float); - gwy_convert_raw_data(buffer, apefile->res, 1, - GWY_RAW_DATA_FLOAT, - GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_convert_raw_data(buffer, apefile->res, 1, GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, data + i*apefile->res, q, 0.0); buffer += apefile->res*sizeof(float); } @@ -552,8 +526,7 @@ } #define HASH_STORE(key, fmt, field) \ - gwy_container_set_string_by_name(meta, key, \ - g_strdup_printf(fmt, apefile->field)) + gwy_container_set_string_by_name(meta, key, g_strdup_printf(fmt, apefile->field)) static GwyContainer* apefile_get_metadata(APEFile *apefile) @@ -563,44 +536,31 @@ meta = gwy_container_new(); - gwy_container_set_string_by_name(meta, "Version", - g_strdup_printf("%u.%u", apefile->version, - apefile->subversion)); + gwy_container_set_string_by_name(meta, "Version", g_strdup_printf("%u.%u", apefile->version, apefile->subversion)); /* - * In SPM_MODE_SNOM or SPM_MODE_AFM_NONCONTACT freq_osc_tip holds the tip - * oscillation frequency. - * If spm_mode=SPM_MODE_AFM_CONTACT then the freq_osc_tip field holds the - * force the tip applies to the sample in nN. - * If spm_mode=SPM_MODE_STM then freq_osc_tip holds the bias voltage in - * Volts. + * In SPM_MODE_SNOM or SPM_MODE_AFM_NONCONTACT freq_osc_tip holds the tip oscillation frequency. + * If spm_mode=SPM_MODE_AFM_CONTACT then the freq_osc_tip field holds the force the tip applies to the sample in + * nN. + * If spm_mode=SPM_MODE_STM then freq_osc_tip holds the bias voltage in Volts. */ - switch (apefile->spm_mode) { - case SPM_MODE_SNOM: - case SPM_MODE_AFM_NONCONTACT: - HASH_STORE("Tip oscillation frequency", "%g Hz", freq_osc_tip); - break; - case SPM_MODE_AFM_CONTACT: - HASH_STORE("Force", "%g nN", freq_osc_tip); - break; - case SPM_MODE_STM: - HASH_STORE("Bias", "%g V", freq_osc_tip); - break; - default: - HASH_STORE("Tip oscillation frequency", "%g Hz", freq_osc_tip); - break; - } + if (apefile->spm_mode == SPM_MODE_SNOM || apefile->spm_mode == SPM_MODE_AFM_NONCONTACT) + HASH_STORE("Tip oscillation frequency", "%g Hz", freq_osc_tip); + else if (apefile->spm_mode == SPM_MODE_AFM_CONTACT) + HASH_STORE("Force", "%g nN", freq_osc_tip); + else if (apefile->spm_mode == SPM_MODE_STM) + HASH_STORE("Bias", "%g V", freq_osc_tip); + else + HASH_STORE("Tip oscillation frequency", "%g Hz", freq_osc_tip); /* We will fetch the HV Amplifier status only if file version>= 2.4*/ if (apefile->version > 1 && apefile->subversion >= 4) { - gwy_container_set_string_by_name - (meta, "XY HV Status", - g_strdup(gwy_enum_to_string(apefile->xy_hv_status, hva_statuses, - G_N_ELEMENTS(hva_statuses)))); - gwy_container_set_string_by_name - (meta, "Z HV Status", - g_strdup(gwy_enum_to_string(apefile->z_hv_status, hva_statuses, - G_N_ELEMENTS(hva_statuses)))); + gwy_container_set_const_string_by_name(meta, "XY HV Status", + gwy_enum_to_string(apefile->xy_hv_status, hva_statuses, + G_N_ELEMENTS(hva_statuses))); + gwy_container_set_const_string_by_name(meta, "Z HV Status", + gwy_enum_to_string(apefile->z_hv_status, hva_statuses, + G_N_ELEMENTS(hva_statuses))); } HASH_STORE("Acquire delay", "%.6f s", acquire_delay); @@ -608,13 +568,10 @@ HASH_STORE("Tip distance", "%g nm", tip_dist); if (apefile->remark && *apefile->remark - && (p = g_convert(apefile->remark, strlen(apefile->remark), - "UTF-8", "ISO-8859-1", NULL, NULL, NULL))) + && (p = g_convert(apefile->remark, strlen(apefile->remark), "UTF-8", "ISO-8859-1", NULL, NULL, NULL))) gwy_container_set_string_by_name(meta, "Comment", p); - gwy_container_set_string_by_name - (meta, "SPM mode", - g_strdup(gwy_enum_to_string(apefile->spm_mode, spm_modes, - G_N_ELEMENTS(spm_modes)))); + gwy_container_set_const_string_by_name(meta, "SPM mode", + gwy_enum_to_string(apefile->spm_mode, spm_modes, G_N_ELEMENTS(spm_modes))); p = format_vt_date(apefile->scan_date); if (p) gwy_container_set_string_by_name(meta, "Date", p); @@ -698,13 +655,13 @@ int j, i, l, n; l = jd + 68569; - n = l * 4 / 146097; - l -= (n * 146097 + 3) / 4; - i = (4000 * (l + 1)) / 1461001; - l += 31 - (i * 1461) / 4; - j = (l * 80) / 2447; - *day = l - (j * 2447) / 80; - l = j / 11; + n = l * 4/146097; + l -= (n * 146097 + 3)/4; + i = (4000 * (l + 1))/1461001; + l += 31 - (i * 1461)/4; + j = (l * 80)/2447; + *day = l - (j * 2447)/80; + l = j/11; *month = (j + 2) - (12 * l); *year = 100 * (n - 49) + i + l; } @@ -804,7 +761,7 @@ VARIANT_DMYFromJulian(julianDays, &lpUdate->st.wYear, &lpUdate->st.wMonth, &lpUdate->st.wDay); - datePart = (datePart + 1.5) / 7.0; + datePart = (datePart + 1.5)/7.0; lpUdate->st.wDayOfWeek = (datePart - floor(datePart)) * 7; if (lpUdate->st.wDayOfWeek == 0) lpUdate->st.wDayOfWeek = 5; @@ -868,8 +825,7 @@ gwy_clear(&tm, 1); gwy_debug("Date: %d-%d-%d %d:%d:%d", - udate.st.wYear, udate.st.wMonth, udate.st.wDay, - udate.st.wHour, udate.st.wMinute, udate.st.wSecond); + udate.st.wYear, udate.st.wMonth, udate.st.wDay, udate.st.wHour, udate.st.wMinute, udate.st.wSecond); tm.tm_year = udate.st.wYear - 1900; tm.tm_mon = udate.st.wMonth - 1; tm.tm_mday = udate.st.wDay; @@ -883,5 +839,4 @@ return g_strstrip(g_strdup(asctime(&tm))); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ - +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/asciiexport.c gwyddion-2.63/modules/file/asciiexport.c --- gwyddion-2.62/modules/file/asciiexport.c 2022-10-11 12:51:16.000000000 +0000 +++ gwyddion-2.63/modules/file/asciiexport.c 2023-02-23 16:16:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: asciiexport.c 25063 2022-10-03 08:45:08Z yeti-dn $ + * $Id: asciiexport.c 25245 2023-02-23 16:16:20Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -28,7 +28,6 @@ **/ #include "config.h" -#include #include #ifdef HAVE_UNISTD_H #include @@ -53,14 +52,7 @@ }; typedef struct { - gboolean needs_decimal_dot; - guint decimal_dot_len; - gchar *decimal_dot; -} DecimalDotInfo; - -typedef struct { GwyParams *params; - DecimalDotInfo decinfo; } ModuleArgs; static gboolean module_register (void); @@ -76,14 +68,13 @@ gint id, ModuleArgs *args, FILE *fh); -static void fill_decimal_dot_info(DecimalDotInfo *info); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Exports data as simple ASCII matrix."), "Yeti ", - "2.0", + "2.1", "David Nečas (Yeti)", "2004", }; @@ -148,10 +139,6 @@ } args.params = gwy_params_new_from_settings(define_module_params()); - fill_decimal_dot_info(&args.decinfo); - if (!args.decinfo.needs_decimal_dot) - gwy_params_set_boolean(args.params, PARAM_DECIMAL_DOT, TRUE); - if (mode == GWY_RUN_INTERACTIVE) { outcome = run_gui(&args); gwy_params_save_to_settings(args.params); @@ -191,7 +178,6 @@ g_unlink(filename); g_object_unref(args.params); - g_free(args.decinfo.decimal_dot); return ok; } @@ -199,16 +185,19 @@ static GwyDialogOutcome run_gui(ModuleArgs *args) { + gboolean needs_decimal_dot_option; GwyDialog *dialog; GwyParamTable *table; + needs_decimal_dot_option = !gwy_strequal(gwy_get_decimal_separator(), "."); + dialog = GWY_DIALOG(gwy_dialog_new(_("Export Text"))); gwy_dialog_add_buttons(dialog, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); table = gwy_param_table_new(args->params); gwy_param_table_append_header(table, -1, _("Options")); - gwy_param_table_append_checkbox(table, PARAM_DECIMAL_DOT); - gwy_param_table_set_sensitive(table, PARAM_DECIMAL_DOT, args->decinfo.needs_decimal_dot); + if (needs_decimal_dot_option) + gwy_param_table_append_checkbox(table, PARAM_DECIMAL_DOT); gwy_param_table_append_checkbox(table, PARAM_ADD_COMMENT); gwy_param_table_append_checkbox(table, PARAM_CONCAT_ALL); gwy_param_table_append_slider(table, PARAM_PRECISION); @@ -219,119 +208,68 @@ return gwy_dialog_run(dialog); } -static inline gint -print_with_decimal_dot(FILE *fh, - gchar *formatted_number, - const gchar *decimal_dot, - guint decimal_dot_len) -{ - gchar *pos = strstr(formatted_number, decimal_dot); - - if (!pos) - return fputs(formatted_number, fh); - else { - pos[0] = '.'; - if (decimal_dot_len == 1) - return fputs(formatted_number, fh); - else { - gint l1, l2; - - pos[1] = '\0'; - if ((l1 = fputs(formatted_number, fh)) == EOF) - return EOF; - if ((l2 = fputs(pos + decimal_dot_len, fh)) == EOF) - return EOF; - return l1 + l2; - } - } -} - static gboolean export_one_channel(GwyContainer *data, gint id, ModuleArgs *args, FILE *fh) { GwyDataField *field = gwy_container_get_object(data, gwy_app_get_data_key_for_id(id)); - gboolean force_decimal_dot = (args->decinfo.needs_decimal_dot - && gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT)); + gboolean decimal_dot = gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT); gint precision = gwy_params_get_int(args->params, PARAM_PRECISION); gboolean add_comment = gwy_params_get_boolean(args->params, PARAM_ADD_COMMENT); - gint xres, yres, i, ddlen = args->decinfo.decimal_dot_len; - const gchar *ddot = args->decinfo.decimal_dot; + gint xres, yres, i; const gdouble *d; - gchar buf[40]; + GString *str; g_return_val_if_fail(GWY_IS_DATA_FIELD(field), FALSE); xres = gwy_data_field_get_xres(field); yres = gwy_data_field_get_yres(field); d = gwy_data_field_get_data_const(field); + str = g_string_new(NULL); if (add_comment) { gdouble xreal = gwy_data_field_get_xreal(field), yreal = gwy_data_field_get_yreal(field); GwySIUnit *units; GwySIValueFormat *vf = NULL; + gdouble v; gchar *s; s = gwy_app_get_data_field_title(data, id); - gwy_fprintf(fh, "# %s %s\n", _("Channel:"), s); + g_string_printf(str, "# %s %s\n", _("Channel:"), s); g_free(s); vf = gwy_data_field_get_value_format_xy(field, GWY_SI_UNIT_FORMAT_VFMARKUP, vf); - if (force_decimal_dot) { - gwy_fprintf(fh, "# %s ", _("Width:")); - g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, xreal/vf->magnitude); - print_with_decimal_dot(fh, buf, ddot, ddlen); - gwy_fprintf(fh, " %s\n", vf->units); - - gwy_fprintf(fh, "# %s ", _("Height:")); - g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, yreal/vf->magnitude); - print_with_decimal_dot(fh, buf, ddot, ddlen); - gwy_fprintf(fh, " %s\n", vf->units); - } - else { - gwy_fprintf(fh, "# %s %.*f %s\n", _("Width:"), vf->precision, xreal/vf->magnitude, vf->units); - gwy_fprintf(fh, "# %s %.*f %s\n", _("Height:"), vf->precision, yreal/vf->magnitude, vf->units); - } + + g_string_append_printf(str, "# %s ", _("Width:")); + v = xreal/vf->magnitude; + gwy_append_doubles_to_gstring(str, &v, 1, precision, "", decimal_dot); + g_string_append_printf(str, " %s\n", vf->units); + + g_string_append_printf(str, "# %s ", _("Height:")); + v = yreal/vf->magnitude; + gwy_append_doubles_to_gstring(str, &v, 1, precision, "", decimal_dot); + g_string_append_printf(str, " %s\n", vf->units); units = gwy_data_field_get_si_unit_z(field); s = gwy_si_unit_get_string(units, GWY_SI_UNIT_FORMAT_VFMARKUP); - gwy_fprintf(fh, "# %s %s\n", _("Value units:"), s); + g_string_append_printf(str, "# %s %s\n", _("Value units:"), s); g_free(s); + fputs(str->str, fh); + gwy_si_unit_value_format_free(vf); } - if (force_decimal_dot) { - for (i = 0; i < xres*yres; i++) { - g_snprintf(buf, sizeof(buf), "%.*g%c", precision, d[i], (i + 1) % xres ? '\t' : '\n'); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - } - } - else { - for (i = 0; i < xres*yres; i++) { - if (gwy_fprintf(fh, "%.*g%c", precision, d[i], (i + 1) % xres ? '\t' : '\n') < 2) - return FALSE; + for (i = 0; i < yres; i++) { + g_string_truncate(str, 0); + gwy_append_doubles_to_gstring(str, d + i*xres, xres, precision, "\t", decimal_dot); + g_string_append_c(str, '\n'); + if (fputs(str->str, fh) == EOF) { + g_string_free(str, TRUE); + return FALSE; } } + g_string_free(str, TRUE); return TRUE; } -static void -fill_decimal_dot_info(DecimalDotInfo *info) -{ - struct lconv *locale_data; - guint len; - - locale_data = localeconv(); - info->decimal_dot = g_strdup(locale_data->decimal_point); - if (!info->decimal_dot || !(len = strlen(info->decimal_dot))) { - g_warning("Cannot get decimal dot information from localeconv()."); - g_free(info->decimal_dot); - info->decimal_dot = g_strdup("."); - len = 1; - } - info->decimal_dot_len = len; - info->needs_decimal_dot = !gwy_strequal(info->decimal_dot, "."); -} - /* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/assing-afm.c gwyddion-2.63/modules/file/assing-afm.c --- gwyddion-2.62/modules/file/assing-afm.c 2019-11-11 08:53:36.000000000 +0000 +++ gwyddion-2.63/modules/file/assing-afm.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: assing-afm.c 22667 2019-11-10 10:26:25Z yeti-dn $ + * $Id: assing-afm.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -143,16 +139,9 @@ } afmfile.real = Angstrom*gwy_get_gfloat_le(&p); - if (!(afmfile.real = fabs(afmfile.real))) { - g_warning("Real size is 0.0, fixing to 1.0"); - afmfile.real = 1.0; - } - - rawfield = gwy_data_field_new(afmfile.res, afmfile.res, - afmfile.real, afmfile.real, - FALSE); - gwy_convert_raw_data(p, afmfile.res*afmfile.res, 1, - GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, + sanitise_real_size(&afmfile.real, "size"); + rawfield = gwy_data_field_new(afmfile.res, afmfile.res, afmfile.real, afmfile.real, FALSE); + gwy_convert_raw_data(p, afmfile.res*afmfile.res, 1, GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, gwy_data_field_get_data(rawfield), 1.0, 0.0); dfield = gwy_data_field_new_rotated_90(rawfield, FALSE); g_object_unref(rawfield); @@ -175,8 +164,7 @@ container = gwy_container_new(); gwy_container_set_object_by_name(container, "/0/data", dfield); - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup("Topography")); + gwy_container_set_string_by_name(container, "/0/data/title", g_strdup("Topography")); g_object_unref(dfield); gwy_file_channel_import_log_add(container, 0, NULL, filename); @@ -232,8 +220,7 @@ q = 65533.0/(max - min); z0 = -32766.5*(max + min)/(max - min); } - z.f = MIN(gwy_data_field_get_xreal(dfield), - gwy_data_field_get_yreal(dfield))/Angstrom; + z.f = MIN(gwy_data_field_get_xreal(dfield), gwy_data_field_get_yreal(dfield))/Angstrom; #if (G_BYTE_ORDER == G_BIG_ENDIAN) GWY_SWAP(guchar, z.pp[0], z.pp[3]); GWY_SWAP(guchar, z.pp[1], z.pp[2]); @@ -267,4 +254,4 @@ return ok; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/attocube.c gwyddion-2.63/modules/file/attocube.c --- gwyddion-2.62/modules/file/attocube.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/attocube.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: attocube.c 20674 2017-12-18 17:58:47Z yeti-dn $ + * $Id: attocube.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* The format is quite similar to SPIP-ASC, however, there are enough @@ -110,8 +106,7 @@ if (only_name) return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION) ? 10 : 0; - if (fileinfo->file_size < MAGIC_SIZE - || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) + if (fileinfo->file_size < MAGIC_SIZE || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) return 0; return 100; @@ -165,9 +160,7 @@ } line = gwy_str_next_line(&p); - if (!line - || sscanf(line, "# %u-%u-%uT%u:%u:%u", - &year, &month, &day, &hour, &minute, &second) != 6) { + if (!line || sscanf(line, "# %u-%u-%uT%u:%u:%u", &year, &month, &day, &hour, &minute, &second) != 6) { err_FILE_TYPE(error, "Attocube ASC"); goto fail; } @@ -187,9 +180,7 @@ parser.item = &lowercase_value; hash = gwy_text_header_parse(header, &parser, NULL, NULL); - if (!require_keys(hash, error, - "x-pixels", "y-pixels", "x-length", "y-length", - NULL)) + if (!require_keys(hash, error, "x-pixels", "y-pixels", "x-length", "y-length", NULL)) goto fail; xres = atoi(g_hash_table_lookup(hash, "x-pixels")); @@ -198,24 +189,16 @@ goto fail; xreal = g_ascii_strtod(g_hash_table_lookup(hash, "x-length"), NULL); + sanitise_real_size(&xreal, "x-length"); yreal = g_ascii_strtod(g_hash_table_lookup(hash, "y-length"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&yreal, "y-length"); dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); - if ((value = g_hash_table_lookup(hash, "x-unit"))) { - if ((line = g_hash_table_lookup(hash, "y-unit")) - && !gwy_strequal(line, value)) + if ((line = g_hash_table_lookup(hash, "y-unit")) && !gwy_strequal(line, value)) { g_warning("X and Y units differ, using X"); + } unit = gwy_si_unit_new_parse(value, &power10); gwy_data_field_set_si_unit_xy(dfield, unit); @@ -257,8 +240,7 @@ g_object_unref(dfield); if ((value = g_hash_table_lookup(hash, "display"))) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(value)); + gwy_container_set_const_string_by_name(container, "/0/data/title", value); meta = gwy_container_new(); gwy_container_set_object_by_name(container, "/0/meta", meta); @@ -269,13 +251,13 @@ gwy_container_set_string_by_name(meta, "Date", value); if ((value = g_hash_table_lookup(hash, "scanspeed"))) - gwy_container_set_string_by_name(meta, "Scan Speed", g_strdup(value)); + gwy_container_set_const_string_by_name(meta, "Scan Speed", value); if ((value = g_hash_table_lookup(hash, "x-offset"))) - gwy_container_set_string_by_name(meta, "X Offset", g_strdup(value)); + gwy_container_set_const_string_by_name(meta, "X Offset", value); if ((value = g_hash_table_lookup(hash, "y-offset"))) - gwy_container_set_string_by_name(meta, "Y Offset", g_strdup(value)); + gwy_container_set_const_string_by_name(meta, "Y Offset", value); gwy_file_channel_import_log_add(container, 0, NULL, filename); @@ -286,4 +268,4 @@ return container; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/bcrfile.c gwyddion-2.63/modules/file/bcrfile.c --- gwyddion-2.62/modules/file/bcrfile.c 2021-08-17 14:28:39.000000000 +0000 +++ gwyddion-2.63/modules/file/bcrfile.c 2023-05-26 14:39:45.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: bcrfile.c 24008 2021-08-17 14:28:39Z yeti-dn $ + * $Id: bcrfile.c 25377 2023-05-26 14:39:44Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -88,15 +84,11 @@ #define MAGIC_SIZE2 (sizeof(MAGIC2) - 1) /* 16bit integers, text header is in Microsoft-style wide characters (utf16) */ -#define MAGIC3 \ - "f\0i\0l\0e\0f\0o\0r\0m\0a\0t\0 \0=\0 " \ - "\0b\0c\0r\0s\0t\0m\0_\0u\0n\0i\0c\0o\0d\0e\0\n\0" +#define MAGIC3 "f\0i\0l\0e\0f\0o\0r\0m\0a\0t\0 \0=\0 \0b\0c\0r\0s\0t\0m\0_\0u\0n\0i\0c\0o\0d\0e\0\n\0" #define MAGIC_SIZE3 (sizeof(MAGIC3) - 1) /* floats, text header is in Microsoft-style wide characters (utf16) */ -#define MAGIC4 \ - "f\0i\0l\0e\0f\0o\0r\0m\0a\0t\0 \0=\0 " \ - "\0b\0c\0r\0f\0_\0u\0n\0i\0c\0o\0d\0e\0\n\0" +#define MAGIC4 "f\0i\0l\0e\0f\0o\0r\0m\0a\0t\0 \0=\0 \0b\0c\0r\0f\0_\0u\0n\0i\0c\0o\0d\0e\0\n\0" #define MAGIC_SIZE4 (sizeof(MAGIC4) - 1) #define MAGIC5 "fileformat = bcrf\r\n" @@ -107,12 +99,6 @@ #define HEADER_SIZE_MAGIC "h\000e\000a\000d\000e\000r\000s\000i\000z\000e\000" -/* values are bytes per pixel */ -typedef enum { - BCR_FILE_INT16 = 2, - BCR_FILE_FLOAT = 4 -} BCRFileType; - static gboolean module_register (void); static gint bcrfile_detect (const GwyFileDetectInfo *fileinfo, gboolean only_name); @@ -130,8 +116,8 @@ static GwyDataField* read_data_field (const guchar *buffer, gint xres, gint yres, - BCRFileType type, - gboolean little_endian, + GwyRawDataType rawtype, + GwyByteOrder byteorder, GwyDataField **voidmask); static GwyContainer* bcrfile_get_metadata(GHashTable *bcrmeta); @@ -140,7 +126,7 @@ &module_register, N_("Imports Image Metrology BCR data files."), "Yeti ", - "0.17", + "0.18", "David Nečas (Yeti) & Petr Klapetek", "2005", }; @@ -166,10 +152,11 @@ { gint score = 0; - if (only_name) + if (only_name) { return (g_str_has_suffix(fileinfo->name_lowercase, ".bcr") || g_str_has_suffix(fileinfo->name_lowercase, ".bcrf")) ? 20 : 0; + } if (fileinfo->buffer_len > MAGIC_SIZE && (memcmp(fileinfo->head, MAGIC1, MAGIC_SIZE1) == 0 @@ -202,9 +189,7 @@ return NULL; } - if (size > 2*HEADER_SIZE - && (memcmp(buffer, MAGIC3, MAGIC_SIZE3) == 0 - || memcmp(buffer, MAGIC4, MAGIC_SIZE4) == 0)) + if (size > 2*HEADER_SIZE && (memcmp(buffer, MAGIC3, MAGIC_SIZE3) == 0 || memcmp(buffer, MAGIC4, MAGIC_SIZE4) == 0)) utf16 = TRUE; else if (size < HEADER_SIZE) { err_TOO_SHORT(error); @@ -216,11 +201,9 @@ if (utf16) { header_size = 2*HEADER_SIZE; find_header_size(buffer, &header_size); - header = gwy_utf16_to_utf8((const gunichar2*)buffer, header_size/2, - GWY_BYTE_ORDER_LITTLE_ENDIAN); + header = gwy_utf16_to_utf8((const gunichar2*)buffer, header_size/2, GWY_BYTE_ORDER_LITTLE_ENDIAN); if (!header) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Cannot convert string from UTF-16.")); gwy_file_abandon_contents(buffer, size, NULL); return NULL; @@ -238,8 +221,7 @@ parser.key_value_separator = "="; bcrmeta = gwy_text_header_parse(header, &parser, NULL, NULL); - dfield = file_load_real(buffer + header_size, size, header_size, bcrmeta, - &voidmask, error); + dfield = file_load_real(buffer + header_size, size, header_size, bcrmeta, &voidmask, error); gwy_file_abandon_contents(buffer, size, NULL); if (dfield) { container = gwy_container_new(); @@ -268,8 +250,7 @@ return container; } -/* Newer files contain header size embedded in the header. Change header_size - * if we find it. */ +/* Newer files contain header size embedded in the header. Change header_size if we find it. */ static void find_header_size(const guchar *buffer, gsize *header_size) @@ -278,8 +259,7 @@ const guchar *s; guint16 c; - s = gwy_memmem(buffer, *header_size, - HEADER_SIZE_MAGIC, sizeof(HEADER_SIZE_MAGIC)-1); + s = gwy_memmem(buffer, *header_size, HEADER_SIZE_MAGIC, sizeof(HEADER_SIZE_MAGIC)-1); if (!s) return; @@ -293,9 +273,7 @@ while (s - buffer < *header_size && (c = gwy_get_guint16_le(&s)) == ' ') ; s -= sizeof(guint16); - while (s - buffer < *header_size - && (c = gwy_get_guint16_le(&s)) - && g_ascii_isdigit(c)) { + while (s - buffer < *header_size && (c = gwy_get_guint16_le(&s)) && g_ascii_isdigit(c)) { size *= 10; size += c - '0'; } @@ -314,9 +292,10 @@ GError **error) { GwyDataField *dfield; - GwySIUnit *siunit1 = NULL, *siunit2 = NULL; - gboolean intelmode = TRUE, voidpixels = FALSE; - BCRFileType type; + GwySIUnit *siunit2 = NULL; + gboolean voidpixels = FALSE; + GwyByteOrder byteorder = GWY_BYTE_ORDER_LITTLE_ENDIAN; + GwyRawDataType rawtype; gdouble q, qq; gint xres, yres, power10; guchar *s; @@ -327,9 +306,9 @@ } if (gwy_strequal(s, "bcrstm") || gwy_strequal(s, "bcrstm_unicode")) - type = BCR_FILE_INT16; + rawtype = GWY_RAW_DATA_SINT16; else if (gwy_strequal(s, "bcrf") || gwy_strequal(s, "bcrf_unicode")) - type = BCR_FILE_FLOAT; + rawtype = GWY_RAW_DATA_FLOAT; else { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Unknown file type header: `%s'."), s); @@ -353,69 +332,56 @@ return NULL; if ((s = g_hash_table_lookup(meta, "intelmode"))) - intelmode = !!atol(s); + byteorder = (atol(s) ? GWY_BYTE_ORDER_LITTLE_ENDIAN : GWY_BYTE_ORDER_BIG_ENDIAN); - if (err_SIZE_MISMATCH(error, xres*yres*type, (guint)(size - header_size), - FALSE)) + if (err_SIZE_MISMATCH(error, xres*yres*gwy_raw_data_size(rawtype), (guint)(size - header_size), FALSE)) return NULL; /* Do not trust `voidpixels' and always read data assuming the rules for * bad pixels. */ - dfield = read_data_field(buffer, xres, yres, type, intelmode, voidmask); + dfield = read_data_field(buffer, xres, yres, rawtype, byteorder, voidmask); - if ((s = g_hash_table_lookup(meta, "xlength")) - && (q = g_ascii_strtod(s, NULL)) > 0) { + if ((s = g_hash_table_lookup(meta, "xlength")) && (q = g_ascii_strtod(s, NULL)) > 0) { if (!(s = g_hash_table_lookup(meta, "xunit"))) s = "nm"; - siunit1 = gwy_si_unit_new_parse(s, &power10); + gwy_si_unit_set_from_string_parse(gwy_data_field_get_si_unit_xy(dfield), s, &power10); q *= pow10(power10); - gwy_data_field_set_si_unit_xy(dfield, siunit1); gwy_data_field_set_xreal(dfield, q); } - if ((s = g_hash_table_lookup(meta, "ylength")) - && (q = g_ascii_strtod(s, NULL)) > 0) { + if ((s = g_hash_table_lookup(meta, "ylength")) && (q = g_ascii_strtod(s, NULL)) > 0) { if (!(s = g_hash_table_lookup(meta, "yunit"))) s = "nm"; siunit2 = gwy_si_unit_new_parse(s, &power10); q *= pow10(power10); - if (siunit1 && !gwy_si_unit_equal(siunit1, siunit2)) + if (!gwy_si_unit_equal(gwy_data_field_get_si_unit_xy(dfield), siunit2)) g_warning("Incompatible x and y units"); g_object_unref(siunit2); gwy_data_field_set_yreal(dfield, q); } - GWY_OBJECT_UNREF(siunit1); if (!(s = g_hash_table_lookup(meta, "zunit"))) s = "nm"; - siunit1 = gwy_si_unit_new_parse(s, &power10); - gwy_data_field_set_si_unit_z(dfield, siunit1); - g_object_unref(siunit1); + gwy_si_unit_set_from_string_parse(gwy_data_field_get_si_unit_z(dfield), s, &power10); q = pow10(power10); - if (type == BCR_FILE_INT16) { - if ((s = g_hash_table_lookup(meta, "bit2nm")) - && (qq = g_ascii_strtod(s, NULL)) > 0) + if (rawtype == GWY_RAW_DATA_SINT16) { + if ((s = g_hash_table_lookup(meta, "bit2nm")) && (qq = g_ascii_strtod(s, NULL)) > 0) gwy_data_field_multiply(dfield, q*qq); } - else if (type == BCR_FILE_FLOAT) + else if (rawtype == GWY_RAW_DATA_FLOAT) gwy_data_field_multiply(dfield, q); - if ((s = g_hash_table_lookup(meta, "zmin")) - && (qq = g_ascii_strtod(s, NULL)) > 0) + if ((s = g_hash_table_lookup(meta, "zmin")) && (qq = g_ascii_strtod(s, NULL)) > 0) gwy_data_field_add(dfield, q*qq - gwy_data_field_get_min(dfield)); if (voidpixels) { gwy_data_field_set_xreal(*voidmask, gwy_data_field_get_xreal(dfield)); gwy_data_field_set_yreal(*voidmask, gwy_data_field_get_yreal(dfield)); - siunit1 = gwy_si_unit_duplicate(gwy_data_field_get_si_unit_xy(dfield)); - gwy_data_field_set_si_unit_xy(*voidmask, siunit1); - g_object_unref(siunit1); - siunit1 = gwy_si_unit_new(NULL); - gwy_data_field_set_si_unit_z(*voidmask, siunit1); - g_object_unref(siunit1); + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(*voidmask), gwy_data_field_get_si_unit_xy(dfield)); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(*voidmask), NULL); } return dfield; @@ -449,13 +415,9 @@ continue; if (metakeys[i].unit) - gwy_container_set_string_by_name(meta, metakeys[i].key, - g_strdup_printf("%s %s", - value, - metakeys[i].unit)); + gwy_container_set_string_by_name(meta, metakeys[i].key, g_strdup_printf("%s %s", value, metakeys[i].unit)); else - gwy_container_set_string_by_name(meta, metakeys[i].key, - g_strdup(value)); + gwy_container_set_const_string_by_name(meta, metakeys[i].key, value); } if (!gwy_container_get_n_items(meta)) { @@ -470,14 +432,13 @@ read_data_field(const guchar *buffer, gint xres, gint yres, - BCRFileType type, - gboolean little_endian, + GwyRawDataType rawtype, + GwyByteOrder byteorder, GwyDataField **voidmask) { - const guint16 *p = (const guint16*)buffer; GwyDataField *dfield; gdouble *data, *voids; - guint i; + guint i, n = xres*yres; dfield = gwy_data_field_new(xres, yres, 1e-6, 1e-6, FALSE); *voidmask = gwy_data_field_new(xres, yres, 1e-6, 1e-6, FALSE); @@ -485,52 +446,18 @@ data = gwy_data_field_get_data(dfield); voids = gwy_data_field_get_data(*voidmask); - switch (type) { - case BCR_FILE_INT16: - if (little_endian) { - for (i = 0; i < xres*yres; i++) { - gdouble v = GINT16_FROM_LE(p[i]); - if (v == 32767.0) - voids[i] = 0.0; - else - data[i] = v; - } - } - else { - for (i = 0; i < xres*yres; i++) { - gdouble v = GINT16_FROM_BE(p[i]); - if (v == 32767.0) - voids[i] = 0.0; - else - data[i] = v; - } + gwy_convert_raw_data(buffer, n, 1, rawtype, byteorder, data, 1.0, 0.0); + if (rawtype == GWY_RAW_DATA_SINT16) { + for (i = 0; i < n; i++) { + if (data[i] == 32767.0) + voids[i] = 0.0; } - break; - - case BCR_FILE_FLOAT: - if (little_endian) { - for (i = 0; i < xres*yres; i++) { - gdouble v = gwy_get_gfloat_le(&buffer); - if (v > 1.7e38) - voids[i] = 0.0; - else - data[i] = v; - } - } - else { - for (i = 0; i < xres*yres; i++) { - gdouble v = gwy_get_gfloat_be(&buffer); - if (v > 1.7e38) - voids[i] = 0.0; - else - data[i] = v; - } + } + else if (rawtype == GWY_RAW_DATA_FLOAT) { + for (i = 0; i < n; i++) { + if (data[i] > 1.7e38) + voids[i] = 0.0; } - break; - - default: - g_assert_not_reached(); - break; } if (!gwy_app_channel_remove_bad_data(dfield, *voidmask)) @@ -539,4 +466,4 @@ return dfield; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/burleigh_bii.c gwyddion-2.63/modules/file/burleigh_bii.c --- gwyddion-2.62/modules/file/burleigh_bii.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/burleigh_bii.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: burleigh_bii.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: burleigh_bii.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2008 David Necas (Yeti), Petr Klapetek, Jan Horak. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, xhorak@gmail.com. * @@ -156,15 +156,9 @@ } p = buffer + data_end_offset + FILE_IMG_XY_SCALE_POS; x_scale = gwy_get_gdouble_le(&p); - if (!((x_scale = fabs(x_scale)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - x_scale = 1.0; - } + sanitise_real_size(&x_scale, "x size"); y_scale = gwy_get_gdouble_le(&p); - if (!((y_scale = fabs(y_scale)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - y_scale = 1.0; - } + sanitise_real_size(&y_scale, "y size"); p = buffer + data_end_offset + FILE_IMG_Z_SCALE_POS; z_scale = gwy_get_gdouble_le(&p); diff -Nru gwyddion-2.62/modules/file/burleigh.c gwyddion-2.63/modules/file/burleigh.c --- gwyddion-2.62/modules/file/burleigh.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/burleigh.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: burleigh.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: burleigh.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek, Hans-Peter Doerr. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, * doerr@cip.physik.uni-freiburg.de. @@ -92,8 +92,8 @@ guint32 xrangemax; guint32 yrangemax; guint32 zrangemax; - guint32 xrange; - guint32 yrange; + gdouble xrange; /* Represented as int in the file, but we keep it as double. */ + gdouble yrange; /* Ditto. */ guint32 zrange; guint32 data_type; guint32 scan_speed; @@ -312,15 +312,8 @@ imgfile->z_gain = gwy_get_guint16_le(&p); imgfile->bias_volts = gwy_get_gfloat_le(&p); imgfile->tunneling_current = gwy_get_gfloat_le(&p); - - if (!(imgfile->xrange > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - imgfile->xrange = 1; - } - if (!(imgfile->yrange > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - imgfile->yrange = 1; - } + sanitise_real_size(&imgfile->xrange, "x size"); + sanitise_real_size(&imgfile->yrange, "y size"); return (const gint16*)(buffer + HEADER_SIZE_V21); } diff -Nru gwyddion-2.62/modules/file/burleigh_exp.c gwyddion-2.63/modules/file/burleigh_exp.c --- gwyddion-2.62/modules/file/burleigh_exp.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/burleigh_exp.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: burleigh_exp.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: burleigh_exp.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2007 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -238,11 +238,7 @@ *value = g_ascii_strtod(vp, &vp); *units = gwy_si_unit_new_parse(vp, &power10); *value *= pow10(power10); - - if (!*value) { - g_warning("%s is 0.0, fixing to 1.0", name); - *value = 1.0; - } + sanitise_real_size(value, name); return TRUE; } diff -Nru gwyddion-2.62/modules/file/codevfile.c gwyddion-2.63/modules/file/codevfile.c --- gwyddion-2.62/modules/file/codevfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/codevfile.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: codevfile.c 20674 2017-12-18 17:58:47Z yeti-dn $ + * $Id: codevfile.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -129,8 +125,7 @@ strs = g_new(gchar*, n+1); n = 0; for (i = 0; line[i]; i++) { - if ((!i || g_ascii_isspace(line[i-1]) || !line[i-1]) - && (line[i] && !g_ascii_isspace(line[i]))) + if ((!i || g_ascii_isspace(line[i-1]) || !line[i-1]) && (line[i] && !g_ascii_isspace(line[i]))) strs[n++] = line + i; else if (i && g_ascii_isspace(line[i]) && !g_ascii_isspace(line[i-1])) line[i] = '\0'; @@ -172,9 +167,7 @@ /* Skip comments. */ p = buffer; - for (line = gwy_str_next_line(&p); - line && line[0] == '!'; - line = gwy_str_next_line(&p)) { + for (line = gwy_str_next_line(&p); line && line[0] == '!'; line = gwy_str_next_line(&p)) { gwy_debug("comment <%s>", line); } if (!line) { @@ -196,12 +189,9 @@ || !gwy_strequal(fields[0], "GRD") || !(xres = atoi(fields[1])) || !(yres = atoi(fields[2])) - || !(type = gwy_stramong(fields[3], - "SUR", "WFR", "FIL", "THV", "BIR", "CAO", - NULL)) + || !(type = gwy_stramong(fields[3], "SUR", "WFR", "FIL", "THV", "BIR", "CAO", NULL)) || !gwy_strequal(fields[4], "WVL") - || (!(wavelength = g_ascii_strtod(fields[5], &end)) - && end == fields[5])) { + || (!(wavelength = g_ascii_strtod(fields[5], &end)) && end == fields[5])) { err_FILE_TYPE(error, "Code V INT"); goto fail; } @@ -225,10 +215,7 @@ goto fail; } gwy_debug("scale_size %g", scale_size); - if (!scale_size) { - g_warning("Zero SSZ, fixing to 1.0"); - scale_size = 1.0; - } + sanitise_real_size(&scale_size, "SSZ"); fi++; if (fields[fi] && gwy_strequal(fields[fi], "NDA")) { @@ -256,10 +243,7 @@ fi++; } gwy_debug("x_scale %g", x_scale); - if (!x_scale) { - g_warning("Zero XSC, fixing to 1.0"); - x_scale = 1.0; - } + sanitise_real_size(&x_scale, "XSC"); /* There may be more stuff but we do not know anything about it. */ @@ -281,8 +265,7 @@ title = "Wavefront"; } else { - g_warning("Don't know how to convert this grid data type to physical " - "units."); + g_warning("Don't know how to convert this grid data type to physical units."); title = fields[3]; } @@ -295,8 +278,7 @@ for (i = 0; i < xres*yres; i++, p = end) { gint value = strtol(p, &end, 10); - if (value != no_data_value && (type != CODEV_INT_INTENSITY_FILTER - || value >= 0)) { + if (value != no_data_value && (type != CODEV_INT_INTENSITY_FILTER || value >= 0)) { mdata[i] = 1.0; data[i] = q*value; } @@ -316,26 +298,21 @@ g_object_unref(dfield); gwy_app_channel_check_nonsquare(container, 0); - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(title)); + gwy_container_set_const_string_by_name(container, "/0/data/title", title); if (mfield) { /* gwy_data_field_invert(mfield, FALSE, TRUE, FALSE); */ - gwy_container_set_object(container, gwy_app_get_mask_key_for_id(0), - mfield); + gwy_container_set_object(container, gwy_app_get_mask_key_for_id(0), mfield); g_object_unref(mfield); } meta = gwy_container_new(); - gwy_container_set_string_by_name(meta, "Comment", g_strdup(comment)); - gwy_container_set_string_by_name(meta, "Interpolation", - g_strdup(nearest_neighbour - ? "NNB" : "Linear")); - gwy_container_set_string_by_name(meta, "Wavelength", - g_strdup_printf("%g μm", wavelength)); + gwy_container_set_const_string_by_name(meta, "Comment", comment); + gwy_container_set_const_string_by_name(meta, "Interpolation", nearest_neighbour ? "NNB" : "Linear"); + gwy_container_set_string_by_name(meta, "Wavelength", g_strdup_printf("%g μm", wavelength)); gwy_container_set_object_by_name(container, "/0/meta", meta); g_object_unref(meta); @@ -349,4 +326,4 @@ return container; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/createc.c gwyddion-2.63/modules/file/createc.c --- gwyddion-2.62/modules/file/createc.c 2019-01-03 12:58:17.000000000 +0000 +++ gwyddion-2.63/modules/file/createc.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: createc.c 21783 2019-01-03 12:58:14Z yeti-dn $ + * $Id: createc.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2004 Rok Zitko. * E-mail: rok.zitko@ijs.si. * Copyright (C) 2009,2012 David Necas (Yeti). @@ -395,10 +395,7 @@ xreal = xres * ti1; /* dacs */ xreal *= 20.0/gwy_powi(2.0, dacbits) * ti2; /* voltage per dac */ xreal *= Angstrom * td; /* piezoconstant [A/V] */ - if (!(xreal = fabs(xreal))) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); HASH_INT2("Delta Y", "Delta Y / Delta Y [Dac]", ti1, error); HASH_INT2("GainY", "GainY / GainY", ti2, error); @@ -406,10 +403,7 @@ yreal = yres * ti1; yreal *= 20.0/gwy_powi(2.0, dacbits) * ti2; yreal *= Angstrom * td; - if (!(yreal = fabs(yreal))) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&yreal, "y size"); HASH_INT2("GainZ", "GainZ / GainZ", ti2, error); HASH_DOUBLE("ZPiezoconst", td, error); /* upcase P */ diff -Nru gwyddion-2.62/modules/file/csmfile.c gwyddion-2.63/modules/file/csmfile.c --- gwyddion-2.62/modules/file/csmfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/csmfile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: csmfile.c 20674 2017-12-18 17:58:47Z yeti-dn $ + * $Id: csmfile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -187,11 +187,7 @@ goto fail; } real = g_ascii_strtod(value, NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - real = 1.0; - } + sanitise_real_size(&real, "size"); if (!(value = g_hash_table_lookup(hash, "HeightScale"))) { err_MISSING_FIELD(error, "HeightScale"); diff -Nru gwyddion-2.62/modules/file/dimensionfile.c gwyddion-2.63/modules/file/dimensionfile.c --- gwyddion-2.62/modules/file/dimensionfile.c 2020-08-14 13:54:31.000000000 +0000 +++ gwyddion-2.63/modules/file/dimensionfile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dimensionfile.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: dimensionfile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -170,10 +170,7 @@ /* Physical dimensions. */ p = buffer + XYREAL_OFFSET; xreal = fabs(gwy_get_gfloat_le(&p)); - if (!(xreal > 0.0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); yreal = xreal; for (i = 0; i < 16; i++) { diff -Nru gwyddion-2.62/modules/file/dmefile.c gwyddion-2.63/modules/file/dmefile.c --- gwyddion-2.62/modules/file/dmefile.c 2021-08-22 20:15:29.000000000 +0000 +++ gwyddion-2.63/modules/file/dmefile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: dmefile.c 24040 2021-08-21 20:50:16Z yeti-dn $ + * $Id: dmefile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -221,15 +221,10 @@ return NULL; } - /* Use negated positive conditions to catch NaNs */ - if (!((dmefile.xreal = fabs(dmefile.x_calibration * dmefile.xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - dmefile.xreal = 1.0; - } - if (!((dmefile.yreal = fabs(dmefile.y_calibration * dmefile.yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - dmefile.yreal = 1.0; - } + dmefile.xreal *= dmefile.x_calibration; + sanitise_real_size(&dmefile.xreal, "x size"); + dmefile.yreal *= dmefile.y_calibration; + sanitise_real_size(&dmefile.yreal, "y size"); dfield = gwy_data_field_new(dmefile.xres, dmefile.yres, Angstrom*dmefile.xreal, Angstrom*dmefile.yreal, diff -Nru gwyddion-2.62/modules/file/ecsfile.c gwyddion-2.63/modules/file/ecsfile.c --- gwyddion-2.62/modules/file/ecsfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/ecsfile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ecsfile.c 20674 2017-12-18 17:58:47Z yeti-dn $ + * $Id: ecsfile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek, Markus Pristovsek * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, * prissi@gift.physik.tu-berlin.de. @@ -185,14 +185,8 @@ } g_free(s); s = NULL; - gwy_debug("xreal: %g q: %g unit: %s", - xreal, q, c == 0x8f ? "Angstrom" : "Nanometer"); - - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + gwy_debug("xreal: %g q: %g unit: %s", xreal, q, c == 0x8f ? "Angstrom" : "Nanometer"); + sanitise_real_size(&xreal, "x size"); if (c == 0x8f) { xreal *= 1e-10; diff -Nru gwyddion-2.62/modules/file/err.h gwyddion-2.63/modules/file/err.h --- gwyddion-2.62/modules/file/err.h 2021-08-02 08:58:59.000000000 +0000 +++ gwyddion-2.63/modules/file/err.h 2023-05-31 15:47:39.000000000 +0000 @@ -1,28 +1,25 @@ /* - * $Id: err.h 23906 2021-08-02 08:58:59Z yeti-dn $ + * $Id: err.h 25392 2023-05-31 15:47:38Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __GWY_FILE_ERR_H__ #define __GWY_FILE_ERR_H__ #include #include +#include #include /* I/O Errors */ @@ -90,8 +87,8 @@ err_FILE_TYPE(GError **error, const gchar *name) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("File is not a %s file, it is seriously damaged, " - "or it is of an unknown format version."), name); + _("File is not a %s file, it is seriously damaged, or it is of an unknown format version."), + name); } static inline gboolean @@ -101,8 +98,7 @@ return FALSE; g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Expected data size calculated from file headers " - "is %u bytes, but the real size is %u bytes."), + _("Expected data size calculated from file headers is %u bytes, but the real size is %u bytes."), expected, real); return TRUE; } @@ -137,8 +133,7 @@ err_BPP(GError **error, gint bpp) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("The number of bits per sample %d is invalid or " - "unsupported for this file type."), + _("The number of bits per sample %d is invalid or unsupported for this file type."), bpp); } @@ -181,6 +176,14 @@ _("File contains no (importable) data.")); } +static inline gboolean +err_INCONSISTENT_SPECTRA(GError **error) +{ + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Inconsistent structure of individual spectra.")); + return FALSE; +} + static inline void err_NO_CHANNEL_EXPORT(GError **error) { @@ -224,6 +227,19 @@ return TRUE; } +static inline gboolean +sanitise_real_size(gdouble *dim, const gchar *name) +{ + *dim = fabs(*dim); + /* Use negated positive conditions to catch weird values. */ + if (!(*dim > 0.0) || gwy_isnan(*dim) || gwy_isinf(*dim)) { + g_warning("Real %s is 0.0 or not finite, fixing it to 1.0", name); + *dim = 1.0; + return FALSE; + } + return TRUE; +} + #endif -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/ezdfile.c gwyddion-2.63/modules/file/ezdfile.c --- gwyddion-2.62/modules/file/ezdfile.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/ezdfile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ezdfile.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: ezdfile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -661,22 +661,11 @@ { EZDSection *section = (EZDSection*) data; - if (!section->data) - return; - - gwy_debug("Check ranges"); - if (!((section->xrange.range = fabs(section->xrange.range)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - section->xrange.range = 1.0; - } - if (!((section->yrange.range = fabs(section->yrange.range)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - section->yrange.range = 1.0; - } - /* fix for Z axis*/ - if (!((section->zrange.range = fabs(section->zrange.range)) > 0)) { - g_warning("Real z size is 0.0, fixing to 1.0"); - section->zrange.range = 1.0; + if (section->data) { + gwy_debug("Check ranges"); + sanitise_real_size(§ion->xrange.range, "x size"); + sanitise_real_size(§ion->yrange.range, "y size"); + sanitise_real_size(§ion->zrange.range, "z size"); } } diff -Nru gwyddion-2.62/modules/file/gdeffile.c gwyddion-2.63/modules/file/gdeffile.c --- gwyddion-2.62/modules/file/gdeffile.c 2020-01-30 15:54:47.000000000 +0000 +++ gwyddion-2.63/modules/file/gdeffile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: gdeffile.c 22723 2020-01-30 15:54:47Z yeti-dn $ + * $Id: gdeffile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2010-2020 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -86,8 +82,8 @@ gchar magic[4]; guint version; guchar alignment[2]; - /* On-disk this is ‘32bit time_t’. We assume it can be safely assigned to - * a larger integer when actual time_t is larger. */ + /* On-disk this is ‘32bit time_t’. We assume it can be safely assigned to a larger integer when actual time_t is + * larger. */ time_t creation_time; guint desc_len; gchar *description; @@ -231,8 +227,7 @@ block->n_variables = gwy_get_guint32_le(p); block->n_data = gwy_get_guint32_le(p); block->next = GUINT_TO_POINTER(!!*((*p)++)); - gwy_debug("n_variables: %u, n_data: %u, next: %u", - block->n_variables, block->n_data, !!block->next); + gwy_debug("n_variables: %u, n_data: %u, next: %u", block->n_variables, block->n_data, !!block->next); *p += 3; return TRUE; @@ -284,9 +279,7 @@ gboolean ok; gwy_debug("ENTER nested data (%u)", depth+1); - ok = gdef_read_variable_data(nestedblock, - p, size - (*p - buffer), - depth+1, error); + ok = gdef_read_variable_data(nestedblock, p, size - (*p - buffer), depth+1, error); gwy_debug("EXIT nested data (%u)", depth+1); if (!ok) return FALSE; @@ -300,8 +293,7 @@ *p += var->size; if (*p > buffer + size) { if (error) { - gchar *s = g_strconcat("GDEF Variable ", var->name, - NULL); + gchar *s = g_strconcat("GDEF Variable ", var->name, NULL); err_TRUNCATED_PART(error, s); g_free(s); } @@ -363,27 +355,21 @@ for (i = 0; i < block->n_variables; i++) { GDEFVariable *var = block->variables + i; - if (!gdef_read_variable(block->variables + i, - p, size - (*p - buffer), error)) + if (!gdef_read_variable(block->variables + i, p, size - (*p - buffer), error)) goto fail; if (var->type == VAR_DATABLOCK) { gwy_debug("ENTER nested variables (%u)", depth+1); - var->data = gdef_read_variable_lists(p, size - (*p - buffer), - depth + 1, - error); + var->data = gdef_read_variable_lists(p, size - (*p - buffer), depth + 1, error); gwy_debug("EXIT nested variables (%u)", depth+1); if (!var->data) goto fail; } } - /* Unlike in .gwy, the data are always stored at the top level, i.e. - * the data of all nested blocks follow the corresponding top-level - * block. So we have to postpone data reading until we get to the - * top level again. */ + /* Unlike in .gwy, the data are always stored at the top level, i.e. the data of all nested blocks follow the + * corresponding top-level block. So we have to postpone data reading until we get to the top level again. */ if (depth == 0) { - if (!gdef_read_variable_data(block, p, size - (*p - buffer), depth, - error)) + if (!gdef_read_variable_data(block, p, size - (*p - buffer), depth, error)) goto fail; } } while (block->next); @@ -413,13 +399,10 @@ return var; if (type == VAR_BOOLEAN && var->type == VAR_BOOL) return var; - if (type == VAR_INTEGRAL && (var->type == VAR_WORD - || var->type == VAR_INTEGER - || var->type == VAR_DWORD - || var->type == VAR_BOOL)) + if (type == VAR_INTEGRAL && (var->type == VAR_WORD || var->type == VAR_INTEGER + || var->type == VAR_DWORD || var->type == VAR_BOOL)) return var; - if (type == VAR_REAL && (var->type == VAR_FLOAT - || var->type == VAR_DOUBLE)) + if (type == VAR_REAL && (var->type == VAR_FLOAT || var->type == VAR_DOUBLE)) return var; if (var->type == type) return var; @@ -474,8 +457,7 @@ static GwyDataField* gdef_read_channel(GDEFControlBlock *block) { - GDEFVariable *xres_var, *yres_var, *ymis_var, *xreal_var, *yreal_var, - *zunit_var, *data_var, *value_var; + GDEFVariable *xres_var, *yres_var, *ymis_var, *xreal_var, *yreal_var, *zunit_var, *data_var, *value_var; GDEFControlBlock *datablock; GwyDataField *dfield; GwySIUnit *siunit; @@ -484,7 +466,7 @@ const gchar *unit; gdouble xreal, yreal; gint xres, yres, ymis; - guint i, j, n; + guint i, n; if (block->n_data != 1) return FALSE; @@ -505,9 +487,7 @@ xres = gdef_get_int_var(xres_var); yres = gdef_get_int_var(yres_var); ymis = gdef_get_int_var(ymis_var); - if (err_DIMENSION(NULL, xres) - || err_DIMENSION(NULL, yres) - || ymis >= yres) { + if (err_DIMENSION(NULL, xres) || err_DIMENSION(NULL, yres) || ymis >= yres) { g_warning("Dimensions %d x %d are invalid.", xres, yres - ymis); return FALSE; } @@ -522,15 +502,8 @@ xreal = fabs(gdef_get_real_var(xreal_var)); yreal = fabs(gdef_get_real_var(yreal_var)); gwy_debug("xreal: %g, yreal: %g", xreal, yreal); - /* Use negated positive conditions to catch NaNs */ - if (!(xreal > 0.0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!(yreal > 0.0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(xres, yres - ymis, xreal, yreal, FALSE); siunit = gwy_data_field_get_si_unit_xy(dfield); @@ -551,10 +524,9 @@ rawdata = value_var->data; /* flip the data vertically */ for (i = 0; i < yres - ymis; i++) { - gdouble *row = data + (yres-ymis-1 - i)*xres; - for (j = xres; j; j--) { - *(row++) = gwy_get_gfloat_le(&rawdata); - } + gwy_convert_raw_data(rawdata + i*xres*sizeof(gfloat), xres, 1, + GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, + data + (yres-ymis-1 - i)*xres, 1.0, 0.0); } return dfield; @@ -588,8 +560,7 @@ for (i = 0; i < block->n_variables; i++) { GDEFVariable *var = block->variables + i; - if (var->type == VAR_INTEGER || var->type == VAR_WORD - || var->type == VAR_DWORD) { + if (var->type == VAR_INTEGER || var->type == VAR_WORD || var->type == VAR_DWORD) { s = g_strdup_printf("%ld", (glong)gdef_get_int_var(var)); gwy_container_set_string_by_name(meta, var->name, s); } @@ -654,9 +625,7 @@ for (j = 0; j < block->n_variables; j++) { var = block->variables + j; if (var->type != VAR_DATABLOCK) - gwy_debug("%s 0x%08x", - var->name, - (guint)((const guchar*)var->data - buffer)); + gwy_debug("%s 0x%08x", var->name, (guint)((const guchar*)var->data - buffer)); } #endif @@ -668,8 +637,7 @@ gwy_container_set_object(container, quark, dfield); g_object_unref(dfield); - var = gdef_find_variable(block, "SourceChannel", VAR_INTEGRAL, - FALSE); + var = gdef_find_variable(block, "SourceChannel", VAR_INTEGRAL, FALSE); if (var) { title = gwy_enuml_to_string(gdef_get_int_var(var), "Light Level", 0, @@ -691,12 +659,10 @@ "Unknown", 16, NULL); key = g_strdup_printf("/%d/data/title", i); - gwy_container_set_string_by_name(container, key, - g_strdup(title)); + gwy_container_set_string_by_name(container, key, g_strdup(title)); g_free(key); - /* XXX: That's what I've been told is necessary to obtain - * values in degrees. */ + /* XXX: That's what I've been told is necessary to obtain values in degrees. */ if (gdef_get_int_var(var) == 12) { gwy_data_field_multiply(dfield, 18.0); } @@ -711,8 +677,7 @@ g_object_unref(meta); g_free(key); } - gwy_file_channel_import_log_add(container, i, NULL, - filename); + gwy_file_channel_import_log_add(container, i, NULL, filename); i++; } } @@ -728,4 +693,4 @@ return container; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/gsffile.c gwyddion-2.63/modules/file/gsffile.c --- gwyddion-2.62/modules/file/gsffile.c 2020-07-10 15:31:36.000000000 +0000 +++ gwyddion-2.63/modules/file/gsffile.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gsffile.c 22877 2020-07-10 15:31:35Z yeti-dn $ + * $Id: gsffile.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2009-2020 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -280,11 +280,7 @@ if ((value = g_hash_table_lookup(hash, key))) { dim = g_ascii_strtod(value, NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((dim = fabs(dim)) > 0)) { - g_warning("%s is 0.0 or NaN, fixing to 1.0", key); - dim = 1.0; - } + sanitise_real_size(&dim, key); } return dim; } @@ -299,7 +295,7 @@ if ((value = g_hash_table_lookup(hash, key))) { off = g_ascii_strtod(value, NULL); /* Catch NaNs */ - if (!(off == off)) { + if (gwy_isnan(off) || gwy_isinf(off)) { g_warning("%s is NaN, fixing to 0.0", key); off = 0.0; } diff -Nru gwyddion-2.62/modules/file/gwytiff.h gwyddion-2.63/modules/file/gwytiff.h --- gwyddion-2.62/modules/file/gwytiff.h 2021-12-20 12:11:35.000000000 +0000 +++ gwyddion-2.63/modules/file/gwytiff.h 2023-06-01 14:08:23.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwytiff.h 24567 2021-12-20 12:11:34Z yeti-dn $ + * $Id: gwytiff.h 25395 2023-06-01 14:08:22Z yeti-dn $ * Copyright (C) 2007-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -201,6 +201,7 @@ guint tagvaluesize; guint tagsize; guint ifdsize; + GwyByteOrder byte_order; gboolean allow_compressed; } GwyTIFF; @@ -235,8 +236,9 @@ gwy_tiff_detect(const guchar *buffer, gsize size, GwyTIFFVersion *version, - guint *byteorder) + GwyByteOrder *byteorder) { + GwyByteOrder tiffbyteorder; guint bom, vm; if (size < GWY_TIFF_HEADER_SIZE) @@ -244,11 +246,11 @@ bom = gwy_get_guint16_le(&buffer); if (bom == 0x4949) { - bom = G_LITTLE_ENDIAN; + tiffbyteorder = GWY_BYTE_ORDER_LITTLE_ENDIAN; vm = gwy_get_guint16_le(&buffer); } else if (bom == 0x4d4d) { - bom = G_BIG_ENDIAN; + tiffbyteorder = GWY_BYTE_ORDER_BIG_ENDIAN; vm = gwy_get_guint16_be(&buffer); } else @@ -268,9 +270,9 @@ } if (byteorder) { - if (*byteorder && *byteorder != bom) + if (*byteorder && *byteorder != tiffbyteorder) return NULL; - *byteorder = bom; + *byteorder = tiffbyteorder; } return buffer; @@ -447,7 +449,6 @@ const guchar *p; guint64 offset; gsize size; - guint byteorder = 0; if (!gwy_file_get_contents(filename, &tiff->data, &size, &err)) { err_GET_FILE_CONTENTS(error, &err); @@ -456,12 +457,12 @@ tiff->size = size; p = tiff->data; - if (!(p = gwy_tiff_detect(p, tiff->size, &tiff->version, &byteorder))) { + if (!(p = gwy_tiff_detect(p, tiff->size, &tiff->version, &tiff->byte_order))) { err_FILE_TYPE(error, "TIFF"); return FALSE; } - if (byteorder == G_LITTLE_ENDIAN) { + if (tiff->byte_order == GWY_BYTE_ORDER_LITTLE_ENDIAN) { tiff->get_guint16 = gwy_get_guint16_le; tiff->get_gint16 = gwy_get_gint16_le; tiff->get_guint32 = gwy_get_guint32_le; @@ -475,7 +476,7 @@ else tiff->get_length = gwy_get_guint32as64_le; } - else if (byteorder == G_BIG_ENDIAN) { + else if (tiff->byte_order == GWY_BYTE_ORDER_BIG_ENDIAN) { tiff->get_guint16 = gwy_get_guint16_be; tiff->get_gint16 = gwy_get_gint16_be; tiff->get_guint32 = gwy_get_guint32_be; diff -Nru gwyddion-2.62/modules/file/gwyzip.h gwyddion-2.63/modules/file/gwyzip.h --- gwyddion-2.62/modules/file/gwyzip.h 2022-03-23 15:45:48.000000000 +0000 +++ gwyddion-2.63/modules/file/gwyzip.h 2023-05-25 15:00:56.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gwyzip.h 24727 2022-03-23 15:45:48Z yeti-dn $ + * $Id: gwyzip.h 25364 2023-05-25 15:00:56Z yeti-dn $ * Copyright (C) 2015-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -375,7 +375,7 @@ { gchar buf[12]; - g_snprintf(buf, sizeof(buf), -status); + g_snprintf(buf, sizeof(buf), "%d", -status); g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, _("%s error while reading the zip file: %s."), "Minizip", buf); } @@ -713,8 +713,7 @@ buffer = g_new(guchar, zst.size + 1); if (zip_fread(file, buffer, zst.size) != zst.size) { - g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, - _("Cannot read file contents.")); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, _("Cannot read file contents.")); zip_fclose(file); g_free(buffer); return NULL; @@ -727,6 +726,212 @@ return buffer; } #endif + +/**************************************************************************** + * + * Zziplib wrapper + * + ****************************************************************************/ +#ifdef HAVE_ZZIP +#define HAVE_GWYZIP 1 +#include + +typedef struct { + gchar *filename; + zzip_off_t off; +} GwyZipFilePos; + +struct _GwyZipFile { + ZZIP_DIR *archive; + ZZIP_DIRENT *current; + GArray *filepos; +}; + +G_GNUC_UNUSED +static GwyZipFile +gwyzip_open(const char *path, GError **error) +{ + struct _GwyZipFile *zipfile; + ZZIP_DIR *archive; + + if (!(archive = zzip_dir_open(path, NULL))) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, + _("%s cannot open the file as a ZIP file."), "Zzip"); + return NULL; + } + + zipfile = g_new0(struct _GwyZipFile, 1); + zipfile->archive = archive; + return zipfile; +} + +G_GNUC_UNUSED +static void +gwyzip_close(GwyZipFile zipfile) +{ + if (zipfile->filepos) { + GArray *filepos = zipfile->filepos; + gsize i; + + for (i = 0; i < filepos->len; i++) + g_free(g_array_index(filepos, GwyZipFilePos, i).filename); + g_array_free(filepos, TRUE); + } + zzip_dir_close(zipfile->archive); + g_free(zipfile); +} + +G_GNUC_UNUSED +static void +err_ZIP_NOFILE(GError **error) +{ + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, + _("%s error while reading the zip file: %s."), "Zzip", _("End of list of files")); +} + +G_GNUC_UNUSED +static void +err_ZIP(GwyZipFile zipfile, GError **error) +{ + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, + _("%s error while reading the zip file: %s."), "Zzip", zzip_strerror_of(zipfile->archive)); +} + +G_GNUC_UNUSED +static gboolean +gwyzip_next_file(GwyZipFile zipfile, GError **error) +{ + if ((zipfile->current = zzip_readdir(zipfile->archive))) + return TRUE; + err_ZIP_NOFILE(error); + return FALSE; +} + +G_GNUC_UNUSED +static gboolean +gwyzip_first_file(GwyZipFile zipfile, GError **error) +{ + /* This rewinds ‘before’ the first file. */ + zzip_rewinddir(zipfile->archive); + /* This actually goes to the first file. */ + return gwyzip_next_file(zipfile, error); +} + +G_GNUC_UNUSED +static gboolean +gwyzip_get_current_filename(GwyZipFile zipfile, gchar **filename, GError **error) +{ + if (!zipfile->current) { + err_ZIP_NOFILE(error); + *filename = NULL; + return FALSE; + } + + /* No idea what is the encoding. */ + *filename = g_strdup(zipfile->current->d_name); + return TRUE; +} + +G_GNUC_UNUSED +static gboolean +gwyzip_locate_file(GwyZipFile zipfile, const gchar *filename, gint casesens, GError **error) +{ + GArray *filepos = zipfile->filepos; + const GwyZipFilePos *pos; + zzip_off_t off; + gsize i; + + /* There is no look-for-file-but-do-not-open-it function and we do not want to open the file for reading here yet. + * The caller may be just checking if certain files exist. Make our own index. Also the index building is silly + * because we always need the previous offset, not the current one… */ + if (!filepos) { + zzip_rewinddir(zipfile->archive); + off = zzip_telldir(zipfile->archive); + if (!(zipfile->current = zzip_readdir(zipfile->archive))) { + err_ZIP_NOFILE(error); + return FALSE; + } + + filepos = zipfile->filepos = g_array_new(FALSE, FALSE, sizeof(GwyZipFilePos)); + do { + GwyZipFilePos newpos; + newpos.filename = g_strdup(zipfile->current->d_name); + newpos.off = off; + off = zzip_telldir(zipfile->archive); + g_array_append_val(filepos, newpos); + } while ((zipfile->current = zzip_readdir(zipfile->archive))); + } + + if (!filepos->len) { + err_ZIP_NOFILE(error); + return FALSE; + } + + for (i = 0; i < filepos->len; i++) { + pos = &g_array_index(filepos, GwyZipFilePos, i); + if (casesens) { + if (gwy_strequal(filename, pos->filename)) + break; + } + else { + /* FIXME: Encoding? Anyone? */ + if (!g_ascii_strcasecmp(filename, pos->filename)) + break; + } + } + + if (i == filepos->len) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, + _("File %s is missing in the zip file."), filename); + return FALSE; + } + + /* This does not actually do much for us. See the rant below in gwyzip_get_file_content(). */ + zzip_seekdir(zipfile->archive, pos->off); + if ((zipfile->current = zzip_readdir(zipfile->archive))) + return TRUE; + return FALSE; +} + +G_GNUC_UNUSED +static guchar* +gwyzip_get_file_content(GwyZipFile zipfile, gsize *contentsize, GError **error) +{ + ZZIP_FILE* fp; + guchar *buffer; + gsize decomp_size; + + if (!zipfile->current) { + err_ZIP_NOFILE(error); + return NULL; + } + + decomp_size = zipfile->current->st_size; + /* XXX: This is rather silly because it scans the archive even though we know exactly which file it is. There is + * no open-the-bloody-current-file function. So modules going through the archive sequentially – which is normally + * very efficient – will, unfortunately, pay the quadratic price with Zzip. */ + fp = zzip_file_open(zipfile->archive, zipfile->current->d_name, 0); + if (!fp) { + err_ZIP(zipfile, error); + return NULL; + } + + gwy_debug("uncompressed_size: %lu", (gulong)decomp_size); + buffer = g_new(guchar, decomp_size + 1); + if (zzip_file_read(fp, buffer, decomp_size) != decomp_size) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_IO, _("Cannot read file contents.")); + zzip_file_close(fp); + g_free(buffer); + return NULL; + } + zzip_file_close(fp); + + buffer[decomp_size] = '\0'; + if (contentsize) + *contentsize = decomp_size; + return buffer; +} +#endif #endif diff -Nru gwyddion-2.62/modules/file/hdf4file.c gwyddion-2.63/modules/file/hdf4file.c --- gwyddion-2.62/modules/file/hdf4file.c 2020-01-13 12:19:57.000000000 +0000 +++ gwyddion-2.63/modules/file/hdf4file.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,28 +1,23 @@ /* - * $Id: hdf4file.c 22698 2020-01-13 12:19:57Z yeti-dn $ + * $Id: hdf4file.c 25394 2023-05-31 16:01:44Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek, Markus Pristovsek * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, * prissi@gift.physik.tu-berlin.de. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* - * The list of HDF tags is covered by the following license (it was taken - * from libHDF4 header files, mainly due to me being too lazy to retype them), - * the rest of the HDF code was implementated from scratch: + * The list of HDF tags is covered by the following license (it was taken from libHDF4 header files, mainly due to me + * being too lazy to retype them), the rest of the HDF code was implementated from scratch: * * Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF) * Software Library and Utilities @@ -259,8 +254,8 @@ HDF4_DD_SIZE = 2 + 2 + 4 + 4, HDF4_TAGREF_SIZE = 2 + 2, HDF4_VERSION_SIZE = 3*4 + 1, - /* We read the first 130 bytes. I thought all headers are 202 bytes long, - * but apparently some are of a different size. */ + /* We read the first 130 bytes. I thought all headers are 202 bytes long, but apparently some are of a different + * size. */ PSI_HD_SIZE_MIN = 130, }; @@ -338,14 +333,6 @@ static gboolean module_register(void) { - /* - gwy_file_func_register("hdf4file", - N_("Hierarchical Data Format v4 (.hdf)"), - (GwyFileDetectFunc)&hdf_detect, - (GwyFileLoadFunc)&hdf_load, - NULL, - NULL); - */ gwy_file_func_register("psifile", N_("Psi HDF4 files (.hdf)"), (GwyFileDetectFunc)&psi_detect, @@ -470,7 +457,6 @@ if (header && data && !fail) { GwyContainer *meta; GwyDataField *dfield; - GwySIUnit *siunit; gint power10; dfield = gwy_data_field_new(header->xres, header->yres, @@ -479,16 +465,12 @@ FALSE); d = gwy_data_field_get_data(dfield); - for (i = 0; i < header->xres*header->yres; i++) - d[i] = GINT16_FROM_LE(data[i]); + gwy_convert_raw_data(data, header->xres*header->yres, 1, + GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, d, 1.0, 0.0); - siunit = gwy_si_unit_new("m"); - gwy_data_field_set_si_unit_xy(dfield, siunit); - g_object_unref(siunit); - - siunit = gwy_si_unit_new_parse(header->zgain_unit, &power10); - gwy_data_field_set_si_unit_z(dfield, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); + gwy_si_unit_set_from_string_parse(gwy_data_field_get_si_unit_z(dfield), + header->zgain_unit, &power10); gwy_data_field_multiply(dfield, header->zgain*pow10(power10)); gwy_data_field_invert(dfield, TRUE, FALSE, FALSE); @@ -498,8 +480,7 @@ g_object_unref(dfield); if (header->title[0]) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(header->title)); + gwy_container_set_const_string_by_name(container, "/0/data/title", header->title); meta = psi_get_metadadata(header); gwy_container_set_object_by_name(container, "/0/meta", meta); @@ -543,28 +524,19 @@ gwy_debug(" x_dir: %d, y_dir: %d", header->x_dir, header->y_dir); header->show_offset = gwy_get_gboolean8(&p); header->no_units = gwy_get_gboolean8(&p); - gwy_debug(" show_offset: %d, no_units: %d", - header->show_offset, header->no_units); + gwy_debug(" show_offset: %d, no_units: %d", header->show_offset, header->no_units); header->xres = gwy_get_guint16_le(&p); header->yres = gwy_get_guint16_le(&p); gwy_debug(" xres: %u, yres: %u", header->xres, header->yres); - if (err_DIMENSION(error, header->xres) - || err_DIMENSION(error, header->yres)) + if (err_DIMENSION(error, header->xres) || err_DIMENSION(error, header->yres)) return FALSE; get_CHARARRAY(header->unknown2, &p); header->xscale = gwy_get_gfloat_le(&p); header->yscale = gwy_get_gfloat_le(&p); gwy_debug(" xscale: %g, yscale: %g", header->xscale, header->yscale); - /* Use negated positive conditions to catch NaNs */ - if (!((header->xscale = fabs(header->xscale)) > 0)) { - g_warning("Real x scale is 0.0, fixing to 1.0"); - header->xscale = 1.0; - } - if (!((header->yscale = fabs(header->yscale)) > 0)) { - g_warning("Real y scale is 0.0, fixing to 1.0"); - header->yscale = 1.0; - } + sanitise_real_size(&header->xscale, "x scale"); + sanitise_real_size(&header->yscale, "y scale"); header->xoff = gwy_get_gfloat_le(&p); header->yoff = gwy_get_gfloat_le(&p); @@ -572,20 +544,16 @@ header->rotation = gwy_get_gfloat_le(&p); header->unknown3 = gwy_get_gfloat_le(&p); header->lines_per_sec = gwy_get_gfloat_le(&p); - gwy_debug(" rotation: %g, lines/s: %g", - header->rotation, header->lines_per_sec); + gwy_debug(" rotation: %g, lines/s: %g", header->rotation, header->lines_per_sec); header->set_point = gwy_get_gfloat_le(&p); get_CHARARRAY0(header->set_point_unit, &p); - gwy_debug(" set_point: %g [%s]", - header->set_point, header->set_point_unit); + gwy_debug(" set_point: %g [%s]", header->set_point, header->set_point_unit); header->sample_bias = gwy_get_gfloat_le(&p); header->tip_bias = gwy_get_gfloat_le(&p); - gwy_debug(" sample_bias: %g [V], tip_bias %g [V]", - header->sample_bias, header->tip_bias); + gwy_debug(" sample_bias: %g [V], tip_bias %g [V]", header->sample_bias, header->tip_bias); header->zgain = gwy_get_gfloat_le(&p); get_CHARARRAY0(header->zgain_unit, &p); - gwy_debug(" zgain: %g [%s]", - header->zgain, header->zgain_unit); + gwy_debug(" zgain: %g [%s]", header->zgain, header->zgain_unit); header->min = gwy_get_gint16_le(&p); header->max = gwy_get_gint16_le(&p); @@ -602,24 +570,12 @@ meta = gwy_container_new(); gwy_container_set_string_by_name(meta, "Set point", - g_strdup_printf("%g %s", - header->set_point, - header->set_point_unit)); - gwy_container_set_string_by_name(meta, "Sample bias", - g_strdup_printf("%g V", - header->sample_bias)); - gwy_container_set_string_by_name(meta, "Tip bias", - g_strdup_printf("%g V", - header->tip_bias)); - gwy_container_set_string_by_name(meta, "Instrument", - g_strdup_printf("%s", - header->instrument)); - gwy_container_set_string_by_name(meta, "Rotation", - g_strdup_printf("%g deg", - header->rotation)); - gwy_container_set_string_by_name(meta, "Scan speed", - g_strdup_printf("%g lines/s", - header->lines_per_sec)); + g_strdup_printf("%g %s", header->set_point, header->set_point_unit)); + gwy_container_set_string_by_name(meta, "Sample bias", g_strdup_printf("%g V", header->sample_bias)); + gwy_container_set_string_by_name(meta, "Tip bias", g_strdup_printf("%g V", header->tip_bias)); + gwy_container_set_string_by_name(meta, "Instrument", g_strdup_printf("%s", header->instrument)); + gwy_container_set_string_by_name(meta, "Rotation", g_strdup_printf("%g deg", header->rotation)); + gwy_container_set_string_by_name(meta, "Scan speed", g_strdup_printf("%g lines/s", header->lines_per_sec)); return meta; } @@ -663,9 +619,7 @@ desc.length = gwy_get_guint32_be(&p); desc.data = buffer + desc.offset; /* Ignore NULL and invalid tags */ - if (desc.tag == HDF4_NULL - || desc.offset == 0xFFFFFFFFUL - || desc.length == 0xFFFFFFFFUL) + if (desc.tag == HDF4_NULL || desc.offset == 0xFFFFFFFFUL || desc.length == 0xFFFFFFFFUL) continue; g_array_append_val(tags, desc); @@ -737,8 +691,7 @@ if (!expected_bits) return 0; if (bits != expected_bits) { - g_warning("Number of bits in type %u is %u instead of %u", - typeinfo, bits, expected_bits); + g_warning("Number of bits in type %u is %u instead of %u", typeinfo, bits, expected_bits); return 0; } @@ -897,8 +850,7 @@ name = gwy_enum_to_string(desc->tag, tag_names, G_N_ELEMENTS(tag_names)); g_string_append_printf(str, "Tag: %u (%s), Ref: %u, Offset: 0x%x, Length: 0x%x;", - desc->tag, name ? name : "UNKNOWN", desc->ref, - desc->offset, desc->length); + desc->tag, name ? name : "UNKNOWN", desc->ref, desc->offset, desc->length); if (desc->tag == HDF4_MT) { /* FIXME */ @@ -921,9 +873,8 @@ g_string_append_printf(str, " \"%.*s\"", desc->length, p); break; - /* FIXME: Psi simply stores three strings in a row. It does not - * seem to be accessible via libHDF SD API though, so I wonder how - * big hack it is. */ + /* FIXME: Psi simply stores three strings in a row. It does not seem to be accessible via libHDF SD API + * though, so I wonder how big hack it is. */ case HDF4_SDL: case HDF4_SDU: { @@ -956,8 +907,7 @@ major = gwy_get_guint32_be(&p); minor = gwy_get_guint32_be(&p); micro = gwy_get_guint32_be(&p); - g_string_append_printf(str, " %u.%u.%u \"%s\"", - major, minor, micro, p); + g_string_append_printf(str, " %u.%u.%u \"%s\"", major, minor, micro, p); } break; @@ -1045,15 +995,16 @@ baseid = id & HDF4TI_MASK; for (i = 0; i < sizeof(data_types)/sizeof(data_types[0]); i++) { - if (baseid == data_types[i].id) + if (baseid == data_types[i].id) { return g_strdup_printf("%s%s%s", (id & HDF4TI_NATIVE) ? "native " : "", (id & HDF4TI_LITEND) ? "little endian " : "", data_types[i].desc); + } } return g_strdup("UNKNOWN"); } #endif -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/hdf5file.c gwyddion-2.63/modules/file/hdf5file.c --- gwyddion-2.62/modules/file/hdf5file.c 2022-08-09 12:40:35.000000000 +0000 +++ gwyddion-2.63/modules/file/hdf5file.c 2023-05-31 16:01:44.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: hdf5file.c 23140 2021-02-09 12:15:52Z yeti-dn $ - * Copyright (C) 2020 David Necas (Yeti), Petr Klapetek. + * $Id: hdf5file.c 25394 2023-05-31 16:01:44Z yeti-dn $ + * Copyright (C) 2020-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -27,15 +23,21 @@ **/ /** + * [FILE-MAGIC-USERGUIDE] + * Shilps Sciences Lucent HDF5 + * .h5 + * Read + **/ + +/** * [FILE-MAGIC-MISSING] * Avoding clash with a standard file format. **/ /* - * HDF5 changes its APIs between versions incompatibly. Forward compatibility - * is not guaranteed. To prevent breakage we need to know which specific - * version of the API we use and tell the library to provide this one through - * compatibility macros. + * HDF5 changes its APIs between versions incompatibly. Forward compatibility is mostly preserved, but not + * guaranteed. To prevent breakage we need to know which specific version of the API we use and tell the library to + * provide this one through compatibility macros. * * Therefore, this file must be compiled with -DH5_USE_18_API */ @@ -60,6 +62,12 @@ #define EXTENSION ".h5" +typedef struct _GenericHDF5File GenericHDF5File; + +typedef void (*AttrHandlerFunc)(GenericHDF5File *ghfile, + hid_t loc_id, + const char *attr_name); + typedef struct { gchar *name; GwySIUnit *xyunit; @@ -69,24 +77,40 @@ gdouble realcoords[4]; } ErgoChannel; -typedef struct { +struct _GenericHDF5File { GArray *addr; GString *path; GString *buf; GwyContainer *meta; + + /* Generic gathering of some numeric values. */ + GArray *idlist; + const gchar *idprefix; + H5O_type_t idwhat; + + /* File type implementation specifics. */ + AttrHandlerFunc attr_handler; + gpointer impl; +}; + +typedef struct { GArray *channels; - GArray *resolutions; gint nframes; } ErgoFile; -static gboolean module_register (void); +static gboolean module_register(void); + +/* Ergo */ static gint ergo_detect (const GwyFileDetectInfo *fileinfo, gboolean only_name); static GwyContainer* ergo_load (const gchar *filename, GwyRunType mode, GError **error); +static void ergo_attr_handler (GenericHDF5File *ghfile, + hid_t loc_id, + const char *attr_name); static GwyContainer* ergo_read_channels(hid_t file_id, - ErgoFile *efile, + GenericHDF5File *ghfile, GError **error); static GwyDataField* ergo_read_image (hid_t file_id, guint r, @@ -95,59 +119,88 @@ const gint *xyres, GString *str, GError **error); -static herr_t ergo_scan_file (hid_t loc_id, - const char *name, - const H5L_info_t *info, - void *user_data); -static herr_t process_attribute (hid_t loc_id, - const char *attr_name, - const H5A_info_t *ainfo, - void *user_data); -static gboolean get_ints_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gint expected_rank, - const gint *expected_dims, - gint *v, - GError **error); -static gboolean get_int_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gint *v, - GError **error); -static gboolean get_floats_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gint expected_rank, - const gint *expected_dims, - gdouble *v, - GError **error); -static gboolean get_float_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gdouble *v, - GError **error); -static gboolean get_strs_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gint expected_rank, - const gint *expected_dims, - gchar **v, - GError **error); -static gboolean get_str_attr (hid_t file_id, - const gchar *obj_path, - const gchar *attr_name, - gchar **v, - GError **error); -static hid_t str_vlen_type = -1; +/* Lucent */ +static gint shilps_detect (const GwyFileDetectInfo *fileinfo, + gboolean only_name); +static GwyContainer* shilps_load (const gchar *filename, + GwyRunType mode, + GError **error); +static GwyContainer* shilps_read_channels(hid_t file_id, + GenericHDF5File *ghfile, + GError **error); +static GwyDataField* shilps_read_image (hid_t file_id, + gint id, + gint xres, + gint yres, + gdouble xreal, + gdouble yreal, + GString *str, + GError **error); + +/* Generic */ +static hid_t quick_check_hdf5 (const GwyFileDetectInfo *fileinfo, + gboolean only_name); +static void generic_hdf5_init (GenericHDF5File *ghfile); +static void generic_hdf5_free (GenericHDF5File *ghfile); +static hid_t make_string_type_for_attr(hid_t attr_type); +static herr_t scan_file (hid_t loc_id, + const char *name, + const H5L_info_t *info, + void *user_data); +static herr_t process_attribute (hid_t loc_id, + const char *attr_name, + const H5A_info_t *ainfo, + void *user_data); +static gboolean get_ints_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gint expected_rank, + const gint *expected_dims, + gint *v, + GError **error); +static gboolean get_int_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gint *v, + GError **error); +static gboolean get_floats_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gint expected_rank, + const gint *expected_dims, + gdouble *v, + GError **error); +static gboolean get_float_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gdouble *v, + GError **error); +static gboolean get_strs_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gint expected_rank, + const gint *expected_dims, + gchar **v, + GError **error); +static gboolean get_str_attr (hid_t file_id, + const gchar *obj_path, + const gchar *attr_name, + gchar **v, + GError **error); +static gboolean enumerate_indexed (GString *path, + const gchar *prefix, + GArray *array); +static void err_HDF5 (GError **error, + const gchar *where, + glong code); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Imports files based on Hierarchical Data Format (HDF), version 5."), "Yeti ", - "1.0", + "1.1", "David Nečas (Yeti) & Petr Klapetek", "2020", }; @@ -165,12 +218,6 @@ H5Eset_auto2(H5E_DEFAULT, NULL, NULL); #endif - /* We use the varlen string type all the time. So keep it around. - * However, reading strings is odd. See the comment in get_strs_attr(). */ - str_vlen_type = H5Tcopy(H5T_C_S1); - H5Tset_size(str_vlen_type, H5T_VARIABLE); - H5Tset_cset(str_vlen_type, H5T_CSET_UTF8); - gwy_file_func_register("ergofile", N_("Asylum Research Ergo HDF5 files (.h5)"), (GwyFileDetectFunc)&ergo_detect, @@ -178,45 +225,43 @@ NULL, NULL); + gwy_file_func_register("shilpsfile", + N_("Shilps Sciences Lucent HDF5 files (.h5)"), + (GwyFileDetectFunc)&shilps_detect, + (GwyFileLoadFunc)&shilps_load, + NULL, + NULL); + return TRUE; } +/******************************************************************************************************************* + * + * Asylum Research Ergo + * + *******************************************************************************************************************/ + static gint ergo_detect(const GwyFileDetectInfo *fileinfo, gboolean only_name) { hid_t file_id; - gchar *format; + gchar *format = NULL; gint version[3], dim = 3; + gint score = 0; - if (only_name) - return 0; - - if (fileinfo->buffer_len <= MAGIC_SIZE - || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) - return 0; - - file_id = H5Fopen(fileinfo->name, H5F_ACC_RDONLY, H5P_DEFAULT); - if (file_id < 0) + if ((file_id = quick_check_hdf5(fileinfo, only_name)) < 0) return 0; - if (!get_str_attr(file_id, ".", "ARFormat", &format, NULL) - || !get_ints_attr(file_id, ".", "ARVersion", 1, &dim, version, NULL)) { - H5Fclose(file_id); - return 0; + if (get_str_attr(file_id, ".", "ARFormat", &format, NULL)) { + if (get_ints_attr(file_id, ".", "ARVersion", 1, &dim, version, NULL)) + score = 100; + H5free_memory(format); } H5Fclose(file_id); - return 100; -} - -static void -err_HDF5(GError **error, const gchar *where, glong code) -{ - g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, - _("HDF5 library error %ld in function %s."), - code, where); + return score; } static GwyContainer* @@ -225,6 +270,7 @@ GError **error) { GwyContainer *container = NULL; + GenericHDF5File ghfile; ErgoFile efile; hid_t file_id; G_GNUC_UNUSED herr_t status; @@ -236,34 +282,27 @@ status = H5Oget_info(file_id, &infobuf); gwy_debug("status %d", status); + generic_hdf5_init(&ghfile); + ghfile.impl = &efile; + ghfile.attr_handler = ergo_attr_handler; + ghfile.idprefix = "/DataSet/Resolution "; + ghfile.idwhat = H5O_TYPE_GROUP; + g_array_append_val(ghfile.addr, infobuf.addr); + gwy_clear(&efile, 1); - efile.meta = gwy_container_new(); - efile.path = g_string_new(NULL); - efile.buf = g_string_new(NULL); - efile.addr = g_array_new(FALSE, FALSE, sizeof(haddr_t)); efile.channels = g_array_new(FALSE, FALSE, sizeof(ErgoChannel)); - efile.resolutions = g_array_new(FALSE, FALSE, sizeof(gint)); - g_array_append_val(efile.addr, infobuf.addr); - - status = H5Literate(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, - ergo_scan_file, &efile); - H5Aiterate2(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, - process_attribute, &efile); + status = H5Literate(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, scan_file, &ghfile); + H5Aiterate2(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, process_attribute, &ghfile); - if (get_int_attr(file_id, "DataSetInfo", "NumFrames", &efile.nframes, - error)) { + if (get_int_attr(file_id, "DataSetInfo", "NumFrames", &efile.nframes, error)) { gwy_debug("nframes %d", efile.nframes); - container = ergo_read_channels(file_id, &efile, error); + container = ergo_read_channels(file_id, &ghfile, error); } status = H5Fclose(file_id); gwy_debug("status %d", status); - g_array_set_size(efile.addr, efile.addr->len-1); - g_array_free(efile.addr, TRUE); - g_string_free(efile.path, TRUE); - g_string_free(efile.buf, TRUE); for (i = 0; i < efile.channels->len; i++) { ErgoChannel *c = &g_array_index(efile.channels, ErgoChannel, i); g_free(c->name); @@ -271,24 +310,23 @@ GWY_OBJECT_UNREF(c->zunit); } g_array_free(efile.channels, TRUE); - g_array_free(efile.resolutions, TRUE); - GWY_OBJECT_UNREF(efile.meta); + generic_hdf5_free(&ghfile); return container; } static GwyContainer* -ergo_read_channels(hid_t file_id, ErgoFile *efile, GError **error) +ergo_read_channels(hid_t file_id, GenericHDF5File *ghfile, GError **error) { + ErgoFile *efile = (ErgoFile*)ghfile->impl; GwyContainer *meta, *container = NULL; GArray *channels = efile->channels; - GArray *resolutions = efile->resolutions; - GString *str = efile->buf; + GArray *resolutions = ghfile->idlist; + GString *str = ghfile->buf; GwyDataField *dfield; gint expected2[2] = { 2, 2 }, xyres[2]; gchar *s, *s2[2]; gint frameid, id = 0; - GQuark quark; guint i, ri, r; for (ri = 0; ri < resolutions->len; ri++) { @@ -296,54 +334,48 @@ for (i = 0; i < channels->len; i++) { ErgoChannel *c = &g_array_index(channels, ErgoChannel, i); - g_string_printf(str, "DataSetInfo/Global/Channels/%s/ImageDims", - c->name); + g_string_printf(str, "DataSetInfo/Global/Channels/%s/ImageDims", c->name); if (!get_str_attr(file_id, str->str, "DataUnits", &s, error)) goto fail; gwy_debug("zunit of %s is %s", c->name, s); c->zunit = gwy_si_unit_new_parse(s, &c->zpower10); + H5free_memory(s); - if (!get_strs_attr(file_id, str->str, "DimUnits", - 1, expected2, s2, error)) + if (!get_strs_attr(file_id, str->str, "DimUnits", 1, expected2, s2, error)) goto fail; gwy_debug("xyunits of %s are %s and %s", c->name, s2[0], s2[1]); if (!gwy_strequal(s2[0], s2[1])) g_warning("X and Y units differ, using X"); - c->xyunit = gwy_si_unit_new_parse(s2[0], &c->xypower10); + c->xyunit = gwy_si_unit_new_parse(s2[1], &c->xypower10); + H5free_memory(s2[0]); + H5free_memory(s2[1]); - if (!get_floats_attr(file_id, str->str, "DimScaling", - 2, expected2, c->realcoords, error)) + /* NB: In all dimensions y is first, then x. */ + if (!get_floats_attr(file_id, str->str, "DimScaling", 2, expected2, c->realcoords, error)) goto fail; gwy_debug("dims of %s are [%g, %g], [%g, %g]", - c->name, - c->realcoords[0], c->realcoords[1], - c->realcoords[2], c->realcoords[3]); + c->name, c->realcoords[2], c->realcoords[3], c->realcoords[0], c->realcoords[1]); g_string_append_printf(str, "/Resolution %d", r); - if (!get_ints_attr(file_id, str->str, "DimExtents", - 1, expected2, xyres, error)) + if (!get_ints_attr(file_id, str->str, "DimExtents", 1, expected2, xyres, error)) goto fail; - gwy_debug("resid %u res %dx%d", r, xyres[0], xyres[1]); + gwy_debug("resid %u res %dx%d", r, xyres[1], xyres[0]); for (frameid = 0; frameid < efile->nframes; frameid++) { - if (!(dfield = ergo_read_image(file_id, r, c, frameid, xyres, - str, error))) + if (!(dfield = ergo_read_image(file_id, r, c, frameid, xyres, str, error))) goto fail; if (!container) container = gwy_container_new(); - quark = gwy_app_get_data_key_for_id(id); - gwy_container_set_object(container, quark, dfield); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), dfield); g_object_unref(dfield); - quark = gwy_app_get_data_title_key_for_id(id); - gwy_container_set_const_string(container, quark, c->name); + gwy_container_set_const_string(container, gwy_app_get_data_title_key_for_id(id), c->name); - meta = gwy_container_duplicate(efile->meta); - quark = gwy_app_get_data_meta_key_for_id(id); - gwy_container_set_object(container, quark, meta); + meta = gwy_container_duplicate(ghfile->meta); + gwy_container_set_object(container, gwy_app_get_data_meta_key_for_id(id), meta); g_object_unref(meta); id++; @@ -373,8 +405,7 @@ gdouble q, xreal, yreal, xoff, yoff; herr_t status; - g_string_printf(str, "DataSet/Resolution %u/Frame %d/%s/Image", - r, frameid, c->name); + g_string_printf(str, "DataSet/Resolution %u/Frame %d/%s/Image", r, frameid, c->name); if ((dataset = H5Dopen(file_id, str->str, H5P_DEFAULT)) < 0) { err_HDF5(error, "H5Dopen", dataset); return NULL; @@ -390,8 +421,7 @@ gwy_debug("dataset space is %d with %d items", (gint)space, nitems); if (nitems != xyres[0]*xyres[1]) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Dataset %s has %d items, which does not match " - "image resolution %d×%d."), + _("Dataset %s has %d items, which does not match image resolution %d×%d."), str->str, nitems, xyres[0], xyres[1]); H5Sclose(space); H5Dclose(dataset); @@ -400,30 +430,23 @@ q = pow10(c->xypower10); - xreal = c->realcoords[1] - c->realcoords[0]; - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - xoff = MIN(c->realcoords[0], c->realcoords[1]); - - yreal = c->realcoords[3] - c->realcoords[2]; - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } - yoff = MIN(c->realcoords[2], c->realcoords[3]); + /* NB: In all dimensions y is first, then x. */ + xreal = c->realcoords[3] - c->realcoords[2]; + sanitise_real_size(&xreal, "x size"); + xoff = MIN(c->realcoords[2], c->realcoords[3]); + + yreal = c->realcoords[1] - c->realcoords[0]; + sanitise_real_size(&yreal, "y size"); + yoff = MIN(c->realcoords[0], c->realcoords[1]); - dfield = gwy_data_field_new(xyres[0], xyres[1], q*xreal, q*yreal, - FALSE); + dfield = gwy_data_field_new(xyres[1], xyres[0], q*xreal, q*yreal, FALSE); gwy_data_field_set_xoffset(dfield, q*xoff); gwy_data_field_set_yoffset(dfield, q*yoff); gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(dfield), c->xyunit); gwy_si_unit_assign(gwy_data_field_get_si_unit_z(dfield), c->zunit); data = gwy_data_field_get_data(dfield); - status = H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, - data); + status = H5Dread(dataset, H5T_IEEE_F64LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); gwy_data_field_invert(dfield, TRUE, FALSE, FALSE); if (c->zpower10) gwy_data_field_multiply(dfield, pow10(c->zpower10)); @@ -446,22 +469,383 @@ gwy_debug("found channel %s", name); gwy_clear(&c, 1); c.name = g_strdup(name); + g_strstrip(c.name); g_array_append_val(channels, c); } +/* XXX: Handle /DataSetInfo/ChannelNames which do not have unique paths and we just build them during the scan */ +static void +ergo_attr_handler(GenericHDF5File *ghfile, hid_t loc_id, const char *attr_name) +{ + ErgoFile *efile = (ErgoFile*)ghfile->impl; + G_GNUC_UNUSED H5T_cset_t cset = H5T_CSET_ERROR; + H5T_class_t type_class; + hid_t attr, attr_type, str_type, space; + gboolean is_vlenstr = FALSE; + gint nitems, i; + herr_t status; + + if (!gwy_strequal(ghfile->path->str, "/DataSetInfo/ChannelNames")) + return; + + gwy_debug("handling /DataSetInfo/ChannelNames"); + attr = H5Aopen(loc_id, attr_name, H5P_DEFAULT); + attr_type = H5Aget_type(attr); + space = H5Aget_space(attr); + nitems = H5Sget_simple_extent_npoints(space); + type_class = H5Tget_class(attr_type); + + if (gwy_strequal(ghfile->path->str, "/DataSetInfo/ChannelNames")) { + if (type_class == H5T_STRING) { + is_vlenstr = H5Tis_variable_str(attr_type); + cset = H5Tget_cset(attr_type); + } + + if (type_class == H5T_STRING && is_vlenstr) { + if (nitems == 1) { + gchar *s; + + str_type = make_string_type_for_attr(attr_type); + if ((status = H5Aread(attr, str_type, &s)) >= 0) { + append_channel_name(efile->channels, s); + H5free_memory(s); + } + H5Tclose(str_type); + } + else if (nitems > 0) { + gchar **s = g_new(gchar*, nitems); + + str_type = make_string_type_for_attr(attr_type); + if ((status = H5Aread(attr, str_type, s)) >= 0) { + for (i = 0; i < nitems; i++) { + append_channel_name(efile->channels, s[i]); + H5free_memory(s[i]); + } + } + H5Tclose(str_type); + g_free(s); + } + } + } + + H5Sclose(space); + H5Tclose(attr_type); + H5Aclose(attr); +} + +/******************************************************************************************************************* + * + * Shilps Sciences Lucent + * + *******************************************************************************************************************/ + +static gint +shilps_detect(const GwyFileDetectInfo *fileinfo, + gboolean only_name) +{ + hid_t file_id; + gchar *company; + gint score = 0; + + if ((file_id = quick_check_hdf5(fileinfo, only_name)) < 0) + return 0; + + if (get_str_attr(file_id, ".", "Company", &company, NULL)) { + if (gwy_strequal(company, "Shilps Sciences")) + score = 100; + H5free_memory(company); + } + + H5Fclose(file_id); + + return score; +} + +static GwyContainer* +shilps_load(const gchar *filename, + G_GNUC_UNUSED GwyRunType mode, + GError **error) +{ + GwyContainer *container = NULL; + GenericHDF5File ghfile; + hid_t file_id; + G_GNUC_UNUSED herr_t status; + H5O_info_t infobuf; + + file_id = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT); + gwy_debug("file_id %d", (gint)file_id); + status = H5Oget_info(file_id, &infobuf); + gwy_debug("status %d", status); + + generic_hdf5_init(&ghfile); + ghfile.idprefix = "/Session/Scan/Image"; + ghfile.idwhat = H5O_TYPE_DATASET; + g_array_append_val(ghfile.addr, infobuf.addr); + + status = H5Literate(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, scan_file, &ghfile); + H5Aiterate2(file_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, process_attribute, &ghfile); + + if (ghfile.idlist->len) { + gwy_debug("nimages %u", ghfile.idlist->len); + container = shilps_read_channels(file_id, &ghfile, error); + } + + status = H5Fclose(file_id); + gwy_debug("status %d", status); + generic_hdf5_free(&ghfile); + + return container; +} + +static GwyContainer* +shilps_read_channels(hid_t file_id, GenericHDF5File *ghfile, GError **error) +{ + const gchar scanpfx[] = "Session/Scan"; + GwyContainer *meta, *container = NULL; + GArray *images = ghfile->idlist; + GString *str = ghfile->buf; + GwyDataField *dfield; + gint xres, yres; + gdouble xreal, yreal; + gchar *channel, *scancyc, *title; + guint i, id; + + if (!get_int_attr(file_id, scanpfx, "X No", &xres, error) + || !get_int_attr(file_id, scanpfx, "Y No", &yres, error) + || !get_float_attr(file_id, scanpfx, "X Range", &xreal, error) + || !get_float_attr(file_id, scanpfx, "Y Range", &yreal, error)) + goto fail; + + gwy_debug("xres %d, yres %d", xres, yres); + if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) + goto fail; + + gwy_debug("xreal %g, yreal %g", xreal, yreal); + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); + /* The dimensions seem to be in microns. */ + xreal *= 1e-6; + yreal *= 1e-6; + + container = gwy_container_new(); + for (i = 0; i < images->len; i++) { + id = g_array_index(images, gint, i); + + if (!(dfield = shilps_read_image(file_id, id, xres, yres, xreal, yreal, str, error))) + goto fail; + + gwy_container_set_object(container, gwy_app_get_data_key_for_id(i), dfield); + g_object_unref(dfield); + + /* shilps_read_image() fills str->str with the correct prefix. */ + if (get_str_attr(file_id, str->str, "Channel", &channel, NULL)) { + g_strstrip(channel); + if (get_str_attr(file_id, str->str, "Scan cycle", &scancyc, NULL)) { + g_strstrip(scancyc); + title = g_strdup_printf("%s (%s)", channel, scancyc); + gwy_container_set_const_string(container, gwy_app_get_data_title_key_for_id(i), title); + g_free(title); + H5free_memory(scancyc); + } + else + gwy_container_set_const_string(container, gwy_app_get_data_title_key_for_id(i), channel); + H5free_memory(channel); + } + else + gwy_app_channel_title_fall_back(container, i); + + meta = gwy_container_duplicate(ghfile->meta); + gwy_container_set_object(container, gwy_app_get_data_meta_key_for_id(i), meta); + g_object_unref(meta); + } + + if (container) + return container; + + err_NO_DATA(error); + +fail: + GWY_OBJECT_UNREF(container); + return NULL; +} + +static GwyDataField* +shilps_read_image(hid_t file_id, gint id, + gint xres, gint yres, gdouble xreal, gdouble yreal, + GString *str, GError **error) +{ + GwyDataField *dfield = NULL; + hid_t dataset, space; + gdouble *data; + gfloat *fdata; + gint i, nitems, power10; + gchar *zunitstr; + gdouble q; + herr_t status = -1; + + g_string_printf(str, "Session/Scan/Image%d", id); + if ((dataset = H5Dopen(file_id, str->str, H5P_DEFAULT)) < 0) { + err_HDF5(error, "H5Dopen", dataset); + return NULL; + } + gwy_debug("dataset %s is %d", str->str, (gint)dataset); + + if ((space = H5Dget_space(dataset)) < 0) { + err_HDF5(error, "H5Dget_space", space); + H5Dclose(dataset); + return NULL; + } + nitems = H5Sget_simple_extent_npoints(space); + gwy_debug("dataset space is %d with %d items", (gint)space, nitems); + if (nitems != xres*yres) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Dataset %s has %d items, which does not match image resolution %d×%d."), + str->str, nitems, xres, yres); + H5Sclose(space); + H5Dclose(dataset); + return NULL; + } + + if (!get_str_attr(file_id, str->str, "Units", &zunitstr, NULL)) + zunitstr = NULL; + + dfield = gwy_data_field_new(xres, yres, xreal, yreal, TRUE); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); + gwy_si_unit_set_from_string_parse(gwy_data_field_get_si_unit_z(dfield), zunitstr, &power10); + H5free_memory(zunitstr); + + data = gwy_data_field_get_data(dfield); + fdata = g_new(gfloat, 2*nitems); + status = H5Dread(dataset, H5T_IEEE_F32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, fdata); + + H5Sclose(space); + H5Dclose(dataset); + + if (status < 0) { + err_HDF5(error, "H5Dread", status); + GWY_OBJECT_UNREF(dfield); + } + else { + q = pow10(power10); + for (i = 0; i < nitems; i++) + data[i] = q*fdata[i]; + } + g_free(fdata); + + return dfield; +} + +/******************************************************************************************************************* + * + * More or less general HDF5 utility functions + * + *******************************************************************************************************************/ + +static hid_t +quick_check_hdf5(const GwyFileDetectInfo *fileinfo, + gboolean only_name) +{ + if (only_name) + return -1; + + if (fileinfo->buffer_len <= MAGIC_SIZE || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) + return -1; + + return H5Fopen(fileinfo->name, H5F_ACC_RDONLY, H5P_DEFAULT); +} + +static void +generic_hdf5_init(GenericHDF5File *ghfile) +{ + gwy_clear(ghfile, 1); + ghfile->meta = gwy_container_new(); + ghfile->path = g_string_new(NULL); + ghfile->buf = g_string_new(NULL); + ghfile->addr = g_array_new(FALSE, FALSE, sizeof(haddr_t)); + ghfile->idlist = g_array_new(FALSE, FALSE, sizeof(gint)); +} + +static void +generic_hdf5_free(GenericHDF5File *ghfile) +{ + g_array_free(ghfile->addr, TRUE); + g_array_free(ghfile->idlist, TRUE); + g_string_free(ghfile->path, TRUE); + g_string_free(ghfile->buf, TRUE); + GWY_OBJECT_UNREF(ghfile->meta); +} + +/* NB: loc_id is ‘parent’ location and name is particlar item within it. */ +static herr_t +scan_file(hid_t loc_id, + const char *name, + G_GNUC_UNUSED const H5L_info_t *info, + void *user_data) +{ + GenericHDF5File *ghfile = (GenericHDF5File*)user_data; + herr_t status, return_val = 0; + H5O_info_t infobuf; + GArray *addr = ghfile->addr; + GString *path = ghfile->path; + guint i, len = path->len; + + status = H5Oget_info_by_name(loc_id, name, &infobuf, H5P_DEFAULT); + if (status < 0) + return status; + + /* Detect loops. */ + for (i = 0; i < addr->len; i++) { + if (g_array_index(addr, haddr_t, i) == infobuf.addr) + return -1; + } + + g_array_append_val(addr, infobuf.addr); + g_string_append_c(path, '/'); + g_string_append(path, name); + gwy_debug("path %s", path->str); + if (infobuf.type == H5O_TYPE_GROUP) { + return_val = H5Literate_by_name(loc_id, name, H5_INDEX_NAME, H5_ITER_NATIVE, + NULL, scan_file, user_data, H5P_DEFAULT); + } + /* Nothing to do for other object types. */ + else if (infobuf.type == H5O_TYPE_DATASET) { + } + else if (infobuf.type == H5O_TYPE_NAMED_DATATYPE) { + } + else { + gwy_debug("unknown type %d", infobuf.type); + } + + if (ghfile->idprefix && infobuf.type == ghfile->idwhat) + enumerate_indexed(path, ghfile->idprefix, ghfile->idlist); + + if (infobuf.num_attrs > 0) { + hid_t this_id = H5Oopen(loc_id, name, H5P_DEFAULT); + + H5Aiterate2(this_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, process_attribute, user_data); + H5Oclose(this_id); + } + + g_string_truncate(path, len); + g_array_set_size(addr, addr->len-1); + + return return_val; +} + static herr_t process_attribute(hid_t loc_id, const char *attr_name, G_GNUC_UNUSED const H5A_info_t *ainfo, void *user_data) { - ErgoFile *efile = (ErgoFile*)user_data; - GString *path = efile->path, *buf = efile->buf; - gint i, nitems; + GenericHDF5File *ghfile = (GenericHDF5File*)user_data; + GString *path = ghfile->path, *buf = ghfile->buf; + G_GNUC_UNUSED H5T_cset_t cset = H5T_CSET_ERROR; guint len = path->len; - gboolean is_vlenstr = FALSE, is_channel_names = FALSE; - hid_t attr, attr_type, space; + hid_t attr, attr_type, str_type, space; + gboolean is_vlenstr = FALSE; H5T_class_t type_class; + gint i, nitems; herr_t status; attr = H5Aopen(loc_id, attr_name, H5P_DEFAULT); @@ -469,22 +853,26 @@ space = H5Aget_space(attr); nitems = H5Sget_simple_extent_npoints(space); type_class = H5Tget_class(attr_type); - if (type_class == H5T_STRING) + if (type_class == H5T_STRING) { is_vlenstr = H5Tis_variable_str(attr_type); + cset = H5Tget_cset(attr_type); + } + gwy_debug("attr %s, type class %d (is_vlenstr: %d, cset: %d)", attr_name, type_class, is_vlenstr, cset); g_string_append_c(path, '/'); g_string_append(path, attr_name); - is_channel_names = gwy_strequal(path->str, "/DataSetInfo/ChannelNames"); status = -1; /* Try to read all attribute types used by Ergo; there are just a few. */ if (type_class == H5T_INTEGER) { if (nitems == 1) { gint v; + gwy_debug("integer"); if ((status = H5Aread(attr, H5T_NATIVE_INT, &v)) >= 0) g_string_printf(buf, "%d", v); } else if (nitems > 0) { gint *v = g_new(gint, nitems); + gwy_debug("integer array"); if ((status = H5Aread(attr, H5T_NATIVE_INT, v)) >= 0) { g_string_printf(buf, "%d", v[0]); for (i = 1; i < nitems; i++) @@ -496,11 +884,13 @@ else if (type_class == H5T_FLOAT) { if (nitems == 1) { gdouble v; + gwy_debug("float"); if ((status = H5Aread(attr, H5T_NATIVE_DOUBLE, &v)) >= 0) g_string_printf(buf, "%.8g", v); } else if (nitems > 0) { gdouble *v = g_new(gdouble, nitems); + gwy_debug("float array"); if ((status = H5Aread(attr, H5T_NATIVE_DOUBLE, v)) >= 0) { g_string_printf(buf, "%.8g", v[0]); for (i = 1; i < nitems; i++) @@ -510,114 +900,70 @@ } } else if (type_class == H5T_STRING && is_vlenstr) { + /* Fixed strings are read differently, into preallocated buffers, but fortunately no one uses them. */ if (nitems == 1) { gchar *s; - if ((status = H5Aread(attr, str_vlen_type, &s)) >= 0) { + gwy_debug("string"); + str_type = make_string_type_for_attr(attr_type); + if ((status = H5Aread(attr, str_type, &s)) >= 0) { + g_strstrip(s); g_string_printf(buf, "%s", s); - if (is_channel_names) - append_channel_name(efile->channels, s); } + H5free_memory(s); + H5Tclose(str_type); } else if (nitems > 0) { gchar **s = g_new(gchar*, nitems); - if ((status = H5Aread(attr, str_vlen_type, s)) >= 0) { + gwy_debug("string array"); + str_type = make_string_type_for_attr(attr_type); + if ((status = H5Aread(attr, str_type, s)) >= 0) { + g_strstrip(s[0]); g_string_assign(buf, s[0]); - if (is_channel_names) - append_channel_name(efile->channels, s[0]); + H5free_memory(s[0]); for (i = 1; i < nitems; i++) { + g_strstrip(s[i]); g_string_append(buf, "; "); g_string_append(buf, s[i]); - if (is_channel_names) - append_channel_name(efile->channels, s[i]); + H5free_memory(s[i]); } } + H5Tclose(str_type); g_free(s); } } + H5Sclose(space); + H5Tclose(attr_type); + H5Aclose(attr); if (status >= 0) { gwy_debug("[%s] = <%s>", path->str, buf->str); - gwy_container_set_const_string_by_name(efile->meta, - path->str, buf->str); + gwy_container_set_const_string_by_name(ghfile->meta, path->str, buf->str); } else { - g_warning("Cannot handle attribute %d(%d)[%d]", - type_class, is_vlenstr, nitems); + g_warning("Cannot handle attribute %d(%d)[%d]", type_class, is_vlenstr, nitems); } - g_string_truncate(path, len); - H5Sclose(space); - H5Tclose(attr_type); - H5Aclose(attr); + if (ghfile->attr_handler) { + ghfile->attr_handler(ghfile, loc_id, attr_name); + } + + g_string_truncate(path, len); return 0; } -/* NB: loc_id is ‘parent’ location and name is particlar item within it. */ -static herr_t -ergo_scan_file(hid_t loc_id, - const char *name, - G_GNUC_UNUSED const H5L_info_t *info, - void *user_data) +static hid_t +make_string_type_for_attr(hid_t attr_type) { - ErgoFile *efile = (ErgoFile*)user_data; - herr_t status, return_val = 0; - H5O_info_t infobuf; - GArray *addr = efile->addr; - GString *path = efile->path; - guint i, len = path->len; - gchar *p; - - status = H5Oget_info_by_name(loc_id, name, &infobuf, H5P_DEFAULT); - if (status < 0) - return status; - - /* Detect loops. */ - for (i = 0; i < addr->len; i++) { - if (g_array_index(addr, haddr_t, i) == infobuf.addr) - return -1; - } - - g_array_append_val(addr, infobuf.addr); - g_string_append_c(path, '/'); - g_string_append(path, name); - if (infobuf.type == H5O_TYPE_GROUP) { - return_val = H5Literate_by_name(loc_id, name, - H5_INDEX_NAME, H5_ITER_NATIVE, - NULL, ergo_scan_file, user_data, - H5P_DEFAULT); - /* Enumerate resolutions. */ - if (g_str_has_prefix(path->str, "/DataSet/Resolution ")) { - p = path->str + strlen("/DataSet/Resolution "); - for (i = 0; g_ascii_isdigit(p[i]); i++) - ; - if (i > 0 && !p[i]) { - i = atol(p); - g_array_append_val(efile->resolutions, i); - gwy_debug("resolution %u", i); - } - } - } - /* Nothing to do for other object types. */ - else if (infobuf.type == H5O_TYPE_DATASET) { - } - else if (infobuf.type == H5O_TYPE_NAMED_DATATYPE) { - } - else { - } - - if (infobuf.num_attrs > 0) { - hid_t this_id = H5Oopen(loc_id, name, H5P_DEFAULT); - - H5Aiterate2(this_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, - process_attribute, user_data); - H5Oclose(this_id); - } + hid_t str_type; - g_string_truncate(path, len); - g_array_set_size(addr, addr->len-1); + g_return_val_if_fail(H5Tget_class(attr_type) == H5T_STRING, -1); + str_type = H5Tcopy(H5T_C_S1); + if (H5Tis_variable_str(attr_type)) + H5Tset_size(str_type, H5T_VARIABLE); + H5Tset_cset(str_type, H5Tget_cset(attr_type)); - return return_val; + return str_type; } static hid_t @@ -636,16 +982,14 @@ gwy_debug("looking for %s in %s, class %d, rank %d", attr_name, obj_path, expected_class, expected_rank); - if ((attr = H5Aopen_by_name(file_id, obj_path, attr_name, - H5P_DEFAULT, H5P_DEFAULT)) < 0) { + if ((attr = H5Aopen_by_name(file_id, obj_path, attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) { err_MISSING_FIELD(error, attr_name); return -1; } attr_type = H5Aget_type(attr); type_class = H5Tget_class(attr_type); - gwy_debug("found attr %d of type %d and class %d", - (gint)attr, (gint)attr_type, type_class); + gwy_debug("found attr %d of type %d and class %d", (gint)attr, (gint)attr_type, type_class); if (type_class != expected_class) { H5Tclose(attr_type); H5Aclose(attr); @@ -671,8 +1015,7 @@ goto fail; } for (i = 0; i < rank; i++) { - gwy_debug("dims[%d]=%lu, expecting %lu", i, - (gulong)dims[i], (gulong)expected_dims[i]); + gwy_debug("dims[%d]=%lu, expecting %lu", i, (gulong)dims[i], (gulong)expected_dims[i]); if (dims[i] != (hsize_t)expected_dims[i]) { err_UNSUPPORTED(error, attr_name); goto fail; @@ -703,8 +1046,7 @@ hid_t attr; gint status; - if ((attr = open_and_check_attr(file_id, obj_path, attr_name, - H5T_INTEGER, + if ((attr = open_and_check_attr(file_id, obj_path, attr_name, H5T_INTEGER, expected_rank, expected_dims, error)) < 0) return FALSE; @@ -737,9 +1079,7 @@ hid_t attr; gint status; - if ((attr = open_and_check_attr(file_id, obj_path, attr_name, - H5T_FLOAT, - expected_rank, expected_dims, error)) < 0) + if ((attr = open_and_check_attr(file_id, obj_path, attr_name, H5T_FLOAT, expected_rank, expected_dims, error)) < 0) return FALSE; status = H5Aread(attr, H5T_NATIVE_DOUBLE, v); @@ -769,16 +1109,11 @@ gchar **v, GError **error) { - static gboolean already_did_the_silly_thing = FALSE; - - hid_t attr, attr_type; + hid_t attr, attr_type, str_type; gboolean is_vlenstr; gint status; - gchar *no_idea_why_i_have_to_do_this; - if ((attr = open_and_check_attr(file_id, obj_path, attr_name, - H5T_STRING, - expected_rank, expected_dims, error)) < 0) + if ((attr = open_and_check_attr(file_id, obj_path, attr_name, H5T_STRING, expected_rank, expected_dims, error)) < 0) return FALSE; attr_type = H5Aget_type(attr); @@ -797,29 +1132,10 @@ return FALSE; } - /* We must read a string with its own attr_type once at the beginning. - * There are various ways to do that, for instance using - * H5LTget_attribute_string(). This simply reproduces the important call - * which happens inside. - * - * We only need to do this once, subsequent string reading then works - * without problems. So we *MUST* call this function with a scalar string - * (expected_rank of 0) as the first thing. This normally happens because - * we look for ARFormat. */ - if (expected_rank == 0 && !already_did_the_silly_thing) { - if (H5Aread(attr, attr_type, &no_idea_why_i_have_to_do_this) < 0) { - gwy_debug("cannot read attr %d with its own type %d", - (gint)attr, (gint)attr_type); - H5Tclose(attr_type); - H5Aclose(attr); - err_UNSUPPORTED(error, attr_name); - return FALSE; - } - already_did_the_silly_thing = TRUE; - } - - status = H5Aread(attr, str_vlen_type, v); + str_type = make_string_type_for_attr(attr_type); + status = H5Aread(attr, str_type, v); H5Tclose(attr_type); + H5Tclose(str_type); H5Aclose(attr); if (status < 0) { err_HDF5(error, "H5Aread", status); @@ -836,4 +1152,36 @@ return get_strs_attr(file_id, obj_path, attr_name, 0, NULL, v, error); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +static gboolean +enumerate_indexed(GString *path, const gchar *prefix, GArray *array) +{ + guint i, len = strlen(prefix); + const gchar *p; + + if (strncmp(path->str, prefix, len)) + return FALSE; + + p = path->str + len; + for (i = 0; g_ascii_isdigit(p[i]); i++) + ; + if (!i || p[i]) + return FALSE; + + i = atol(p); + if (i > G_MAXINT) + return FALSE; + + g_array_append_val(array, i); + gwy_debug("found indexed %s[%u]", prefix, i); + return TRUE; +} + +static void +err_HDF5(GError **error, const gchar *where, glong code) +{ + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, + _("HDF5 library error %ld in function %s."), + code, where); +} + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/hitachi-afm.c gwyddion-2.63/modules/file/hitachi-afm.c --- gwyddion-2.62/modules/file/hitachi-afm.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/hitachi-afm.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: hitachi-afm.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: hitachi-afm.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek, Markus Pristovsek * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * prissi@gift.physik.tu-berlin.de. @@ -265,15 +265,8 @@ q = gwy_get_gdouble_le(&p) * Nanometer; gwy_debug("xreal: %g, yreal: %g, zreal: %g", xreal/Nanometer, yreal/Nanometer, q/Nanometer); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); /* XXX: I don't know where the factor of 0.5 comes from. But it makes * the imported data match the original software. */ q /= 2.0; @@ -342,15 +335,8 @@ yreal = yscale * vy; q = zscale; gwy_debug("xreal: %g, yreal: %g, zscale: %g", xreal, yreal, q); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); data = gwy_data_field_get_data(dfield); diff -Nru gwyddion-2.62/modules/file/hitachi-sem.c gwyddion-2.63/modules/file/hitachi-sem.c --- gwyddion-2.62/modules/file/hitachi-sem.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/hitachi-sem.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: hitachi-sem.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: hitachi-sem.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -195,11 +195,7 @@ goto fail; dx = g_ascii_strtod(g_hash_table_lookup(hash, "PixelSize"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((dx = fabs(dx)) > 0)) { - g_warning("Pixel size is 0.0, fixing to 1.0"); - dx = 1.0; - } + sanitise_real_size(&dx, "pixel size"); dx *= Nanometre; dfield = gwy_data_field_new(hxres, hyres, hxres*dx, hyres*dx, FALSE); diff -Nru gwyddion-2.62/modules/file/imgexport.c gwyddion-2.63/modules/file/imgexport.c --- gwyddion-2.62/modules/file/imgexport.c 2022-10-21 09:23:20.000000000 +0000 +++ gwyddion-2.63/modules/file/imgexport.c 2023-05-25 12:31:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: imgexport.c 25101 2022-10-18 12:48:01Z yeti-dn $ + * $Id: imgexport.c 25362 2023-05-25 12:31:11Z yeti-dn $ * Copyright (C) 2014-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -157,7 +156,7 @@ GwyGradient *gradient; GwyGradient *grey; gchar *title; - gchar *decimal_symbol; + const gchar *decimal_symbol; GwyLayerBasicRangeType fm_rangetype; gdouble fm_min; gdouble fm_max; @@ -580,29 +579,33 @@ pixbuf_formats = gdk_pixbuf_get_formats(); for (l = pixbuf_formats; l; l = g_slist_next(l)) { GdkPixbufFormat *pixbuf_format = (GdkPixbufFormat*)l->data; - const gchar *name; ImgExportFormat *format; + gchar *name; name = gdk_pixbuf_format_get_name(pixbuf_format); if (!gdk_pixbuf_format_is_writable(pixbuf_format)) { gwy_debug("Ignoring pixbuf format %s, not writable", name); + g_free(name); continue; } if (!(format = find_format(name, FALSE))) { gwy_debug("Skipping writable pixbuf format %s " "because we don't know it.", name); + g_free(name); continue; } if (format->write_pixbuf) { gwy_debug("Skipping pixbuf format %s, we have our own writer.", name); + g_free(name); continue; } gwy_debug("Adding generic pixbuf writer for %s.", name); format->write_pixbuf = write_pixbuf_generic; + g_free(name); } g_slist_free(pixbuf_formats); @@ -4932,17 +4935,13 @@ GObject *sel; GwyInventory *gradients; const guchar *gradname = NULL, *key; - struct lconv *locale_data; guint xres, yres; GString *s; s = g_string_new(NULL); gwy_clear(env, 1); - locale_data = localeconv(); - env->decimal_symbol = g_strdup(locale_data->decimal_point); - g_assert(strlen(env->decimal_symbol) != 0); - + env->decimal_symbol = gwy_get_decimal_separator(); env->format = format; env->data = data; gwy_app_data_browser_get_current(GWY_APP_DATA_FIELD, &dfield, @@ -6831,7 +6830,6 @@ gwy_resource_release(GWY_RESOURCE(env->grey)); gwy_resource_release(GWY_RESOURCE(env->gradient)); g_free(env->title); - g_free(env->decimal_symbol); g_array_free(env->selections, TRUE); } diff -Nru gwyddion-2.62/modules/file/intematix.c gwyddion-2.63/modules/file/intematix.c --- gwyddion-2.62/modules/file/intematix.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/intematix.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: intematix.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: intematix.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2007 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* @@ -156,8 +152,7 @@ return score; /* Weed out non-TIFFs */ - if (!gwy_tiff_detect(fileinfo->head, fileinfo->buffer_len, - &version, &byteorder)) + if (!gwy_tiff_detect(fileinfo->head, fileinfo->buffer_len, &version, &byteorder)) return 0; if ((tiff = gwy_tiff_load(fileinfo->name, NULL)) @@ -181,18 +176,17 @@ GwySIUnit *siunitx, *siunity, *siunitz; GwyTIFF *tiff; ISDFImage image; - guint magic, t, i, j; + GwyRawDataType rawtype; + guint magic, t; gint power10x, power10y, power10z; const guchar *p; - gdouble *data; gdouble q; if (!(tiff = gwy_tiff_load(filename, error))) return NULL; gwy_clear(&image, 1); - if (!gwy_tiff_get_sint0(tiff, ISDF_TIFFTAG_FILEID, &magic) - || magic != ISDF_MAGIC_NUMBER) { + if (!gwy_tiff_get_sint0(tiff, ISDF_TIFFTAG_FILEID, &magic) || magic != ISDF_MAGIC_NUMBER) { err_FILE_TYPE(error, "Intematix SDF"); goto fail; } @@ -209,8 +203,7 @@ goto fail; t = gwy_tiff_data_type_size(image.raw_data_type); - if (err_SIZE_MISMATCH(error, t*image.xres*image.yres, t*image.raw_data_len, - TRUE)) + if (err_SIZE_MISMATCH(error, t*image.xres*image.yres, t*image.raw_data_len, TRUE)) goto fail; siunitx = gwy_si_unit_new_parse(image.xunit, &power10x); @@ -219,18 +212,10 @@ if (!gwy_si_unit_equal(siunitx, siunity)) g_warning("Different x and y units are not representable, ignoring y."); - /* Use negated positive conditions to catch NaNs */ - if (!((image.xreal = fabs(image.xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - image.xreal = 1.0; - } - if (!((image.yreal = fabs(image.yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - image.yreal = 1.0; - } + sanitise_real_size(&image.xreal, "x size"); + sanitise_real_size(&image.yreal, "y size"); dfield = gwy_data_field_new(image.xres, image.yres, - image.xreal*pow10(power10x), - image.yreal*pow10(power10y), + image.xreal*pow10(power10x), image.yreal*pow10(power10y), FALSE); gwy_data_field_set_si_unit_xy(dfield, siunitx); gwy_data_field_set_si_unit_z(dfield, siunitz); @@ -239,27 +224,15 @@ g_object_unref(siunitz); q = pow10(power10z)/image.data_cnvt; - data = gwy_data_field_get_data(dfield); - p = image.raw_data; - switch (image.raw_data_type) { - case GWY_TIFF_SLONG: - for (i = 0; i < image.yres; i++) { - for (j = 0; j < image.xres; j++) - data[i*image.xres + j] = q*tiff->get_gint32(&p); - } - break; - - case GWY_TIFF_DOUBLE: - for (i = 0; i < image.yres; i++) { - for (j = 0; j < image.xres; j++) - data[i*image.xres + j] = q*tiff->get_gdouble(&p); - } - break; - - default: - g_critical("Should not be reached."); - break; + if (image.raw_data_type == GWY_TIFF_SLONG) + rawtype = GWY_RAW_DATA_SINT32; + else if (image.raw_data_type == GWY_TIFF_DOUBLE) + rawtype = GWY_RAW_DATA_DOUBLE; + else { + g_assert_not_reached(); } + gwy_convert_raw_data(image.raw_data, image.xres*image.yres, 1, rawtype, tiff->byte_order, + gwy_data_field_get_data(dfield), q, 0.0); container = gwy_container_new(); gwy_container_set_object_by_name(container, "/0/data", dfield); @@ -270,8 +243,7 @@ g_object_unref(meta); if (gwy_container_gis_string_by_name(meta, "Data type", &p)) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(p)); + gwy_container_set_const_string_by_name(container, "/0/data/title", p); gwy_app_channel_title_fall_back(container, 0); gwy_file_channel_import_log_add(container, 0, NULL, filename); @@ -320,8 +292,7 @@ image->raw_data = tiff->data + tiff->get_guint32(&p); image->raw_data_type = entry->type; image->raw_data_len = entry->count; - if (image->raw_data_type != GWY_TIFF_SLONG - && image->raw_data_type != GWY_TIFF_DOUBLE) { + if (image->raw_data_type != GWY_TIFF_SLONG && image->raw_data_type != GWY_TIFF_DOUBLE) { err_DATA_TYPE(error, image->raw_data_type); return FALSE; } @@ -357,54 +328,51 @@ meta = gwy_container_new(); - if ((s = gwy_enuml_to_string(image->file_type, - "STM", 1, "AFM", 2, "EMP", 3, - NULL))) + if ((s = gwy_enuml_to_string(image->file_type, "STM", 1, "AFM", 2, "EMP", 3, NULL))) gwy_container_set_string_by_name(meta, "File type", g_strdup(s)); - s = gwy_enuml_to_string - (image->data_type, - "STM Topography forward", 0x0001, - "STM Topography backward", 0x0002, - "STM Tunneling current forward", 0x0003, - "STM Tunneling current backward", 0x0004, - "STM A/D channel signal forward", 0x0005, - "STM A/D channel signal backward", 0x0006, - "STM 1D I-V spectroscopy", 0x0010, - "STM 1D dI/dV spectroscopy", 0x0011, - "STM 2D CITS spectroscopy", 0x0012, - "STM 2D dI/dV spectroscopy", 0x0013, - "STM 1D tunneling current approaching spectroscopy", 0x0020, - "STM 1D A/D channel signal approaching spectroscopy", 0x0021, - "STM 2D tunneling current approaching spectroscopy", 0x0022, - "STM 2D A/D channel signal approaching spectroscopy", 0x0023, - "AFM Topography forward", 0x0101, - "AFM Topography backward", 0x0102, - "AFM Error forward", 0x0103, - "AFM Error backward", 0x0104, - "AFM A/D channel signal forward", 0x0105, - "AFM A/D channel signal backward", 0x0106, - "EMP Topography forward", 0x0201, - "EMP Topography backward", 0x0202, - "EMP Resonnant frequency forward", 0x0203, - "EMP Resonnant frequency backward", 0x0204, - "EMP Quality factor backward", 0x0205, - "EMP Quality factor forward", 0x0206, - "EMP A/D channel signal forward", 0x0207, - "EMP A/D channel signal backward", 0x0208, - "EMP 1D frequency sweeping I-signal spectroscopy", 0x0210, - "EMP 1D frequency sweeping Q-signal spectroscopy", 0x0211, - "EMP 2D frequency sweeping I-signal spectroscopy", 0x0212, - "EMP 2D frequency sweeping I-signal spectroscopy", 0x0213, - "EMP 1D approaching resonant frequency spectroscopy", 0x0220, - "EMP 1D approaching quality factor spectroscopy", 0x0221, - "EMP 1D approaching A/D channel signal spectroscopy", 0x0222, - "EMP 2D approaching resonant frequency spectroscopy", 0x0223, - "EMP 2D approaching quality factor spectroscopy", 0x0224, - "EMP 2D approaching A/D channel signal spectroscopy", 0x0225, - NULL); + s = gwy_enuml_to_string(image->data_type, + "STM Topography forward", 0x0001, + "STM Topography backward", 0x0002, + "STM Tunneling current forward", 0x0003, + "STM Tunneling current backward", 0x0004, + "STM A/D channel signal forward", 0x0005, + "STM A/D channel signal backward", 0x0006, + "STM 1D I-V spectroscopy", 0x0010, + "STM 1D dI/dV spectroscopy", 0x0011, + "STM 2D CITS spectroscopy", 0x0012, + "STM 2D dI/dV spectroscopy", 0x0013, + "STM 1D tunneling current approaching spectroscopy", 0x0020, + "STM 1D A/D channel signal approaching spectroscopy", 0x0021, + "STM 2D tunneling current approaching spectroscopy", 0x0022, + "STM 2D A/D channel signal approaching spectroscopy", 0x0023, + "AFM Topography forward", 0x0101, + "AFM Topography backward", 0x0102, + "AFM Error forward", 0x0103, + "AFM Error backward", 0x0104, + "AFM A/D channel signal forward", 0x0105, + "AFM A/D channel signal backward", 0x0106, + "EMP Topography forward", 0x0201, + "EMP Topography backward", 0x0202, + "EMP Resonnant frequency forward", 0x0203, + "EMP Resonnant frequency backward", 0x0204, + "EMP Quality factor backward", 0x0205, + "EMP Quality factor forward", 0x0206, + "EMP A/D channel signal forward", 0x0207, + "EMP A/D channel signal backward", 0x0208, + "EMP 1D frequency sweeping I-signal spectroscopy", 0x0210, + "EMP 1D frequency sweeping Q-signal spectroscopy", 0x0211, + "EMP 2D frequency sweeping I-signal spectroscopy", 0x0212, + "EMP 2D frequency sweeping I-signal spectroscopy", 0x0213, + "EMP 1D approaching resonant frequency spectroscopy", 0x0220, + "EMP 1D approaching quality factor spectroscopy", 0x0221, + "EMP 1D approaching A/D channel signal spectroscopy", 0x0222, + "EMP 2D approaching resonant frequency spectroscopy", 0x0223, + "EMP 2D approaching quality factor spectroscopy", 0x0224, + "EMP 2D approaching A/D channel signal spectroscopy", 0x0225, + NULL); if (s) - gwy_container_set_string_by_name(meta, "Data type", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Data type", s); meta_add_string(meta, tiff, GWY_TIFFTAG_IMAGE_DESCRIPTION, "Description"); meta_add_string(meta, tiff, GWY_TIFFTAG_SOFTWARE, "Software"); @@ -414,11 +382,9 @@ meta_add_string(meta, tiff, ISDF_TIFFTAG_SAMPLEINFO, "Sample information"); if (gwy_tiff_get_float0(tiff, ISDF_TIFFTAG_SCANRATE, &v)) - gwy_container_set_string_by_name(meta, "Scan rate", - g_strdup_printf("%g line/s", v)); + gwy_container_set_string_by_name(meta, "Scan rate", g_strdup_printf("%g line/s", v)); if (gwy_tiff_get_float0(tiff, ISDF_TIFFTAG_BIASVOLTS, &v)) - gwy_container_set_string_by_name(meta, "Bias", - g_strdup_printf("%g V", v)); + gwy_container_set_string_by_name(meta, "Bias", g_strdup_printf("%g V", v)); return meta; } @@ -431,4 +397,4 @@ g_free(image->dataunit); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/iso28600.c gwyddion-2.63/modules/file/iso28600.c --- gwyddion-2.62/modules/file/iso28600.c 2019-11-21 12:53:47.000000000 +0000 +++ gwyddion-2.63/modules/file/iso28600.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: iso28600.c 22687 2019-11-21 12:53:47Z yeti-dn $ + * $Id: iso28600.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2011-2016 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -604,8 +600,7 @@ goto fail; experiment = header[7].enumerated.value; - if (experiment == ISO28600_EXPERIMENT_MAP_SC - || experiment == ISO28600_EXPERIMENT_MAP_MC) { + if (experiment == ISO28600_EXPERIMENT_MAP_SC || experiment == ISO28600_EXPERIMENT_MAP_MC) { guint xres, yres, nchannels; gdouble xreal, yreal; @@ -621,13 +616,11 @@ g_warning("X and Y units differ, using X"); if (header[16].enumerated.value == ISO28600_SCAN_IRREGULAR_MAPPING) { - /* Ignore all area information because we have explicit X and Y - * coordinates of each point. Just precalculate the factors. */ + /* Ignore all area information because we have explicit X and Y coordinates of each point. Just + * precalculate the factors. */ xreal = pow10(header[25].unit.power10); yreal = pow10(header[26].unit.power10); - container = load_xyz_data(header, filename, strings, &p, - experiment, nchannels, xreal, yreal, - error); + container = load_xyz_data(header, filename, strings, &p, experiment, nchannels, xreal, yreal, error); } else if (header[16].enumerated.value == ISO28600_SCAN_REGULAR_MAPPING) { xres = header[23].i; @@ -637,32 +630,21 @@ xreal = header[27].d; yreal = header[28].d; - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); xreal *= pow10(header[25].unit.power10); yreal *= pow10(header[26].unit.power10); - container = load_channels(header, filename, strings, &p, - experiment, nchannels, - xres, yres, xreal, yreal, + container = load_channels(header, filename, strings, &p, experiment, nchannels, xres, yres, xreal, yreal, error); } else { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Only regular and irregular mappings are implemented " - "but the file has mapping type ‘%s’."), + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Only regular and irregular mappings are implemented but the file has mapping type ‘%s’."), header[16].enumerated.str); goto fail; } } - if (experiment == ISO28600_EXPERIMENT_SPEC_SC - || experiment == ISO28600_EXPERIMENT_SPEC_MC) { + if (experiment == ISO28600_EXPERIMENT_SPEC_SC || experiment == ISO28600_EXPERIMENT_SPEC_MC) { ISO28600SpectroscopyScanMode smode; guint npts, nord; @@ -682,30 +664,21 @@ } if (header[82].real_list.n && header[82].text_list.n != nord) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("List ‘%s’ has %u items which differs from " - "the number %u given by ‘%s’."), - field_name(82), header[82].text_list.n, - nord, field_name(81)); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("List ‘%s’ has %u items which differs from the number %u given by ‘%s’."), + field_name(82), header[82].text_list.n, nord, field_name(81)); goto fail; } if (header[83].real_list.n && header[83].text_list.n != nord) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("List ‘%s’ has %u items which differs from " - "the number %u given by ‘%s’."), - field_name(83), header[83].text_list.n, - nord, field_name(81)); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("List ‘%s’ has %u items which differs from the number %u given by ‘%s’."), + field_name(83), header[83].text_list.n, nord, field_name(81)); goto fail; } if (header[84].real_list.n && header[84].real_list.n != nord) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("List ‘%s’ has %u items which differs from " - "the number %u given by ‘%s’."), - field_name(84), header[84].text_list.n, - nord, field_name(81)); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("List ‘%s’ has %u items which differs from the number %u given by ‘%s’."), + field_name(84), header[84].text_list.n, nord, field_name(81)); goto fail; } @@ -768,8 +741,7 @@ k < xres*yres; line = gwy_str_next_line(p), k++) { if (!line) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("End of file reached when reading sample #%u of %u"), k, xres*yres); goto fail; @@ -777,10 +749,8 @@ for (id = 0; id < nchannels; id++) { datas[id][k] = powers10[id]*g_ascii_strtod(line, &end); if (line == end) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Malformed data encountered when reading sample " - "#%u"), + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Malformed data encountered when reading sample #%u"), k); goto fail; } @@ -866,10 +836,8 @@ for (id = 0; id < nchannels+2; id++) { gdouble v = powers10[id]*g_ascii_strtod(line, &end); if (line == end) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Malformed data encountered when reading sample " - "#%u") + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Malformed data encountered when reading sample #%u") , k); goto fail; } @@ -972,8 +940,7 @@ for (id = 0; id < nord; id++) { if (header[83].text_list.n) { gint power10; - units[id+1] = gwy_si_unit_new_parse(header[83].text_list.items[id], - &power10); + units[id+1] = gwy_si_unit_new_parse(header[83].text_list.items[id], &power10); powers10[id+1] = pow10(power10); } else { @@ -990,12 +957,9 @@ for (k = 0; k < npts; k++) data[k] = q*k + x0; } - for (line = gwy_str_next_line(p), k = 0; - k < npts; - line = gwy_str_next_line(p), k++) { + for (line = gwy_str_next_line(p), k = 0; k < npts; line = gwy_str_next_line(p), k++) { if (!line) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("End of file reached when reading sample #%d of %d"), k, npts); goto fail; @@ -1003,10 +967,8 @@ for (id = from; id < nord + 1; id++) { data[id*npts + k] = powers10[id]*g_ascii_strtod(line, &end); if (line == end) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Malformed data encountered when reading sample " - "#%d of %d"), + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Malformed data encountered when reading sample #%d of %d"), k, npts); goto fail; } @@ -1044,8 +1006,7 @@ "axis-label-bottom", header[74].s, NULL); - gwy_container_set_object(container, gwy_app_get_graph_key_for_id(id), - gmodel); + gwy_container_set_object(container, gwy_app_get_graph_key_for_id(id), gmodel); g_object_unref(gmodel); } @@ -1063,16 +1024,15 @@ guint id) { static const guint fields[] = { - 2, 3, 4, 5, 6, 17, 18, 19, 20, 21, 22, 38, 39, 42, 43, 44, 45, 46, 52, - 54, 55, 58, 62, 64, 65, 66, 70, 79, 84, 85, 87, 88, 89, 90, 91, + 2, 3, 4, 5, 6, 17, 18, 19, 20, 21, 22, 38, 39, 42, 43, 44, 45, 46, 52, 54, 55, 58, 62, 64, 65, 66, 70, 79, 84, + 85, 87, 88, 89, 90, 91, }; static const guint fields_with_units[] = { 35, 34, 37, 36, }; static const GwyEnum fields_without_units[] = { - { "deg", 33 }, { "V", 40 }, { "K", 49 }, { "Pa", 50 }, { "%", 51 }, - { "N/m", 56 }, { "Hz", 57 }, { "deg", 59 }, { "deg", 60 }, - { "deg", 61 }, + { "deg", 33 }, { "V", 40 }, { "K", 49 }, { "Pa", 50 }, { "%", 51 }, { "N/m", 56 }, { "Hz", 57 }, { "deg", 59 }, + { "deg", 60 }, { "deg", 61 }, }; gint year, month, day, hour, minute, second, offset; GwyContainer *meta = gwy_container_new(); @@ -1085,24 +1045,17 @@ || header_fields[i].type == ISO28600_REAL_NUMS || header_fields[i].type == ISO28600_UNITS || header_fields[i].type == ISO28600_TEXT_LIST - || header_fields[i].type == ISO28600_ENUM) - && strlen(strings[i])) - || (header_fields[i].type == ISO28600_INTEGER - && header[i].i) - || (header_fields[i].type == ISO28600_REAL_NUM - && header[i].d)) - gwy_container_set_string_by_name(meta, field_name(i), - g_strdup(strings[i])); + || header_fields[i].type == ISO28600_ENUM) && strlen(strings[i])) + || (header_fields[i].type == ISO28600_INTEGER && header[i].i) + || (header_fields[i].type == ISO28600_REAL_NUM && header[i].d)) + gwy_container_set_string_by_name(meta, field_name(i), g_strdup(strings[i])); } for (k = 0; k < G_N_ELEMENTS(fields_with_units)/2; k++) { - guint i = fields_with_units[2*k], - j = fields_with_units[2*k + 1]; + guint i = fields_with_units[2*k], j = fields_with_units[2*k + 1]; if (header[i].d) - gwy_container_set_string_by_name(meta, field_name(i), - g_strconcat(strings[i], " ", - strings[j], NULL)); + gwy_container_set_string_by_name(meta, field_name(i), g_strconcat(strings[i], " ", strings[j], NULL)); } for (k = 0; k < G_N_ELEMENTS(fields_without_units); k++) { @@ -1110,9 +1063,7 @@ guint i = fields_without_units[k].value; if (header[i].d) - gwy_container_set_string_by_name(meta, field_name(i), - g_strconcat(strings[i], " ", - units, NULL)); + gwy_container_set_string_by_name(meta, field_name(i), g_strconcat(strings[i], " ", units, NULL)); } year = header[8].i; @@ -1122,24 +1073,20 @@ minute = header[12].i; second = header[13].i; offset = header[14].i; - if (year >= 0 && month >= 0 && day >= 0 - && hour >= 0 && minute >= 0 && second >= 0) { + if (year >= 0 && month >= 0 && day >= 0 && hour >= 0 && minute >= 0 && second >= 0) { gchar *value; if (offset) value = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u (+%u)", - year, month, day, hour, minute, second, - offset); + year, month, day, hour, minute, second, offset); else value = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", year, month, day, hour, minute, second); gwy_container_set_string_by_name(meta, "Date", value); } - if (strlen(strings[96 + 3*id])) { - gwy_container_set_string_by_name(meta, "Comment", - g_strdup(strings[96 + 3*id])); - } + if (strlen(strings[96 + 3*id])) + gwy_container_set_const_string_by_name(meta, "Comment", strings[96 + 3*id]); if (!gwy_container_get_n_items(meta)) { g_object_unref(meta); @@ -1154,8 +1101,7 @@ gchar **strings, GError **error) { - ISO28600FieldValue *header = g_new0(ISO28600FieldValue, - G_N_ELEMENTS(header_fields)); + ISO28600FieldValue *header = g_new0(ISO28600FieldValue, G_N_ELEMENTS(header_fields)); guint i, j; for (i = 0; i < G_N_ELEMENTS(header_fields); i++) { @@ -1173,8 +1119,7 @@ if (type == ISO28600_FIXED) { if (!gwy_strequal(line, name)) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Line %u does not contain mandatory label ‘%s’."), i+1, name); goto fail; @@ -1556,25 +1501,18 @@ } if (i < n) { g_free(title); - title = g_strdup("Not representable in ASCII. Ask the committee to " - "fix the standard to permit UTF-8."); + title = g_strdup("Not representable in ASCII. Ask the committee to fix the standard to permit UTF-8."); } - g_ascii_formatd(xreal, sizeof(xreal), "%.8g", - gwy_data_field_get_xreal(dfield)); - g_ascii_formatd(yreal, sizeof(yreal), "%.8g", - gwy_data_field_get_yreal(dfield)); - g_ascii_formatd(xoff, sizeof(xoff), "%.8g", - gwy_data_field_get_xoffset(dfield)); - g_ascii_formatd(yoff, sizeof(yoff), "%.8g", - gwy_data_field_get_yoffset(dfield)); + g_ascii_formatd(xreal, sizeof(xreal), "%.8g", gwy_data_field_get_xreal(dfield)); + g_ascii_formatd(yreal, sizeof(yreal), "%.8g", gwy_data_field_get_yreal(dfield)); + g_ascii_formatd(xoff, sizeof(xoff), "%.8g", gwy_data_field_get_xoffset(dfield)); + g_ascii_formatd(yoff, sizeof(yoff), "%.8g", gwy_data_field_get_yoffset(dfield)); if (gwy_fprintf(fh, header_template, - xres, yres, - unitxy, unitxy, xreal, yreal, - unitxy, unitxy, xoff, yoff, - title, title, unitz, - title, unitz, title) < 0) { + xres, yres, + unitxy, unitxy, xreal, yreal, unitxy, unitxy, xoff, yoff, + title, title, unitz, title, unitz, title) < 0) { err_WRITE(error); goto fail; } @@ -1616,8 +1554,7 @@ const gchar *convstr; /* Ignore non-base units altogether because we never produce them. */ - if (gwy_stramong(str, "A", "C", "eV", "Hz", "K", "m", "m/s", "N", "N/m", - "Pa", "s", "V", NULL)) + if (gwy_stramong(str, "A", "C", "eV", "Hz", "K", "m", "m/s", "N", "N/m", "Pa", "s", "V", NULL)) return str; if (gwy_strequal(str, "deg")) @@ -1633,4 +1570,4 @@ return g_strdup(convstr); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/jeol.c gwyddion-2.63/modules/file/jeol.c --- gwyddion-2.62/modules/file/jeol.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/jeol.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: jeol.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: jeol.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -59,8 +55,8 @@ #include "err.h" #include "get.h" -/* Magic includes TIFF directory start address and size because they are fixed - * numbers for JEOL enabling to quicky weed out most of other TIFF files. */ +/* Magic includes TIFF directory start address and size because they are fixed numbers for JEOL enabling to quicky + * weed out most of other TIFF files. */ #define MAGIC "II\x2a\x00\xd4\x17\x00\x00\x00\x04" #define MAGIC_SIZE (sizeof(MAGIC) - 1) @@ -649,8 +645,7 @@ goto fail; } - if (err_DIMENSION(error, image_header.xres) - || err_DIMENSION(error, image_header.yres)) + if (err_DIMENSION(error, image_header.xres) || err_DIMENSION(error, image_header.yres)) goto fail; expected_size = image_header.bpp/8 * image_header.xres*image_header.yres; @@ -662,21 +657,13 @@ goto fail; } - /* Use negated positive conditions to catch NaNs */ - if (!((image_header.xreal = fabs(image_header.xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - image_header.xreal = 1.0; - } - if (!((image_header.yreal = fabs(image_header.yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - image_header.yreal = 1.0; - } + sanitise_real_size(&image_header.xreal, "x size"); + sanitise_real_size(&image_header.yreal, "y size"); dfield = jeol_read_data_field(buffer + JEOL_DATA_START, &image_header); if (!dfield) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("The type of data is unknown. " - "Please report it to the developers.")); + _("The type of data is unknown. Please report it to the developers.")); goto fail; } @@ -685,19 +672,16 @@ g_object_unref(dfield); /* Title */ - s = g_convert(image_header.internal_filename, -1, - "iso-8859-1", "utf-8", NULL, NULL, NULL); + s = g_convert(image_header.internal_filename, -1, "iso-8859-1", "utf-8", NULL, NULL, NULL); if (s) g_strstrip(s); if (s && *s) gwy_container_set_string_by_name(container, "/0/data/title", s); else { - title = gwy_flat_enum_to_string(image_header.data_source, - G_N_ELEMENTS(data_sources), + title = gwy_flat_enum_to_string(image_header.data_source, G_N_ELEMENTS(data_sources), data_sources, data_sources_name); if (title) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(title)); + gwy_container_set_const_string_by_name(container, "/0/data/title", title); } /* Meta */ @@ -725,8 +709,7 @@ header->yres = gwy_get_guint16_le(&p); header->xreal = gwy_get_gfloat_le(&p); header->yreal = gwy_get_gfloat_le(&p); - gwy_debug("res: (%d,%d), real: (%g,%g)", - header->xres, header->yres, header->xreal, header->yreal); + gwy_debug("res: (%d,%d), real: (%g,%g)", header->xres, header->yres, header->xreal, header->yreal); header->z0 = gwy_get_gfloat_le(&p); header->z255 = gwy_get_gfloat_le(&p); header->adc_min = gwy_get_guint16_le(&p); @@ -791,10 +774,9 @@ gwy_debug("z_gain: %g o_gain: %g", header->spm_param.z_gain, header->spm_param.o_gain); header->spm_param.back_scan_bias = gwy_get_gfloat_le(&p); - /* XXX: This does not match what the documentation says, there seems to be - * a four-byte quantity missing between back_scan_bias and mode (the size - * of SPM params struct is also 4 bytes shorter than the space alloted for - * it). */ + /* XXX: This does not match what the documentation says, there seems to be a four-byte quantity missing between + * back_scan_bias and mode (the size of SPM params struct is also 4 bytes shorter than the space alloted for it). + * */ p += 4; /* whatever */ header->spm_param.mode = gwy_get_guint32_le(&p); gwy_debug("mode: %d", header->spm_param.mode); @@ -902,11 +884,7 @@ break; } - dfield = gwy_data_field_new(header->xres, header->yres, - Nanometer*header->xreal, - Nanometer*header->yreal, - FALSE); - + dfield = gwy_data_field_new(header->xres, header->yres, Nanometer*header->xreal, Nanometer*header->yreal, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), unitstr); @@ -1016,36 +994,27 @@ time_ = &header->measurement_time; format_meta(meta, "Date and time of measurement", "%04d-%02d-%02d %02d:%02d:%02d.%02d", - date->year_1980, date->month, date->day, - time_->hour, time_->minute, time_->second, time_->second_100); + date->year_1980, date->month, date->day, time_->hour, time_->minute, time_->second, time_->second_100); date = &header->save_date; time_ = &header->save_time; format_meta(meta, "Date and time of file save", "%04d-%02d-%02d %02d:%02d:%02d.%02d", - date->year_1980, date->month, date->day, - time_->hour, time_->minute, time_->second, time_->second_100); + date->year_1980, date->month, date->day, time_->hour, time_->minute, time_->second, time_->second_100); format_meta(meta, "Tip speed X", "%g nm/s", header->tip_speed_x); format_meta(meta, "Tip speed Y", "%g nm/s", header->tip_speed_y); - if ((s = gwy_flat_enum_to_string(header->data_source, - G_N_ELEMENTS(data_sources), - data_sources, data_sources_name))) + if ((s = gwy_flat_enum_to_string(header->data_source, G_N_ELEMENTS(data_sources), data_sources, data_sources_name))) format_meta(meta, "Data source", "%s", s); format_meta(meta, "Direction", header->forward ? "Forward" : "Backward"); format_bit(meta, "Measurement signal", - G_N_ELEMENTS(measurement_signals), measurement_signals, - measurement_signals_name, + G_N_ELEMENTS(measurement_signals), measurement_signals, measurement_signals_name, header->spm_misc_param.measurement_signal); - format_bit(meta, "SPM mode", - G_N_ELEMENTS(spm_modes), spm_modes, spm_modes_name, - header->spm_misc_param.spm_mode); - format_bit(meta, "AFM mode", - G_N_ELEMENTS(afm_modes), afm_modes, afm_modes_name, - header->spm_misc_param.afm_mode); + format_bit(meta, "SPM mode", G_N_ELEMENTS(spm_modes), spm_modes, spm_modes_name, header->spm_misc_param.spm_mode); + format_bit(meta, "AFM mode", G_N_ELEMENTS(afm_modes), afm_modes, afm_modes_name, header->spm_misc_param.afm_mode); return meta; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/jpkscan.c gwyddion-2.63/modules/file/jpkscan.c --- gwyddion-2.62/modules/file/jpkscan.c 2022-10-11 13:48:10.000000000 +0000 +++ gwyddion-2.63/modules/file/jpkscan.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: jpkscan.c 25076 2022-10-11 13:48:10Z yeti-dn $ + * $Id: jpkscan.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Loader for JPK Image Scans. * Copyright (C) 2005 JPK Instruments AG. * Written by Sven Neumann . @@ -374,15 +374,8 @@ return NULL; } - /* Use negated positive conditions to catch NaNs */ - if (!((ulen = fabs(ulen)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - ulen = 1.0; - } - if (!((vlen = fabs(vlen)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - vlen = 1.0; - } + sanitise_real_size(&ulen, "x size"); + sanitise_real_size(&vlen, "y size"); container = gwy_container_new(); meta = gwy_container_new(); diff -Nru gwyddion-2.62/modules/file/jspmfile.c gwyddion-2.63/modules/file/jspmfile.c --- gwyddion-2.62/modules/file/jspmfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/jspmfile.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: jspmfile.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: jspmfile.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -400,15 +400,8 @@ FALSE)) return FALSE; - /* Use negated positive conditions to catch NaNs */ - if (!((jspmfile->xreal = fabs(jspmfile->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - jspmfile->xreal = 1.0; - } - if (!((jspmfile->yreal = fabs(jspmfile->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - jspmfile->yreal = 1.0; - } + sanitise_real_size(&jspmfile->xreal, "x size"); + sanitise_real_size(&jspmfile->yreal, "y size"); return TRUE; } diff -Nru gwyddion-2.62/modules/file/keyence.c gwyddion-2.63/modules/file/keyence.c --- gwyddion-2.62/modules/file/keyence.c 2022-08-24 15:13:25.000000000 +0000 +++ gwyddion-2.63/modules/file/keyence.c 2023-05-26 13:43:29.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: keyence.c 24931 2022-08-24 15:13:25Z yeti-dn $ + * $Id: keyence.c 25371 2023-05-26 13:43:29Z yeti-dn $ * Copyright (C) 2015-2022 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -1585,6 +1585,7 @@ g_object_unref(meta); } } + g_free(ids); } static GwyContainer* diff -Nru gwyddion-2.62/modules/file/magellan.c gwyddion-2.63/modules/file/magellan.c --- gwyddion-2.62/modules/file/magellan.c 2019-10-30 13:15:45.000000000 +0000 +++ gwyddion-2.63/modules/file/magellan.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: magellan.c 22626 2019-10-30 09:14:30Z yeti-dn $ + * $Id: magellan.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2013 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -170,8 +170,7 @@ || (value = g_hash_table_lookup(hash, "Scan::PixelWidth"))) { gwy_debug("PixelWidth %s", value); xstep = g_strtod(value, NULL); - if (!((xstep = fabs(xstep)) > 0)) - g_warning("Real pixel width is 0.0, fixing to 1.0"); + sanitise_real_size(&xstep, "pixel width"); } else { err_MISSING_FIELD(error, "PixelWidth"); @@ -182,8 +181,7 @@ || (value = g_hash_table_lookup(hash, "Scan::PixelHeight"))) { gwy_debug("PixelHeight %s", value); ystep = g_strtod(value, NULL); - if (!((ystep = fabs(ystep)) > 0)) - g_warning("Real pixel height is 0.0, fixing to 1.0"); + sanitise_real_size(&ystep, "pixel height"); } else { err_MISSING_FIELD(error, "PixelHeight"); diff -Nru gwyddion-2.62/modules/file/Makefile.am gwyddion-2.63/modules/file/Makefile.am --- gwyddion-2.62/modules/file/Makefile.am 2022-10-06 15:01:28.000000000 +0000 +++ gwyddion-2.63/modules/file/Makefile.am 2023-05-25 15:00:56.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25364 2023-05-25 15:00:56Z yeti-dn $ # For each optional module foo there is variable foo_module that should be set # to foo.la when the module is enabled. @@ -154,6 +154,11 @@ zip_libs = @MINIZIP2_LIBS@ endif +if HAVE_ZZIP +zip_cflags = @ZZIP_CFLAGS@ +zip_libs = @ZZIP_LIBS@ +endif + # These modules compile also without the respective libraries so just add the # flags if the libraries are available. createc_la_LIBADD = @ZLIB@ diff -Nru gwyddion-2.62/modules/file/Makefile.in gwyddion-2.63/modules/file/Makefile.in --- gwyddion-2.62/modules/file/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/file/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25364 2023-05-25 15:00:56Z yeti-dn $ VPATH = @srcdir@ @@ -1523,6 +1523,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1682,9 +1684,11 @@ @HAVE_LIBZIP_TRUE@zip_cflags = @LIBZIP_CFLAGS@ @HAVE_MINIZIP1_TRUE@zip_cflags = @MINIZIP1_CFLAGS@ @HAVE_MINIZIP2_TRUE@zip_cflags = @MINIZIP2_CFLAGS@ +@HAVE_ZZIP_TRUE@zip_cflags = @ZZIP_CFLAGS@ @HAVE_LIBZIP_TRUE@zip_libs = @LIBZIP_LIBS@ @HAVE_MINIZIP1_TRUE@zip_libs = @MINIZIP1_LIBS@ @HAVE_MINIZIP2_TRUE@zip_libs = @MINIZIP2_LIBS@ +@HAVE_ZZIP_TRUE@zip_libs = @ZZIP_LIBS@ # These modules compile also without the respective libraries so just add the # flags if the libraries are available. diff -Nru gwyddion-2.62/modules/file/metropro.c gwyddion-2.63/modules/file/metropro.c --- gwyddion-2.62/modules/file/metropro.c 2019-02-26 13:55:25.000000000 +0000 +++ gwyddion-2.63/modules/file/metropro.c 2023-05-26 11:42:58.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: metropro.c 21925 2019-02-26 13:51:16Z yeti-dn $ + * $Id: metropro.c 25370 2023-05-26 11:42:57Z yeti-dn $ * Copyright (C) 2006,2014-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -415,6 +415,8 @@ GWY_OBJECT_UNREF(mprofile->intensity_data[n]); GWY_OBJECT_UNREF(mprofile->intensity_mask[n]); } + g_free(mprofile->intensity_data); + g_free(mprofile->intensity_mask); GWY_OBJECT_UNREF(mprofile->phase_data); GWY_OBJECT_UNREF(mprofile->phase_mask); g_free(mprofile); diff -Nru gwyddion-2.62/modules/file/microprof.c gwyddion-2.63/modules/file/microprof.c --- gwyddion-2.62/modules/file/microprof.c 2020-08-12 11:32:25.000000000 +0000 +++ gwyddion-2.63/modules/file/microprof.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: microprof.c 22902 2020-08-12 11:32:25Z yeti-dn $ + * $Id: microprof.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2005-2020 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1133,14 +1133,8 @@ if (!read_blocks(p, size - (p - buffer), &mfile, error)) goto fail; - if (!(mfile.block0067.xrange = fabs(mfile.block0067.xrange))) { - g_warning("Real x size is 0.0, fixing to 1.0"); - mfile.block0067.xrange = 1.0; - } - if (!(mfile.block0067.yrange = fabs(mfile.block0067.yrange))) { - g_warning("Real x size is 0.0, fixing to 1.0"); - mfile.block0067.yrange = 1.0; - } + sanitise_real_size(&mfile.block0067.xrange, "x size"); + sanitise_real_size(&mfile.block0067.yrange, "y size"); container = gwy_container_new(); meta = create_meta(&mfile); diff -Nru gwyddion-2.62/modules/file/miffile.c gwyddion-2.63/modules/file/miffile.c --- gwyddion-2.62/modules/file/miffile.c 2019-01-03 12:58:17.000000000 +0000 +++ gwyddion-2.63/modules/file/miffile.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: miffile.c 21783 2019-01-03 12:58:14Z yeti-dn $ + * $Id: miffile.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2010 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -425,15 +425,8 @@ setup->xreal = gwy_get_gdouble_le(p); setup->yreal = gwy_get_gdouble_le(p); gwy_debug("xreal: %g, yreal: %g", setup->xreal, setup->yreal); - /* Use negated positive conditions to catch NaNs */ - if (!((setup->xreal = fabs(setup->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - setup->xreal = 1.0; - } - if (!((setup->yreal = fabs(setup->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - setup->yreal = 1.0; - } + sanitise_real_size(&setup->xreal, "x size"); + sanitise_real_size(&setup->yreal, "y size"); setup->xoff = gwy_get_gdouble_le(p); setup->yoff = gwy_get_gdouble_le(p); gwy_debug("xoff: %g, yoff: %g", setup->xoff, setup->yoff); @@ -678,8 +671,7 @@ GwyDataField *dfield; gdouble *data, *linecorrdata = NULL; gsize datasize; - const gint16 *d16; - gint i, j; + gint i; if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) return NULL; @@ -698,9 +690,10 @@ if (datasize + yres*sizeof(gint16) <= block->size) { gwy_debug("There may be %u correction data after the image.", yres); linecorrdata = g_new(gdouble, yres); - d16 = (const gint16*)(buffer + block->offset + datasize); + gwy_convert_raw_data(buffer + block->offset + datasize, yres, 1, + GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, linecorrdata, 1.0, 0.0); for (i = 0; i < yres; i++) { - linecorrdata[i] = gwy_powi(2.0, d16[i] - 13); + linecorrdata[i] = gwy_powi(2.0, linecorrdata[i] - 13); gwy_debug("corr[%u] %g", i, linecorrdata[i]); } } @@ -709,7 +702,6 @@ gwy_data_field_set_xoffset(dfield, xoff); gwy_data_field_set_yoffset(dfield, yoff); data = gwy_data_field_get_data(dfield); - d16 = (const gint16*)(buffer + block->offset); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), "m"); @@ -723,9 +715,8 @@ for (i = 0; i < yres; i++) { gdouble qi = linecorrdata ? q*linecorrdata[i] : q; - for (j = 0; j < yres; j++) { - data[(yres-1 - i)*xres + j] = qi*GINT16_FROM_LE(d16[i*xres + j]); - } + gwy_convert_raw_data(buffer + block->offset + i*xres*sizeof(gint16), xres, 1, + GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, data + (yres-1 - i)*xres, qi, 0.0); } g_free(linecorrdata); diff -Nru gwyddion-2.62/modules/file/mifile.c gwyddion-2.63/modules/file/mifile.c --- gwyddion-2.62/modules/file/mifile.c 2022-11-02 14:00:39.000000000 +0000 +++ gwyddion-2.63/modules/file/mifile.c 2023-06-05 15:30:03.000000000 +0000 @@ -1,25 +1,21 @@ /* - * $Id: mifile.c 25134 2022-11-02 14:00:39Z yeti-dn $ + * $Id: mifile.c 25410 2023-06-05 15:30:03Z yeti-dn $ * Copyright (C) 2005 Chris Anderson, Molecular Imaging Corp. * E-mail: sidewinder.asu@gmail.com * * This source code is based off of stpfile.c, * Copyright (C) 2005 David Necas (Yeti), Petr Klstptek. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -46,7 +42,7 @@ * [FILE-MAGIC-USERGUIDE] * Molecular Imaging MI * .mi - * Read SPS:Limited[1] + * Read SPS:Limited[1] Curvemap * [1] Spectra curves are imported as graphs, positional information is lost. **/ @@ -61,6 +57,7 @@ #include #include #include +#include #include "err.h" @@ -69,23 +66,20 @@ #define SPECT_MAGIC "fileType Spectroscopy" #define SPECT_MAGIC_SIZE (sizeof(SPECT_MAGIC) - 1) -#define DATA_MAGIC "data \n" -#define DATA_MAGIC_SIZE (sizeof(DATA_MAGIC) - 1) -#define BINARY_DATA_MAGIC "data BINARY\n" -#define BINARY_DATA_MAGIC_SIZE (sizeof(BINARY_DATA_MAGIC) - 1) -#define BINARY32_DATA_MAGIC "data BINARY_32\n" -#define BINARY32_DATA_MAGIC_SIZE (sizeof(BINARY32_DATA_MAGIC) - 1) -#define ASCII_DATA_MAGIC "data ASCII\n" -#define ASCII_DATA_MAGIC_SIZE (sizeof(ASCII_DATA_MAGIC) - 1) - #define EXTENSION ".mi" #define KEY_LEN 14 -#define GRAPH_PREFIX "/0/graph/graph" + +typedef enum { + HEADER_ANY = 0, + HEADER_BUFFER_LABEL, + HEADER_BUFFER_UNIT, +} HeaderContext; typedef enum { MI_ASCII = 0, - MI_BINARY = 1, /* This means 16-bit data */ - MI_BINARY32 = 2, + MI_BINARY = 2, /* This means 16-bit data, except for new spectra where it means a float. Fuck. */ + MI_BINARY32 = 4, + MI_ASCII_MULTICOL_FLAG = 0x100u, } MIDataType; /* These two structs are for MI Image Files only */ @@ -103,20 +97,39 @@ GHashTable *meta; } MIFile; -/* These two structs are for MI Spectroscopy Files only */ +/* These structs are for MI Spectroscopy Files only */ typedef struct { gchar *label; gchar *unit; } MISpectData; typedef struct { + guint len; + guint bufno; + gdouble tstart; + gdouble dt; + gdouble xstart; + gdouble dx; + const gchar *label; +} MISpectChunk; + +typedef struct { gint num_buffers; + guint sumlen; + guint maxchunklen; MISpectData *buffers; gint num_points; - const gfloat *data; GArray *chunks; GHashTable *meta; + + /* Curve maps only. */ + gboolean is_curve_map; + gboolean is_floating_point; + gint xres; + gint yres; + gdouble xreal; + gdouble yreal; } MISpectFile; typedef struct { @@ -131,52 +144,57 @@ gint format; } MetaDataFlatFormat; -/* Gwyddion File Module Functions */ -static gboolean module_register (void); -static gint mifile_detect (const GwyFileDetectInfo *fileinfo, - gboolean only_name); -static GwyContainer* mifile_load (const gchar *filename, - GwyRunType mode, - GError **error); - -/* Helper Functions */ -static guint find_data_start (const guchar *buffer, gsize size, - MIDataType *data_type); -static guint image_file_read_header (MIFile *mifile, - gchar *buffer, - GError **error); -static guint spect_file_read_header (MISpectFile *mifile, - gchar *buffer, - GError **error); -static void read_data_field_bin (GwyDataField *dfield, - MIData *midata, - gint xres, gint yres); -static void read_data_field_bin32 (GwyDataField *dfield, - MIData *midata, - gint xres, gint yres); -static void read_data_field_text (GwyDataField *dfield, - const guchar *buffer, - guint *pos, - gint xres, gint yres); -static void image_file_free (MIFile *mifile); -static void spect_file_free (MISpectFile *mifile); -static gboolean mifile_get_double (GHashTable *meta, - const gchar *key, - gdouble *value); -static void process_metadata (MIFile *mifile, - guint id, - GwyContainer *container, - const gchar *container_key); -static gchar** split_to_nparts (const gchar *str, - const gchar *sep, - guint n); +static gboolean module_register (void); +static gint mifile_detect (const GwyFileDetectInfo *fileinfo, + gboolean only_name); +static GwyContainer* mifile_load (const gchar *filename, + GwyRunType mode, + GError **error); +static guint find_data_start (const guchar *buffer, + gsize size, + MIDataType *data_type); +static guint image_file_read_header(MIFile *mifile, + gchar *buffer, + GError **error); +static guint spect_file_read_header(MISpectFile *mifile, + gchar *buffer, + GError **error); +static GwyContainer* read_image_data (MIFile *mifile, + const guchar *buffer, + MIDataType data_type, + gsize header_size, + const gchar *filename); +static GwyContainer* read_graph_data (MISpectFile *mifile, + const guchar *buffer, + gsize size, + MIDataType data_type, + gboolean ismulticol, + gsize header_size, + GError **error); +static GwyContainer* read_curve_map_data (MISpectFile *mifile, + const guchar *buffer, + MIDataType data_type, + gsize header_size, + const gchar *filename, + GError **error); +static void image_file_free (MIFile *mifile); +static void spect_file_free (MISpectFile *mifile); +static gboolean mifile_get_double (GHashTable *meta, + const gchar *key, + gdouble *value); +static void process_metadata (MIFile *mifile, + guint id, + GwyContainer *container); +static gchar** split_to_nparts (const gchar *str, + const gchar *sep, + guint n); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Imports Molecular Imaging MI data files."), "Chris Anderson ", - "0.16", + "0.18", "Chris Anderson, Molecular Imaging Corp.", "2006", }; @@ -217,23 +235,17 @@ G_GNUC_UNUSED GwyRunType mode, GError **error) { - MIFile *mifile = NULL; + MIFile *mifile_img = NULL; MISpectFile *mifile_spect = NULL; GwyContainer *container = NULL; - gchar *container_key = NULL; guchar *buffer = NULL; gsize size = 0; GError *err = NULL; - GwyDataField *dfield = NULL; - GwyGraphCurveModel *cmodel; - GwyGraphModel *gmodel; - gdouble *xdata, *ydata, *xchunk, *ychunk; - gsize header_size, offset, len; - gchar *p, *data, *line, **lineparts; + gsize header_size, expected_size; + gchar *p; gboolean ok = TRUE; MIDataType data_type = MI_BINARY; - gboolean isimage = TRUE; - guint i = 0, j = 0, pos, buffi; + gboolean isimage = TRUE, ismulticol = FALSE; /* Open the file and load in its contents into "buffer" */ if (!gwy_file_get_contents(filename, &buffer, &size, &err)) { @@ -242,7 +254,7 @@ } /* Make sure file is of reasonable size */ - if (size <= BINARY_DATA_MAGIC_SIZE) + if (size <= MAX(IMAGE_MAGIC_SIZE, SPECT_MAGIC_SIZE)) ok = FALSE; /* Find out if this is an Image or Spectroscopy file */ @@ -253,7 +265,7 @@ else ok = FALSE; - gwy_debug("isimage: %i ok: %i", isimage, ok); + gwy_debug("isimage: %d ok: %d", isimage, ok); /* Find out the length of the file header (and binary/ascii mode) */ header_size = find_data_start(buffer, size, &data_type); @@ -261,6 +273,10 @@ ok = FALSE; gwy_debug("header_size: %lu", header_size); + if (data_type & MI_ASCII_MULTICOL_FLAG) { + ismulticol = TRUE; + data_type &= ~MI_ASCII_MULTICOL_FLAG; + } /* Report error if file is invalid */ if (!ok) { @@ -271,21 +287,32 @@ /* Load the header information into the appropriate structure */ p = g_strndup(buffer, header_size); if (isimage) { - mifile = g_new0(MIFile, 1); - ok = image_file_read_header(mifile, p, error); - ok = ok && !(err_DIMENSION(error, mifile->xres) - || err_DIMENSION(error, mifile->yres)); - ok = ok && !err_SIZE_MISMATCH(error, - header_size - + mifile->n*2*mifile->xres*mifile->yres, - size, FALSE); + mifile_img = g_new0(MIFile, 1); + ok = image_file_read_header(mifile_img, p, error); + ok = ok && !(err_DIMENSION(error, mifile_img->xres) || err_DIMENSION(error, mifile_img->yres)); + expected_size = header_size + data_type*mifile_img->n * mifile_img->xres*mifile_img->yres; + gwy_debug("size: %zu, expected: %zu", size - header_size, expected_size - header_size); + ok = ok && !err_SIZE_MISMATCH(error, expected_size, size, FALSE); if (!ok) - image_file_free(mifile); + image_file_free(mifile_img); } else { mifile_spect = g_new0(MISpectFile, 1); ok = spect_file_read_header(mifile_spect, p, error); - ok = ok && !err_DIMENSION(error, mifile_spect->num_points); + if (ok && mifile_spect->is_curve_map) { + ok = ok && !err_DIMENSION(error, mifile_spect->xres); + ok = ok && !err_DIMENSION(error, mifile_spect->yres); + /* XXX: The data format is still a mystery. */ + expected_size = header_size + sizeof(gfloat)*mifile_spect->sumlen; + gwy_debug("size: %zu, expected: %zu", size - header_size, expected_size - header_size); + ok = ok && !err_SIZE_MISMATCH(error, expected_size, size, FALSE); + if (ok && mifile_spect->chunks->len % (mifile_spect->xres * mifile_spect->yres) != 0) { + err_INVALID(error, "chunk"); + } + } + else { + ok = ok && !err_DIMENSION(error, mifile_spect->num_points); + } if (!ok) spect_file_free(mifile_spect); } @@ -296,184 +323,289 @@ return NULL; } - /* create a container */ - container = gwy_container_new(); - - /* Load the image data or spectroscopy data */ + /* Load the image data or spectroscopy data (graph/curve map). */ if (isimage) { - /* Load image data: */ - pos = header_size; - for (i = 0; i < mifile->n; i++) { - dfield = gwy_data_field_new(mifile->xres, mifile->yres, - 1.0, 1.0, FALSE); - - if (data_type == MI_BINARY) { - mifile->buffers[i].data = buffer + pos; - read_data_field_bin(dfield, mifile->buffers + i, - mifile->xres, mifile->yres); - pos += 2*mifile->xres * mifile->yres; - } - else if (data_type == MI_BINARY32) { - mifile->buffers[i].data = buffer + pos; - read_data_field_bin32(dfield, mifile->buffers + i, - mifile->xres, mifile->yres); - pos += 4*mifile->xres * mifile->yres; + container = read_image_data(mifile_img, buffer, data_type, header_size, filename); + image_file_free(mifile_img); + if (!container) + err_NO_DATA(error); + } + else if (!mifile_spect->is_curve_map) { + container = read_graph_data(mifile_spect, buffer, size, data_type, ismulticol, header_size, error); + spect_file_free(mifile_spect); + } + else { + if (data_type == MI_ASCII) { + err_UNSUPPORTED(error, "data"); + GWY_OBJECT_UNREF(container); + } + else { + container = read_curve_map_data(mifile_spect, buffer, data_type, header_size, filename, error); + spect_file_free(mifile_spect); + } + } + + gwy_file_abandon_contents(buffer, size, NULL); + + return container; +} + +static GwyContainer* +read_image_data(MIFile *mifile, const guchar *buffer, + MIDataType data_type, gsize header_size, const gchar *filename) +{ + GwyContainer *container; + MIData *midata; + GwyDataField *dfield; + gdouble *d; + gsize pos = header_size; + guint i; + gint xres = mifile->xres, yres = mifile->yres, k; + + container = gwy_container_new(); + /* Load image data. */ + for (i = 0; i < mifile->n; i++) { + dfield = gwy_data_field_new(xres, yres, 1.0, 1.0, FALSE); + d = gwy_data_field_get_data(dfield); + midata = mifile->buffers + i; + midata->data = buffer + pos; + + if (data_type == MI_BINARY) { + for (k = 0; k < yres; k++) { + gwy_convert_raw_data(midata->data + (yres-1 - k)*xres*sizeof(gint16), xres, 1, + GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, d + k*xres, + 1.0/32768.0, 0.0); } - else { - read_data_field_text(dfield, buffer, &pos, - mifile->xres, mifile->yres); + pos += sizeof(gint16) * xres*yres; + } + else if (data_type == MI_BINARY32) { + for (k = 0; k < yres; k++) { + gwy_convert_raw_data(midata->data + (yres-1 - k)*xres*sizeof(gint32), xres, 1, + GWY_RAW_DATA_SINT32, GWY_BYTE_ORDER_LITTLE_ENDIAN, d + k*xres, + 1.0/2147483648.0, 0.0); } + pos += sizeof(gint32) * xres*yres; + } + else { + for (k = 0; k < xres*yres; k++) { + gchar *end; - container_key = g_strdup_printf("/%i/data", i); - gwy_container_set_object_by_name(container, container_key, - dfield); - g_object_unref(dfield); - process_metadata(mifile, i, container, container_key); - g_free(container_key); - gwy_file_channel_import_log_add(container, i, NULL, filename); + d[k] = strtol(buffer + pos, &end, 10)/32768.0; + pos = (const guchar*)end - buffer; + } } - image_file_free(mifile); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(i), dfield); + g_object_unref(dfield); + process_metadata(mifile, i, container); + gwy_file_channel_import_log_add(container, i, NULL, filename); } - else { - const guchar *pp; - /* Load spectroscopy data: */ - gwy_debug("data type=%d", data_type); + return container; +} + +static GwyContainer* +read_graph_data(MISpectFile *mifile, const guchar *buffer, gsize size, + MIDataType data_type, G_GNUC_UNUSED gboolean ismulticol, gsize header_size, + GError **error) +{ + GwyContainer *container; + GwyGraphModel *gmodel; + gdouble *xdata, *ydata; + gsize pos; + guint i, j; + const guchar *line; + gchar *data = NULL, *p; + gchar **lineparts; + + /* Load spectroscopy data. */ + container = gwy_container_new(); + gwy_debug("data type=%d", data_type); + gwy_debug("num_buffers %d", mifile->num_buffers); - /* get a pointer to the spectroscopy data */ - pos = header_size; + xdata = g_new0(gdouble, mifile->maxchunklen); + ydata = g_new0(gdouble, mifile->maxchunklen); + pos = header_size; + if (data_type == MI_ASCII) { + p = data = g_strndup(buffer + header_size, size - header_size); + line = gwy_str_next_line(&p); + } + + /* FIXME: Probably only chunks with the same buffer number should belong to the same graph. I do not have + * relevant data examples. */ + gmodel = gwy_graph_model_new(); + g_object_set(gmodel, "title", _("Spectroscopy Graph"), NULL); + if (mifile->num_buffers >= 2) { + GwySIUnit *xunit = gwy_si_unit_new(mifile->buffers[0].unit), *yunit = gwy_si_unit_new(mifile->buffers[1].unit); + + g_object_set(gmodel, + "si-unit-x", xunit, "si-unit-y", yunit, + "axis-label-bottom", mifile->buffers[0].label, "axis-label-left", mifile->buffers[1].label, + NULL); + g_object_unref(xunit); + g_object_unref(yunit); + } + + gwy_container_set_object(container, gwy_app_get_graph_key_for_id(1), gmodel); + + for (j = 0; j < mifile->chunks->len; j++) { + const MISpectChunk *chunk = &g_array_index(mifile->chunks, MISpectChunk, j); + GwyGraphCurveModel *cmodel; + /* Apparetly means approach/retract. */ + gwy_debug("bufno %u", chunk->bufno); if (data_type == MI_ASCII) { - data = g_strndup(buffer + header_size, size - header_size); - p = data; - xdata = g_new0(gdouble, mifile_spect->num_points); - ydata = g_new0(gdouble, mifile_spect->num_points); - line = gwy_str_next_line(&p); - for (i = 0; i < mifile_spect->num_points; i++) { - if(!(line = gwy_str_next_line(&p))) - goto fail; - if (!(lineparts = split_to_nparts(line, " \t\n\r", 3))) + for (i = 0; i < chunk->len; i++) { + if (!(line = gwy_str_next_line(&p)) || !(lineparts = split_to_nparts(line, " \t\n\r", 3))) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Cannot parse data values at line %d."), j+1); + GWY_OBJECT_UNREF(container); goto fail; + } xdata[i] = g_ascii_strtod(lineparts[1], NULL); ydata[i] = g_ascii_strtod(lineparts[2], NULL); g_strfreev(lineparts); } + } + else { + for (i = 0; i < chunk->len; i++) + xdata[i] = chunk->xstart + i*chunk->dx; + gwy_convert_raw_data(buffer + pos, chunk->len, 1, + GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, ydata, 1.0, 0.0); + pos += chunk->len*sizeof(gfloat); + } - /* create graph model and curve model */ - gmodel = gwy_graph_model_new(); - g_object_set(gmodel, - "title", _("Spectroscopy Graph"), NULL); - /* XXX: SET UNITS HERE gwy_graph_model_set_si_unit_x */ - if (!mifile_spect->chunks) { - cmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(gmodel, cmodel); - g_object_unref(cmodel); - g_object_set(cmodel, - "description", "Curve 1", - "mode", GWY_GRAPH_CURVE_POINTS, - NULL); - gwy_graph_curve_model_set_data(cmodel, xdata, ydata, - mifile_spect->num_points); - } - else { - offset = 0; - for (j = 0; j < mifile_spect->chunks->len; j++) { - len = g_array_index (mifile_spect->chunks, gint, j); - xchunk = g_memdup(xdata + offset, - len * sizeof(gdouble)); - ychunk = g_memdup(ydata + offset, - len * sizeof(gdouble)); - offset += len; - cmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(gmodel, cmodel); - g_object_unref(cmodel); - g_object_set(cmodel, - "description", - g_strdup_printf("Curve %d", j+1), - "mode", GWY_GRAPH_CURVE_POINTS, - "color", gwy_graph_get_preset_color(j), - NULL); - gwy_graph_curve_model_set_data(cmodel, - xchunk, ychunk, - len); - g_free(xchunk); - g_free(ychunk); - } - } - - /* add gmodel to container */ - container_key = g_strdup_printf("/0/graph/graph/1"); - gwy_container_set_object_by_name(container, - container_key, - gmodel); - g_object_unref(gmodel); - g_free(container_key); + cmodel = gwy_graph_curve_model_new(); + gwy_graph_curve_model_set_data(cmodel, xdata, ydata, chunk->len); + gwy_graph_curve_model_enforce_order(cmodel); + g_object_set(cmodel, + "mode", GWY_GRAPH_CURVE_LINE, + "color", gwy_graph_get_preset_color(j), + NULL); + if (chunk->label) + g_object_set(cmodel, "description", chunk->label, NULL); + else { + gchar *desc = g_strdup_printf("Curve %d", j+1); + g_object_set(cmodel, "description", desc, NULL); + g_free(desc); + } + gwy_graph_model_add_curve(gmodel, cmodel); + g_object_unref(cmodel); + } fail: - g_free(xdata); - g_free(ydata); + g_object_unref(gmodel); + g_free(data); + g_free(xdata); + g_free(ydata); - spect_file_free(mifile_spect); - g_free(data); + return container; +} +static GwyContainer* +read_curve_map_data(MISpectFile *mifile, const guchar *buffer, + MIDataType data_type, gsize header_size, const gchar *filename, + GError **error) +{ + GwyContainer *container; + const MISpectChunk *chunk; + //MISpectData *midata; + GwyLawn *lawn; + GArray *chunks = mifile->chunks; + gsize pos = header_size; + gint xres = mifile->xres, yres = mifile->yres, nsegments, i, j, nabscissa; + guint k, kpix, m, len, off; + gdouble *d; + gint *segments; + + if (data_type != MI_BINARY) { + err_UNSUPPORTED(error, "data"); + return NULL; + } + + nsegments = chunks->len/(xres*yres); + gwy_debug("num_buffers %d", mifile->num_buffers); + /* The curve set has to be uniform across pixels. So decide which curves we have and stick to it. */ + nabscissa = 0; + if (g_array_index(chunks, MISpectChunk, 0).dt != 0.0) { + nabscissa++; + if (g_array_index(chunks, MISpectChunk, 0).dx != 0.0) + nabscissa++; + } + gwy_debug("nsegments %d, nabscissae %d", nsegments, nabscissa); + + /* TODO: Handle curve labels, units, segments, etc. */ + container = gwy_container_new(); + lawn = gwy_lawn_new(xres, yres, mifile->xreal, mifile->yreal, 1 + nabscissa, nsegments); + gwy_si_unit_set_from_string(gwy_lawn_get_si_unit_xy(lawn), "m"); + if (nabscissa >= 1) { + gwy_lawn_set_curve_label(lawn, 0, "Time"); + gwy_si_unit_set_from_string(gwy_lawn_get_si_unit_curve(lawn, 0), "s"); + if (nabscissa >= 2) { + if (mifile->num_buffers >= 1) { + gwy_lawn_set_curve_label(lawn, 1, mifile->buffers[0].label); + gwy_si_unit_set_from_string(gwy_lawn_get_si_unit_curve(lawn, 1), mifile->buffers[0].unit); + } + else { + gwy_lawn_set_curve_label(lawn, 1, "Distance"); + gwy_si_unit_set_from_string(gwy_lawn_get_si_unit_curve(lawn, 1), "m"); + } } - else { - mifile_spect->data = (const gfloat*)(buffer + pos); + } + if (mifile->num_buffers >= 2) { + gwy_lawn_set_curve_label(lawn, nabscissa, mifile->buffers[1].label); + gwy_si_unit_set_from_string(gwy_lawn_get_si_unit_curve(lawn, nabscissa), mifile->buffers[1].unit); + } - /* load xdata */ - buffi = mifile_spect->num_points; /* skip time data */ - xdata = g_new0(gdouble, mifile_spect->num_points); - for (i = 0; i < mifile_spect->num_points; i++) { - pp = (const guchar*)(mifile_spect->data + buffi + i); - xdata[i] = gwy_get_gfloat_le(&pp); - // gwy_debug("i: %i xdata: %f", i, xdata[i]); - } - - /* The first buffer always represents the x axis. All - remaining buffers represent the corresponding Y axes of seperate - graphs. As a result, we need to create a num_buffers-1 graphs. */ - for (j = 0; j < mifile_spect->num_buffers-1; j++) { - buffi += mifile_spect->num_points; - - ydata = g_new0(gdouble, mifile_spect->num_points); - for (i = 0; i < mifile_spect->num_points; i++) { - pp = (const guchar*)(mifile_spect->data + buffi + i); - ydata[i] = gwy_get_gfloat_le(&pp); - // gwy_debug("i: %i ydata: %f", i, ydata[i]); - } + for (k = 0; k < nsegments; k++) { + chunk = &g_array_index(mifile->chunks, MISpectChunk, k); + if (chunk->label) + gwy_lawn_set_segment_label(lawn, k, chunk->label); + } - /* create graph model and curve model */ - gmodel = gwy_graph_model_new(); - cmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(gmodel, cmodel); - g_object_unref(cmodel); - - g_object_set(gmodel, - "title", _("Spectroscopy Graph"), NULL); - /* XXX: SET UNITS HERE gwy_graph_model_set_si_unit_x */ - g_object_set(cmodel, - "description", "Curve 1", - "mode", GWY_GRAPH_CURVE_POINTS, - NULL); - gwy_graph_curve_model_set_data(cmodel, xdata, ydata, - mifile_spect->num_points); - g_free(ydata); - - /* add gmodel to container */ - container_key = g_strdup_printf("%s/%d", GRAPH_PREFIX, j+1); - gwy_container_set_object_by_name(container, - container_key, - gmodel); - g_object_unref(gmodel); - g_free(container_key); + d = g_new(gdouble, nsegments*(1u + nabscissa)*mifile->maxchunklen); + segments = g_new(gint, 2*nsegments); + /* Load cuve map data. */ + for (i = 0; i < yres; i++) { + for (j = 0; j < xres; j++) { + kpix = (i*xres + j)*nsegments; + len = 0; + for (k = 0; k < nsegments; k++) { + chunk = &g_array_index(mifile->chunks, MISpectChunk, kpix + k); + segments[2*k] = len; + len += chunk->len; + segments[2*k+1] = len; } - g_free(xdata); + gwy_convert_raw_data(buffer + pos, len, 1, GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, + d + len*nabscissa, 1.0, 0.0); + if (nabscissa >= 1) { + chunk = &g_array_index(mifile->chunks, MISpectChunk, kpix); + /* Add time as a monotonic abscissa, even though the file zeroes it more often. */ + off = 0; + for (m = 0; m < len; m++) + d[off++] = chunk->tstart + m*chunk->dt; + if (nabscissa >= 2) { + for (k = 0; k < nsegments; k++) { + chunk = &g_array_index(mifile->chunks, MISpectChunk, kpix + k); + for (m = 0; m < chunk->len; m++) + d[off++] = chunk->xstart + m*chunk->dx; + } + } + } + gwy_lawn_set_curves(lawn, j, i, len, d, NULL); + gwy_lawn_curve_set_segments(lawn, j, i, segments); - spect_file_free(mifile_spect); + pos += sizeof(gfloat) * len; } } - gwy_file_abandon_contents(buffer, size, NULL); + + gwy_container_set_object(container, gwy_app_get_lawn_key_for_id(i), lawn); + g_object_unref(lawn); + // TODO process_metadata(mifile, i, container); + gwy_file_curve_map_import_log_add(container, 0, NULL, filename); + + g_free(d); + g_free(segments); return container; } @@ -481,36 +613,35 @@ static guint find_data_start(const guchar *buffer, gsize size, MIDataType *data_type) { - const guchar *locate_none, *locate_binary, *locate_ascii, *locate_binary32; - guint value = 0; + static const GwyEnum data_type_markers[] = { + { "\n", MI_BINARY, }, + { "BINARY\n", MI_BINARY, }, + { "BINARY_32\n", MI_BINARY32, }, + { "ASCII\n", MI_ASCII, }, + { "ASCII_MULTICOLUMN\n", MI_ASCII | MI_ASCII_MULTICOL_FLAG, }, + }; + static const gchar data_marker[KEY_LEN+1] = "data "; + const guchar *data; + guint i, len, pos = 0; - locate_none = g_strstr_len(buffer, size, DATA_MAGIC); - locate_binary = g_strstr_len(buffer, size, BINARY_DATA_MAGIC); - locate_binary32 = g_strstr_len(buffer, size, BINARY32_DATA_MAGIC); - locate_ascii = g_strstr_len(buffer, size, ASCII_DATA_MAGIC); - - if (locate_none != NULL) { - *data_type = MI_BINARY; - value = (locate_none - buffer) + DATA_MAGIC_SIZE; - } - else if (locate_binary != NULL) { - *data_type = MI_BINARY; - value = (locate_binary - buffer) + BINARY_DATA_MAGIC_SIZE; - } - else if (locate_binary32 != NULL) { - *data_type = MI_BINARY32; - value = (locate_binary32 - buffer) + BINARY32_DATA_MAGIC_SIZE; - } - else if (locate_ascii != NULL) { - *data_type = MI_ASCII; - value = (locate_ascii - buffer) + ASCII_DATA_MAGIC_SIZE; + data = g_strstr_len(buffer, size, data_marker); + if (!data) { + gwy_debug("cannot find the data marked"); + return 0; + } + gwy_debug("data marker at 0x%lx", (gulong)(data - buffer)); + + data += KEY_LEN; + pos = data - buffer; + for (i = 0; i < G_N_ELEMENTS(data_type_markers); i++) { + len = strlen(data_type_markers[i].name); + if (size - pos > len && !memcmp(data, data_type_markers[i].name, len)) { + *data_type = data_type_markers[i].value; + return pos + len; + } } - else - value = 0; - - gwy_debug("data start at 0x%x", value); - - return value; + gwy_debug("data marker type is not known"); + return 0; } static guint @@ -520,8 +651,7 @@ GHashTable *meta; gchar *line, *key, *value = NULL; - mifile->meta = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + mifile->meta = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); mifile->xres = mifile->yres = 0; meta = mifile->meta; while ((line = gwy_str_next_line(&buffer))) { @@ -529,10 +659,10 @@ mifile->n++; mifile->buffers = g_renew(MIData, mifile->buffers, mifile->n); data = mifile->buffers + (mifile->n - 1); - data->meta = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + data->meta = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); data->data = NULL; data->id = g_strstrip(g_strdup(line + KEY_LEN)); + gwy_debug("new buffer <%s>", data->id); meta = data->meta; } if (line[0] == ' ') @@ -561,42 +691,55 @@ GHashTable *meta; gchar *line, *key, *value = NULL; gchar **parts; - gint sum = 0, chunklen; + gint i, sum, ncols; + HeaderContext ctx = HEADER_ANY; - mifile->meta = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + mifile->meta = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); meta = mifile->meta; + sum = 0; - mifile->chunks = g_array_new (FALSE, TRUE, sizeof (gint)); + mifile->chunks = g_array_new(FALSE, TRUE, sizeof(MISpectChunk)); while ((line = gwy_str_next_line(&buffer))) { if (!strncmp(line, "bufferLabel ", KEY_LEN)) { mifile->num_buffers++; - mifile->buffers = g_renew(MISpectData, mifile->buffers, - mifile->num_buffers); + mifile->buffers = g_renew(MISpectData, mifile->buffers, mifile->num_buffers); data = mifile->buffers + (mifile->num_buffers - 1); - - data->label = NULL; data->unit = NULL; /* store buffer label */ data->label = g_strstrip(g_strdup(line + KEY_LEN)); + gwy_debug("new buffer <%s>", data->label); + ctx = HEADER_BUFFER_LABEL; + continue; + } - /* store buffer unit (by geting next line which should be - "bufferUnit") */ - if ((line = gwy_str_next_line(&buffer))) { - if (!strncmp(line, "bufferUnit ", KEY_LEN)) { - data->unit = g_strstrip(g_strdup(line + KEY_LEN)); - } - else { - err_INVALID(error, "bufferUnit"); - return 0; + if (ctx == HEADER_BUFFER_LABEL) { + if (!strncmp(line, "bufferUnit ", KEY_LEN)) { + data->unit = g_strstrip(g_strdup(line + KEY_LEN)); + ctx = HEADER_BUFFER_UNIT; + continue; + } + err_INVALID(error, "bufferUnit"); + } + + if (ctx == HEADER_BUFFER_UNIT) { + if (!strncmp(line, "grid ", KEY_LEN)) { + parts = g_strsplit_set(line + KEY_LEN, " \t", 6); + if (g_strv_length(parts) > 4) { + mifile->xreal = g_ascii_strtod(parts[1], NULL); + mifile->yreal = g_ascii_strtod(parts[2], NULL); + mifile->xres = atol(parts[3]); + mifile->yres = atol(parts[4]); + mifile->is_curve_map = TRUE; + gwy_debug("grid %d x %d (%g x %g)", mifile->xres, mifile->yres, mifile->xreal, mifile->yreal); } - } else { - err_INVALID(error, "bufferLabel"); - return 0; + ctx = HEADER_ANY; + continue; } } + ctx = HEADER_ANY; + if (line[0] == ' ') continue; @@ -604,83 +747,62 @@ value = g_strstrip(g_strdup(line + KEY_LEN)); g_hash_table_replace(meta, key, value); - if (!strcmp(key, "DataPoints")) + /* Old files contain the actual number of data points here, but new files just say 0 as chunks can have + * varying data point counts. Only check that the sizes match when num_points is non-zero. */ + if (!strcmp(key, "DataPoints")) { mifile->num_points = atol(value); + /* XXX: This seems to be correlated, but is it really the right flag? */ + mifile->is_floating_point = (mifile->num_points == 0); + } if (!strcmp(key, "chunk")) { - parts = g_strsplit_set(value," \t", 3); - chunklen = atol(parts[1]); + MISpectChunk chunk; + + gwy_clear(&chunk, 1); + parts = g_strsplit_set(value, " \t", 0); + ncols = g_strv_length(parts); + if (ncols > 1) { + chunk.bufno = atol(parts[0]); + chunk.len = atol(parts[1]); + if (ncols > 3) { + chunk.tstart = g_ascii_strtod(parts[2], NULL); + chunk.dt = g_ascii_strtod(parts[3], NULL); + if (ncols > 5) { + chunk.xstart = g_ascii_strtod(parts[4], NULL); + chunk.dx = g_ascii_strtod(parts[5], NULL); + if (ncols > 7) { + chunk.label = g_intern_string(parts[7]); + } + } + } + sum += chunk.len; + g_array_append_val(mifile->chunks, chunk); + } g_strfreev(parts); - sum += chunklen; - g_array_append_val(mifile->chunks, chunklen); } } + mifile->sumlen = sum; - if (!mifile->num_buffers) - err_NO_DATA(error); - - if (sum != mifile->num_points) { - g_array_free (mifile->chunks, TRUE); - mifile->chunks = NULL; - } - - return mifile->num_buffers; -} - -static void -read_data_field_bin(GwyDataField *dfield, - MIData *midata, - gint xres, gint yres) -{ - gdouble *data; - const gint16 *row; - gint i, j; - - gwy_data_field_resample(dfield, xres, yres, GWY_INTERPOLATION_NONE); - data = gwy_data_field_get_data(dfield); - for (i = 0; i < yres; i++) { - row = (const gint16*)midata->data + (yres-1 - i)*xres; - for (j = 0; j < xres; j++) - data[i*xres + j] = GINT16_FROM_LE(row[j])/32768.0; + if (!mifile->chunks->len) + mifile->num_buffers = 0; + else { + for (i = 0; i < mifile->chunks->len; i++) { + const MISpectChunk *chunk = &g_array_index(mifile->chunks, MISpectChunk, i); + mifile->maxchunklen = MAX(mifile->maxchunklen, chunk->len); + } } -} -static void -read_data_field_bin32(GwyDataField *dfield, - MIData *midata, - gint xres, gint yres) -{ - gdouble *data; - const gint32 *row; - gint i, j; - - gwy_data_field_resample(dfield, xres, yres, GWY_INTERPOLATION_NONE); - data = gwy_data_field_get_data(dfield); - for (i = 0; i < yres; i++) { - row = (const gint32*)midata->data + (yres-1 - i)*xres; - for (j = 0; j < xres; j++) - data[i*xres + j] = GINT32_FROM_LE(row[j])/2147483648.0; + if (!mifile->is_curve_map) { + if (mifile->num_points && sum != mifile->num_points) { + gwy_debug("DataPoints %u does not match the sum of chunk lengths %u.", mifile->num_points, sum); + } + mifile->num_points = sum; } -} -static void -read_data_field_text(GwyDataField *dfield, - const guchar *buffer, - guint *pos, - gint xres, gint yres) -{ - const gchar *buf = (const gchar*)buffer; - gdouble *data; - gint i; - - gwy_data_field_resample(dfield, xres, yres, GWY_INTERPOLATION_NONE); - data = gwy_data_field_get_data(dfield); - for (i = 0; i < xres*yres; i++) { - gchar *end; + if (!mifile->num_buffers) + err_NO_DATA(error); - data[i] = strtol(buf + *pos, &end, 10)/32768.0; - *pos = (const gchar*)end - buf; - } + return mifile->num_buffers; } static void @@ -700,7 +822,6 @@ static void spect_file_free(MISpectFile *mifile) { - guint i; for (i = 0; i < mifile->num_buffers; i++) { @@ -712,7 +833,7 @@ g_free(mifile->buffers); g_hash_table_destroy(mifile->meta); if (mifile->chunks) - g_array_free (mifile->chunks, TRUE); + g_array_free(mifile->chunks, TRUE); g_free(mifile); } @@ -739,8 +860,7 @@ static void process_metadata(MIFile *mifile, guint id, - GwyContainer *container, - const gchar *container_key) + GwyContainer *container) { #ifdef GWY_RELOC_SOURCE /* @flat: MetaDataFlatFormat */ @@ -870,64 +990,48 @@ GwyDataField *dfield; const gchar *mode, *s; gchar *bufferUnit; - GwySIUnit *siunit; gint power10; gdouble bufferRange; GString *str; gchar *p; guint i; gdouble xLength, yLength; - gchar *channel_key = NULL; - const gchar *channel_title = NULL; - dfield = GWY_DATA_FIELD(gwy_container_get_object_by_name(container, - container_key)); + dfield = GWY_DATA_FIELD(gwy_container_get_object(container, gwy_app_get_data_key_for_id(id))); /* Make "data" point to the selected buffer */ data = mifile->buffers + id; /* Get the buffer mode */ - mode = NULL; mode = g_hash_table_lookup(data->meta, "bufferLabel"); /* Set the container's title to whatever the buffer mode is */ - if (mode) - channel_title = mode; - else - channel_title = "Unknown Channel"; - channel_key = g_strdup_printf("%s/title", container_key); - gwy_container_set_const_string_by_name(container, channel_key, - g_strdup(channel_title)); - g_free(channel_key); + gwy_container_set_const_string(container, gwy_app_get_data_title_key_for_id(id), mode ? mode : "Unknown Channel"); /* Fix z-value scale */ - bufferUnit = NULL; power10 = 0; bufferUnit = g_hash_table_lookup(data->meta, "bufferUnit"); - if (bufferUnit) { - siunit = gwy_si_unit_new_parse(bufferUnit, &power10); - gwy_data_field_set_si_unit_z(dfield, siunit); - g_object_unref(siunit); - } + if (bufferUnit) + gwy_si_unit_set_from_string_parse(gwy_data_field_get_si_unit_z(dfield), bufferUnit, &power10); if (mifile_get_double(data->meta, "bufferRange", &bufferRange)) gwy_data_field_multiply(dfield, bufferRange * pow10(power10)); /* Fix x-y value scale */ - siunit = gwy_si_unit_new("m"); - gwy_data_field_set_si_unit_xy(dfield, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); if (!mifile_get_double(mifile->meta, "xLength", &xLength)) { g_warning("Missing or invalid x length"); xLength = 1e-9; } - if (xLength <= 0.0) xLength = 1.0; /* Needed for 0-d calibration images */ + if (xLength <= 0.0) + xLength = 1.0; /* Needed for 0-d calibration images */ gwy_data_field_set_xreal(dfield, xLength); if (!mifile_get_double(mifile->meta, "yLength", &yLength)) { g_warning("Missing or invalid y length"); yLength = 1e-9; } - if (yLength <= 0.0) yLength = 1.0; /* Needed for 0-d calibration images */ + if (yLength <= 0.0) + yLength = 1.0; /* Needed for 0-d calibration images */ gwy_data_field_set_yreal(dfield, yLength); /* Store Metadata */ @@ -964,27 +1068,22 @@ /* if ((p = g_hash_table_lookup(data->meta, "Date")) && (s = g_hash_table_lookup(data->meta, "time"))) - gwy_container_set_string_by_name(meta, "Date", - g_strconcat(p, " ", s, NULL)); + gwy_container_set_string_by_name(meta, "Date", g_strconcat(p, " ", s, NULL)); */ if ((p = g_hash_table_lookup(mifile->meta, "scanUp"))) { if (g_str_equal(p, "FALSE")) - gwy_container_set_string_by_name(meta, "Scanning direction", - g_strdup("Top to bottom")); + gwy_container_set_const_string_by_name(meta, "Scanning direction", "Top to bottom"); else if (g_str_equal(p, "TRUE")) - gwy_container_set_string_by_name(meta, "Scanning direction", - g_strdup("Bottom to top")); + gwy_container_set_const_string_by_name(meta, "Scanning direction", "Bottom to top"); } /* if ((p = g_hash_table_lookup(data->meta, "collect_mode"))) { if (!strcmp(p, "1")) - gwy_container_set_string_by_name(meta, "Line direction", - g_strdup("Left to right")); + gwy_container_set_string_by_name(meta, "Line direction", g_strdup("Left to right")); else if (!strcmp(p, "2")) - gwy_container_set_string_by_name(meta, "Line direction", - g_strdup("Right to left")); + gwy_container_set_string_by_name(meta, "Line direction", g_strdup("Right to left")); } */ @@ -1011,4 +1110,4 @@ return parts; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/mulfile.c gwyddion-2.63/modules/file/mulfile.c --- gwyddion-2.62/modules/file/mulfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/mulfile.c 2023-05-31 15:47:53.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: mulfile.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: mulfile.c 25393 2023-05-31 15:47:53Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -63,8 +59,8 @@ #define Angstrom (1e-10) #define Nano (1e-9) -/* This is actually the number and address of the first data as there is no - * real identifier. It should be constant, though. */ +/* This is actually the number and address of the first data as there is no real identifier. It should be constant, + * though. */ #define MAGIC "\x01\x00\x03\x00\x00\x00" #define MAGIC_SIZE (sizeof(MAGIC)-1) #define EXTENSION ".mul" @@ -99,8 +95,8 @@ gint size; /* In blocks */ gint xres, yres, zres; gint year, month, day, hour, minute, second; - gint xdim, ydim; /* In Angström */ - gint xoff, yoff; /* In Angström */ + gdouble xdim, ydim; /* In Angström; they are ints in the file but useful to keep as doubles. */ + gdouble xoff, yoff; /* In Angström; ditto. */ gint zscale; /* In Volts */ gint tilt; gint speed; @@ -256,22 +252,17 @@ image_index[n].addr = gwy_get_gint32_le(&p); gwy_debug("%u 0x%08lx", image_index[n].id, (gulong)image_index[n].addr); if (image_index[n].id) { - if (image_index[n].addr >= size/MUL_BLOCK_SIZE - || image_index[n].addr < 3) { - g_warning("Address of block %u is invalid.", - image_index[n].id); - } + if (image_index[n].addr >= size/MUL_BLOCK_SIZE || image_index[n].addr < 3) + g_warning("Address of block %u is invalid.", image_index[n].id); else n++; } else if (first_zero) { /* The first zero-id entry contains the file size, apparently. */ - if (image_index[n].addr - && MUL_BLOCK_SIZE * image_index[n].addr != size) - g_warning("The sentinel zero-id address is 0x%08lx " - "but we would expect 0x%08lx.", - (gulong)image_index[n].addr, - (gulong)(size/MUL_BLOCK_SIZE)); + if (image_index[n].addr && MUL_BLOCK_SIZE * image_index[n].addr != size) { + g_warning("The sentinel zero-id address is 0x%08lx but we would expect 0x%08lx.", + (gulong)image_index[n].addr, (gulong)(size/MUL_BLOCK_SIZE)); + } first_zero = FALSE; } } @@ -292,8 +283,7 @@ label->id = gwy_get_gint16_le(&p); if (label->id != entry->id) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Image number in the label %u does not match " - "the number %u in the index."), + _("Image number in the label %u does not match the number %u in the index."), label->id, entry->id); return FALSE; } @@ -307,13 +297,11 @@ label->xres = gwy_get_gint16_le(&p); label->yres = gwy_get_gint16_le(&p); label->zres = gwy_get_gint16_le(&p); - gwy_debug("[%u] xres: %u, yres: %u, zres: %u", - label->id, label->xres, label->yres, label->zres); + gwy_debug("[%u] xres: %u, yres: %u, zres: %u", label->id, label->xres, label->yres, label->zres); if (err_DIMENSION(error, label->xres) || err_DIMENSION(error, label->yres)) return FALSE; /* The extra MUL_BLOCK_SIZE is for the label itself. */ - if (err_SIZE_MISMATCH(error, 2*label->xres * label->yres + MUL_BLOCK_SIZE, - label->size*MUL_BLOCK_SIZE, FALSE)) + if (err_SIZE_MISMATCH(error, 2*label->xres * label->yres + MUL_BLOCK_SIZE, label->size*MUL_BLOCK_SIZE, FALSE)) return FALSE; label->year = gwy_get_gint16_le(&p); label->month = gwy_get_gint16_le(&p); @@ -322,21 +310,12 @@ label->minute = gwy_get_gint16_le(&p); label->second = gwy_get_gint16_le(&p); gwy_debug("[%u] %u-%u-%u %u:%u:%u", - label->id, - label->year, label->month, label->day, - label->hour, label->minute, label->second); + label->id, label->year, label->month, label->day, label->hour, label->minute, label->second); label->xdim = gwy_get_gint16_le(&p); label->ydim = gwy_get_gint16_le(&p); gwy_debug("[%u] (%u, %u)", label->id, label->xdim, label->ydim); - /* Use negated positive conditions to catch NaNs */ - if (!label->xdim) { - g_warning("Real x size is 0.0, fixing to 1.0"); - label->xdim = 1; - } - if (!label->ydim) { - g_warning("Real y size is 0.0, fixing to 1.0"); - label->ydim = 1; - } + sanitise_real_size(&label->xdim, "x size"); + sanitise_real_size(&label->ydim, "y size"); label->xoff = gwy_get_gint16_le(&p); label->yoff = gwy_get_gint16_le(&p); label->zscale = gwy_get_gint16_le(&p); @@ -366,8 +345,7 @@ get_CHARS(label->title, &p, MUL_STRING_SIZE); label->title[MUL_STRING_SIZE] = '\0'; - gwy_debug("[%u] sample: <%s>, title: <%s>", - label->id, label->sample, label->title); + gwy_debug("[%u] sample: <%s>, title: <%s>", label->id, label->sample, label->title); label->postpr = gwy_get_gint16_le(&p); label->postd1 = gwy_get_gint16_le(&p); @@ -408,22 +386,17 @@ const MulImageLabel *label, const gchar *filename) { - const gint16 *d16 = (const gint16*)(buffer - + (entry->addr + 1)* MUL_BLOCK_SIZE); - const guint16 *u16 = (const guint16*)(buffer - + (entry->addr + 1)* MUL_BLOCK_SIZE); + const guchar *p = (buffer + (entry->addr + 1)* MUL_BLOCK_SIZE); GwyDataField *field; + GwyRawDataType rawtype; GwyContainer *meta; gdouble *data; gdouble q_height, q_current, q_voltage, q = 1.0/32768; - guint i, j; + guint i; guchar key[64], *title; /* XXX: The specs say lenght unit is 0.1 Å but that does not seem right. */ - field = gwy_data_field_new(label->xres, label->yres, - Angstrom*label->xdim, - Angstrom*label->ydim, - FALSE); + field = gwy_data_field_new(label->xres, label->yres, Angstrom*label->xdim, Angstrom*label->ydim, FALSE); /* gwy_data_field_set_xoffset(field, Angstrom*label->xoff); gwy_data_field_set_yoffset(field, Angstrom*label->yoff); @@ -484,21 +457,11 @@ gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(field), "V"); } + rawtype = (label->mode == MUL_MODE_CURRENT ? GWY_RAW_DATA_UINT16 : GWY_RAW_DATA_SINT16); data = gwy_data_field_get_data(field); for (i = 0; i < label->yres; i++) { - guint ib = (label->yres-1 - i)*label->xres; - if (label->mode == MUL_MODE_CURRENT) { - for (j = 0; j < label->xres; j++) { - gint16 v = GUINT16_FROM_LE(u16[i*label->xres + j]); - data[ib + j] = q*v; - } - } - else { - for (j = 0; j < label->xres; j++) { - gint16 v = GINT16_FROM_LE(d16[i*label->xres + j]); - data[ib + j] = q*v; - } - } + gwy_convert_raw_data(p + i*label->xres*gwy_raw_data_size(rawtype), label->xres, 1, + rawtype, GWY_BYTE_ORDER_LITTLE_ENDIAN, data + (label->yres-1 - i)*label->xres, q, 0.0); } g_snprintf(key, sizeof(key), "/%d/data", label->id); @@ -524,47 +487,29 @@ { GwyContainer *meta = gwy_container_new(); - gwy_container_set_string_by_name - (meta, "Date", g_strdup_printf("%u-%02u-%02u %02u:%02u:%02u", - label->year, label->month, label->day, - label->hour, label->minute, - label->second)); - gwy_container_set_string_by_name - (meta, "X-Offset", g_strdup_printf("%g nm", label->xoff/10.0)); - gwy_container_set_string_by_name - (meta, "Y-Offset", g_strdup_printf("%g nm", label->yoff/10.0)); - gwy_container_set_string_by_name - (meta, "Z-Scale", g_strdup_printf("%u V", label->zscale)); - gwy_container_set_string_by_name - (meta, "Tilt", g_strdup_printf("%u deg", label->tilt)); - gwy_container_set_string_by_name - (meta, "Scan duration", g_strdup_printf("%g s", label->speed/100.0)); - gwy_container_set_string_by_name - (meta, "Bias", g_strdup_printf("%g V", -10.0*label->bias/32768.0)); - gwy_container_set_string_by_name - (meta, "Current", g_strdup_printf("%g nA", label->current/100.0)); - gwy_container_set_string_by_name - (meta, "Bias (corrected)", - g_strdup_printf("%g V", - -10.0*label->bias/32768.0 - 1e-6*label->current)); - gwy_container_set_string_by_name - (meta, "Postprocessing", g_strdup_printf("%u", label->postpr)); - gwy_container_set_string_by_name - (meta, "Current factor", g_strdup_printf("%u", label->curr_factor)); - gwy_container_set_string_by_name - (meta, "Mode", g_strdup_printf("%u", label->mode)); - gwy_container_set_string_by_name - (meta, "R_Nr", g_strdup_printf("%u", label->n_point_scans)); - gwy_container_set_string_by_name - (meta, "Unit number", g_strdup_printf("%u", label->unitnr)); - gwy_container_set_string_by_name - (meta, "Version", g_strdup_printf("%u", label->version)); - gwy_container_set_string_by_name - (meta, "Gain", g_strdup_printf("%u", label->spare_60)); - gwy_container_set_string_by_name - (meta, "STM", g_strdup_printf("%u", label->spare_61)); + gwy_container_set_string_by_name(meta, "Date", + g_strdup_printf("%u-%02u-%02u %02u:%02u:%02u", + label->year, label->month, label->day, + label->hour, label->minute, label->second)); + gwy_container_set_string_by_name(meta, "X-Offset", g_strdup_printf("%g nm", label->xoff/10.0)); + gwy_container_set_string_by_name(meta, "Y-Offset", g_strdup_printf("%g nm", label->yoff/10.0)); + gwy_container_set_string_by_name(meta, "Z-Scale", g_strdup_printf("%u V", label->zscale)); + gwy_container_set_string_by_name(meta, "Tilt", g_strdup_printf("%u deg", label->tilt)); + gwy_container_set_string_by_name(meta, "Scan duration", g_strdup_printf("%g s", label->speed/100.0)); + gwy_container_set_string_by_name(meta, "Bias", g_strdup_printf("%g V", -10.0*label->bias/32768.0)); + gwy_container_set_string_by_name(meta, "Current", g_strdup_printf("%g nA", label->current/100.0)); + gwy_container_set_string_by_name(meta, "Bias (corrected)", + g_strdup_printf("%g V", -10.0*label->bias/32768.0 - 1e-6*label->current)); + gwy_container_set_string_by_name(meta, "Postprocessing", g_strdup_printf("%u", label->postpr)); + gwy_container_set_string_by_name(meta, "Current factor", g_strdup_printf("%u", label->curr_factor)); + gwy_container_set_string_by_name(meta, "Mode", g_strdup_printf("%u", label->mode)); + gwy_container_set_string_by_name(meta, "R_Nr", g_strdup_printf("%u", label->n_point_scans)); + gwy_container_set_string_by_name(meta, "Unit number", g_strdup_printf("%u", label->unitnr)); + gwy_container_set_string_by_name(meta, "Version", g_strdup_printf("%u", label->version)); + gwy_container_set_string_by_name(meta, "Gain", g_strdup_printf("%u", label->spare_60)); + gwy_container_set_string_by_name(meta, "STM", g_strdup_printf("%u", label->spare_61)); return meta; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/nanoeducator.c gwyddion-2.63/modules/file/nanoeducator.c --- gwyddion-2.62/modules/file/nanoeducator.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/nanoeducator.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanoeducator.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: nanoeducator.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -843,22 +843,14 @@ { gint i, j; GwyDataField *dfield; - GwySIUnit *siunit; gdouble *data; const gint16 *d16 = (const gint16*)buffer; if (err_SIZE_MISMATCH(error, 2*xres*yres, size, FALSE)) return NULL; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); data = gwy_data_field_get_data(dfield); @@ -871,13 +863,8 @@ } } - siunit = gwy_si_unit_new(xyunits); - gwy_data_field_set_si_unit_xy(dfield, siunit); - g_object_unref(siunit); - - siunit = gwy_si_unit_new(zunits); - gwy_data_field_set_si_unit_z(dfield, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), xyunits); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), zunits); return dfield; } @@ -901,12 +888,7 @@ if (err_SIZE_MISMATCH(error, 2*res*ncurves, size, FALSE)) return NULL; - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - real = 1.0; - } - + sanitise_real_size(&real, "size"); siunitx = gwy_si_unit_new(xunits); siunity = gwy_si_unit_new(yunits); gmodel = g_object_new(GWY_TYPE_GRAPH_MODEL, @@ -1030,12 +1012,7 @@ if (err_SIZE_MISMATCH(error, 2*4*nspectra*res, data_size, FALSE)) return NULL; - /* Use negated positive conditions to catch NaNs */ - if (!((xy_step = fabs(xy_step)) > 0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - xy_step = 1.0; - } - + sanitise_real_size(&xy_step, "step size"); spectra = gwy_spectra_new(); siunit = gwy_si_unit_new("m"); gwy_spectra_set_si_unit_xy(spectra, siunit); diff -Nru gwyddion-2.62/modules/file/nanonics.c gwyddion-2.63/modules/file/nanonics.c --- gwyddion-2.62/modules/file/nanonics.c 2021-11-25 14:22:15.000000000 +0000 +++ gwyddion-2.63/modules/file/nanonics.c 2023-06-05 15:30:03.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanonics.c 24542 2021-11-25 14:22:14Z yeti-dn $ + * $Id: nanonics.c 25410 2023-06-05 15:30:03Z yeti-dn $ * Copyright (C) 2009-2011 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -//#define DEBUG 1 + /** * [FILE-MAGIC-FREEDESKTOP] * @@ -230,17 +230,11 @@ goto fail; nfile.xreal = g_ascii_strtod(g_hash_table_lookup(nfile.meta, "WSF"), NULL); - if (!(nfile.xreal = fabs(nfile.xreal))) { - g_warning("Real x size is 0.0, fixing to 1.0"); - nfile.xreal = 1.0; - } + sanitise_real_size(&nfile.xreal, "x size"); nfile.xreal *= Micrometer; nfile.yreal = g_ascii_strtod(g_hash_table_lookup(nfile.meta, "WSS"), NULL); - if (!(nfile.yreal = fabs(nfile.yreal))) { - g_warning("Real y size is 0.0, fixing to 1.0"); - nfile.yreal = 1.0; - } + sanitise_real_size(&nfile.yreal, "y size"); nfile.yreal *= Micrometer; nfile.page_data_size = sizeof(guint32)*nfile.xres*nfile.yres; diff -Nru gwyddion-2.62/modules/file/nanonis.c gwyddion-2.63/modules/file/nanonis.c --- gwyddion-2.62/modules/file/nanonis.c 2022-09-30 10:57:12.000000000 +0000 +++ gwyddion-2.63/modules/file/nanonis.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanonis.c 25057 2022-09-30 10:57:12Z yeti-dn $ + * $Id: nanonis.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2006,2015-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -333,6 +333,8 @@ g_free(columns); return 0; } + g_free(columns); + columns = NULL; if (sxmfile->data_info) { g_warning("Multiple DATA_INFOs, keeping only the last"); @@ -663,15 +665,8 @@ } if (sxmfile.ok) { - /* Use negated positive conditions to catch NaNs */ - if (!((sxmfile.xreal = fabs(sxmfile.xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - sxmfile.xreal = 1.0; - } - if (!((sxmfile.yreal = fabs(sxmfile.yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - sxmfile.yreal = 1.0; - } + sanitise_real_size(&sxmfile.xreal, "x size"); + sanitise_real_size(&sxmfile.yreal, "y size"); } } diff -Nru gwyddion-2.62/modules/file/nanoobserver.c gwyddion-2.63/modules/file/nanoobserver.c --- gwyddion-2.62/modules/file/nanoobserver.c 2022-09-29 11:15:02.000000000 +0000 +++ gwyddion-2.63/modules/file/nanoobserver.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanoobserver.c 25056 2022-09-29 11:15:01Z yeti-dn $ + * $Id: nanoobserver.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2012-2017 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -1125,11 +1125,7 @@ GwyDataLine *dline; gdouble real = spectrum->sweep_to - spectrum->sweep_from; - if (!(fabs(real) > 0.0)) { - g_warning("Spectrum sweep range is zero, fixing to 1.0"); - real = 1.0; - } - + sanitise_real_size(&real, "spectrum sweep range"); dline = gwy_data_line_new(specdata->nvalues, fabs(real), FALSE); gwy_assign(gwy_data_line_get_data(dline), specdata->values, specdata->nvalues); diff -Nru gwyddion-2.62/modules/file/nanoscope.c gwyddion-2.63/modules/file/nanoscope.c --- gwyddion-2.62/modules/file/nanoscope.c 2022-11-02 14:00:39.000000000 +0000 +++ gwyddion-2.63/modules/file/nanoscope.c 2023-06-01 14:08:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanoscope.c 25134 2022-11-02 14:00:39Z yeti-dn $ + * $Id: nanoscope.c 25396 2023-06-01 14:08:49Z yeti-dn $ * Copyright (C) 2004-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -40,7 +40,7 @@ * [FILE-MAGIC-USERGUIDE] * Veeco Nanoscope III * .spm, .001, .002, etc. - * Read SPS:Limited[1] Volume + * Read SPS:Limited[1] Volume Curvemap * [1] Spectra curves are imported as graphs, positional information is lost. **/ @@ -254,7 +254,7 @@ &module_register, N_("Imports Bruker Nanoscope data files, version 3 or newer."), "Yeti ", - "0.48", + "0.49", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -398,9 +398,10 @@ file_type = NANOSCOPE_FILE_TYPE_FORCE_VOLUME; } } - /* If there is FOL, not FVOL, the data seems just single curves. */ + /* If there is FOL, not FVOL, the data seems just single curves. + * Also, FOL seems to never be present in images, even when Operating mode says Image. */ if (gwy_strequal(start_context, "FOL")) { - if (file_type == NANOSCOPE_FILE_TYPE_FORCE_VOLUME) { + if (file_type == NANOSCOPE_FILE_TYPE_FORCE_VOLUME || file_type == NANOSCOPE_FILE_TYPE_BIN) { gwy_debug("seeing start context %s, forcing single curve data", start_context); file_type = NANOSCOPE_FILE_TYPE_FORCE_BIN; } @@ -824,15 +825,8 @@ if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) goto fail; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); } q = 1.0; @@ -952,15 +946,8 @@ if (!get_offset_and_size(hash, bufsize, &offset, &size, error)) goto fail; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); q = 1.0; unitz = get_physical_scale(hash, scannerlist, scanlist, contrlist, version, TRUE, &q, qbpp, error); @@ -1857,11 +1844,7 @@ if (err_SIZE_MISMATCH(error, offset + size, bufsize, FALSE)) goto fail; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); val = g_hash_table_lookup(hash, "@4:Image Data"); gwy_debug("channel=%s", val->hard_value_str); diff -Nru gwyddion-2.62/modules/file/nanoscope-ii.c gwyddion-2.63/modules/file/nanoscope-ii.c --- gwyddion-2.62/modules/file/nanoscope-ii.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/nanoscope-ii.c 2023-05-31 11:06:50.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: nanoscope-ii.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: nanoscope-ii.c 25389 2023-05-31 11:06:49Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -187,12 +183,10 @@ GError **error) { GwyDataField *dfield; - GwySIUnit *unitz, *unitxy; gchar *val; - gint xres, yres, i, j; + gint xres, yres, i; gdouble xreal, yreal, q; gdouble *data; - const gint16 *d16; if (!require_keys(hash, error, "num_samp", "scan_sz", "z_scale", NULL)) return NULL; @@ -220,20 +214,14 @@ } dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); data = gwy_data_field_get_data(dfield); - d16 = (const gint16*)buffer; for (i = 0; i < yres; i++) { - for (j = 0; j < xres; j++) - data[(yres-1 - i)*xres + j] = q*GINT16_FROM_LE(d16[i*xres + j]); + gwy_convert_raw_data(buffer + (yres-1 - i)*xres*sizeof(gint16), xres, 1, + GWY_RAW_DATA_SINT16, GWY_BYTE_ORDER_LITTLE_ENDIAN, data + i*xres, q, 0.0); } - unitz = gwy_si_unit_new("m"); - gwy_data_field_set_si_unit_z(dfield, unitz); - g_object_unref(unitz); - - unitxy = gwy_si_unit_new("m"); - gwy_data_field_set_si_unit_xy(dfield, unitxy); - g_object_unref(unitxy); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), "m"); return dfield; } @@ -254,8 +242,7 @@ gwy_debug("<%s>", line); value = strchr(line, '='); if (!value) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Malformed header line (missing =).")); g_hash_table_destroy(hash); @@ -294,9 +281,7 @@ meta = gwy_container_new(); for (i = 0; i < G_N_ELEMENTS(metadata); i++) { if ((val = g_hash_table_lookup(hash, metadata[i].key))) - gwy_container_set_string_by_name(meta, metadata[i].name, - g_strconcat(val, metadata[i].unit, - NULL)); + gwy_container_set_string_by_name(meta, metadata[i].name, g_strconcat(val, metadata[i].unit, NULL)); } if (gwy_container_get_n_items(meta)) return meta; @@ -305,4 +290,4 @@ return NULL; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/nanosystemz.c gwyddion-2.63/modules/file/nanosystemz.c --- gwyddion-2.62/modules/file/nanosystemz.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/nanosystemz.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nanosystemz.c 21622 2018-11-13 10:44:18Z yeti-dn $ + * $Id: nanosystemz.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -180,16 +180,9 @@ goto fail; } - /* Use negated positive conditions to catch NaNs */ - if (!((header.dx = fabs(header.dx)) > 0)) { - g_warning("Real x pixel size is 0.0, fixing to 1.0"); - header.dx = 1.0; - } + sanitise_real_size(&header.dx, "x pixel size"); header.dx *= 1e-3; - if (!((header.dy = fabs(header.dy)) > 0)) { - g_warning("Real y pixel size is 0.0, fixing to 1.0"); - header.dy = 1.0; - } + sanitise_real_size(&header.dy, "y pixel size"); header.dy *= 1e-3; n = header.xres*header.yres; diff -Nru gwyddion-2.62/modules/file/nanotop.c gwyddion-2.63/modules/file/nanotop.c --- gwyddion-2.62/modules/file/nanotop.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/nanotop.c 2023-06-01 14:25:06.000000000 +0000 @@ -239,15 +239,8 @@ xreal = spmfile->mx*spmfile->Kx; yreal = spmfile->my*spmfile->Ky; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(spmfile->mx, spmfile->my, xreal*nanometer, yreal*nanometer, diff -Nru gwyddion-2.62/modules/file/netcdf.c gwyddion-2.63/modules/file/netcdf.c --- gwyddion-2.62/modules/file/netcdf.c 2021-03-15 14:50:56.000000000 +0000 +++ gwyddion-2.63/modules/file/netcdf.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: netcdf.c 23265 2021-03-15 14:50:56Z yeti-dn $ + * $Id: netcdf.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek, Niv Levy. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, nivl2000@gmail.com. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -50,8 +46,7 @@ #define EXTENSION ".nc" -/* Align a number to nearest larger multiple of 4 as things are aligned in - * NetCDF */ +/* Align a number to nearest larger multiple of 4 as things are aligned in NetCDF */ #define ALIGN4(n) (n) += (4 - (n) % 4) % 4 enum { @@ -114,70 +109,69 @@ gsize data_start; } NetCDF; -static gboolean module_register (void); -static gint gxsm_detect (const GwyFileDetectInfo *fileinfo, - gboolean only_name); -static GwyContainer* gxsm_load (const gchar *filename, - GwyRunType mode, - GError **error); -static gboolean cdffile_load (NetCDF *cdffile, - const gchar *filename, - GError **error); -static GwySIUnit* read_real_size (const NetCDF *cdffile, - const gchar *name, - gdouble *real, - gint *power10); -static GwyDataField* read_data_field (const guchar *buffer, - gint xres, - gint yres, - NetCDFType type, - gint frame_i); -static gboolean cdffile_read_dim_array (NetCDFDim **pdims, - gint *pndims, - const guchar *buf, - gsize size, - const guchar **p, - GError **error); -static gboolean cdffile_read_attr_array(NetCDFAttr **pattrs, - gint *pnattrs, - const guchar *buf, - gsize size, - const guchar **p, - GError **error); -static gboolean cdffile_read_var_array (NetCDFVar **pvars, - gint *pnvars, - NetCDFVersion version, - const guchar *buf, - gsize size, - const guchar **p, - GError **error); -static NetCDFDim* cdffile_get_dim (const NetCDF *cdffile, - const gchar *name); -static NetCDFVar* cdffile_get_var (const NetCDF *cdffile, - const gchar *name); -static const NetCDFAttr* cdffile_get_attr (const NetCDFAttr *attrs, - gint nattrs, - const gchar *name); -static gboolean cdffile_validate_vars (const NetCDF *cdffile, - GError **error); -static void cdffile_free (NetCDF *cdffile); - -static GwyBrick* read_brick (const guchar *buffer, - gint xres, - gint yres, - gint zres, - NetCDFType type); - -static GwyContainer* create_meta (const NetCDF cdffile); -static void add_size_to_meta (GwyContainer* meta, - GwyDataField* dfield); +static gboolean module_register (void); +static gint gxsm_detect (const GwyFileDetectInfo *fileinfo, + gboolean only_name); +static GwyContainer* gxsm_load (const gchar *filename, + GwyRunType mode, + GError **error); +static gboolean cdffile_load (NetCDF *cdffile, + const gchar *filename, + GError **error); +static GwySIUnit* read_real_size (const NetCDF *cdffile, + const gchar *name, + gboolean is_new_value, + gdouble *real, + gint *power10); +static GwyDataField* read_data_field (const guchar *buffer, + gint xres, + gint yres, + NetCDFType type, + gint frame_i); +static gboolean cdffile_read_dim_array (NetCDFDim **pdims, + gint *pndims, + const guchar *buf, + gsize size, + const guchar **p, + GError **error); +static gboolean cdffile_read_attr_array(NetCDFAttr **pattrs, + gint *pnattrs, + const guchar *buf, + gsize size, + const guchar **p, + GError **error); +static gboolean cdffile_read_var_array (NetCDFVar **pvars, + gint *pnvars, + NetCDFVersion version, + const guchar *buf, + gsize size, + const guchar **p, + GError **error); +static NetCDFDim* cdffile_get_dim (const NetCDF *cdffile, + const gchar *name); +static NetCDFVar* cdffile_get_var (const NetCDF *cdffile, + const gchar *name); +static const NetCDFAttr* cdffile_get_attr (const NetCDFAttr *attrs, + gint nattrs, + const gchar *name); +static gboolean cdffile_validate_vars (const NetCDF *cdffile, + GError **error); +static void cdffile_free (NetCDF *cdffile); +static GwyBrick* read_brick (const guchar *buffer, + gint xres, + gint yres, + gint zres, + NetCDFType type); +static GwyContainer* create_meta (const NetCDF cdffile); +static void add_size_to_meta (GwyContainer* meta, + GwyDataField* dfield); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Imports network Common Data Form (netCDF) files created by GXSM."), "Yeti ", - "0.9", + "0.10", "David Nečas (Yeti), Petr Klapetek & Niv Levy", "2006", }; @@ -218,11 +212,8 @@ gwy_clear(&cdffile, 1); p = fileinfo->head + MAGIC_SIZE; cdffile.nrecs = gwy_get_guint32_be(&p); - if (cdffile_read_dim_array(&cdffile.dims, &cdffile.ndims, - fileinfo->head, fileinfo->buffer_len-1, &p, - NULL)) { - if (cdffile_get_dim(&cdffile, "dimx") - && cdffile_get_dim(&cdffile, "dimy")) + if (cdffile_read_dim_array(&cdffile.dims, &cdffile.ndims, fileinfo->head, fileinfo->buffer_len-1, &p, NULL)) { + if (cdffile_get_dim(&cdffile, "dimx") && cdffile_get_dim(&cdffile, "dimy")) score = 80; } cdffile_free(&cdffile); @@ -238,7 +229,7 @@ field_name); } -/*TODO: +/* TODO: * deal with fast scan (just issue a warning statement for now) * deal with rotated scans * Find some way to avoid duplicate code between field and brick e.g. real size @@ -262,7 +253,7 @@ gfloat *values; gint i, power10, value_i, time_i, frame_i; const guchar *p; - guchar *pt; + gchar *s; gboolean good_time_series = FALSE, good_value_Series = FALSE; /*allowed deviation from linearity (beyond which we don't load as volume)*/ const gfloat value_series_deviation = 0.01, time_series_deviation = 0.01; @@ -277,10 +268,8 @@ goto gxsm_load_fail; } - /* Look for variable "H" or "FloatField". This seems to be how GXSM calls - * data. */ - if (!(field_var = cdffile_get_var(&cdffile, "H")) - && !(field_var = cdffile_get_var(&cdffile, "FloatField"))) { + /* Look for variable "H" or "FloatField". This seems to be how GXSM calls data. */ + if (!(field_var = cdffile_get_var(&cdffile, "H")) && !(field_var = cdffile_get_var(&cdffile, "FloatField"))) { err_NO_DATA(error); goto gxsm_load_fail; } @@ -295,11 +284,13 @@ } if (err_DIMENSION(error, cdffile.dims[field_var->dimids[3]].length) - || err_DIMENSION(error, cdffile.dims[field_var->dimids[2]].length) + || err_DIMENSION(error, cdffile.dims[field_var->dimids[2]].length) || err_DIMENSION(error, cdffile.dims[field_var->dimids[1]].length) - || err_DIMENSION(error, cdffile.dims[field_var->dimids[0]].length)) + || err_DIMENSION(error, cdffile.dims[field_var->dimids[0]].length)) goto gxsm_load_fail; + /* TODO TODO TODO: Validate field_var->type. The code decides to fail assertion on unknown type. */ + /* we know these exist, so just read them */ dim = cdffile.dims + field_var->dimids[0]; @@ -311,31 +302,26 @@ values = g_new(gfloat, dim_value); gwy_debug("dimensions: time = %d value = %d", dim_time, dim_value); - /* create volume data only if equally spaced - to better than some - * arbitrary limit currently set at 1% - * This is meant mostly for time movies where the clock can occasionnaly - * be off by a tick, but it still would be better to have the stack in - * that case - i think. - * */ + /* Create volume data only if equally spaced - to better than some arbitrary limit currently set at 1% + * This is meant mostly for time movies where the clock can occasionnaly be off by a tick, but it still would be + * better to have the stack in that case - i think. */ if (dim_value > 1) { good_value_Series = TRUE; var = cdffile_get_var(&cdffile, "value"); - if ((attr = cdffile_get_attr(var->attrs, var->nattrs, "value")) - && attr->type != NC_FLOAT) { + if ((attr = cdffile_get_attr(var->attrs, var->nattrs, "value")) && attr->type != NC_FLOAT) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Value series values must be of type FLOAT.")); + _("Value series values must be of type FLOAT.")); goto gxsm_load_fail; } p = (const guchar*) (cdffile.buffer + var->begin); for (i = 0; i < dim_value; i++) { values[i] = gwy_get_gfloat_be(&p); - if (i > 1 && good_value_Series && fabs(((values[i] - values[i-1]) - / (values[i-1] - values[i-2])) - 1) - > value_series_deviation) { + if (i > 1 + && good_value_Series + && fabs(((values[i] - values[i-1])/(values[i-1] - values[i-2])) - 1) > value_series_deviation) { good_value_Series = FALSE; - g_warning("value spacing uniformity below %g - loading as 2D images", - value_series_deviation); + g_warning("value spacing uniformity below %g - loading as 2D images", value_series_deviation); } } } @@ -344,21 +330,20 @@ good_time_series = TRUE; var = cdffile_get_var(&cdffile, "time"); if ((attr = cdffile_get_attr(var->attrs, var->nattrs, "time")) - && attr->type != NC_DOUBLE) { + && attr->type != NC_DOUBLE) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Time values must be of type DOUBLE.")); + _("Time values must be of type DOUBLE.")); goto gxsm_load_fail; } p = (const guchar*) (cdffile.buffer + var->begin); for (i = 1; i < dim_time; i++) { times[i] = gwy_get_gdouble_be(&p); - if (i > 1 && good_time_series && - fabs(((times[i] - times[i-1]) - / (times[i-1] - times[i-2])) - 1) > time_series_deviation) { - good_time_series = FALSE; - g_warning( - "time series is not equally spaced to within %g- loading as stack of 2D images", - time_series_deviation); + if (i > 1 + && good_time_series + && fabs(((times[i] - times[i-1])/(times[i-1] - times[i-2])) - 1) > time_series_deviation) { + good_time_series = FALSE; + g_warning("time series is not equally spaced to within %g- loading as stack of 2D images", + time_series_deviation); } } } @@ -367,73 +352,59 @@ p = (const guchar*) (cdffile.buffer + var->begin); if (gwy_get_gint16_be(&p) == 1) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_UNIMPLEMENTED, - _("Reading of fast scan files is not implemented - yet.")); + _("Reading of fast scan files is not implemented - yet.")); goto gxsm_load_fail; } } - /* TODO : add the label of the field getting modified in gxsm2 ! - * currently it does not save it, so there is no way to know what the - * value meant */ + /* TODO: add the label of the field getting modified in gxsm2 ! currently it does not save it, so there is no way + * to know what the value meant */ data = gwy_container_new(); - /* create meta before data since i want to use it for some conditional - * stuff*/ + /* create meta before data since i want to use it for some conditional stuff*/ meta = create_meta(cdffile); - /* also FIXME -check if recent gxsm does put a name for the value*/ + /* also FIXME - check if recent gxsm does put a name for the value*/ gwy_container_set_object_by_name(data, "/brick/0/meta", meta); g_object_unref(meta); - if ((good_value_Series && (dim_time == 1)) - || (good_time_series && (dim_value == 1))) { + if ((good_value_Series && (dim_time == 1)) || (good_time_series && (dim_value == 1))) { if (good_value_Series) { gwy_debug("Reading brick, xres=%d yres=%d zres=%d", - cdffile.dims[field_var->dimids[3]].length, - cdffile.dims[field_var->dimids[2]].length, - dim_value); - dbrick = read_brick((const guchar*)( - cdffile.buffer + field_var->begin), - cdffile.dims[field_var->dimids[3]].length, - cdffile.dims[field_var->dimids[2]].length, - dim_value, - field_var->type); - /* NOTE : - * 1. flip the Z direction so that "up" is "correctly oriented" - * note that this opens issues is one tries to correlate voltage - * with scan time!, + cdffile.dims[field_var->dimids[3]].length, + cdffile.dims[field_var->dimids[2]].length, + dim_value); + dbrick = read_brick((const guchar*)(cdffile.buffer + field_var->begin), + cdffile.dims[field_var->dimids[3]].length, cdffile.dims[field_var->dimids[2]].length, + dim_value, + field_var->type); + /* NOTE: + * + * 1. flip the Z direction so that "up" is "correctly oriented" note that this opens issues is one tries + * to correlate voltage with scan time!, * but i don't currently have a better idea. - * 2. The zreal calculated does not match the extreme of the - * values. - * I decided to leave it this way since it corresponds more to the - * usual convention for data where the value corresponds to the - * center of a pixel, rather than the border e.g. if one take a - * series of images at -0.95, -0.85.... 0.95V (20 steps), - * zreal = 2.0 rather than 1.9V. In a sense, it's treating it as - * if we took the images in a cell at [-1,-0.9]; it seems to be - * self consistent. + * + * 2. The zreal calculated does not match the extreme of the values. I decided to leave it this way since + * it corresponds more to the usual convention for data where the value corresponds to the center of + * a pixel, rather than the border e.g. if one take a series of images at -0.95, -0.85.... 0.95V (20 + * steps), zreal = 2.0 rather than 1.9V. In a sense, it's treating it as if we took the images in a cell + * at [-1,-0.9]; it seems to be self consistent. */ - if ((real = (values[1] - values[0]) * dim_value) < 0 ) { + if ((real = (values[1] - values[0]) * dim_value) < 0) { g_warning("Flipping brick since values have negative step"); gwy_brick_invert(dbrick, FALSE, FALSE, TRUE, FALSE); real = -real; offset = values[dim_value-1]; - gwy_container_set_string_by_name(meta, "Z flipped", - g_strdup("True")); + gwy_container_set_string_by_name(meta, "Z flipped", g_strdup("True")); gwy_container_set_string_by_name(meta, "Z values", - g_strdup_printf("%g, %g... %g", - values[dim_value-1], - values[dim_value-2], - values[0])); + g_strdup_printf("%g, %g... %g", + values[dim_value-1], values[dim_value-2], values[0])); } else { offset = values[0]; - gwy_container_set_string_by_name(meta, "Z flipped", - g_strdup("False")); + gwy_container_set_string_by_name(meta, "Z flipped", g_strdup("False")); gwy_container_set_string_by_name(meta, "Z values", - g_strdup_printf("%g, %g... %g", - values[0], - values[1], - values[dim_value-1])); + g_strdup_printf("%g, %g... %g", + values[0], values[1], values[dim_value-1])); } gwy_brick_set_zoffset(dbrick, offset); @@ -441,55 +412,41 @@ // duplicating code, yuck var = cdffile_get_var(&cdffile, "value"); attr = cdffile_get_attr(var->attrs, var->nattrs, "unit"); - if (!attr->nelems) - p = NULL; - else - p = g_strndup(attr->values, attr->nelems); - siunit = gwy_si_unit_new_parse(p, 0); - gwy_brick_set_si_unit_z(dbrick, siunit); - g_object_unref(siunit); + s = attr->nelems ? g_strndup(attr->values, attr->nelems) : NULL; + gwy_si_unit_set_from_string(gwy_brick_get_si_unit_z(dbrick), s); + g_free(s); } else { dbrick = read_brick((const guchar*)(cdffile.buffer + field_var->begin), - cdffile.dims[field_var->dimids[3]].length, - cdffile.dims[field_var->dimids[2]].length, - dim_time, - field_var->type); + cdffile.dims[field_var->dimids[3]].length, + cdffile.dims[field_var->dimids[2]].length, + dim_time, + field_var->type); /* if the times are not ordered something is very wrong - i say we fail*/ if (times[1] < times[0]) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Time series order is wrong.")); + _("Time series order is wrong.")); goto gxsm_load_fail; } gwy_brick_set_zoffset(dbrick, times[0]); gwy_brick_set_zreal(dbrick, (times[1] - times[0]) * dim_time); - siunit = gwy_si_unit_new_parse("s", 0); - gwy_brick_set_si_unit_z(dbrick, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_brick_get_si_unit_z(dbrick), "s"); } - if ((siunit = read_real_size(&cdffile, "rangex", &real, &power10))) { - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - real = 1.0; - } + if ((siunit = read_real_size(&cdffile, "rangex", FALSE, &real, &power10))) { + sanitise_real_size(&real, "x size"); gwy_brick_set_xreal(dbrick, real*pow10(power10)); - gwy_brick_set_si_unit_x(dbrick, siunit); + gwy_si_unit_assign(gwy_brick_get_si_unit_x(dbrick), siunit); g_object_unref(siunit); } else { g_warning("Failed to read rangex when creating brick"); } - if ((siunit = read_real_size(&cdffile, "rangey", &real, &power10))) { - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - real = 1.0; - } + if ((siunit = read_real_size(&cdffile, "rangey", FALSE, &real, &power10))) { + sanitise_real_size(&real, "y size"); gwy_brick_set_yreal(dbrick, real*pow10(power10)); - gwy_brick_set_si_unit_y(dbrick, siunit); + gwy_si_unit_assign(gwy_brick_get_si_unit_y(dbrick), siunit); g_object_unref(siunit); } else { @@ -497,33 +454,27 @@ } // add the offsets - mostly important for adding spectra later - if ((siunit = read_real_size(&cdffile, "offsetx", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "offsetx", FALSE, &real, &power10))) { /* some minimal checking */ - if (!(fabs(real) >= 0)) { + if (!(fabs(real) >= 0)) g_warning("x offset reading failed, not using it"); - } - else { - gwy_brick_set_xoffset(dbrick, real*pow10(power10) - - 0.5*gwy_brick_get_xreal(dbrick)); - } + else + gwy_brick_set_xoffset(dbrick, real*pow10(power10) - 0.5*gwy_brick_get_xreal(dbrick)); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, "offsety", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "offsety", FALSE, &real, &power10))) { /* some minimal checking */ - if (!(fabs(real) >= 0)) { + if (!(fabs(real) >= 0)) g_warning("y offset reading failed, not using it"); - } - else { - gwy_brick_set_yoffset(dbrick, real*pow10(power10) - - 0.5*gwy_brick_get_yreal(dbrick)); - } + else + gwy_brick_set_yoffset(dbrick, real*pow10(power10) - 0.5*gwy_brick_get_yreal(dbrick)); g_object_unref(siunit); } // zrange is what gwyddion calls "w" for volume data - if ((siunit = read_real_size(&cdffile, "rangez", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "rangez", TRUE, &real, &power10))) { /* rangez seems to be some bogus value, take only units */ - gwy_brick_set_si_unit_w(dbrick, siunit); + gwy_si_unit_assign(gwy_brick_get_si_unit_w(dbrick), siunit); gwy_brick_multiply(dbrick, pow10(power10)); g_object_unref(siunit); } @@ -531,7 +482,7 @@ g_warning("Failed to read rangez when creating brick"); } - if ((siunit = read_real_size(&cdffile, "dz", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "dz", TRUE, &real, &power10))) { /* on the other hand the units seem to be bogus here, take the range */ gwy_brick_multiply(dbrick, real); g_object_unref(siunit); @@ -542,22 +493,17 @@ gwy_container_set_object_by_name(data, "/brick/0", dbrick); if ((var = cdffile_get_var(&cdffile, "basename"))) { - /* FIXME - i should do something safer - even a name including this - * would be a problem! */ + /* FIXME - i should do something safer - even a name including this would be a problem! */ if (g_strstr_len(cdffile.buffer + var->begin, var->vsize, "-Xm-") && !g_strstr_len(cdffile.buffer + var->begin, var->vsize, "-Xp-")) { - gwy_debug("gxsm netcdf: flip data field since basename contains " - "'-Xm-' and not '-Xp-'"); + gwy_debug("gxsm netcdf: flip data field since basename contains '-Xm-' and not '-Xp-'"); g_warning("netcdf brick: inverting across y"); gwy_brick_invert(dbrick, FALSE, TRUE, FALSE, FALSE); - gwy_container_set_string_by_name(meta, "Fast scan", - g_strdup("right to left")); + gwy_container_set_string_by_name(meta, "Fast scan", g_strdup("right to left")); } else { - /* just assume it left to right (default scan direction) in this - * case */ - gwy_container_set_string_by_name(meta, "Fast scan", - g_strdup("left to right")); + /* just assume it left to right (default scan direction) in this case */ + gwy_container_set_string_by_name(meta, "Fast scan", g_strdup("left to right")); } } @@ -566,12 +512,10 @@ gwy_brick_mean_xy_plane(dbrick, dfield); gwy_container_set_object_by_name(data, "/brick/0/preview", dfield); if ((attr = cdffile_get_attr(field_var->attrs, field_var->nattrs, "long_name")) - && attr->type == NC_CHAR - && attr->nelems) { - gwy_container_set_string_by_name(data, - "/brick/0/title", - g_strndup(attr->values, attr->nelems)); - } + && attr->type == NC_CHAR + && attr->nelems) { + gwy_container_set_string_by_name(data, "/brick/0/title", g_strndup(attr->values, attr->nelems)); + } add_size_to_meta(meta, dfield); g_object_unref(dfield); g_object_unref(dbrick); @@ -583,148 +527,103 @@ frame_i = value_i * dim_time + time_i; dfield = read_data_field((const guchar*)(cdffile.buffer + field_var->begin), - cdffile.dims[field_var->dimids[3]].length, - cdffile.dims[field_var->dimids[2]].length, - field_var->type, - frame_i); - - if ((siunit = read_real_size(&cdffile, "rangex", &real, &power10))) { - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - real = 1.0; - } + cdffile.dims[field_var->dimids[3]].length, + cdffile.dims[field_var->dimids[2]].length, + field_var->type, + frame_i); + + if ((siunit = read_real_size(&cdffile, "rangex", FALSE, &real, &power10))) { + sanitise_real_size(&real, "x size"); gwy_data_field_set_xreal(dfield, real*pow10(power10)); - gwy_data_field_set_si_unit_xy(dfield, siunit); + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(dfield), siunit); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, "rangey", &real, &power10))) { - /* Use negated positive conditions to catch NaNs */ - if (!((real = fabs(real)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - real = 1.0; - } + if ((siunit = read_real_size(&cdffile, "rangey", FALSE, &real, &power10))) { + sanitise_real_size(&real, "y size"); gwy_data_field_set_yreal(dfield, real*pow10(power10)); /* must be the same gwy_data_field_set_si_unit_xy(dfield, siunit); */ g_object_unref(siunit); } // add the offsets - mostly important for adding spectra later - if ((siunit = read_real_size(&cdffile, "offsetx", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "offsetx", FALSE, &real, &power10))) { /* some minimal checking */ - if (!(fabs(real) >= 0)) { + if (!(fabs(real) >= 0)) g_warning("x offset reading failed, not using it"); - } - else { - gwy_data_field_set_xoffset(dfield, real*pow10(power10) - - 0.5*gwy_data_field_get_xreal(dfield)); - } + else + gwy_data_field_set_xoffset(dfield, real*pow10(power10) - 0.5*gwy_data_field_get_xreal(dfield)); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, "offsety", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "offsety", FALSE, &real, &power10))) { /* some minimal checking */ - if (!(fabs(real) >= 0)) { + if (!(fabs(real) >= 0)) g_warning("y offset reading failed, not using it"); - } - else { - gwy_data_field_set_yoffset(dfield, real*pow10(power10) - - 0.5*gwy_data_field_get_yreal(dfield)); - } + else + gwy_data_field_set_yoffset(dfield, real*pow10(power10) - 0.5*gwy_data_field_get_yreal(dfield)); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, "rangez", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "rangez", TRUE, &real, &power10))) { /* rangez seems to be some bogus value, take only units */ - gwy_data_field_set_si_unit_z(dfield, siunit); + gwy_si_unit_assign(gwy_data_field_get_si_unit_z(dfield), siunit); gwy_data_field_multiply(dfield, pow10(power10)); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, "dz", &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "dz", TRUE, &real, &power10))) { /* on the other hand the units seem to be bogus here, take the range */ gwy_data_field_multiply(dfield, real); g_object_unref(siunit); } - /* The "long name" is pretty useless - give something that is - * useful, especially for multilayer files */ - pt = g_strdup_printf("/%d/data/title", frame_i); - if (dim_value > 1 && dim_time > 1) { - gwy_container_set_string_by_name(data, pt, - g_strdup_printf("layer = %5.2f, time = %5.2f", - values[value_i], - times[time_i])); - } - else if (dim_value > 1) { - gwy_container_set_string_by_name(data, pt, - g_strdup_printf("layer = %5.2f", - values[value_i])); - } - else if (dim_time > 1) { - gwy_container_set_string_by_name(data, pt, - g_strdup_printf("time = %5.2f", - times[time_i])); - } - // no better idea for the single frame case - use file name? basename? - else if ((attr = cdffile_get_attr(field_var->attrs, field_var->nattrs, - "long_name")) + gwy_container_set_object(data, gwy_app_get_data_key_for_id(frame_i), dfield); + g_object_unref(dfield); + + /* The "long name" is pretty useless. Use "ZLabel" and the layer for multilayer files */ + s = NULL; + if (dim_value > 1 && dim_time > 1) + s = g_strdup_printf("layer = %5.2f, time = %5.2f", values[value_i], times[time_i]); + if (!s && dim_value > 1) + s = g_strdup_printf("layer = %5.2f", values[value_i]); + if (!s && dim_time > 1) + s = g_strdup_printf("time = %5.2f", times[time_i]); + if (!s && ((attr = cdffile_get_attr(field_var->attrs, field_var->nattrs, "ZLabel")) + || (attr = cdffile_get_attr(field_var->attrs, field_var->nattrs, "long_name"))) && attr->type == NC_CHAR - && attr->nelems) { - gwy_container_set_string_by_name(data, pt, - g_strndup(attr->values, attr->nelems)); - } - g_free(pt); + && attr->nelems) + s = g_strndup(attr->values, attr->nelems); + if (s) + gwy_container_set_string(data, gwy_app_get_data_title_key_for_id(frame_i), s); - /*TODO copy meta instead of creating a new one when dealing with - * multiple frames? */ meta = create_meta(cdffile); - pt = g_strdup_printf("/%d/meta", frame_i); - gwy_container_set_object_by_name(data, pt, meta); - g_free(pt); - add_size_to_meta(meta, dfield); - g_object_unref(meta); //flip the data if we're reading a right to left scan! if ((var = cdffile_get_var(&cdffile, "basename"))) { - /* FIXME - i should do something safer - even a name including this - * would be a problem! */ + /* FIXME - i should do something safer - even a name including this would be a problem! */ if (g_strstr_len(cdffile.buffer + var->begin, var->vsize, "-Xm-") && !g_strstr_len(cdffile.buffer + var->begin, var->vsize, "-Xp-")) { - gwy_debug("gxsm netcdf: data field since basename contains " - "'-Xm-' and not '-Xp-'"); + gwy_debug("gxsm netcdf: data field since basename contains '-Xm-' and not '-Xp-'"); // flip horizontally gwy_data_field_invert(dfield, FALSE, TRUE, FALSE); - gwy_container_set_string_by_name(meta, "Fast scan", - g_strdup("right to left")); + gwy_container_set_string_by_name(meta, "Fast scan", g_strdup("right to left")); } else { - /* just assume it left to right (default scan direction) in this - * case */ - gwy_container_set_string_by_name(meta, "Fast scan", - g_strdup("left to right")); + /* just assume it left to right (default scan direction) in this case */ + gwy_container_set_string_by_name(meta, "Fast scan", g_strdup("left to right")); } } - if (dim_value > 1) { - gwy_container_set_string_by_name(meta, "layer value", - g_strdup_printf("%5.2f", - values[value_i])); - } + if (dim_value > 1) + gwy_container_set_string_by_name(meta, "layer value", g_strdup_printf("%5.2f", values[value_i])); - if (dim_time > 1) { - gwy_container_set_string_by_name(meta, "time", - g_strdup_printf("%5.2f", - times[time_i])); - } + if (dim_time > 1) + gwy_container_set_string_by_name(meta, "time", g_strdup_printf("%5.2f", times[time_i])); - pt = g_strdup_printf("/%d/data", frame_i); - gwy_container_set_object_by_name(data, pt, dfield); - g_free(pt); - g_object_unref(dfield); + gwy_container_set_object(data, gwy_app_get_data_meta_key_for_id(frame_i), meta); + g_object_unref(meta); - gwy_file_channel_import_log_add(data, frame_i, NULL, - filename); + gwy_file_channel_import_log_add(data, frame_i, NULL, filename); } } } @@ -741,6 +640,7 @@ static GwySIUnit* read_real_size(const NetCDF *cdffile, const gchar *name, + gboolean is_new_value, gdouble *real, gint *power10) { @@ -759,30 +659,33 @@ /* * Warning: Madness ahead. * - * Older GXSM files contain "AA" in "unit", that makes sense, as the units - * are Angstroems. + * Older GXSM files contain "AA" in "unit", that makes sense, as the units are Angstroems. * - * Newer GXSM files contain "nm" in "unit" though, in spite of the units - * being still Angstroems. They seem to contain the real units in - * "var_unit". The info field reads: + * Newer GXSM files contain "nm" in "unit" though, in spite of the units being still Angstroems. They seem to + * contain the real units in "var_unit". The info field reads: * - * This number is alwalys stored in Angstroem. Unit is used for user - * display only. + * This number is alwalys stored in Angstroem. Unit is used for user display only. * * In addition they invented yet another Angstroem abbreviation: Ang. + * + * However, this holds for dimensions. For values in new files (is_new_value), "unit" is actually the unit. */ - attr = cdffile_get_attr(var->attrs, var->nattrs, "var_unit"); - if (!attr || attr->type != NC_CHAR) { + if (is_new_value) { attr = cdffile_get_attr(var->attrs, var->nattrs, "unit"); if (!attr || attr->type != NC_CHAR) - return NULL; + attr = cdffile_get_attr(var->attrs, var->nattrs, "unitSymbol"); + if (!attr || attr->type != NC_CHAR) + attr = cdffile_get_attr(var->attrs, var->nattrs, "var_unit"); } + else { + attr = cdffile_get_attr(var->attrs, var->nattrs, "var_unit"); + if (!attr || attr->type != NC_CHAR) + attr = cdffile_get_attr(var->attrs, var->nattrs, "unit"); + } + if (!attr || attr->type != NC_CHAR) + return NULL; - if (!attr->nelems) - s = NULL; - else - s = g_strndup(attr->values, attr->nelems); - + s = attr->nelems ? g_strndup(attr->values, attr->nelems) : NULL; siunit = gwy_si_unit_new_parse(s, power10); g_free(s); @@ -797,11 +700,26 @@ return siunit; } +static GwyRawDataType +raw_type_from_necdf_type(NetCDFType type) +{ + if (type == NC_BYTE || type == NC_CHAR) + return GWY_RAW_DATA_SINT8; + if (type == NC_SHORT) + return GWY_RAW_DATA_SINT16; + if (type == NC_INT) + return GWY_RAW_DATA_SINT32; + if (type == NC_FLOAT) + return GWY_RAW_DATA_FLOAT; + if (type == NC_DOUBLE) + return GWY_RAW_DATA_DOUBLE; + g_return_val_if_reached((GwyRawDataType)-1); +} + /* Notes: * 1. I assume that all frames have the same xres, yres - which seems reasonable - * 2. afaik only float data actually exists - - * i haven't actually checked this for anything else -*/ + * 2. afaik only float data actually exists - i haven't actually checked this for anything else + */ static GwyDataField* read_data_field(const guchar *buffer, gint xres, @@ -810,127 +728,39 @@ gint frame_i) { GwyDataField *dfield; - gdouble *data; - gint i; - const guchar* shifted_buffer; + GwyRawDataType rawtype; gwy_debug("processing frame %d", frame_i); dfield = gwy_data_field_new(xres, yres, 1.0, 1.0, FALSE); - data = gwy_data_field_get_data(dfield); - - switch (type) { - case NC_BYTE: - case NC_CHAR: - { - const gint8 *d8 = (const gint8*)buffer; - - for (i = 0; i < xres*yres; i++) - data[i] = d8[i + xres * yres * frame_i]; - } - break; - - case NC_SHORT: - { - const gint16 *d16 = (const gint16*)buffer; - - for (i = 0; i < xres*yres; i++) - data[i] = GINT16_FROM_BE(d16[i + xres * yres * frame_i]); - } - break; - - case NC_INT: - { - const gint32 *d32 = (const gint32*)buffer; - - for (i = 0; i < xres*yres; i++) - data[i] = GINT32_FROM_BE(d32[i + xres * yres * frame_i]); - } - break; - - case NC_FLOAT: - shifted_buffer = buffer + sizeof(gfloat) * xres * yres * frame_i; - for (i = 0; i < xres*yres; i++) - data[i] = gwy_get_gfloat_be(&shifted_buffer); - break; - - case NC_DOUBLE: - shifted_buffer = buffer + sizeof(gdouble) * xres * yres * frame_i; - for (i = 0; i < xres*yres; i++) - data[i] = gwy_get_gdouble_be(&shifted_buffer); - break; - - /* not using frame_i if we got here - no point*/ - default: - g_return_val_if_reached(dfield); - break; - } + rawtype = raw_type_from_necdf_type(type); + g_return_val_if_fail(rawtype != (GwyRawDataType)-1, dfield); + gwy_convert_raw_data(buffer + xres*yres*frame_i, xres*yres, 1, rawtype, GWY_BYTE_ORDER_BIG_ENDIAN, + gwy_data_field_get_data(dfield), 1.0, 0.0); return dfield; } static GwyBrick* read_brick(const guchar *buffer, - gint xres, - gint yres, - gint zres, - NetCDFType type) + gint xres, + gint yres, + gint zres, + NetCDFType type) { GwyBrick *brick; - gdouble * data; - gint i; + GwyRawDataType rawtype; brick = gwy_brick_new(xres, yres, zres, 1.0, 1.0, 1.0, FALSE); - data = gwy_brick_get_data(brick); - switch (type) { - case NC_BYTE: - case NC_CHAR: - { - const gint8 *d8 = (const gint8*)buffer; - - for (i = 0; i < xres*yres*zres; i++) - data[i] = d8[i]; - } - break; - - case NC_SHORT: - { - const gint16 *d16 = (const gint16*)buffer; - - for (i = 0; i < xres*yres*zres; i++) - data[i] = GINT16_FROM_BE(d16[i]); - } - break; - - case NC_INT: - { - const gint32 *d32 = (const gint32*)buffer; - - for (i = 0; i < xres*yres*zres; i++) - data[i] = GINT32_FROM_BE(d32[i]); - } - break; - - case NC_FLOAT: - for (i = 0; i < xres*yres*zres; i++) - data[i] = gwy_get_gfloat_be(&buffer); - break; - - case NC_DOUBLE: - for (i = 0; i < xres*yres*zres; i++) - data[i] = gwy_get_gdouble_be(&buffer); - break; - - default: - g_return_val_if_reached(brick); - break; - } + rawtype = raw_type_from_necdf_type(type); + g_return_val_if_fail(rawtype != (GwyRawDataType)-1, brick); + gwy_convert_raw_data(buffer, xres*yres*zres, 1, rawtype, GWY_BYTE_ORDER_BIG_ENDIAN, + gwy_brick_get_data(brick), 1.0, 0.0); return brick; } static GwyContainer* -create_meta -(const NetCDF cdffile) +create_meta(const NetCDF cdffile) { GwyContainer *meta; const NetCDFVar *var; @@ -942,92 +772,75 @@ if ((var = cdffile_get_var(&cdffile, "comment"))) { /* not sure if this would be a valid string, so create a new one with - * fixed length */ + * fixed length */ gwy_container_set_string_by_name(meta, "Comments", - g_strndup(cdffile.buffer + var->begin, - var->vsize)); + g_strndup(cdffile.buffer + var->begin, var->vsize)); } if ((var = cdffile_get_var(&cdffile, "dateofscan"))) { /* not sure if this would be a valid string, so create a new one with - * fixed length */ + * fixed length */ gwy_container_set_string_by_name(meta, "Date and time", - g_strndup(cdffile.buffer + var->begin, - var->vsize)); + g_strndup(cdffile.buffer + var->begin, var->vsize)); } - if ((siunit = read_real_size(&cdffile, "time", - &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "time", TRUE, &real, &power10))) { gwy_container_set_string_by_name(meta, "Scan time", g_strdup_printf("%5.2f s", real)); g_object_unref(siunit); } - /* NOTE: i know this is bad as it's hardware dependent (i.e. only someone - * using the sranger 2 dsp gets this); but since these details depend in - * gxsm on the plugin, i see no better option */ - if ((siunit = read_real_size(&cdffile, "sranger_mk2_hwi_bias", - &real, &power10))) { + /* NOTE: i know this is bad as it's hardware dependent (i.e. only someone using the sranger 2 dsp gets this); but + * since these details depend in gxsm on the plugin, i see no better option */ + if ((siunit = read_real_size(&cdffile, "sranger_mk2_hwi_bias", TRUE, &real, &power10))) { gwy_container_set_string_by_name(meta, "V_bias", - g_strdup_printf("%5.2g V", - real*pow10(power10))); + g_strdup_printf("%5.2g V", real*pow10(power10))); g_object_unref(siunit); } - if ((siunit = read_real_size(&cdffile, - "sranger_mk2_hwi_mix0_set_point", - &real, &power10))) { + if ((siunit = read_real_size(&cdffile, "sranger_mk2_hwi_mix0_set_point", TRUE, &real, &power10))) { gwy_container_set_string_by_name(meta, "I_setpoint", - g_strdup_printf("%5.2g A", - real*pow10(power10))); + g_strdup_printf("%5.2g A", real*pow10(power10))); g_object_unref(siunit); } - else if ((siunit = read_real_size(&cdffile, - "sranger_mk2_hwi_mix0_current_set_point", - &real, &power10))) { + else if ((siunit = read_real_size(&cdffile, "sranger_mk2_hwi_mix0_current_set_point", TRUE, &real, &power10))) { gwy_container_set_string_by_name(meta, "I_setpoint", - g_strdup_printf("%5.2g A", - real*pow10(power10))); + g_strdup_printf("%5.2g A", real*pow10(power10))); g_object_unref(siunit); } if ((var = cdffile_get_var(&cdffile, "spm_scancontrol"))) { gwy_container_set_string_by_name(meta, "Slow scan", - g_strndup(cdffile.buffer + var->begin, - var->vsize)); + g_strndup(cdffile.buffer + var->begin, var->vsize)); } return meta; } -/* Add the lateral size information to the meta data; used for both brick - * and field option - * */ - +/* Add the lateral size information to the meta data; used for both brick and field option */ static void add_size_to_meta(GwyContainer* meta, GwyDataField* dfield) { gwy_container_set_string_by_name(meta, "Size", - g_strdup_printf("%0.2g x %0.2g %s", - gwy_data_field_get_xreal(dfield), - gwy_data_field_get_yreal(dfield), - gwy_si_unit_get_string(gwy_data_field_get_si_unit_xy(dfield), - GWY_SI_UNIT_FORMAT_PLAIN))); + g_strdup_printf("%0.2g x %0.2g %s", + gwy_data_field_get_xreal(dfield), + gwy_data_field_get_yreal(dfield), + gwy_si_unit_get_string(gwy_data_field_get_si_unit_xy(dfield), + GWY_SI_UNIT_FORMAT_PLAIN))); /* Should work, but it seems there's a problem when the units are um, * so i'm using the simpler, inelegant solution above - xreal = gwy_data_field_get_xreal(dfield); - yreal = gwy_data_field_get_yreal(dfield); - siunit = gwy_data_field_get_si_unit_xy(dfield); - vf = gwy_si_unit_get_format(siunit, GWY_SI_UNIT_FORMAT_VFMARKUP, - sqrt(xreal*yreal), NULL); - gwy_container_set_string_by_name(meta, "Size", - g_strdup_printf("%.*f×%.*f%s%s", - vf->precision, xreal/vf->magnitude, - vf->precision, yreal/vf->magnitude, - (vf->units && *vf->units) ? " " : "", vf->units)); - g_object_unref(siunit); - gwy_si_unit_value_format_free(vf);*/ + xreal = gwy_data_field_get_xreal(dfield); + yreal = gwy_data_field_get_yreal(dfield); + siunit = gwy_data_field_get_si_unit_xy(dfield); + vf = gwy_si_unit_get_format(siunit, GWY_SI_UNIT_FORMAT_VFMARKUP, + sqrt(xreal*yreal), NULL); + gwy_container_set_string_by_name(meta, "Size", + g_strdup_printf("%.*f×%.*f%s%s", + vf->precision, xreal/vf->magnitude, + vf->precision, yreal/vf->magnitude, + (vf->units && *vf->units) ? " " : "", vf->units)); + g_object_unref(siunit); + gwy_si_unit_value_format_free(vf);*/ gwy_container_set_string_by_name(meta, "Resolution", - g_strdup_printf("%u x %u", - gwy_data_field_get_xres(dfield), - gwy_data_field_get_yres(dfield))); + g_strdup_printf("%u x %u", + gwy_data_field_get_xres(dfield), gwy_data_field_get_yres(dfield))); } @@ -1041,8 +854,7 @@ gwy_clear(cdffile, 1); - if (!gwy_file_get_contents(filename, &cdffile->buffer, &cdffile->size, - &err)) { + if (!gwy_file_get_contents(filename, &cdffile->buffer, &cdffile->size, &err)) { err_GET_FILE_CONTENTS(error, &err); return FALSE; } @@ -1073,24 +885,21 @@ gwy_debug("nrecs %d", cdffile->nrecs); /* Dimensions */ - if (!cdffile_read_dim_array(&cdffile->dims, &cdffile->ndims, - cdffile->buffer, cdffile->size, &p, error)) { + if (!cdffile_read_dim_array(&cdffile->dims, &cdffile->ndims, cdffile->buffer, cdffile->size, &p, error)) { cdffile_free(cdffile); gwy_file_abandon_contents(cdffile->buffer, cdffile->size, NULL); return FALSE; } /* Global attributes */ - if (!cdffile_read_attr_array(&cdffile->attrs, &cdffile->nattrs, - cdffile->buffer, cdffile->size, &p, error)) { + if (!cdffile_read_attr_array(&cdffile->attrs, &cdffile->nattrs, cdffile->buffer, cdffile->size, &p, error)) { cdffile_free(cdffile); gwy_file_abandon_contents(cdffile->buffer, cdffile->size, NULL); return FALSE; } /* Variables */ - if (!cdffile_read_var_array(&cdffile->vars, &cdffile->nvars, - cdffile->version, + if (!cdffile_read_var_array(&cdffile->vars, &cdffile->nvars, cdffile->version, cdffile->buffer, cdffile->size, &p, error)) { cdffile_free(cdffile); gwy_file_abandon_contents(cdffile->buffer, cdffile->size, NULL); @@ -1213,9 +1022,7 @@ dims[i].name = g_strndup((const gchar*)*p, n); *p += n; dims[i].length = gwy_get_guint32_be(p); - gwy_debug("dim_array[%d]: <%s> %d%s", - i, dims[i].name, dims[i].length, - dims[i].length ? "" : "(record)"); + gwy_debug("dim_array[%d]: <%s> %d%s", i, dims[i].name, dims[i].length, dims[i].length ? "" : "(record)"); } /* Check record dimensions */ @@ -1223,8 +1030,7 @@ for (i = 0; i < ndims; i++) { if (!dims[i].length) { if (n > -1) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("More than one record dimension found.")); return FALSE; } @@ -1279,8 +1085,7 @@ *p += n; attrs[i].type = gwy_get_guint32_be(p); attrs[i].nelems = gwy_get_guint32_be(p); - gwy_debug("attr_array[%d]: <%s> %d of %d", - i, attrs[i].name, attrs[i].nelems, attrs[i].type); + gwy_debug("attr_array[%d]: <%s> %d of %d", i, attrs[i].name, attrs[i].nelems, attrs[i].type); ts = cdffile_type_size(attrs[i].type); if (!ts) { err_DATA_TYPE(error, attrs[i].type); @@ -1356,19 +1161,16 @@ *p += n; vars[i].ndims = gwy_get_guint32_be(p); gwy_debug("var_array[%d]: <%s> %d", i, vars[i].name, vars[i].ndims); - if (!cdffile_check_size(error, "var_array", buf, size, *p, - 4*vars[i].ndims)) + if (!cdffile_check_size(error, "var_array", buf, size, *p, 4*vars[i].ndims)) return FALSE; vars[i].dimids = g_new(gint, vars[i].ndims); for (n = 0; n < vars[i].ndims; n++) { vars[i].dimids[n] = gwy_get_guint32_be(p); gwy_debug("var_array[%d][%d]: %d", i, n, vars[i].dimids[n]); } - if (!cdffile_read_attr_array(&vars[i].attrs, &vars[i].nattrs, - buf, size, p, error)) + if (!cdffile_read_attr_array(&vars[i].attrs, &vars[i].nattrs, buf, size, p, error)) return FALSE; - if (!cdffile_check_size(error, "var_array", buf, size, *p, - 8 + offset_size)) + if (!cdffile_check_size(error, "var_array", buf, size, *p, 8 + offset_size)) return FALSE; vars[i].type = gwy_get_guint32_be(p); ts = cdffile_type_size(vars[i].type); @@ -1452,8 +1254,7 @@ return FALSE; } dim = cdffile->dims + var->dimids[j]; - /* XXX: record vars have length == 0 for the first dimension, but - * frankly, we don not care. */ + /* XXX: record vars have length == 0 for the first dimension, but frankly, we don not care. */ if (dim->length <= 0) { err_CDF_INTEGRITY(error, var->name); return FALSE; @@ -1519,4 +1320,4 @@ cdffile->vars = 0; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/nova-asc.c gwyddion-2.63/modules/file/nova-asc.c --- gwyddion-2.62/modules/file/nova-asc.c 2022-03-21 12:13:49.000000000 +0000 +++ gwyddion-2.63/modules/file/nova-asc.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nova-asc.c 24699 2022-03-21 12:13:49Z yeti-dn $ + * $Id: nova-asc.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2022 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -210,15 +210,8 @@ q = pow10(power10); xreal = q*xres*g_ascii_strtod(g_hash_table_lookup(hash, "Scale X"), NULL); yreal = q*yres*g_ascii_strtod(g_hash_table_lookup(hash, "Scale Y"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); gwy_data_field_set_xreal(field, xreal); gwy_data_field_set_yreal(field, yreal); diff -Nru gwyddion-2.62/modules/file/nrrdfile.c gwyddion-2.63/modules/file/nrrdfile.c --- gwyddion-2.62/modules/file/nrrdfile.c 2022-10-05 14:03:46.000000000 +0000 +++ gwyddion-2.63/modules/file/nrrdfile.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nrrdfile.c 25069 2022-10-05 14:03:46Z yeti-dn $ + * $Id: nrrdfile.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2011-2019 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -1182,16 +1182,9 @@ q = g_ascii_strtod(value, NULL) - z0; /* FIXME: This is probably wrong if dimensions == 3 && chanaxis != 2. */ - if ((value = g_hash_table_lookup(fields, "spacings")) - && parse_float_vector(value, 2, &dx, &dy)) { - if (!((dx = fabs(dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - dx = 1.0; - } - if (!((dy = fabs(dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - dy = 1.0; - } + if ((value = g_hash_table_lookup(fields, "spacings")) && parse_float_vector(value, 2, &dx, &dy)) { + sanitise_real_size(&dx, "x step"); + sanitise_real_size(&dy, "y step"); } /* FIXME: This is probably wrong if dimensions == 3 && chanaxis != 2. */ @@ -1200,18 +1193,11 @@ /* Prefer axismaxs if both spacings and axismaxs are given. */ /* FIXME: This is probably wrong if dimensions == 3 && chanaxis != 2. */ - if ((value = g_hash_table_lookup(fields, "axismaxs")) - && parse_float_vector(value, 2, &dx, &dy)) { + if ((value = g_hash_table_lookup(fields, "axismaxs")) && parse_float_vector(value, 2, &dx, &dy)) { dx = (dx - xoff)/xres; dy = (dy - xoff)/xres; - if (!((dx = fabs(dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - dx = 1.0; - } - if (!((dy = fabs(dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - dy = 1.0; - } + sanitise_real_size(&dx, "x step"); + sanitise_real_size(&dy, "y step"); } if ((value = g_hash_table_lookup(fields, "sampleunits"))) { @@ -1276,20 +1262,10 @@ if ((value = g_hash_table_lookup(fields, "oldmax"))) q = g_ascii_strtod(value, NULL) - w0; - if ((value = g_hash_table_lookup(fields, "spacings")) - && parse_float_vector(value, 3, &dx, &dy, &dz)) { - if (!((dx = fabs(dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - dx = 1.0; - } - if (!((dy = fabs(dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - dy = 1.0; - } - if (!((dz = fabs(dz)) > 0)) { - g_warning("Real z step is 0.0, fixing to 1.0"); - dz = 1.0; - } + if ((value = g_hash_table_lookup(fields, "spacings")) && parse_float_vector(value, 3, &dx, &dy, &dz)) { + sanitise_real_size(&dx, "x step"); + sanitise_real_size(&dy, "y step"); + sanitise_real_size(&dz, "z step"); } if ((value = g_hash_table_lookup(fields, "axismins"))) @@ -1301,18 +1277,9 @@ dx = (dx - xoff)/xres; dy = (dy - xoff)/xres; dz = (dz - zoff)/zres; - if (!((dx = fabs(dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - dx = 1.0; - } - if (!((dy = fabs(dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - dy = 1.0; - } - if (!((dz = fabs(dz)) > 0)) { - g_warning("Real z step is 0.0, fixing to 1.0"); - dz = 1.0; - } + sanitise_real_size(&dx, "x step"); + sanitise_real_size(&dy, "y step"); + sanitise_real_size(&dz, "z step"); } if ((value = g_hash_table_lookup(fields, "sampleunits"))) { diff -Nru gwyddion-2.62/modules/file/nxiifile.c gwyddion-2.63/modules/file/nxiifile.c --- gwyddion-2.62/modules/file/nxiifile.c 2019-10-30 13:15:45.000000000 +0000 +++ gwyddion-2.63/modules/file/nxiifile.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nxiifile.c 22626 2019-10-30 09:14:30Z yeti-dn $ + * $Id: nxiifile.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -329,23 +329,11 @@ return FALSE; gwy_debug("xres %u, yres %u", nxiifile->xres, nxiifile->yres); nxiifile->xreal = gwy_get_gdouble_le(&p); - /* Use negated positive conditions to catch NaNs */ - if (!((nxiifile->xreal = fabs(nxiifile->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - nxiifile->xreal = 1.0; - } + sanitise_real_size(&nxiifile->xreal, "x size"); nxiifile->yreal = gwy_get_gdouble_le(&p); - /* Use negated positive conditions to catch NaNs */ - if (!((nxiifile->yreal = fabs(nxiifile->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - nxiifile->yreal = 1.0; - } + sanitise_real_size(&nxiifile->yreal, "y size"); nxiifile->zreal = gwy_get_gdouble_le(&p); - /* Use negated positive conditions to catch NaNs */ - if (!((nxiifile->zreal = fabs(nxiifile->zreal)) > 0)) { - g_warning("Real z size is 0.0, fixing to 1.0"); - nxiifile->zreal = 1.0; - } + sanitise_real_size(&nxiifile->zreal, "z size"); nxiifile->xoff = gwy_get_gdouble_le(&p); nxiifile->yoff = gwy_get_gdouble_le(&p); gwy_debug("xreal %g, xoff %g", nxiifile->xreal, nxiifile->xoff); diff -Nru gwyddion-2.62/modules/file/oirfile.c gwyddion-2.63/modules/file/oirfile.c --- gwyddion-2.62/modules/file/oirfile.c 2020-11-26 14:08:55.000000000 +0000 +++ gwyddion-2.63/modules/file/oirfile.c 2023-05-25 12:31:11.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: oirfile.c 22968 2020-11-26 13:53:48Z yeti-dn $ - * Copyright (C) 2019-2020 David Necas (Yeti). + * $Id: oirfile.c 25362 2023-05-25 12:31:11Z yeti-dn $ + * Copyright (C) 2019-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -76,8 +72,10 @@ #define POIR_MAGIC "PK\x03\x04" #define POIR_MAGIC_SIZE (sizeof(POIR_MAGIC)-1) -#define XML_MAGIC "" -#define XML_MAGIC_SIZE (sizeof(XML_MAGIC)-1) +#define XML_MAGIC_ASCII "" +#define XML_MAGIC_ASCII_SIZE (sizeof(XML_MAGIC_ASCII)-1) +#define XML_MAGIC_UTF8 "" +#define XML_MAGIC_UTF8_SIZE (sizeof(XML_MAGIC_UTF8)-1) #define EXTENSION ".oir" @@ -86,6 +84,7 @@ }; typedef enum { + OIR_CHUNK_XML0 = 0, OIR_CHUNK_XML = 1, OIR_CHUNK_BMP = 2, OIR_CHUNK_WTF = 3, @@ -127,8 +126,7 @@ const guchar *data; /* image data */ } OIRImageDataBlock; -/* Bare XML fragment. They are accompanied/surrounded by various binary data, - * but their structres vary. */ +/* Bare XML fragment. They are accompanied/surrounded by various binary data, but their structres vary. */ typedef struct { guint32 size; /* length of the following XML text fragment */ const guchar *xml; /* XML fragment */ @@ -164,6 +162,7 @@ typedef struct { GString *path; + GString *image_uuid; GHashTable *hash; GArray *scales; } OIRXMLParserData; @@ -178,6 +177,7 @@ OIRImageDataBlock green; OIRImageDataBlock blue; OIRMetaData moremeta; + OIRMetaData standalonemeta; OIRXMLParserData xmldata; } OIRFile; @@ -241,7 +241,7 @@ &module_register, N_("Imports Olympus OIR data files."), "Yeti ", - "0.5", + "0.6", "David Nečas (Yeti)", "2019", }; @@ -306,8 +306,7 @@ } container = gwy_container_new(); - ndata = oirfile_load_from_memory(container, 0, buffer, size, filename, - error); + ndata = oirfile_load_from_memory(container, 0, buffer, size, filename, error); gwy_file_abandon_contents(buffer, size, NULL); if (!ndata) GWY_OBJECT_UNREF(container); @@ -330,8 +329,7 @@ || memcmp(head, POIR_MAGIC, POIR_MAGIC_SIZE) != 0) return 0; - /* Try to find some typical file name fragments near the beginning of the - * ZIP file. */ + /* Try to find some typical file name fragments near the beginning of the ZIP file. */ mlen = MIN(fileinfo->buffer_len, 256); if (!gwy_memmem(fileinfo->head, mlen, ".oir", 4)) return 0; @@ -387,8 +385,7 @@ } prevndata = ndata; - ndata = oirfile_load_from_memory(container, ndata, buffer, size, - filename, error); + ndata = oirfile_load_from_memory(container, ndata, buffer, size, filename, error); if (ndata <= prevndata) { GWY_OBJECT_UNREF(container); goto fail; @@ -419,7 +416,7 @@ const guchar *p, *end; guint32 chunksize; OIRChunkType chunktype; - gboolean seen_wtf = FALSE, seen_images = FALSE; + gboolean seen_wtf = FALSE, seen_images = FALSE, seen_xml0 = FALSE; guint i; #ifdef DEBUG @@ -434,24 +431,19 @@ goto fail; gwy_debug("pos after header: %d", (gint)(p - buffer)); - while (p < end && - chunk_size_and_type(p, end, &chunksize, &chunktype, error)) { + while (p < end && chunk_size_and_type(p, end, &chunksize, &chunktype, error)) { if (chunktype == OIR_CHUNK_BMP) { - gwy_debug("skipping thumbnail chunk starting at %d", - (gint)(p - buffer)); + gwy_debug("skipping thumbnail chunk starting at %d", (gint)(p - buffer)); if (!skip_thumbnail(&p, end, error)) goto fail; } else if (chunktype == OIR_CHUNK_WTF) { if (seen_wtf) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Chunk type %u occured multiple times."), - chunktype); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Chunk type %u occured multiple times."), chunktype); goto fail; } - gwy_debug("reading triplet of strange images starting at %d", - (gint)(p - buffer)); + gwy_debug("reading triplet of strange images starting at %d", (gint)(p - buffer)); if (!read_image_data_block(&p, end, &oirfile.wtf1, "wtf1", error) || !read_image_data_block(&p, end, &oirfile.wtf2, "wtf2", error) || !read_image_data_block(&p, end, &oirfile.wtf3, "wtf3", error)) @@ -460,39 +452,46 @@ } else if (chunktype == OIR_CHUNK_XML) { if (seen_images) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Chunk type %u occured multiple times."), - chunktype); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Chunk type %u occured multiple times."), chunktype); goto fail; } - /* Before we get to image data, there is a short binary block with - * a bit of XML inside. This one is important as it defines image - * type, dimensions, depth, etc. */ - gwy_debug("reading first part of metadata starting at %d", - (gint)(p - buffer)); + /* Before we get to image data, there is a short binary block with a bit of XML inside. This one is + * important as it defines image type, dimensions, depth, etc. */ + gwy_debug("reading first part of metadata starting at %d", (gint)(p - buffer)); if (!read_image_meta_data(&p, end, &oirfile.imgmeta, error)) goto fail; - gwy_debug("reading images starting at %d (finally!)", - (gint)(p - buffer)); + gwy_debug("reading images starting at %d (finally!)", (gint)(p - buffer)); if (!read_image_data_block(&p, end, &oirfile.red, "red", error) || !read_image_data_block(&p, end, &oirfile.green, "green", error) || !read_image_data_block(&p, end, &oirfile.blue, "blue", error)) goto fail; - gwy_debug("reading second part of metadata starting at %d", - (gint)(p - buffer)); + gwy_debug("reading second part of metadata starting at %d", (gint)(p - buffer)); if (!read_more_meta_data(&p, end, &oirfile.moremeta, error)) goto fail; seen_images = TRUE; } + else if (chunktype == OIR_CHUNK_XML0) { + const guchar *chunkend = p + chunksize + 2*sizeof(guint32); + chunkend = MIN(chunkend, end); + if (seen_xml0) { + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Chunk type %u occured multiple times."), chunktype); + goto fail; + } + gwy_debug("reading standalone part of metadata starting at %d", (gint)(p - buffer)); + if (!read_more_meta_data(&p, chunkend, &oirfile.standalonemeta, error)) + goto fail; + seen_xml0 = TRUE; + gwy_debug("fnished reading standalone part of metadata at %d", (gint)(p - buffer)); + } else if (chunktype == OIR_CHUNK_TERMINATOR) { /* The last 140 bytes is some kind of nonsense apparently. But * it is nonsense we expect to see. */ gwy_debug("found known terminator chunk or whatever it is"); - gwy_debug("first 4 bytes are %02x %02x %02x %02x (expecting ffs)", - p[0], p[1], p[2], p[3]); + gwy_debug("first 4 bytes are %02x %02x %02x %02x (expecting ffs)", p[0], p[1], p[2], p[3]); break; } else { @@ -526,12 +525,9 @@ parse_xml_to_hash(xml, &oirfile.xmldata); } - if (!create_datafield(container, oirfile.xmldata.hash, 0, channelno + 0, - &oirfile.red, filename, error) - || !create_datafield(container, oirfile.xmldata.hash, 1, channelno + 1, - &oirfile.green, filename, error) - || !create_datafield(container, oirfile.xmldata.hash, 2, channelno + 2, - &oirfile.blue, filename, error)) + if (!create_datafield(container, oirfile.xmldata.hash, 0, channelno + 0, &oirfile.red, filename, error) + || !create_datafield(container, oirfile.xmldata.hash, 1, channelno + 1, &oirfile.green, filename, error) + || !create_datafield(container, oirfile.xmldata.hash, 2, channelno + 2, &oirfile.blue, filename, error)) goto fail; channelno += 3; @@ -548,11 +544,14 @@ OIRXMLParserData *xmldata = &oirfile->xmldata; g_free(oirfile->moremeta.fragments); + g_free(oirfile->standalonemeta.fragments); if (xmldata->scales) g_array_free(xmldata->scales, TRUE); if (xmldata->path) g_string_free(xmldata->path, TRUE); + if (xmldata->image_uuid) + g_string_free(xmldata->image_uuid, TRUE); if (xmldata->hash) g_hash_table_destroy(xmldata->hash); } @@ -577,9 +576,7 @@ header->unknown2 = gwy_get_guint32_le(p); header->unknown3 = gwy_get_guint32_le(p); header->unknown4 = gwy_get_guint32_le(p); - gwy_debug("unknown[1..4] %u %u %u %u", - header->unknown1, header->unknown2, - header->unknown3, header->unknown4); + gwy_debug("unknown[1..4] %u %u %u %u", header->unknown1, header->unknown2, header->unknown3, header->unknown4); header->file_size = gwy_get_guint32_le(p); gwy_debug("file_size %u", header->file_size); header->unknown5 = gwy_get_guint32_le(p); @@ -594,10 +591,8 @@ header->unknown11 = gwy_get_guint32_le(p); header->unknown12 = gwy_get_guint32_le(p); gwy_debug("unknown[5..12] %u %u %u %u :: %u %u %u %u", - header->unknown5, header->unknown6, - header->unknown7, header->unknown8, - header->unknown9, header->unknown10, - header->unknown11, header->unknown12); + header->unknown5, header->unknown6, header->unknown7, header->unknown8, + header->unknown9, header->unknown10, header->unknown11, header->unknown12); get_CHARARRAY(header->unknown_str, p); gwy_debug("unknown_str %.8s", header->unknown_str); header->unknown13 = gwy_get_guint32_le(p); @@ -605,8 +600,7 @@ header->unknown15 = gwy_get_guint32_le(p); header->unknown16 = gwy_get_guint32_le(p); gwy_debug("unknown[13..16] %u %u 0x%x 0x%x", - header->unknown13, header->unknown14, - header->unknown15, header->unknown16); + header->unknown13, header->unknown14, header->unknown15, header->unknown16); gwy_debug("successfully read file header"); @@ -668,21 +662,41 @@ return TRUE; } +static const guchar* +find_xml_fragment_start(const guchar *p, gsize size, guint *magic_size) +{ + const guchar *xml_ascii = gwy_memmem(p, size, XML_MAGIC_ASCII, XML_MAGIC_ASCII_SIZE); + const guchar *xml_utf8 = gwy_memmem(p, size, XML_MAGIC_UTF8, XML_MAGIC_UTF8_SIZE); + + gwy_debug("XML ASCII at %p, UTF8 at %p", xml_ascii, xml_utf8); + if (!xml_ascii && !xml_utf8) + return NULL; + if (!xml_utf8 || xml_ascii < xml_utf8) { + if (magic_size) + *magic_size = XML_MAGIC_ASCII_SIZE; + return xml_ascii; + } + if (magic_size) + *magic_size = XML_MAGIC_UTF8_SIZE; + return xml_utf8; +} + static void identify_xml_fragment(OIRXMLFragment *fragment) { const guchar *p, *end; + guint magic_size; gwy_md5_get_digest(fragment->xml, fragment->size, fragment->md5); - if (!gwy_memmem(fragment->xml, fragment->size, XML_MAGIC, XML_MAGIC_SIZE)) { + if (!find_xml_fragment_start(fragment->xml, fragment->size, &magic_size)) { fragment->root_size = 0; fragment->root_name = fragment->xml; return; } end = fragment->xml + fragment->size; - for (p = fragment->xml + XML_MAGIC_SIZE; p < end && *p != '<'; p++) + for (p = fragment->xml + magic_size; p < end && *p != '<'; p++) ; if (p < end) p++; @@ -693,8 +707,7 @@ p++; fragment->root_size = p - fragment->root_name; - gwy_debug("XML fragment type is %.*s", - fragment->root_size, fragment->root_name); + gwy_debug("XML fragment type is %.*s", fragment->root_size, fragment->root_name); } static gboolean @@ -738,8 +751,7 @@ gwy_debug("unknown[7..8] %u %u", fragment->unknown7, fragment->unknown8); fragment->unknown9 = gwy_get_guint32_le(p); fragment->unknown10 = gwy_get_guint32_le(p); - gwy_debug("unknown[9..10] %u %u", - fragment->unknown9, fragment->unknown10); + gwy_debug("unknown[9..10] %u %u", fragment->unknown9, fragment->unknown10); if (end - *p < sizeof(guint32)) { err_TRUNCATED_PART(error, "XML fragment header "); @@ -771,12 +783,10 @@ fragment.size = end - begin; g_array_append_val(fragments, fragment); if (fragment.size <= 4096) { - gwy_debug("xml[%u] %.*s", - (guint)fragments->len, fragment.size, fragment.xml); + gwy_debug("xml[%u] %.*s", (guint)fragments->len, fragment.size, fragment.xml); } else { - gwy_debug("xml[%u] %.4096s... (total length %u)", - (guint)fragments->len, fragment.xml, fragment.size); + gwy_debug("xml[%u] %.4096s... (total length %u)", (guint)fragments->len, fragment.xml, fragment.size); } } @@ -802,10 +812,9 @@ /* metadata->content_size does not seem to be the actual content size * end = *p + metadata->content_size; */ fragments = g_array_new(FALSE, FALSE, sizeof(OIRXMLFragment)); - while (end - *p > XML_MAGIC_SIZE) { - const guchar *xml = gwy_memmem(*p, end - *p, XML_MAGIC, XML_MAGIC_SIZE); - const guchar *q; - guint depth = 0, tagcntr = 0; + while (end - *p > MAX(XML_MAGIC_ASCII_SIZE, XML_MAGIC_UTF8_SIZE)) { + guint depth = 0, tagcntr = 0, magic_size; + const guchar *q, *xml = find_xml_fragment_start(*p, end - *p, &magic_size); gboolean failed = FALSE, closing = FALSE, last_was_slash = FALSE; if (!xml) @@ -814,7 +823,7 @@ #ifdef DEBUG gwy_debug("XML fragment at %u", (guint)(xml - global_buffer)); #endif - for (q = xml + XML_MAGIC_SIZE; q < end; q++) { + for (q = xml + magic_size; q < end; q++) { if (g_ascii_isspace(*q)) continue; if (G_UNLIKELY(*q < 0x20)) { @@ -872,12 +881,12 @@ last_was_slash = FALSE; } + gwy_debug("failed: %d", failed); if (failed) break; append_xml_fragment(fragments, xml, q+1); - identify_xml_fragment(&g_array_index(fragments, - OIRXMLFragment, fragments->len-1)); + identify_xml_fragment(&g_array_index(fragments, OIRXMLFragment, fragments->len-1)); *p = q + 1; } @@ -894,8 +903,8 @@ static void oir_xml_start_element(G_GNUC_UNUSED GMarkupParseContext *context, const gchar *element_name, - G_GNUC_UNUSED const gchar **attribute_names, - G_GNUC_UNUSED const gchar **attribute_values, + const gchar **attribute_names, + const gchar **attribute_values, gpointer user_data, G_GNUC_UNUSED GError **error) { @@ -908,11 +917,22 @@ g_string_append(data->path, p+1); else g_string_append(data->path, element_name); + + /* Remember UUID for channels. */ + if (gwy_strequal(element_name, "commonphase:channel")) { + guint i; + for (i = 0; attribute_names[i]; i++) { + if (gwy_strequal(attribute_names[i], "id")) { + g_string_assign(data->image_uuid, attribute_values[i]); + break; + } + } + } } static void oir_xml_end_element(G_GNUC_UNUSED GMarkupParseContext *context, - G_GNUC_UNUSED const gchar *element_name, + const gchar *element_name, gpointer user_data, G_GNUC_UNUSED GError **error) { @@ -923,6 +943,9 @@ g_string_truncate(data->path, p - data->path->str); else g_string_truncate(data->path, 0); + + if (gwy_strequal(element_name, "commonphase:channel")) + g_string_truncate(data->image_uuid, 0); } static void @@ -935,8 +958,7 @@ static const gchar *channel_arrays[] = { "frameProperties::channelImageDefinition::", "cameraChannel::elementChannel::", - /* These can occur six times. But the last three belong to strange - * images. We can use the first three. */ + /* These can occur six times. But the last three belong to strange images. We can use the first three. */ "imageProperties::imageInfo::phase::group::channel::", "imageProperties::acquisition::phase::group::channel::", "imageProperties::acquisition::imagingParam::productData::scale::", @@ -945,7 +967,7 @@ static const gchar scales[] = "frameProperties::additionalData::scales"; OIRXMLParserData *data = (OIRXMLParserData*)user_data; - guint i, j, l; + guint i, j, l, ll; GString *path; gchar *s; @@ -979,9 +1001,20 @@ g_string_append_printf(path, "[%u]", j); if (!g_hash_table_lookup(data->hash, path->str)) { gwy_debug("%s = %s", path->str, s); - g_hash_table_replace(data->hash, - g_strdup(path->str), g_strdup(s)); + g_hash_table_replace(data->hash, g_strdup(path->str), g_strdup(s)); g_string_truncate(path, l); + + if (data->image_uuid && data->image_uuid->len && g_str_has_suffix(path->str, "::imageType")) { + ll = path->len - strlen("::imageType"); + g_string_truncate(path, ll); + g_string_append(path, "::uuid"); + g_string_append_printf(path, "[%u]", j); + gwy_debug("%s = %s", path->str, data->image_uuid->str); + g_hash_table_replace(data->hash, g_strdup(path->str), g_strdup(data->image_uuid->str)); + g_string_truncate(path, ll); + g_string_append(path, "::imageType"); + } + g_free(s); return; } g_string_truncate(path, l); @@ -1003,18 +1036,13 @@ }; GMarkupParseContext *context; - if (!data->path) - data->path = g_string_new(NULL); - else - g_string_truncate(data->path, 0); + data->path = data->path ? g_string_truncate(data->path, 0) : g_string_new(NULL); + data->image_uuid = data->image_uuid ? g_string_truncate(data->image_uuid, 0) : g_string_new(NULL); - if (!data->hash) { - data->hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); - } + if (!data->hash) + data->hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - context = g_markup_parse_context_new(&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, - data, NULL); + context = g_markup_parse_context_new(&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, data, NULL); g_markup_parse_context_parse(context, xml->xml, xml->size, NULL); g_markup_parse_context_free(context); } @@ -1120,12 +1148,11 @@ GError **error) { static const gchar frameprops[] = "frameProperties::imageDefinition"; - static const gchar imgpprops[] - = "imageProperties::imageInfo::phase::group::channel"; + static const gchar imgpprops[] = "imageProperties::imageInfo::phase::group::channel"; - const gchar *s, *device, *name, *gradient = NULL; + const gchar *s, *device, *name, *xmluuid, *gradient = NULL; gchar *title; - gint xres, yres, depth; + gint xres, yres, depth, j; gdouble xreal, yreal, zscale = 0.0; GwyRawDataType rawdatatype; GwyDataField *dfield; @@ -1148,6 +1175,11 @@ rawdatatype = GWY_RAW_DATA_UINT8; else if (depth == 2) rawdatatype = GWY_RAW_DATA_UINT16; + else if (depth == 3) { + g_warning("Depth is given as 3 which is nonense, assuming 1."); + depth = 1; + rawdatatype = GWY_RAW_DATA_UINT8; + } else { err_BPP(error, depth); return FALSE; @@ -1165,34 +1197,42 @@ return FALSE; yreal = 1e-6*yres*g_ascii_strtod(s, NULL); - device = get_meta_or_fail(hash, - "imageProperties::imageInfo", "acquireDevice", - -1, NULL); + device = get_meta_or_fail(hash, "imageProperties::imageInfo", "acquireDevice", -1, NULL); gwy_debug("name %s", device); + /* Try to match images by UUID (and change imgid accordingly). The binary image UUIDs are longer strings with + * a prefix like t001_0_ and suffix like _0. So look just for a substring. */ if (device && gwy_strequal(device, "LSM")) { - /* Only one channel is actually height. The other two are intensity - * and ???. Furthermore, the names are shifted. It's a mess. */ - imgid = (imgid + 1) % 3; - if ((s = get_meta_or_fail(hash, imgpprops, "length::z", imgid, NULL))) { - zscale = 1e-6*g_ascii_strtod(s, NULL); - gwy_debug("zscale %g", zscale); + for (j = 0; j < 3; j++) { + xmluuid = get_meta_or_fail(hash, imgpprops, "imageDefinition::uuid", j, NULL); + if (strstr(image->uuid, xmluuid)) { + gwy_debug("matched channel #%u to XML record #%d (uuid %s)\n", imgid, j, xmluuid); + imgid = j; + break; + } } + if (j == 3) { + gwy_debug("did NOT match image by UUID, using just order in the file"); + } + } + /* Read the z scale. It is given the same for all channels, even intensity and invalid. We ignore it below based + * on image type. */ + if ((s = get_meta_or_fail(hash, imgpprops, "length::z", imgid, NULL))) { + zscale = 1e-6*g_ascii_strtod(s, NULL); + gwy_debug("zscale %g", zscale); } - name = get_meta_or_fail(hash, imgpprops, "imageDefinition::imageType", - imgid, NULL); + name = get_meta_or_fail(hash, imgpprops, "imageDefinition::imageType", imgid, NULL); + gwy_debug("imageType %s", name); if (!name || !gwy_strequal(name, "HEIGHT")) zscale = 0.0; dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); - if (zscale != 0.0) { + if (zscale != 0.0) gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), "m"); - } - gwy_convert_raw_data(image->data, xres*yres, 1, - rawdatatype, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_convert_raw_data(image->data, xres*yres, 1, rawdatatype, GWY_BYTE_ORDER_LITTLE_ENDIAN, gwy_data_field_get_data(dfield), zscale != 0.0 ? zscale : 1.0, 0.0); @@ -1244,4 +1284,4 @@ return TRUE; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/ols.c gwyddion-2.63/modules/file/ols.c --- gwyddion-2.62/modules/file/ols.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/ols.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ols.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: ols.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -189,10 +189,7 @@ continue; } xy_axis = g_ascii_strtod(s1, NULL); - if (!((xy_axis = fabs(xy_axis)) > 0)) { - g_warning("Real size step is 0.0, fixing to 1.0"); - xy_axis = 1.0; - } + sanitise_real_size(&xy_axis, "size step"); g_string_printf(key, "Data %u Info::Z Convert Value", dir_num+1); if (!(s1 = g_hash_table_lookup(hash, key->str))) { g_warning("Cannot find 'Z Convert Value' for data %u.", dir_num+1); diff -Nru gwyddion-2.62/modules/file/omicron.c gwyddion-2.63/modules/file/omicron.c --- gwyddion-2.62/modules/file/omicron.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/omicron.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: omicron.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: omicron.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2006-2011 David Necas (Yeti), Petr Klapetek, Markus Pristovsek * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, * prissi@gift.physik.tu-berlin.de. @@ -498,15 +498,8 @@ ofile->xreal = g_ascii_strtod(val, NULL); GET_FIELD(ofile->meta, val, "Field Y Size in nm", error); ofile->yreal = g_ascii_strtod(val, NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((ofile->xreal = fabs(ofile->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - ofile->xreal = 1.0; - } - if (!((ofile->yreal = fabs(ofile->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - ofile->yreal = 1.0; - } + sanitise_real_size(&ofile->xreal, "x size"); + sanitise_real_size(&ofile->yreal, "y size"); ofile->xreal *= Nanometer; ofile->yreal *= Nanometer; diff -Nru gwyddion-2.62/modules/file/opdfile.c gwyddion-2.63/modules/file/opdfile.c --- gwyddion-2.62/modules/file/opdfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/opdfile.c 2023-05-14 09:31:31.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: opdfile.c 20676 2017-12-18 18:19:09Z yeti-dn $ - * Copyright (C) 2008-2017 David Necas (Yeti). + * $Id: opdfile.c 25324 2023-05-14 09:22:08Z yeti-dn $ + * Copyright (C) 2008-2023 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -105,9 +101,8 @@ OPD_FLOAT = 7, OPD_DOUBLE = 8, OPD_LONG = 12, - /* Serialised structs; some look like bits of OPDx, some do not. If this - * appears positions in the file are off. Unfortunately not just of the - * binary stuff but apparently also of other things. */ + /* Serialised structs; some look like bits of OPDx, some do not. If this appears positions in the file are off. + * Unfortunately not just of the binary stuff but apparently also of other things. */ OPD_BINARY_STUFF = 15, } OPDDataType; @@ -198,7 +193,7 @@ &module_register, N_("Imports Wyko OPD and ASC files."), "Yeti ", - "0.11", + "0.12", "David Nečas (Yeti)", "2008", }; @@ -234,8 +229,7 @@ if (only_name) return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION) ? 10 : 0; - if (fileinfo->file_size < BLOCK_SIZE + 2 - || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) + if (fileinfo->file_size < BLOCK_SIZE + 2 || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) return 0; return 100; @@ -299,13 +293,11 @@ /* Skip void header blocks */ if (header[j].size) { gwy_debug("<%s> size=0x%08x, pos=0x%08x, type=%u, flags=0x%04x", - header[j].name, header[j].size, header[j].pos, - header[j].type, header[j].flags); + header[j].name, header[j].size, header[j].pos, header[j].type, header[j].flags); j++; } if (offset > size) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Item `%s' is beyond the end of the file."), header[i].name); goto fail; @@ -340,8 +332,7 @@ gchar *s; if (!gwy_stramong(header[i].name, - "OPD", "SAMPLE_DATA", "RAW_DATA", "RAW DATA", - "Image", "Intensity", "SecArr_0", "Raw", + "OPD", "SAMPLE_DATA", "RAW_DATA", "RAW DATA", "Image", "Intensity", "SecArr_0", "Raw", NULL)) continue; @@ -351,44 +342,30 @@ } dfield = mfield = NULL; - intensity = gwy_stramong(header[i].name, - "Image", "Intensity", "SecArr_0", NULL); + intensity = gwy_stramong(header[i].name, "Image", "Intensity", "SecArr_0", NULL); if (intensity) { - if (!(dfield = get_data_field(header + i, - pixel_size, aspect, 1.0, NULL, - NULL, error))) + if (!(dfield = get_data_field(header + i, pixel_size, aspect, 1.0, NULL, NULL, error))) goto fail; } else { - if (!(dfield = get_data_field(header + i, - pixel_size, aspect, wavelength, "m", - &mfield, error))) + if (!(dfield = get_data_field(header + i, pixel_size, aspect, wavelength, "m", &mfield, error))) goto fail; } - gwy_container_set_object(container, gwy_app_get_data_key_for_id(j), - dfield); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(j), dfield); if (mfield) - gwy_container_set_object(container, gwy_app_get_mask_key_for_id(j), - mfield); + gwy_container_set_object(container, gwy_app_get_mask_key_for_id(j), mfield); - s = g_strdup_printf("%s/title", - g_quark_to_string(gwy_app_get_data_key_for_id(j))); - if (intensity) { - gwy_container_set_string_by_name(container, s, - g_strdup(header[i].name)); - } - else if ((k = find_block(header, nblocks, "Title")) != nblocks) { - gwy_container_set_string_by_name(container, s, - g_strndup(header[k].data, - header[k].size)); - } + s = g_strdup_printf("%s/title", g_quark_to_string(gwy_app_get_data_key_for_id(j))); + if (intensity) + gwy_container_set_string_by_name(container, s, g_strdup(header[i].name)); + else if ((k = find_block(header, nblocks, "Title")) != nblocks) + gwy_container_set_string_by_name(container, s, g_strndup(header[k].data, header[k].size)); else gwy_app_channel_title_fall_back(container, j); g_free(s); - s = g_strdup_printf("%s/realsquare", - g_quark_to_string(gwy_app_get_data_key_for_id(j))); + s = g_strdup_printf("%s/realsquare", g_quark_to_string(gwy_app_get_data_key_for_id(j))); gwy_container_set_boolean_by_name(container, s, TRUE); g_free(s); @@ -428,19 +405,18 @@ block->size = gwy_get_guint32_le(p); block->flags = gwy_get_guint16_le(p); - if (strncmp(block->name, "AdjustVSI_", sizeof("AdjustVSI_")-1) == 0 - && block->type == 7 - && block->size == 2) { - gwy_info("Changing the type of field %s from float to short.", - block->name); + if (strncmp(block->name, "AdjustVSI_", sizeof("AdjustVSI_")-1) == 0 && block->type == 7 && block->size == 2) { + gwy_info("Changing the type of field %s from float to short.", block->name); block->type = 6; } - if (gwy_strequal(block->name, "ImageModificat~0") - && block->type == 7 - && block->size == 40) { + else if (gwy_strequal(block->name, "ImageModificat~0") && block->type == 7 && block->size == 40) { gwy_info("Changing the size of field %s from 40 to 4.", block->name); block->size = 4; } + else if (block->type == 6 && block->size == 4) { + gwy_info("Changing the type of field %s from short to long.", block->name); + block->type = OPD_LONG; + } } static gboolean @@ -453,6 +429,7 @@ const guchar *p; guint i; + gwy_debug("trying to read float %s", name); if ((i = find_block(header, nblocks, name)) == nblocks) { err_MISSING_FIELD(error, name); return FALSE; @@ -477,6 +454,7 @@ const guchar *p; guint i; + gwy_debug("trying to read int16 %s", name); if ((i = find_block(header, nblocks, name)) == nblocks) { err_MISSING_FIELD(error, name); return FALSE; @@ -510,8 +488,7 @@ *maskfield = NULL; p = get_array_params(datablock->data, &xres, &yres, &datatype); - dfield = gwy_data_field_new(xres, yres, - xres*pixel_size, aspect*yres*pixel_size, FALSE); + dfield = gwy_data_field_new(xres, yres, xres*pixel_size, aspect*yres*pixel_size, FALSE); siunit = gwy_si_unit_new("m"); gwy_data_field_set_si_unit_xy(dfield, siunit); @@ -582,23 +559,18 @@ p = header[i].data; s = NULL; if (type == OPD_TEXT) { - s = g_convert(header[i].data, header[i].size, "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); + s = g_convert(header[i].data, header[i].size, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); if (s && !*s) { g_free(s); s = NULL; } } else if (type == OPD_SHORT || type == OPD_LONG) { - gint32 value = (type == OPD_SHORT) - ? gwy_get_gint16_le(&p) - : gwy_get_gint32_le(&p); + gint32 value = (type == OPD_SHORT) ? gwy_get_gint16_le(&p) : gwy_get_gint32_le(&p); s = g_strdup_printf("%d", value); } else if (type == OPD_FLOAT || type == OPD_DOUBLE) { - gdouble value = (type == OPD_FLOAT) - ? gwy_get_gfloat_le(&p) - : gwy_get_gdouble_le(&p); + gdouble value = (type == OPD_FLOAT) ? gwy_get_gfloat_le(&p) : gwy_get_gdouble_le(&p); s = g_strdup_printf("%g", value); } /* Ignore all other types */ @@ -618,36 +590,36 @@ /* 0 1 2 3 4 5 6 7 8 9 10 11 12 */ static const guint sizes[] = { 0, 0, 0, 0, 0, 0, 2, 4, 8, 0, 0, 0, 4 }; - guint i, type; + guint i, type, size; for (i = 0; i < nblocks; i++) { type = header[i].type; + size = header[i].size; if (type < G_N_ELEMENTS(sizes)) { if (sizes[type]) { - if (header[i].size != sizes[type]) { + if (size != sizes[type]) { + gwy_debug("for %s (type %d) header says %u, type size is %u", + header[i].name, type, size, sizes[type]); err_INVALID(error, header[i].name); return FALSE; } } else if (type == OPD_DIRECTORY) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Nested directories found")); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Nested directories found")); return FALSE; } else if (type == OPD_ARRAY) { guint xres, yres; /* array params */ - if (header[i].size < 3*2) { + if (size < 3*2) { err_INVALID(error, header[i].name); return FALSE; } /* array contents */ get_array_params(header[i].data, &xres, &yres, &type); - gwy_debug("%s xres=%u yres=%u type=%u size=%u", - header[i].name, xres, yres, type, header[i].size); - if (header[i].size < 3*2 + xres*yres*type) { + gwy_debug("%s xres=%u yres=%u type=%u size=%u", header[i].name, xres, yres, type, size); + if (size < 3*2 + xres*yres*type) { err_INVALID(error, header[i].name); return FALSE; } @@ -705,11 +677,9 @@ gboolean only_name) { if (only_name) - return g_str_has_suffix(fileinfo->name_lowercase, - EXTENSION_ASC) ? 10 : 0; + return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION_ASC) ? 10 : 0; - if (fileinfo->file_size < MAGIC_ASC_SIZE + 2 - || memcmp(fileinfo->head, MAGIC_ASC, MAGIC_ASC_SIZE) != 0) + if (fileinfo->file_size < MAGIC_ASC_SIZE + 2 || memcmp(fileinfo->head, MAGIC_ASC, MAGIC_ASC_SIZE) != 0) return 0; return 100; @@ -743,14 +713,12 @@ err_FILE_TYPE(error, "Wyko ASC data"); goto fail; } - if (sscanf(line + MAGIC_ASC_SIZE, "%d %d %d", - &tmp, &real_units, &is_float) != 3) { + if (sscanf(line + MAGIC_ASC_SIZE, "%d %d %d", &tmp, &real_units, &is_float) != 3) { err_INVALID(error, "Data File Format"); goto fail; } format = tmp; - gwy_debug("array format %d, real units %d, is float %d", - format, real_units, is_float); + gwy_debug("array format %d, real units %d, is float %d", format, real_units, is_float); if (format < 0 || format > 2) { err_UNSUPPORTED(error, "Array Format"); goto fail; @@ -787,8 +755,8 @@ continue; s++; - if (gwy_stramong(line, "OPD", "SAMPLE_DATA", "RAW_DATA", "RAW DATA", - "Image", "Intensity", "SecArr_0", "Raw", + if (gwy_stramong(line, + "OPD", "SAMPLE_DATA", "RAW_DATA", "RAW DATA", "Image", "Intensity", "SecArr_0", "Raw", NULL)) { gdouble pixel_size, wavelength, mult = 1.0, aspect = 1.0, zcalib; gboolean intensity; @@ -803,14 +771,12 @@ goto fail; } - if (!(s = g_hash_table_lookup(hash, "Pixel_size")) - || !(pixel_size = fabs(g_ascii_strtod(s, NULL)))) { + if (!(s = g_hash_table_lookup(hash, "Pixel_size")) || !(pixel_size = fabs(g_ascii_strtod(s, NULL)))) { err_MISSING_FIELD(error, "Pixel_size"); goto fail; } gwy_debug("pixel_size = %g", pixel_size); - if (!(s = g_hash_table_lookup(hash, "Wavelength")) - || !(wavelength = fabs(g_ascii_strtod(s, NULL)))) { + if (!(s = g_hash_table_lookup(hash, "Wavelength")) || !(wavelength = fabs(g_ascii_strtod(s, NULL)))) { err_MISSING_FIELD(error, "Wavelength"); goto fail; } @@ -822,8 +788,7 @@ if ((s = g_hash_table_lookup(hash, "Mult"))) mult = g_ascii_strtod(s, NULL); - intensity = gwy_stramong(line, - "Image", "Intensity", "SecArr_0", NULL); + intensity = gwy_stramong(line, "Image", "Intensity", "SecArr_0", NULL); pixel_size *= Milimeter; zcalib = Nanometer*mult; @@ -831,8 +796,7 @@ zcalib *= wavelength; dfield = mfield = NULL; - dfield = get_asc_data_field(&p, format, xres, yres, - pixel_size, aspect, zcalib, + dfield = get_asc_data_field(&p, format, xres, yres, pixel_size, aspect, zcalib, intensity ? "" : "m", intensity ? NULL : &mfield); if (!dfield) { @@ -841,15 +805,11 @@ goto fail; } - gwy_container_set_object(container, gwy_app_get_data_key_for_id(j), - dfield); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(j), dfield); if (mfield) - gwy_container_set_object(container, - gwy_app_get_mask_key_for_id(j), - mfield); + gwy_container_set_object(container, gwy_app_get_mask_key_for_id(j), mfield); - s = g_strdup_printf("%s/title", - g_quark_to_string(gwy_app_get_data_key_for_id(j))); + s = g_strdup_printf("%s/title", g_quark_to_string(gwy_app_get_data_key_for_id(j))); if (intensity) gwy_container_set_string_by_name(container, s, g_strdup(line)); else if ((k = g_hash_table_lookup(hash, "Title"))) @@ -858,13 +818,11 @@ gwy_app_channel_title_fall_back(container, j); g_free(s); - s = g_strdup_printf("%s/realsquare", - g_quark_to_string(gwy_app_get_data_key_for_id(j))); + s = g_strdup_printf("%s/realsquare", g_quark_to_string(gwy_app_get_data_key_for_id(j))); gwy_container_set_boolean_by_name(container, s, TRUE); g_free(s); - gwy_file_channel_import_log_add(container, j, NULL, - filename); + gwy_file_channel_import_log_add(container, j, NULL, filename); j++; continue; @@ -908,8 +866,7 @@ GwyContainer *meta = (GwyContainer*)user_data; gchar *cval; - if (!(cval = g_convert(value, strlen(value), "UTF-8", "ISO-8859-1", - NULL, NULL, NULL))) + if (!(cval = g_convert(value, strlen(value), "UTF-8", "ISO-8859-1", NULL, NULL, NULL))) return; gwy_container_set_string_by_name(meta, key, cval); } @@ -931,8 +888,7 @@ if (maskfield) *maskfield = NULL; - dfield = gwy_data_field_new(xres, yres, - xres*pixel_size, aspect*yres*pixel_size, FALSE); + dfield = gwy_data_field_new(xres, yres, xres*pixel_size, aspect*yres*pixel_size, FALSE); siunit = gwy_si_unit_new("m"); gwy_data_field_set_si_unit_xy(dfield, siunit); @@ -1038,4 +994,4 @@ } } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/opengps.c gwyddion-2.63/modules/file/opengps.c --- gwyddion-2.62/modules/file/opengps.c 2019-04-16 13:58:08.000000000 +0000 +++ gwyddion-2.63/modules/file/opengps.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: opengps.c 22001 2019-04-16 13:58:04Z yeti-dn $ + * $Id: opengps.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* NB: There is a draft of ISO 25178 Part 72, which may replace 5436-2 @@ -165,21 +161,17 @@ return g_str_has_suffix(fileinfo->name_lowercase, EXTENSION) ? 15 : 0; /* Generic ZIP file. */ - if (fileinfo->file_size < MAGIC_SIZE - || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) + if (fileinfo->file_size < MAGIC_SIZE || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) return 0; /* It contains main.xml and maybe directory bindata. One of them should be * somewehre near the begining of the file. */ - if (!gwy_memmem(fileinfo->head, fileinfo->buffer_len, - MAGIC1, MAGIC1_SIZE) - && !gwy_memmem(fileinfo->head, fileinfo->buffer_len, - MAGIC2, MAGIC2_SIZE)) + if (!gwy_memmem(fileinfo->head, fileinfo->buffer_len, MAGIC1, MAGIC1_SIZE) + && !gwy_memmem(fileinfo->head, fileinfo->buffer_len, MAGIC2, MAGIC2_SIZE)) return 0; - /* We have to realy look inside. And since main.xml is a popular name - * for the main XML document within such files, we also have to see if - * we find "ISO5436_2" somewehre near the begining of the file. */ + /* We have to realy look inside. And since main.xml is a popular name for the main XML document within such + * files, we also have to see if we find "ISO5436_2" somewehre near the begining of the file. */ if ((zipfile = gwyzip_open(fileinfo->name, NULL))) { if (gwyzip_locate_file(zipfile, "main.xml", 1, NULL) && (content = gwyzip_get_file_content(zipfile, NULL, NULL))) { @@ -249,10 +241,8 @@ GQuark quark; gchar buf[40]; - dfield = gwy_data_field_new(x3pfile->xres, - x3pfile->yres, - x3pfile->xres*x3pfile->dx, - x3pfile->yres*x3pfile->dy, + dfield = gwy_data_field_new(x3pfile->xres, x3pfile->yres, + x3pfile->xres*x3pfile->dx, x3pfile->yres*x3pfile->dy, FALSE); gwy_assign(dfield->data, x3pfile->values + id*n, n); for (k = 0; k < n; k++) { @@ -336,10 +326,7 @@ "color", gwy_graph_get_preset_color(id), NULL); g_free(title); - gwy_graph_curve_model_set_data(gcmodel, - (gdouble*)validx->data, - (gdouble*)validy->data, - validx->len); + gwy_graph_curve_model_set_data(gcmodel, (gdouble*)validx->data, (gdouble*)validy->data, validx->len); gwy_graph_model_add_curve(gmodel, gcmodel); g_object_unref(gcmodel); } @@ -379,8 +366,7 @@ path = x3pfile->path->str; gwy_debug("%s", path); - if (gwy_strequal(path, "/ISO5436_2/Record3/DataLink") - || gwy_strequal(path, "/ISO5436_2/Record3/DataList")) { + if (gwy_strequal(path, "/ISO5436_2/Record3/DataLink") || gwy_strequal(path, "/ISO5436_2/Record3/DataList")) { if (!data_start(x3pfile, error)) return; } @@ -408,13 +394,10 @@ /* Invalid data points are represented by empty . But then * x3p_text() is not called at all and we must handle that here. */ - if (gwy_strequal(path, "/ISO5436_2/Record3/DataList/Datum") - && !x3pfile->seen_datum) { + if (gwy_strequal(path, "/ISO5436_2/Record3/DataList/Datum") && !x3pfile->seen_datum) { if (x3pfile->datapos >= x3pfile->ndata) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Too many DataList items for given " - "matrix dimensions.")); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Too many DataList items for given matrix dimensions.")); return; } x3pfile->values[x3pfile->datapos] = 0.0; @@ -444,21 +427,16 @@ /* Data represented directly in XML. */ if (gwy_strequal(path, "/ISO5436_2/Record3/DataList/Datum")) { if (x3pfile->datapos >= x3pfile->ndata) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, - _("Too many DataList items for given " - "matrix dimensions.")); + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, + _("Too many DataList items for given matrix dimensions.")); return; } - /* There can be a ;-separated list. And it can contain dummy values - * for the unused y-axis for profiles (poor design). Since we do not - * care about PCL, we only ever want the last value of the list, - * whatever it is. */ + /* There can be a ;-separated list. And it can contain dummy values for the unused y-axis for profiles (poor + * design). Since we do not care about PCL, we only ever want the last value of the list, whatever it is. */ if ((semicolon = strlenrchr(text, ';', text_len))) text = semicolon + 1; - x3pfile->values[x3pfile->datapos] - = x3pfile->dz*g_ascii_strtod(text, NULL) + x3pfile->zoff; + x3pfile->values[x3pfile->datapos] = x3pfile->dz*g_ascii_strtod(text, NULL) + x3pfile->zoff; x3pfile->valid[x3pfile->datapos] = TRUE; gwy_debug("valid Datum %g", x3pfile->values[x3pfile->datapos]); x3pfile->datapos++; @@ -500,8 +478,7 @@ if (!x3pfile->path) x3pfile->path = g_string_new(NULL); if (!x3pfile->hash) - x3pfile->hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + x3pfile->hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); context = g_markup_parse_context_new(&parser, 0, x3pfile, NULL); if (!g_markup_parse_context_parse(context, s, -1, error)) @@ -519,8 +496,8 @@ return ok; } -/* This is the main verification function that checks we have everything we - * need and the data are of a supported type. */ +/* This is the main verification function that checks we have everything we need and the data are of a supported type. + * */ static gboolean data_start(X3PFile *x3pfile, GError **error) { @@ -538,8 +515,7 @@ return FALSE; } - /* First check axes to get meaningful error messages if their types are - * not as expected. */ + /* First check axes to get meaningful error messages if their types are not as expected. */ if (!require_keys(x3pfile->hash, error, "/ISO5436_2/Record1/FeatureType", AXES_PREFIX "/CX/AxisType", @@ -548,17 +524,14 @@ NULL)) return FALSE; - s = (gchar*)g_hash_table_lookup(x3pfile->hash, - "/ISO5436_2/Record1/FeatureType"); - x3pfile->feature_type = gwy_string_to_enum(s, features, - G_N_ELEMENTS(features)); + s = (gchar*)g_hash_table_lookup(x3pfile->hash, "/ISO5436_2/Record1/FeatureType"); + x3pfile->feature_type = gwy_string_to_enum(s, features, G_N_ELEMENTS(features)); if (x3pfile->feature_type == (X3PFeatureType)-1) { err_UNSUPPORTED(error, "/ISO5436_2/Record1/FeatureType"); return FALSE; } - if (x3pfile->feature_type != X3P_FEATURE_SUR - && x3pfile->feature_type != X3P_FEATURE_PRF) { + if (x3pfile->feature_type != X3P_FEATURE_SUR && x3pfile->feature_type != X3P_FEATURE_PRF) { err_UNSUPPORTED(error, "/ISO5436_2/Record1/FeatureType"); return FALSE; } @@ -625,17 +598,11 @@ s = (gchar*)g_hash_table_lookup(x3pfile->hash, AXES_PREFIX "/CX/Increment"); x3pfile->dx = g_ascii_strtod(s, NULL); - if (!((x3pfile->dx = fabs(x3pfile->dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - x3pfile->dx = 1.0; - } + sanitise_real_size(&x3pfile->dx, "x step"); s = (gchar*)g_hash_table_lookup(x3pfile->hash, AXES_PREFIX "/CY/Increment"); x3pfile->dy = g_ascii_strtod(s, NULL); - if (!((x3pfile->dy = fabs(x3pfile->dy)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - x3pfile->dy = 1.0; - } + sanitise_real_size(&x3pfile->dy, "y step"); s = (gchar*)g_hash_table_lookup(x3pfile->hash, AXES_PREFIX "/CX/Offset"); x3pfile->xoff = g_ascii_strtod(s, NULL); @@ -643,9 +610,8 @@ s = (gchar*)g_hash_table_lookup(x3pfile->hash, AXES_PREFIX "/CY/Offset"); x3pfile->yoff = g_ascii_strtod(s, NULL); - /* Defaults that are good for floating point data conversion. If a file - * with floating point data specifies Increment and Offset, we apply them - * without hesitation. The behaviour is probably undefined. */ + /* Defaults that are good for floating point data conversion. If a file with floating point data specifies + * Increment and Offset, we apply them without hesitation. The behaviour is probably undefined. */ x3pfile->dz = 1.0; x3pfile->zoff = 0.0; @@ -698,14 +664,12 @@ if (!(bindata = gwyzip_get_file_content(zipfile, &size, error))) return FALSE; - if (err_SIZE_MISMATCH(error, x3pfile->ndata * gwy_raw_data_size(rawtype), - size, TRUE)) { + if (err_SIZE_MISMATCH(error, x3pfile->ndata * gwy_raw_data_size(rawtype), size, TRUE)) { g_free(bindata); return FALSE; } - gwy_convert_raw_data(bindata, x3pfile->ndata, 1, - rawtype, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_convert_raw_data(bindata, x3pfile->ndata, 1, rawtype, GWY_BYTE_ORDER_LITTLE_ENDIAN, x3pfile->values, x3pfile->dz, x3pfile->zoff); g_free(bindata); @@ -716,8 +680,7 @@ if (!s) return TRUE; - if (!gwyzip_locate_file(zipfile, s, 1, error) - || !(bindata = gwyzip_get_file_content(zipfile, &size, error))) + if (!gwyzip_locate_file(zipfile, s, 1, error) || !(bindata = gwyzip_get_file_content(zipfile, &size, error))) return FALSE; if (err_SIZE_MISMATCH(error, (x3pfile->ndata + 7)/8, size, TRUE)) { @@ -767,10 +730,8 @@ "/ISO5436_2/Record2/ProbingSystem/Identification", "/ISO5436_2/Record2/Comment", NULL) - && !g_str_has_prefix(key, - "/ISO5436_2/Record2/ProbingSystem/Identification/") - && !g_str_has_prefix(key, - "/ISO5436_2/Record1/Axes/Rotation")) + && !g_str_has_prefix(key, "/ISO5436_2/Record2/ProbingSystem/Identification/") + && !g_str_has_prefix(key, "/ISO5436_2/Record1/Axes/Rotation")) return; key = strrchr(key, '/'); @@ -822,4 +783,4 @@ return FALSE; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/pixmap.c gwyddion-2.63/modules/file/pixmap.c --- gwyddion-2.62/modules/file/pixmap.c 2022-09-23 13:20:48.000000000 +0000 +++ gwyddion-2.63/modules/file/pixmap.c 2023-05-26 10:45:41.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: pixmap.c 25045 2022-09-23 13:20:48Z yeti-dn $ + * $Id: pixmap.c 25366 2023-05-26 10:45:41Z yeti-dn $ * Copyright (C) 2004-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -235,7 +235,7 @@ fmtname = gdk_pixbuf_format_get_name(pixbuf_format); if (gwy_strequal(fmtname, "heif/avif")) - fmtname = "heif"; + gwy_assign_string(&fmtname, "heif"); gwy_debug("Found format %s", fmtname); for (i = 0; i < G_N_ELEMENTS(known_formats); i++) { if (gwy_strequal(fmtname, known_formats[i].name)) { @@ -245,6 +245,7 @@ } if (!known_format) { gwy_debug("Ignoring GdkPixbuf format %s because it is not on the whitelist.", fmtname); + g_free(fmtname); continue; } diff -Nru gwyddion-2.62/modules/file/pltfile.c gwyddion-2.63/modules/file/pltfile.c --- gwyddion-2.62/modules/file/pltfile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/pltfile.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: pltfile.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: pltfile.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -122,7 +122,7 @@ GwyContainer *container = NULL; GwyDataField *dfield = NULL; GwyTextHeaderParser parser; - GwySIUnit *xunit, *yunit, *zunit; + gchar *xunit, *yunit, *zunit; gchar *p, *value, *buffer = NULL; GHashTable *hash = NULL; gsize size; @@ -155,10 +155,7 @@ parser.line_prefix = "#"; parser.key_value_separator = ":"; hash = gwy_text_header_parse(buffer, &parser, NULL, NULL); - if (!require_keys(hash, error, - "Channel", "Lines", "Points", - "XRange", "YRange", "ZRange", - NULL)) + if (!require_keys(hash, error, "Channel", "Lines", "Points", "XRange", "YRange", "ZRange", NULL)) goto fail; xres = atoi(g_hash_table_lookup(hash, "Points")); @@ -167,36 +164,22 @@ goto fail; value = g_hash_table_lookup(hash, "XRange"); - xreal = g_ascii_strtod(value, &value); - xunit = gwy_si_unit_new(value); + xreal = g_ascii_strtod(value, &xunit); value = g_hash_table_lookup(hash, "YRange"); - yreal = g_ascii_strtod(value, &value); - yunit = gwy_si_unit_new(value); + yreal = g_ascii_strtod(value, &yunit); value = g_hash_table_lookup(hash, "ZRange"); - zreal = g_ascii_strtod(value, &value); - zunit = gwy_si_unit_new(value); + zreal = g_ascii_strtod(value, &zunit); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } - - if (!gwy_si_unit_equal(xunit, yunit)) - g_warning("X and Y units differ, using X"); + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); - gwy_data_field_set_si_unit_xy(dfield, xunit); - gwy_data_field_set_si_unit_z(dfield, zunit); - g_object_unref(xunit); - g_object_unref(yunit); - g_object_unref(zunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), xunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), zunit); + if (!gwy_si_unit_equal_string(gwy_data_field_get_si_unit_xy(dfield), yunit)) + g_warning("X and Y units differ, using X"); data = gwy_data_field_get_data(dfield); value = p; @@ -210,8 +193,7 @@ g_object_unref(dfield); if ((value = g_hash_table_lookup(hash, "Channel"))) - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup(value)); + gwy_container_set_const_string_by_name(container, "/0/data/title", value); else gwy_app_channel_title_fall_back(container, 0); diff -Nru gwyddion-2.62/modules/file/pnifile.c gwyddion-2.63/modules/file/pnifile.c --- gwyddion-2.62/modules/file/pnifile.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/pnifile.c 2023-06-01 14:46:51.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: pnifile.c 20866 2018-03-20 10:15:35Z yeti-dn $ + * $Id: pnifile.c 25397 2023-06-01 14:46:51Z yeti-dn $ * Copyright (C) 2006-2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -258,15 +258,8 @@ xreal = gwy_get_gfloat_le(&p); p = buffer + REAL_YSIZE_OFFSET; yreal = gwy_get_gfloat_le(&p); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); xreal *= Micrometer; yreal *= Micrometer; diff -Nru gwyddion-2.62/modules/file/psia.c gwyddion-2.63/modules/file/psia.c --- gwyddion-2.62/modules/file/psia.c 2021-08-17 15:18:43.000000000 +0000 +++ gwyddion-2.63/modules/file/psia.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: psia.c 24013 2021-08-17 15:18:43Z yeti-dn $ + * $Id: psia.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2006-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -504,15 +504,8 @@ header->xreal = gwy_get_gdouble_le(&p); header->yreal = gwy_get_gdouble_le(&p); gwy_debug("xreal: %g, yreal: %g", header->xreal, header->yreal); - /* Use negated positive conditions to catch NaNs */ - if (!((header->xreal = fabs(header->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - header->xreal = 1.0; - } - if (!((header->yreal = fabs(header->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - header->yreal = 1.0; - } + sanitise_real_size(&header->xreal, "x size"); + sanitise_real_size(&header->yreal, "y size"); header->xreal *= Micrometre; header->yreal *= Micrometre; diff -Nru gwyddion-2.62/modules/file/psppt.c gwyddion-2.63/modules/file/psppt.c --- gwyddion-2.62/modules/file/psppt.c 2022-04-28 13:46:18.000000000 +0000 +++ gwyddion-2.63/modules/file/psppt.c 2023-05-18 12:45:55.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: psppt.c 24791 2022-04-28 13:46:18Z yeti-dn $ + * $Id: psppt.c 25334 2023-05-18 12:45:54Z yeti-dn $ * Copyright (C) 2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -37,7 +37,7 @@ * [FILE-MAGIC-USERGUIDE] * Park Systems PS-PPT * .ps-ppt - * Read + * Read Curvemap **/ #include "config.h" @@ -141,7 +141,7 @@ module_register, N_("Imports Park Systems PS-PPT data files."), "Yeti ", - "1.0", + "1.1", "David Nečas (Yeti)", "2021", }; @@ -292,14 +292,6 @@ } static gboolean -err_INCONSISTENT(GError **error) -{ - g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, - _("Inconsistent structure of individual spectra.")); - return FALSE; -} - -static gboolean get_json_with_type(json_t *object, json_t **member, const gchar *key, json_type type, GError **error) { static const GwyEnum typenames[] = { @@ -472,7 +464,7 @@ * structure. */ lawn = pfile->lawn; if (!n || n != nnum || (lawn && n != gwy_lawn_get_n_curves(lawn))) - return err_INCONSISTENT(error); + return err_INCONSISTENT_SPECTRA(error); if (!pfile->lawn) { const PSPPTScanStart *ss = &pfile->scanstart; @@ -505,7 +497,7 @@ if (!i) base64len = json_string_length(item); else if (json_string_length(item) != base64len) - return err_INCONSISTENT(error); + return err_INCONSISTENT_SPECTRA(error); } if (lawn_is_new) { @@ -531,7 +523,7 @@ npts = str->len/sizeof(gfloat); if (i) { if (npts != pfile->databuf->len/n) - return err_INCONSISTENT(error); + return err_INCONSISTENT_SPECTRA(error); } else g_array_set_size(pfile->databuf, n*npts); @@ -556,7 +548,7 @@ if (!values[i]) values[i] = g_strdup(json_string_value(item)); else if (!gwy_strequal(json_string_value(item), values[i])) - return err_INCONSISTENT(error); + return err_INCONSISTENT_SPECTRA(error); return TRUE; } diff -Nru gwyddion-2.62/modules/file/pt3file.c gwyddion-2.63/modules/file/pt3file.c --- gwyddion-2.62/modules/file/pt3file.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/pt3file.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: pt3file.c 20788 2018-02-02 09:41:17Z yeti-dn $ + * $Id: pt3file.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -796,10 +796,7 @@ else { g_return_val_if_reached(NULL); } - if (!(pix_resol = fabs(pix_resol))) { - g_warning("Pixel size is 0.0, fixing to 1.0"); - pix_resol = 1.0; - } + sanitise_real_size(&pix_resol, "pixel size"); pix_resol *= 1e-6; dfield = gwy_data_field_new(xres, yres, pix_resol*xres, pix_resol*yres, diff -Nru gwyddion-2.62/modules/file/quesant.c gwyddion-2.63/modules/file/quesant.c --- gwyddion-2.62/modules/file/quesant.c 2019-11-11 08:53:36.000000000 +0000 +++ gwyddion-2.63/modules/file/quesant.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: quesant.c 22668 2019-11-10 10:30:19Z yeti-dn $ + * $Id: quesant.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2008 David Necas (Yeti), Jan Horak. * E-mail: yeti@gwyddion.net, xhorak@gmail.com. * @@ -207,10 +207,7 @@ "HARD", error))) return FALSE; info->real_size = gwy_get_gfloat_le(&p); - if (!((info->real_size = fabs(info->real_size)) > 0)) { - g_warning("Real size is 0.0, fixing to 1.0"); - info->real_size = 1.0; - } + sanitise_real_size(&info->real_size, "size"); /* Value scale factor */ if (!(p = get_param_pointer(buffer, size, diff -Nru gwyddion-2.62/modules/file/rawfile.c gwyddion-2.63/modules/file/rawfile.c --- gwyddion-2.62/modules/file/rawfile.c 2022-10-12 13:23:49.000000000 +0000 +++ gwyddion-2.63/modules/file/rawfile.c 2023-02-23 16:16:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rawfile.c 25082 2022-10-12 13:23:49Z yeti-dn $ + * $Id: rawfile.c 25245 2023-02-23 16:16:20Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -37,7 +37,6 @@ #include "config.h" #include #include -#include #include #include #include @@ -1487,7 +1486,6 @@ gboolean decomma = gwy_params_get_boolean(params, PARAM_DECOMMA); RawStrtodFunc strtod_func = (decomma ? gwy_comma_strtod : gwy_ascii_strtod); const guchar *buffer = args->file.buffer; - struct lconv *locale_data; guint i, j, n; gint cdelim = '\0'; gint delimlen; @@ -1498,8 +1496,7 @@ missingval = NULL; /* Update locale data before parsing. */ - locale_data = localeconv(); - decimal_point = locale_data->decimal_point; + decimal_point = gwy_get_decimal_separator(); decimal_point_len = strlen(decimal_point); g_assert(decimal_point_len != 0); diff -Nru gwyddion-2.62/modules/file/rawgraph.c gwyddion-2.63/modules/file/rawgraph.c --- gwyddion-2.62/modules/file/rawgraph.c 2022-10-12 09:02:13.000000000 +0000 +++ gwyddion-2.63/modules/file/rawgraph.c 2023-03-09 08:36:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rawgraph.c 25080 2022-10-12 09:02:12Z yeti-dn $ + * $Id: rawgraph.c 25268 2023-03-08 21:32:31Z yeti-dn $ * Copyright (C) 2009-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -87,7 +87,7 @@ &module_register, N_("Imports simple text files as graph curves."), "Yeti ", - "0.6", + "0.7", "David Nečas (Yeti)", "2009", }; @@ -120,7 +120,7 @@ paramdef = gwy_param_def_new(); gwy_param_def_set_function_name(paramdef, gwy_file_func_current()); gwy_param_def_add_string(paramdef, PARAM_TITLE, "title", _("_Title"), - GWY_PARAM_STRING_EMPTY_IS_NULL, NULL, _("Curve")); + GWY_PARAM_STRING_NULL_IS_EMPTY, NULL, _("Curve")); gwy_param_def_add_string(paramdef, PARAM_X_LABEL, "x-label", _("_X label"), GWY_PARAM_STRING_NULL_IS_EMPTY, NULL, "x"); gwy_param_def_add_string(paramdef, PARAM_Y_LABEL, "y-label", _("_Y label"), diff -Nru gwyddion-2.62/modules/file/rhk-sm3.c gwyddion-2.63/modules/file/rhk-sm3.c --- gwyddion-2.62/modules/file/rhk-sm3.c 2021-08-17 14:36:26.000000000 +0000 +++ gwyddion-2.63/modules/file/rhk-sm3.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: rhk-sm3.c 24009 2021-08-17 14:36:26Z yeti-dn $ + * $Id: rhk-sm3.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2005,2008 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -215,9 +211,8 @@ gdouble angle; guchar page_id[16]; gchar *strings[RHK_STRING_NSTRINGS]; - /* The actual type depends. The documentation is a bit confusing as to - * which type is used when, but at least we know int32 and float32 can - * occur. */ + /* The actual type depends. The documentation is a bit confusing as to which type is used when, but at least we + * know int32 and float32 can occur. */ const guchar *page_data; RHKColorInformation color_info; } RHKPage; @@ -293,8 +288,7 @@ if (len < 2*n) return NULL; - s = gwy_utf16_to_utf8((const gunichar2*)*buffer, n, - GWY_BYTE_ORDER_LITTLE_ENDIAN); + s = gwy_utf16_to_utf8((const gunichar2*)*buffer, n, GWY_BYTE_ORDER_LITTLE_ENDIAN); *buffer += n*sizeof(gunichar2); g_strstrip(s); gwy_debug("String: <%s>", s); @@ -358,8 +352,7 @@ page->x_size = gwy_get_guint32_le(&p); page->y_size = gwy_get_guint32_le(&p); gwy_debug("x_size = %u, y_size = %u", page->x_size, page->y_size); - if (err_DIMENSION(error, page->x_size) - || err_DIMENSION(error, page->y_size)) + if (err_DIMENSION(error, page->x_size) || err_DIMENSION(error, page->y_size)) goto fail; page->source_type = gwy_get_guint32_le(&p); @@ -377,23 +370,14 @@ page->x_scale = gwy_get_gfloat_le(&p); page->y_scale = gwy_get_gfloat_le(&p); page->z_scale = gwy_get_gfloat_le(&p); - gwy_debug("x,y,z_scale = %g %g %g", - page->x_scale, page->y_scale, page->z_scale); - /* Use negated positive conditions to catch NaNs */ - if (!((page->x_scale = fabs(page->x_scale)) > 0)) { - g_warning("Real x scale is 0.0, fixing to 1.0"); - page->x_scale = 1.0; - } - if (!((page->y_scale = fabs(page->y_scale)) > 0)) { - g_warning("Real y scale is 0.0, fixing to 1.0"); - page->y_scale = 1.0; - } + gwy_debug("x,y,z_scale = %g %g %g", page->x_scale, page->y_scale, page->z_scale); + sanitise_real_size(&page->x_scale, "x scale"); + sanitise_real_size(&page->y_scale, "y scale"); page->xy_scale = gwy_get_gfloat_le(&p); page->x_offset = gwy_get_gfloat_le(&p); page->y_offset = gwy_get_gfloat_le(&p); page->z_offset = gwy_get_gfloat_le(&p); - gwy_debug("x,y,z_offset = %g %g %g", - page->x_offset, page->y_offset, page->z_offset); + gwy_debug("x,y,z_offset = %g %g %g", page->x_offset, page->y_offset, page->z_offset); page->period = gwy_get_gfloat_le(&p); page->bias = gwy_get_gfloat_le(&p); page->current = gwy_get_gfloat_le(&p); @@ -409,8 +393,7 @@ gwy_debug("position %04x", (guint)(p - *buffer)); s = rhk_sm3_read_string(&p, *len - (p - *buffer)); if (!s) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("End of file reached in string #%u."), i); goto fail; } @@ -430,17 +413,14 @@ if (page->type == RHK_TYPE_IMAGE) { if (*len < (p - *buffer) + 4) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("End of file reached in color data header.")); goto fail; } - /* XPMPro manual says the length field is 4bytes, but reality seems to - * disagree vehemently. */ + /* XPMPro manual says the length field is 4 bytes, but reality seems to disagree vehemently. */ page->color_info.size = gwy_get_guint16_le(&p); if (*len < (p - *buffer) + page->color_info.size) { - g_set_error(error, GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_DATA, + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("End of file reached in color data.")); goto fail; } @@ -461,31 +441,21 @@ rhk_sm3_page_to_data_field(const RHKPage *page) { GwyDataField *dfield; - GwySIUnit *siunit; const gchar *unit; - gint xres, yres, i, j; - const gint32 *pdata; - gdouble *data; + gint xres, yres; xres = page->x_size; yres = page->y_size; dfield = gwy_data_field_new(xres, yres, - xres*fabs(page->x_scale), - yres*fabs(page->y_scale), + xres*fabs(page->x_scale), yres*fabs(page->y_scale), FALSE); - data = gwy_data_field_get_data(dfield); - pdata = (const gint32*)page->page_data; - for (i = 0; i < yres; i++) { - for (j = 0; j < xres; j++) { - data[i*xres + xres-1 - j] = GINT32_FROM_LE(pdata[i*xres + j]) - *page->z_scale + page->z_offset; - } - } + gwy_convert_raw_data(page->page_data, xres*yres, 1, GWY_RAW_DATA_SINT32, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_data_field_get_data(dfield), page->z_scale, page->z_offset); + gwy_data_field_invert(dfield, FALSE, TRUE, FALSE); if (page->strings[RHK_STRING_X_UNITS] && page->strings[RHK_STRING_Y_UNITS]) { - if (!gwy_strequal(page->strings[RHK_STRING_X_UNITS], - page->strings[RHK_STRING_Y_UNITS])) + if (!gwy_strequal(page->strings[RHK_STRING_X_UNITS], page->strings[RHK_STRING_Y_UNITS])) g_warning("X and Y units differ, using X"); unit = page->strings[RHK_STRING_X_UNITS]; } @@ -495,9 +465,7 @@ unit = page->strings[RHK_STRING_Y_UNITS]; else unit = ""; - siunit = gwy_si_unit_new(unit); - gwy_data_field_set_si_unit_xy(dfield, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), unit); if (page->strings[RHK_STRING_Z_UNITS]) unit = page->strings[RHK_STRING_Z_UNITS]; @@ -506,9 +474,7 @@ /* Fix some silly units */ if (gwy_strequal(unit, "N/sec")) unit = "s^-1"; - siunit = gwy_si_unit_new(unit); - gwy_data_field_set_si_unit_z(dfield, siunit); - g_object_unref(siunit); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), unit); return dfield; } @@ -554,8 +520,7 @@ GwyGraphCurveModel *gcmodel = gwy_graph_curve_model_new(); gchar *s = g_strdup_printf("%d", i+1); - /* FIXME: The docs seem to talk about floats, but AFAICT the data looks - * like integers. */ + /* FIXME: The docs seem to talk about floats, but AFAICT the data looks like integers. */ for (j = 0; j < res; j++) data[j] = gwy_get_gint32_le(&p) * page->z_scale + page->z_offset; @@ -652,8 +617,7 @@ gwy_container_set_object(container, quark, dfield); g_object_unref(dfield); p = rhkpage->strings[RHK_STRING_LABEL]; - cs = gwy_enum_to_string(rhkpage->scan_dir, - scan_directions, G_N_ELEMENTS(scan_directions)); + cs = gwy_enum_to_string(rhkpage->scan_dir, scan_directions, G_N_ELEMENTS(scan_directions)); if (p && *p) { g_string_assign(key, g_quark_to_string(quark)); g_string_append(key, "/title"); @@ -688,27 +652,23 @@ p = rhkpage->strings[RHK_STRING_LABEL]; if (!p || !*p) - p = gwy_enuml_to_string - (rhkpage->line_type, - "Histogram", RHK_LINE_HISTOGRAM, - "Cross section", RHK_LINE_CROSS_SECTION, - "Line test", RHK_LINE_LINE_TEST, - "Oscilloscope", RHK_LINE_OSCILLOSCOPE, - "Noise power spectrum", RHK_LINE_NOISE_POWER_SPECTRUM, - "I-V spectrum", RHK_LINE_IV_SPECTRUM, - "I-Z spectrum", RHK_LINE_IZ_SPECTRUM, - "Image x average", RHK_LINE_IMAGE_X_AVERAGE, - "Image y average", RHK_LINE_IMAGE_Y_AVERAGE, - "Noise autocorrelation spectrum", - RHK_LINE_NOISE_AUTOCORRELATION_SPECTRUM, - "Multichannel analyser data", - RHK_LINE_MULTICHANNEL_ANALYSER_DATA, - "Renormalized I-V", RHK_LINE_RENORMALIZED_IV, - "Image histogram spectra", - RHK_LINE_IMAGE_HISTOGRAM_SPECTRA, - "Image cross section", RHK_LINE_IMAGE_CROSS_SECTION, - "Image avegrage", RHK_LINE_IMAGE_AVERAGE, - NULL); + p = gwy_enuml_to_string(rhkpage->line_type, + "Histogram", RHK_LINE_HISTOGRAM, + "Cross section", RHK_LINE_CROSS_SECTION, + "Line test", RHK_LINE_LINE_TEST, + "Oscilloscope", RHK_LINE_OSCILLOSCOPE, + "Noise power spectrum", RHK_LINE_NOISE_POWER_SPECTRUM, + "I-V spectrum", RHK_LINE_IV_SPECTRUM, + "I-Z spectrum", RHK_LINE_IZ_SPECTRUM, + "Image x average", RHK_LINE_IMAGE_X_AVERAGE, + "Image y average", RHK_LINE_IMAGE_Y_AVERAGE, + "Noise autocorrelation spectrum", RHK_LINE_NOISE_AUTOCORRELATION_SPECTRUM, + "Multichannel analyser data", RHK_LINE_MULTICHANNEL_ANALYSER_DATA, + "Renormalized I-V", RHK_LINE_RENORMALIZED_IV, + "Image histogram spectra", RHK_LINE_IMAGE_HISTOGRAM_SPECTRA, + "Image cross section", RHK_LINE_IMAGE_CROSS_SECTION, + "Image avegrage", RHK_LINE_IMAGE_AVERAGE, + NULL); if (!p || !*p) p = s = g_strdup_printf(_("Unknown line %d"), count); @@ -750,8 +710,7 @@ "Force", RHK_PAGE_FORCE, "Signal", RHK_PAGE_SIGNAL, "FFT transform", RHK_PAGE_FFT, - "Noise power spectrum", - RHK_PAGE_NOISE_POWER_SPECTRUM, + "Noise power spectrum", RHK_PAGE_NOISE_POWER_SPECTRUM, "Line test", RHK_PAGE_LINE_TEST, "Oscilloscope", RHK_PAGE_OSCILLOSCOPE, "IV spectra", RHK_PAGE_IV_SPECTRA, @@ -768,20 +727,17 @@ "4 gain current", RHK_PAGE_4_GAIN_CURRENT, "8 gain current", RHK_PAGE_8_GAIN_CURRENT, "Image IV 64x64", RHK_PAGE_IV_64x64, - "Autocorrelation spectrum", - RHK_PAGE_AUTOCORRELATION_SPECTRUM, + "Autocorrelation spectrum", RHK_PAGE_AUTOCORRELATION_SPECTRUM, "Counter data", RHK_PAGE_COUNTER, - "Multichannel analyser", - RHK_PAGE_MULTICHANNEL_ANALYSER, + "Multichannel analyser", RHK_PAGE_MULTICHANNEL_ANALYSER, "AFM using AFM-100", RHK_PAGE_AFM_100, NULL); if (s && *s) - gwy_container_set_string_by_name(meta, "Type", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Type", s); - s = gwy_enum_to_string(rhkpage->scan_dir, - scan_directions, G_N_ELEMENTS(scan_directions)); + s = gwy_enum_to_string(rhkpage->scan_dir, scan_directions, G_N_ELEMENTS(scan_directions)); if (s && *s) - gwy_container_set_string_by_name(meta, "Scan Direction", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Scan Direction", s); s = gwy_enuml_to_string(rhkpage->source_type, "Raw", RHK_SOURCE_RAW_PAGE, @@ -790,14 +746,11 @@ "Imported", RHK_SOURCE_IMPORTED_PAGE, NULL); if (s && *s) - gwy_container_set_string_by_name(meta, "Source", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Source", s); - gwy_container_set_string_by_name(meta, "Bias", - g_strdup_printf("%g V", rhkpage->bias)); - gwy_container_set_string_by_name(meta, "Rotation angle", - g_strdup_printf("%f", rhkpage->angle)); - gwy_container_set_string_by_name(meta, "Period", - g_strdup_printf("%f s", rhkpage->period)); + gwy_container_set_string_by_name(meta, "Bias", g_strdup_printf("%g V", rhkpage->bias)); + gwy_container_set_string_by_name(meta, "Rotation angle", g_strdup_printf("%f", rhkpage->angle)); + gwy_container_set_string_by_name(meta, "Period", g_strdup_printf("%f s", rhkpage->period)); s = rhkpage->strings[RHK_STRING_DATE]; if (s && *s) { @@ -806,25 +759,24 @@ } s = rhkpage->strings[RHK_STRING_LABEL]; - if (s && *s) { - gwy_container_set_string_by_name(meta, "Label", g_strdup(s)); - } + if (s && *s) + gwy_container_set_const_string_by_name(meta, "Label", s); s = rhkpage->strings[RHK_STRING_PATH]; if (s && *s) - gwy_container_set_string_by_name(meta, "Path", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Path", s); s = rhkpage->strings[RHK_STRING_SYSTEM_TEXT]; if (s && *s) - gwy_container_set_string_by_name(meta, "System comment", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "System comment", s); s = rhkpage->strings[RHK_STRING_SESSION_TEXT]; if (s && *s) - gwy_container_set_string_by_name(meta, "Session comment", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "Session comment", s); s = rhkpage->strings[RHK_STRING_USER_TEXT]; if (s && *s) - gwy_container_set_string_by_name(meta, "User comment", g_strdup(s)); + gwy_container_set_const_string_by_name(meta, "User comment", s); str = g_new(gchar, 33); for (i = 0; i < 16; i++) { @@ -839,5 +791,4 @@ return meta; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ - +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/rhk-sm4.c gwyddion-2.63/modules/file/rhk-sm4.c --- gwyddion-2.62/modules/file/rhk-sm4.c 2021-11-03 17:28:15.000000000 +0000 +++ gwyddion-2.63/modules/file/rhk-sm4.c 2023-05-26 13:43:29.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rhk-sm4.c 24459 2021-11-03 17:28:15Z yeti-dn $ + * $Id: rhk-sm4.c 25371 2023-05-26 13:43:29Z yeti-dn $ * Copyright (C) 2009-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -660,6 +660,7 @@ fail: gwy_file_abandon_contents(buffer, size, NULL); rhk_sm4_free(&rhkfile); + GWY_OBJECT_UNREF(prmmeta); if (!imageid && !graphid) { GWY_OBJECT_UNREF(container); } @@ -1103,6 +1104,7 @@ g_free(page->piezo_sensitivity); } g_free(page->spec_info); + g_free(page->objects); } g_free(rhkfile->page_indices); } diff -Nru gwyddion-2.62/modules/file/rhk-spm32.c gwyddion-2.63/modules/file/rhk-spm32.c --- gwyddion-2.62/modules/file/rhk-spm32.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/rhk-spm32.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rhk-spm32.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: rhk-spm32.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -427,16 +427,10 @@ } /* Use negated positive conditions to catch NaNs */ - if (!((fabs(rhkpage->x.scale)) > 0)) { - g_warning("Real x scale is 0.0, fixing to 1.0"); - rhkpage->x.scale = 1.0; - } - if (!((fabs(rhkpage->y.scale)) > 0)) { - /* The y scale seem unused for non-image data */ - if (rhkpage->type == RHK_TYPE_IMAGE) - g_warning("Real y scale is 0.0, fixing to 1.0"); - rhkpage->y.scale = 1.0; - } + sanitise_real_size(&rhkpage->x.scale, "x scale"); + /* The y scale seem unused for non-image data */ + if (rhkpage->type == RHK_TYPE_IMAGE) + sanitise_real_size(&rhkpage->y.scale, "y scale"); if (!g_str_has_prefix(buffer + 0xa0, "XY ")) { err_MISSING_FIELD(error, "XY"); diff -Nru gwyddion-2.62/modules/file/s94file.c gwyddion-2.63/modules/file/s94file.c --- gwyddion-2.62/modules/file/s94file.c 2019-10-30 13:15:45.000000000 +0000 +++ gwyddion-2.63/modules/file/s94file.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: s94file.c 22625 2019-10-30 09:12:55Z yeti-dn $ + * $Id: s94file.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2013 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -255,14 +255,8 @@ size, TRUE)) return FALSE; - if (!(s94file->xreal = fabs(s94file->xreal))) { - g_warning("Real x size is 0.0, fixing to 1.0"); - s94file->xreal = 1.0; - } - if (!(s94file->yreal = fabs(s94file->yreal))) { - g_warning("Real y size is 0.0, fixing to 1.0"); - s94file->yreal = 1.0; - } + sanitise_real_size(&s94file->xreal, "x size"); + sanitise_real_size(&s94file->yreal, "y size"); if (s94file->mode == S94_TOPOGRAPHY) s94file->q = 5.5/65536.0 * (1 << (2*(s94file->zgain - 1))) * Nanometre; diff -Nru gwyddion-2.62/modules/file/sensofar.c gwyddion-2.63/modules/file/sensofar.c --- gwyddion-2.62/modules/file/sensofar.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/sensofar.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sensofar.c 20781 2018-01-31 09:41:03Z yeti-dn $ + * $Id: sensofar.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2004-2017 David Necas (Yeti), Petr Klapetek, Jan Horak. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, xhorak@gmail.com. * @@ -1140,16 +1140,8 @@ return FALSE; if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) return FALSE; - if (!((data_desc->axes_config.mppx - = fabs(data_desc->axes_config.mppx)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - data_desc->axes_config.mppx = 1.0; - } - if (!((data_desc->axes_config.mppy - = fabs(data_desc->axes_config.mppy)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - data_desc->axes_config.mppy = 1.0; - } + sanitise_real_size(&data_desc->axes_config.mppx, "x size"); + sanitise_real_size(&data_desc->axes_config.mppy, "y size"); dfield = gwy_data_field_new(xres, yres, data_desc->axes_config.mppx * xres * Micrometer, @@ -1256,16 +1248,8 @@ return FALSE; if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) return FALSE; - if (!((data_desc->axes_config.mppx - = fabs(data_desc->axes_config.mppx)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - data_desc->axes_config.mppx = 1.0; - } - if (!((data_desc->axes_config.mppy - = fabs(data_desc->axes_config.mppy)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - data_desc->axes_config.mppy = 1.0; - } + sanitise_real_size(&data_desc->axes_config.mppx, "x size"); + sanitise_real_size(&data_desc->axes_config.mppy, "y size"); rfield = gwy_data_field_new(xres, yres, data_desc->axes_config.mppx * xres * Micrometer, @@ -1370,11 +1354,7 @@ return FALSE; if (err_DIMENSION(error, xres) || err_DIMENSION(error, yres)) return FALSE; - if (!((data_desc->axes_config.mppx - = fabs(data_desc->axes_config.mppx)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - data_desc->axes_config.mppx = 1.0; - } + sanitise_real_size(&data_desc->axes_config.mppx, "x size"); xdata = g_new(gdouble, xres); ydata = g_new(gdouble, xres); diff -Nru gwyddion-2.62/modules/file/sensofarx.c gwyddion-2.63/modules/file/sensofarx.c --- gwyddion-2.62/modules/file/sensofarx.c 2021-11-11 15:39:06.000000000 +0000 +++ gwyddion-2.63/modules/file/sensofarx.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,21 +1,17 @@ /* - * $Id: sensofarx.c 22001 2019-04-16 13:58:04Z yeti-dn $ + * $Id: sensofarx.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2015 David Necas (Yeti). * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -125,15 +121,13 @@ || memcmp(fileinfo->head, MAGIC, MAGIC_SIZE) != 0) return 0; - /* It should contain some of the expected file names. Unfortunately, - * they seem to store the raw data first and they are to huge to catch - * anything following. So this may not be as reliable as we would like. */ + /* It should contain some of the expected file names. Unfortunately, they seem to store the raw data first and + * they are to huge to catch anything following. So this may not be as reliable as we would like. */ if (!sensofarx_is_plausible_file(fileinfo->head, fileinfo->buffer_len)) return 0; - /* We have to realy look inside. And since index.xml is a popular name - * for the main XML document within such files, we also have to see if - * we find "" somewehre near the begining of the file. */ + /* We have to realy look inside. And since index.xml is a popular name for the main XML document within such + * files, we also have to see if we find "" somewehre near the begining of the file. */ if ((zipfile = gwyzip_open(fileinfo->name, NULL))) { if (gwyzip_locate_file(zipfile, "index.xml", 1, NULL)) { if ((content = gwyzip_get_file_content(zipfile, NULL, NULL))) { @@ -236,19 +230,10 @@ if (err_DIMENSION(error, yres)) return FALSE; - xreal = g_ascii_strtod(g_hash_table_lookup(hash, "/xml/GENERAL/FOV_X"), - NULL); - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - - yreal = g_ascii_strtod(g_hash_table_lookup(hash, "/xml/GENERAL/FOV_Y"), - NULL); - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + xreal = g_ascii_strtod(g_hash_table_lookup(hash, "/xml/GENERAL/FOV_X"), NULL); + sanitise_real_size(&xreal, "x size"); + yreal = g_ascii_strtod(g_hash_table_lookup(hash, "/xml/GENERAL/FOV_Y"), NULL); + sanitise_real_size(&yreal, "y size"); for (i = 0; i < layers->len; i++) { id = g_array_index(layers, gint, i); @@ -261,8 +246,7 @@ gwy_debug("FILENAME_Z %s: %s", str->str, datafilename); if (!gwyzip_locate_file(zipfile, datafilename, 1, error) - || !(content = gwyzip_get_file_content(zipfile, &contentsize, - error))) { + || !(content = gwyzip_get_file_content(zipfile, &contentsize, error))) { return FALSE; } @@ -272,21 +256,15 @@ return FALSE; } - dfield = gwy_data_field_new(xres, yres, - xres*xreal*1e-6, yres*yreal*1e-6, - FALSE); - gwy_convert_raw_data(content, xres*yres, 1, - GWY_RAW_DATA_FLOAT, - GWY_BYTE_ORDER_LITTLE_ENDIAN, - gwy_data_field_get_data(dfield), - 1e-6, 0.0); + dfield = gwy_data_field_new(xres, yres, xres*xreal*1e-6, yres*yreal*1e-6, FALSE); + gwy_convert_raw_data(content, xres*yres, 1, GWY_RAW_DATA_FLOAT, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_data_field_get_data(dfield), 1e-6, 0.0); g_free(content); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(dfield), "m"); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), "m"); - gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), - dfield); + gwy_container_set_object(container, gwy_app_get_data_key_for_id(id), dfield); if ((mask = gwy_app_channel_mask_of_nans(dfield, TRUE))) { quark = gwy_app_get_mask_key_for_id(id); gwy_container_set_object(container, quark, mask); @@ -414,8 +392,7 @@ pluxfile->path = g_string_new(NULL); pluxfile->str = g_string_new(NULL); - pluxfile->hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + pluxfile->hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); pluxfile->layers = g_array_new(FALSE, FALSE, sizeof(gint)); context = g_markup_parse_context_new(&parser, 0, pluxfile, NULL); @@ -452,8 +429,7 @@ /* XXX: for some reason the file tends to be named ‘./recipe.txt’ in the * archive. */ - if ((!gwyzip_locate_file(zipfile, "recipe.txt", 1, NULL) - && !gwyzip_locate_file(zipfile, "./recipe.txt", 1, NULL)) + if ((!gwyzip_locate_file(zipfile, "recipe.txt", 1, NULL) && !gwyzip_locate_file(zipfile, "./recipe.txt", 1, NULL)) || !(content = gwyzip_get_file_content(zipfile, NULL, NULL))) return; @@ -463,12 +439,10 @@ if (g_str_has_prefix(s, BLOODY_UTF8_BOM)) s += strlen(BLOODY_UTF8_BOM); - pluxfile->recipe_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + pluxfile->recipe_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); pluxfile->parsing_recipe = TRUE; context = g_markup_parse_context_new(&parser, 0, pluxfile, NULL); - if (!g_markup_parse_context_parse(context, s, -1, NULL) - || !g_markup_parse_context_end_parse(context, NULL)) { + if (!g_markup_parse_context_parse(context, s, -1, NULL) || !g_markup_parse_context_end_parse(context, NULL)) { g_hash_table_destroy(pluxfile->recipe_hash); pluxfile->recipe_hash = NULL; } @@ -519,8 +493,7 @@ *p = g_ascii_tolower(*p); } - gwy_container_set_const_string_by_name((GwyContainer*)user_data, - name, (const gchar*)hvalue); + gwy_container_set_const_string_by_name((GwyContainer*)user_data, name, (const gchar*)hvalue); g_free(name); } @@ -572,4 +545,4 @@ return NULL; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin et columns=120 tw=118 ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/sensolytics.c gwyddion-2.63/modules/file/sensolytics.c --- gwyddion-2.62/modules/file/sensolytics.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/sensolytics.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sensolytics.c 20676 2017-12-18 18:19:09Z yeti-dn $ + * $Id: sensolytics.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -286,57 +286,34 @@ Dimensions *dimensions, GError **error) { - const gchar *value; + if (!require_keys(hash, error, "Channels", "Lines", "Rows", "X-Length", "Y-Length", NULL)) + return FALSE; /* Number of fields */ - if (!(value = g_hash_table_lookup(hash, "Channels"))) { - err_MISSING_FIELD(error, "Channels"); - return FALSE; - } - *ndata = atoi(value); + *ndata = atoi(g_hash_table_lookup(hash, "Channels")); if (*ndata <= 0 || *ndata > 1024) { err_INVALID(error, "Channels"); return FALSE; } /* Pixel sizes */ - if (!(value = g_hash_table_lookup(hash, "Lines"))) { - err_MISSING_FIELD(error, "Lines"); - return FALSE; - } - dimensions->yres = atoi(value); + dimensions->yres = atoi(g_hash_table_lookup(hash, "Lines")); if (err_DIMENSION(error, dimensions->yres)) return FALSE; - if (!(value = g_hash_table_lookup(hash, "Rows"))) { - err_MISSING_FIELD(error, "Rows"); - return FALSE; - } /* XXX: When the file says Rows, it actually means Columns-1. Bite me. */ - dimensions->xres = atoi(value) + 1; + dimensions->xres = atoi(g_hash_table_lookup(hash, "Rows")) + 1; if (err_DIMENSION(error, dimensions->xres)) return FALSE; /* Real sizes */ - if (!(value = g_hash_table_lookup(hash, "X-Length"))) { - err_MISSING_FIELD(error, "X-Length"); - return FALSE; - } - dimensions->xreal = Micrometer * g_ascii_strtod(value, NULL); - if (!((dimensions->xreal = fabs(dimensions->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - dimensions->xreal = 1.0; - } - - if (!(value = g_hash_table_lookup(hash, "Y-Length"))) { - err_MISSING_FIELD(error, "Y-Length"); - return FALSE; - } - dimensions->yreal = Micrometer * g_ascii_strtod(value, NULL); - if (!((dimensions->yreal = fabs(dimensions->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - dimensions->yreal = 1.0; - } + dimensions->xreal = g_ascii_strtod(g_hash_table_lookup(hash, "X-Length"), NULL); + sanitise_real_size(&dimensions->xreal, "x size"); + dimensions->xreal *= Micrometer; + + dimensions->yreal = g_ascii_strtod(g_hash_table_lookup(hash, "Y-Length"), NULL); + sanitise_real_size(&dimensions->yreal, "y size"); + dimensions->yreal *= Micrometer; return TRUE; } diff -Nru gwyddion-2.62/modules/file/shimadzu.c gwyddion-2.63/modules/file/shimadzu.c --- gwyddion-2.62/modules/file/shimadzu.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/shimadzu.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: shimadzu.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: shimadzu.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2007 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -83,12 +83,6 @@ HEADER_SIZE = 32768 }; -/* These are used as type sizes, too */ -typedef enum { - SHIMADZU_SHORT = 2, - SHIMADZU_FLOAT = 4 -} ShimadzuDataType; - #define MAGIC "Shimadzu SPM File Format Version " #define MAGIC_SIZE (sizeof(MAGIC)-1) @@ -264,13 +258,12 @@ GHashTable *hash, GError **error) { - ShimadzuDataType data_type; - gint xres, yres, i; + GwyRawDataType rawtype; + gint xres, yres; guint expected; gdouble xreal, yreal, zscale, xoff, yoff, zoff; GwySIUnit *unitxy, *unitz; GwyDataField *dfield = NULL; - gdouble *d; const gchar *s; if (!(s = g_hash_table_lookup(hash, "DataType"))) { @@ -279,9 +272,9 @@ } if (g_ascii_strcasecmp(s, "short") == 0) - data_type = SHIMADZU_SHORT; + rawtype = GWY_RAW_DATA_SINT16; else if (g_ascii_strcasecmp(s, "float") == 0) - data_type = SHIMADZU_FLOAT; + rawtype = GWY_RAW_DATA_FLOAT; else { err_UNSUPPORTED(error, "DataType"); return NULL; @@ -295,33 +288,18 @@ &zscale, &zoff, unitz, error)) goto fail; - expected = data_type*xres*yres + HEADER_SIZE; + expected = xres*yres*gwy_raw_data_size(rawtype) + HEADER_SIZE; if (err_SIZE_MISMATCH(error, expected, size, FALSE)) goto fail; dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); gwy_data_field_set_xoffset(dfield, xoff); gwy_data_field_set_yoffset(dfield, yoff); - gwy_data_field_set_si_unit_xy(dfield, unitxy); - gwy_data_field_set_si_unit_z(dfield, unitz); - d = gwy_data_field_get_data(dfield); - - if (data_type == SHIMADZU_SHORT) { - const gint16 *d16 = (const gint16*)(buffer + HEADER_SIZE); - - for (i = 0; i < xres*yres; i++) - d[i] = zscale*GUINT16_FROM_LE(d16[i]) + zoff; - } - else if (data_type == SHIMADZU_FLOAT) { - const guchar *p = buffer + HEADER_SIZE; - - for (i = 0; i < xres*yres; i++) - d[i] = zscale*gwy_get_gfloat_le(&p) + zoff; - } - else { - g_assert_not_reached(); - } - + gwy_si_unit_assign(gwy_data_field_get_si_unit_xy(dfield), unitxy); + gwy_si_unit_assign(gwy_data_field_get_si_unit_z(dfield), unitz); + gwy_convert_raw_data(buffer + HEADER_SIZE, xres*yres, 1, + rawtype, GWY_BYTE_ORDER_LITTLE_ENDIAN, + gwy_data_field_get_data(dfield), zscale, zoff); gwy_data_field_invert(dfield, TRUE, FALSE, FALSE); fail: @@ -534,20 +512,14 @@ unit = gwy_si_unit_new(NULL); p = g_hash_table_lookup(hash, "SCANNING PARAMS::SizeX"); - *xreal = fabs(g_ascii_strtod(p, &p)); - if (!*xreal) { - g_warning("Real x size is 0.0, fixing to 1.0"); - *xreal = 1.0; - } + *xreal = g_ascii_strtod(p, &p); + sanitise_real_size(xreal, "x size"); gwy_si_unit_set_from_string_parse(si_unit_xy, p, &power10); *xreal *= pow10(power10); p = g_hash_table_lookup(hash, "SCANNING PARAMS::SizeY"); - *yreal = fabs(g_ascii_strtod(p, &p)); - if (!*yreal) { - g_warning("Real y size is 0.0, fixing to 1.0"); - *yreal = 1.0; - } + *yreal = g_ascii_strtod(p, &p); + sanitise_real_size(yreal, "y size"); gwy_si_unit_set_from_string_parse(unit, p, &power10); *yreal *= pow10(power10); if (!gwy_si_unit_equal(unit, si_unit_xy)) { diff -Nru gwyddion-2.62/modules/file/sis.c gwyddion-2.63/modules/file/sis.c --- gwyddion-2.62/modules/file/sis.c 2019-01-03 12:58:17.000000000 +0000 +++ gwyddion-2.63/modules/file/sis.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sis.c 21783 2019-01-03 12:58:14Z yeti-dn $ + * $Id: sis.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -618,15 +618,8 @@ if ((d = g_hash_table_lookup(sisfile->params, GUINT_TO_POINTER(4)))) zreal = *d * 1e-9; - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 100.0e-9; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 100.0e-9; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(image->width, image->height, xreal, yreal, diff -Nru gwyddion-2.62/modules/file/spip-asc.c gwyddion-2.63/modules/file/spip-asc.c --- gwyddion-2.62/modules/file/spip-asc.c 2022-03-21 12:12:25.000000000 +0000 +++ gwyddion-2.63/modules/file/spip-asc.c 2023-06-01 15:22:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: spip-asc.c 24698 2022-03-21 12:12:25Z yeti-dn $ + * $Id: spip-asc.c 25398 2023-06-01 15:22:43Z yeti-dn $ * Copyright (C) 2009-2019 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -221,15 +221,8 @@ xreal = Nanometer * g_ascii_strtod(g_hash_table_lookup(hash, "x-length"), NULL); yreal = Nanometer * g_ascii_strtod(g_hash_table_lookup(hash, "y-length"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); field = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(field), "m"); diff -Nru gwyddion-2.62/modules/file/spmlab.c gwyddion-2.63/modules/file/spmlab.c --- gwyddion-2.62/modules/file/spmlab.c 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/modules/file/spmlab.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: spmlab.c 22642 2019-11-03 11:46:07Z yeti-dn $ + * $Id: spmlab.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -415,16 +415,10 @@ p = buffer + offsets[PHYSDIM_IDX]; slfile->xoff = -getflt(&p); slfile->xreal = getflt(&p) - slfile->xoff; - if (!((slfile->xreal = fabs(slfile->xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - slfile->xreal = 1.0; - } + sanitise_real_size(&slfile->xreal, "x size"); slfile->yoff = -getflt(&p); slfile->yreal = getflt(&p) - slfile->yoff; - if (!((slfile->yreal = fabs(slfile->yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - slfile->yreal = 1.0; - } + sanitise_real_size(&slfile->yreal, "y size"); p = buffer + offsets[SCALING_IDX]; slfile->q = getflt(&p); diff -Nru gwyddion-2.62/modules/file/spmlabf.c gwyddion-2.63/modules/file/spmlabf.c --- gwyddion-2.62/modules/file/spmlabf.c 2021-06-10 08:39:21.000000000 +0000 +++ gwyddion-2.63/modules/file/spmlabf.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: spmlabf.c 23822 2021-06-10 06:58:57Z yeti-dn $ + * $Id: spmlabf.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2008 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -188,11 +188,7 @@ else siunitx = gwy_si_unit_new_parse(end, &power10); xreal *= pow10(power10); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); yreal = g_ascii_strtod(g_hash_table_lookup(hash, "ScanRangeY"), &end); if ((s = g_hash_table_lookup(hash, "XYUnit"))) @@ -200,11 +196,7 @@ else siunity = gwy_si_unit_new_parse(end, &power10); yreal *= pow10(power10); - /* Use negated positive conditions to catch NaNs */ - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&yreal, "y size"); q = g_ascii_strtod(g_hash_table_lookup(hash, "ZTransferCoefficient"), &end); if ((s = g_hash_table_lookup(hash, "ZUnit"))) diff -Nru gwyddion-2.62/modules/file/surffile.c gwyddion-2.63/modules/file/surffile.c --- gwyddion-2.62/modules/file/surffile.c 2021-08-22 20:15:29.000000000 +0000 +++ gwyddion-2.63/modules/file/surffile.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: surffile.c 24038 2021-08-21 11:18:28Z yeti-dn $ + * $Id: surffile.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2005-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -482,15 +482,8 @@ } } - /* Use negated positive conditions to catch NaNs */ - if (!((surffile.dx = fabs(surffile.dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - surffile.dx = 1.0; - } - if (!((surffile.dy = fabs(surffile.dy)) > 0)) { - g_warning("Real y step is 0.0, fixing to 1.0"); - surffile.dy = 1.0; - } + sanitise_real_size(&surffile.dx, "x step"); + sanitise_real_size(&surffile.dy, "y step"); p = buffer + SURF_HEADER_SIZE + add; @@ -498,6 +491,7 @@ coef = 0; surffile.xyunit = gwy_si_unit_new_parse(surffile.dx_unit, &coef); surffile.dx *= pow10(coef); + g_object_unref(surffile.xyunit); coef = 0; surffile.xyunit = gwy_si_unit_new_parse(surffile.dy_unit, &coef); surffile.dy *= pow10(coef); diff -Nru gwyddion-2.62/modules/file/tescan.c gwyddion-2.63/modules/file/tescan.c --- gwyddion-2.62/modules/file/tescan.c 2019-10-30 13:15:45.000000000 +0000 +++ gwyddion-2.63/modules/file/tescan.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: tescan.c 22625 2019-10-30 09:12:55Z yeti-dn $ + * $Id: tescan.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2013-2019 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -231,8 +231,7 @@ if ((value = g_hash_table_lookup(hash, "Main::PixelSizeX"))) { gwy_debug("Main::PixelSizeX %s", value); xstep = g_strtod(value, NULL); - if (!((xstep = fabs(xstep)) > 0)) - g_warning("Real pixel width is 0.0, fixing to 1.0"); + sanitise_real_size(&xstep, "x step"); } else { err_MISSING_FIELD(error, "Main::PixelSizeX"); @@ -242,8 +241,7 @@ if ((value = g_hash_table_lookup(hash, "Main::PixelSizeY"))) { gwy_debug("Main::PixelSizeY %s", value); ystep = g_strtod(value, NULL); - if (!((ystep = fabs(ystep)) > 0)) - g_warning("Real pixel height is 0.0, fixing to 1.0"); + sanitise_real_size(&ystep, "y step"); } else { err_MISSING_FIELD(error, "Main::PixelSizeY"); diff -Nru gwyddion-2.62/modules/file/ttffile.c gwyddion-2.63/modules/file/ttffile.c --- gwyddion-2.62/modules/file/ttffile.c 2022-04-28 13:19:48.000000000 +0000 +++ gwyddion-2.63/modules/file/ttffile.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: ttffile.c 24789 2022-04-28 13:19:47Z yeti-dn $ + * $Id: ttffile.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2019-2021 David Necas (Yeti), Thomas Wagner. * E-mail: yeti@gwyddion.net, hirschbeutel@gmail.com. * @@ -329,10 +329,7 @@ return FALSE; n = xres*yres; - if (!(invdx > 0.0)) { - g_warning("Real pixel width is 0.0, fixing to 1.0"); - invdx = 1.0; - } + sanitise_real_size(&invdx, "pixel width"); /* This means tag data are never stored within the tag; just the pointer. */ size = 4*entry->count; @@ -678,7 +675,7 @@ { GMatchInfo *info = NULL; GRegex *regex; - gchar *s, *retval = NULL; + gchar *s, *t, *retval = NULL; gdouble mmp, pmm; s = strstr(p, "Units: "); @@ -702,8 +699,10 @@ err_MISSING_FIELD(error, "Size"); goto fail; } - header->xres = atoi(g_match_info_fetch_named(info, "xres")); - header->yres = atoi(g_match_info_fetch_named(info, "yres")); + header->xres = atoi((t = g_match_info_fetch_named(info, "xres"))); + g_free(t); + header->yres = atoi((t = g_match_info_fetch_named(info, "yres"))); + g_free(t); gwy_debug("xres %d, yres %d", header->xres, header->yres); free_matchinfo(info); free_regex(regex); @@ -715,18 +714,18 @@ err_MISSING_FIELD(error, "Box"); goto fail; } - pmm = g_strtod(g_match_info_fetch_named(info, "pixmm"), NULL); - mmp = g_strtod(g_match_info_fetch_named(info, "mmpix"), NULL); + pmm = g_strtod((t = g_match_info_fetch_named(info, "pixmm")), NULL); + g_free(t); + mmp = g_strtod((t = g_match_info_fetch_named(info, "mmpix")), NULL); + g_free(t); free_matchinfo(info); free_regex(regex); pmm = sqrt(fabs(pmm/mmp)); header->xreal = 1e-3 * header->xres/pmm; header->yreal = 1e-3 * header->yres/pmm; gwy_debug("xreal %g, yreal %g", header->xreal, header->yreal); - if (!(header->xreal > 0.0)) { - g_warning("Real pixel width is 0.0, fixing to 1.0"); - header->xreal = header->yreal = 1.0; - } + sanitise_real_size(&header->xreal, "x size"); + sanitise_real_size(&header->yreal, "y size"); regex = g_regex_new("\\bUnits:\\s+(?P\\S+)", G_REGEX_NO_AUTO_CAPTURE, 0, NULL); g_return_val_if_fail(regex, NULL); @@ -734,7 +733,7 @@ err_MISSING_FIELD(error, "Units"); goto fail; } - header->units = g_strdup(g_match_info_fetch_named(info, "units")); + header->units = g_match_info_fetch_named(info, "units"); gwy_debug("units %s", header->units); free_matchinfo(info); free_regex(regex); diff -Nru gwyddion-2.62/modules/file/witec-asc.c gwyddion-2.63/modules/file/witec-asc.c --- gwyddion-2.62/modules/file/witec-asc.c 2021-10-29 11:16:50.000000000 +0000 +++ gwyddion-2.63/modules/file/witec-asc.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: witec-asc.c 24433 2021-10-29 11:16:49Z yeti-dn $ + * $Id: witec-asc.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -184,15 +184,8 @@ zunit = gwy_si_unit_new_parse(g_hash_table_lookup(hash, "DataUnit"), &power10z); xreal = g_ascii_strtod(g_hash_table_lookup(hash, "ScanWidth"), NULL); yreal = g_ascii_strtod(g_hash_table_lookup(hash, "ScanHeight"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); xreal *= pow10(power10xy); yreal *= pow10(power10xy); diff -Nru gwyddion-2.62/modules/file/wrustfile.c gwyddion-2.63/modules/file/wrustfile.c --- gwyddion-2.62/modules/file/wrustfile.c 2022-04-05 11:16:24.000000000 +0000 +++ gwyddion-2.63/modules/file/wrustfile.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wrustfile.c 24756 2022-04-05 11:16:24Z yeti-dn $ + * $Id: wrustfile.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2021-2022 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -215,15 +215,8 @@ * which is given like 1234 um/100V, which we do by multiplying by 100 back. Together they give ×100/10 = ×10 */ xreal = xscale * 10.0 * g_ascii_strtod(g_hash_table_lookup(hash, "RasterX"), NULL); yreal = yscale * 10.0 * g_ascii_strtod(g_hash_table_lookup(hash, "RasterY"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); diff -Nru gwyddion-2.62/modules/file/wsffile.c gwyddion-2.63/modules/file/wsffile.c --- gwyddion-2.62/modules/file/wsffile.c 2020-11-26 10:58:29.000000000 +0000 +++ gwyddion-2.63/modules/file/wsffile.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wsffile.c 22967 2020-11-26 10:58:28Z yeti-dn $ + * $Id: wsffile.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2011-2019 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -189,15 +189,8 @@ xreal = g_ascii_strtod(g_hash_table_lookup(hash, "X Range"), NULL); yreal = g_ascii_strtod(g_hash_table_lookup(hash, "Y Range"), NULL); - /* Use negated positive conditions to catch NaNs */ - if (!((xreal = fabs(xreal)) > 0)) { - g_warning("Real x size is 0.0, fixing to 1.0"); - xreal = 1.0; - } - if (!((yreal = fabs(yreal)) > 0)) { - g_warning("Real y size is 0.0, fixing to 1.0"); - yreal = 1.0; - } + sanitise_real_size(&xreal, "x size"); + sanitise_real_size(&yreal, "y size"); xreal *= Micro; yreal *= Micro; diff -Nru gwyddion-2.62/modules/file/xyzexport.c gwyddion-2.63/modules/file/xyzexport.c --- gwyddion-2.62/modules/file/xyzexport.c 2022-10-03 08:45:08.000000000 +0000 +++ gwyddion-2.63/modules/file/xyzexport.c 2023-02-23 16:16:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: xyzexport.c 25063 2022-10-03 08:45:08Z yeti-dn $ + * $Id: xyzexport.c 25245 2023-02-23 16:16:20Z yeti-dn $ * Copyright (C) 2015-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -23,7 +23,6 @@ **/ #include "config.h" -#include #include #ifdef HAVE_UNISTD_H #include @@ -53,14 +52,7 @@ }; typedef struct { - gboolean needs_decimal_dot; - guint decimal_dot_len; - gchar *decimal_dot; -} DecimalDotInfo; - -typedef struct { GwyParams *params; - DecimalDotInfo decinfo; GwyAppPage pageno; gboolean have_mask; } ModuleArgs; @@ -81,14 +73,13 @@ static gboolean xyzexport_export_surface (GwySurface *surface, FILE *fh, ModuleArgs *args); -static void fill_decimal_dot_info (DecimalDotInfo *info); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Exports data as simple XYZ text file."), "Yeti ", - "3.0", + "3.1", "David Nečas (Yeti)", "2015", }; @@ -180,9 +171,6 @@ } args.params = gwy_params_new_from_settings(define_module_params()); - fill_decimal_dot_info(&args.decinfo); - if (!args.decinfo.needs_decimal_dot) - gwy_params_set_boolean(args.params, PARAM_DECIMAL_DOT, TRUE); if (dfield) gwy_container_gis_string(data, gwy_app_get_data_title_key_for_id(fid), &title); @@ -258,10 +246,13 @@ static GwyDialogOutcome run_gui(ModuleArgs *args, const gchar *title) { + gboolean needs_decimal_dot_option; GwyDialog *dialog; GwyParamTable *table; gchar *desc = NULL; + needs_decimal_dot_option = !gwy_strequal(gwy_get_decimal_separator(), "."); + dialog = GWY_DIALOG(gwy_dialog_new(_("Export XYZ"))); gwy_dialog_add_buttons(dialog, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); @@ -274,8 +265,8 @@ gwy_param_table_append_info(table, INFO_CHANNEL, desc); gwy_param_table_info_set_valuestr(table, INFO_CHANNEL, title); gwy_param_table_append_header(table, -1, _("Options")); - gwy_param_table_append_checkbox(table, PARAM_DECIMAL_DOT); - gwy_param_table_set_sensitive(table, PARAM_DECIMAL_DOT, args->decinfo.needs_decimal_dot); + if (needs_decimal_dot_option) + gwy_param_table_append_checkbox(table, PARAM_DECIMAL_DOT); gwy_param_table_append_checkbox(table, PARAM_ADD_COMMENT); gwy_param_table_append_slider(table, PARAM_PRECISION); gwy_param_table_slider_set_mapping(table, PARAM_PRECISION, GWY_SCALE_MAPPING_LINEAR); @@ -287,47 +278,18 @@ return gwy_dialog_run(dialog); } -static inline gint -print_with_decimal_dot(FILE *fh, - gchar *formatted_number, - const gchar *decimal_dot, - guint decimal_dot_len) -{ - gchar *pos = strstr(formatted_number, decimal_dot); - - if (!pos) - return fputs(formatted_number, fh); - else { - pos[0] = '.'; - if (decimal_dot_len == 1) - return fputs(formatted_number, fh); - else { - gint l1, l2; - - pos[1] = '\0'; - if ((l1 = fputs(formatted_number, fh)) == EOF) - return EOF; - if ((l2 = fputs(pos + decimal_dot_len, fh)) == EOF) - return EOF; - return l1 + l2; - } - } -} - static gboolean xyzexport_export_data_field(GwyDataField *dfield, GwyDataField *mfield, FILE *fh, ModuleArgs *args) { - gboolean force_decimal_dot = (args->decinfo.needs_decimal_dot - && gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT)); + gboolean decimal_dot = gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT); gint precision = gwy_params_get_int(args->params, PARAM_PRECISION); GwyMaskingType masking = gwy_params_get_masking(args->params, PARAM_MASKING, &mfield); - gint ddlen = args->decinfo.decimal_dot_len; - const gchar *ddot = args->decinfo.decimal_dot; gdouble dx, dy, xoff, yoff; const gdouble *d, *m; gint xres, yres, i, j; - gchar buf[40]; + gdouble xyz[3]; + GString *str; xres = gwy_data_field_get_xres(dfield); yres = gwy_data_field_get_yres(dfield); @@ -339,51 +301,30 @@ d = gwy_data_field_get_data_const(dfield); m = mfield ? gwy_data_field_get_data_const(mfield) : NULL; - if (force_decimal_dot) { - for (i = 0; i < yres; i++) { - gdouble y = dy*(i + 0.5) + yoff; - for (j = 0; j < xres; j++) { - gdouble x = dx*(j + 0.5) + xoff; - gdouble z = d[i*xres + j]; - - if (m) { - if (masking == GWY_MASK_EXCLUDE && m[i*xres + j] > 0.5) - continue; - if (masking == GWY_MASK_INCLUDE && m[i*xres + j] < 0.5) - continue; - } - - g_snprintf(buf, sizeof(buf), "%.*g\t", precision, x); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - g_snprintf(buf, sizeof(buf), "%.*g\t", precision, y); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - g_snprintf(buf, sizeof(buf), "%.*g\n", precision, z); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; + str = g_string_new(NULL); + for (i = 0; i < yres; i++) { + xyz[1] = dy*(i + 0.5) + yoff; + for (j = 0; j < xres; j++) { + if (m) { + if (masking == GWY_MASK_EXCLUDE && m[i*xres + j] > 0.5) + continue; + if (masking == GWY_MASK_INCLUDE && m[i*xres + j] < 0.5) + continue; } - } - } - else { - for (i = 0; i < yres; i++) { - gdouble y = dy*(i + 0.5) + yoff; - for (j = 0; j < xres; j++) { - gdouble x = dx*(j + 0.5) + xoff; - gdouble z = d[i*xres + j]; - - if (m) { - if (masking == GWY_MASK_EXCLUDE && m[i*xres + j] > 0.5) - continue; - if (masking == GWY_MASK_INCLUDE && m[i*xres + j] < 0.5) - continue; - } - if (gwy_fprintf(fh, "%.*g\t%.*g\t%.*g\n", precision, x, precision, y, precision, z) < 3) - return FALSE; + xyz[0] = dx*(j + 0.5) + xoff; + xyz[2] = d[i*xres + j]; + + g_string_truncate(str, 0); + gwy_append_doubles_to_gstring(str, xyz, 3, precision, "\t", decimal_dot); + g_string_append_c(str, '\n'); + if (fputs(str->str, fh) == EOF) { + g_string_free(str, TRUE); + return FALSE; } } } + g_string_free(str, TRUE); return TRUE; } @@ -392,58 +333,25 @@ xyzexport_export_surface(GwySurface *surface, FILE *fh, ModuleArgs *args) { - gboolean force_decimal_dot = (args->decinfo.needs_decimal_dot - && gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT)); + gboolean decimal_dot = gwy_params_get_boolean(args->params, PARAM_DECIMAL_DOT); gint precision = gwy_params_get_int(args->params, PARAM_PRECISION); - gint ddlen = args->decinfo.decimal_dot_len; - const gchar *ddot = args->decinfo.decimal_dot; - const GwyXYZ *data; - guint n, i; - gchar buf[40]; - - data = surface->data; - n = surface->n; - - if (force_decimal_dot) { - for (i = 0; i < n; i++) { - g_snprintf(buf, sizeof(buf), "%.*g\t", precision, data[i].x); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - g_snprintf(buf, sizeof(buf), "%.*g\t", precision, data[i].y); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - g_snprintf(buf, sizeof(buf), "%.*g\n", precision, data[i].z); - if (print_with_decimal_dot(fh, buf, ddot, ddlen) == EOF) - return FALSE; - } - } - else { - for (i = 0; i < n; i++) { - if (gwy_fprintf(fh, "%.*g\t%.*g\t%.*g\n", - precision, data[i].x, precision, data[i].y, precision, data[i].z) < 3) - return FALSE; + const GwyXYZ *data = gwy_surface_get_data(surface); + guint i, n = gwy_surface_get_npoints(surface); + GString *str; + + str = g_string_new(NULL); + for (i = 0; i < n; i++) { + g_string_truncate(str, 0); + gwy_append_doubles_to_gstring(str, (gdouble*)(data + i), 3, precision, "\t", decimal_dot); + g_string_append_c(str, '\n'); + if (fputs(str->str, fh) == EOF) { + g_string_free(str, TRUE); + return FALSE; } } + g_string_free(str, TRUE); return TRUE; } -static void -fill_decimal_dot_info(DecimalDotInfo *info) -{ - struct lconv *locale_data; - guint len; - - locale_data = localeconv(); - info->decimal_dot = g_strdup(locale_data->decimal_point); - if (!info->decimal_dot || !(len = strlen(info->decimal_dot))) { - g_warning("Cannot get decimal dot information from localeconv()."); - g_free(info->decimal_dot); - info->decimal_dot = g_strdup("."); - len = 1; - } - info->decimal_dot_len = len; - info->needs_decimal_dot = !gwy_strequal(info->decimal_dot, "."); -} - /* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/zeiss.c gwyddion-2.63/modules/file/zeiss.c --- gwyddion-2.62/modules/file/zeiss.c 2019-10-30 13:15:45.000000000 +0000 +++ gwyddion-2.63/modules/file/zeiss.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: zeiss.c 22626 2019-10-30 09:14:30Z yeti-dn $ + * $Id: zeiss.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /** @@ -103,8 +99,7 @@ return 0; /* Use GwyTIFF for detection to avoid problems with fragile libtiff. */ - if ((tiff = gwy_tiff_load(fileinfo->name, NULL)) - && gwy_tiff_get_string0(tiff, ZEISS_HEADER_TAG, &comment)) { + if ((tiff = gwy_tiff_load(fileinfo->name, NULL)) && gwy_tiff_get_string0(tiff, ZEISS_HEADER_TAG, &comment)) { if (strstr(comment, MAGIC_COMMENT)) score = 100; else if (g_str_has_prefix(comment, SOMEWHAT_LESS_MAGIC_COMMENT)) @@ -189,39 +184,32 @@ } dx = g_ascii_strtod(value, &end); - /* Use negated positive conditions to catch NaNs */ - if (!((dx = fabs(dx)) > 0)) { - g_warning("Real pixel size is 0.0, fixing to 1.0"); - dx = 1.0; - } + sanitise_real_size(&dx, "pixel size"); if (!new_file) end = "m"; /* Request a reader, this ensures dimensions and stuff are defined. - * NB: Newer versions store the image as RGB. Not useful here; just - * average the channels. */ + * NB: Newer versions store the image as RGB. Not useful here; just average the channels. */ if (!(reader = gwy_tiff_get_image_reader(tiff, 0, 3, error))) goto fail; siunit = gwy_si_unit_new_parse(end, &power10); factor = pow10(power10); dfield = gwy_data_field_new(reader->width, reader->height, - reader->width * factor * dx, - reader->height * factor * dx, + reader->width * factor * dx, reader->height * factor * dx, FALSE); gwy_data_field_set_si_unit_xy(dfield, siunit); g_object_unref(siunit); data = gwy_data_field_get_data(dfield); for (i = 0; i < reader->height; i++) - gwy_tiff_read_image_row_averaged(tiff, reader, i, 1.0, 0.0, - data + i*reader->width); + gwy_tiff_read_image_row_averaged(tiff, reader, i, 1.0, 0.0, data + i*reader->width); + gwy_tiff_image_reader_free(reader); container = gwy_container_new(); gwy_container_set_object_by_name(container, "/0/data", dfield); g_object_unref(dfield); - gwy_container_set_string_by_name(container, "/0/data/title", - g_strdup("Secondary electron count")); + gwy_container_set_const_string_by_name(container, "/0/data/title", "Secondary electron count"); if (new_file) { meta = gwy_container_new(); @@ -242,12 +230,9 @@ static void add_meta(gpointer hkey, gpointer hvalue, gpointer user_data) { - gchar *value = g_convert((const gchar*)hvalue, -1, - "UTF-8", "ISO-8859-1", - NULL, NULL, NULL); + gchar *value = g_convert((const gchar*)hvalue, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL); if (value) - gwy_container_set_string_by_name(GWY_CONTAINER(user_data), - (gchar*)hkey, value); + gwy_container_set_string_by_name(GWY_CONTAINER(user_data), (gchar*)hkey, value); } static GHashTable* @@ -257,8 +242,7 @@ GHashTable *hash = g_hash_table_new(g_str_hash, g_str_equal); for (line = gwy_str_next_line(&p); line; line = gwy_str_next_line(&p)) { - if (g_str_has_prefix(line, "Date :") - || g_str_has_prefix(line, "Time :")) + if (g_str_has_prefix(line, "Date :") || g_str_has_prefix(line, "Time :")) value = line + 6; else if (!(value = strchr(line, '='))) continue; @@ -274,4 +258,4 @@ return hash; } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/file/zemax.c gwyddion-2.63/modules/file/zemax.c --- gwyddion-2.62/modules/file/zemax.c 2018-11-26 10:25:16.000000000 +0000 +++ gwyddion-2.63/modules/file/zemax.c 2023-06-01 15:40:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: zemax.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: zemax.c 25399 2023-06-01 15:40:20Z yeti-dn $ * Copyright (C) 2013 David Necas (Yeti). * E-mail: yeti@gwyddion.net * @@ -299,22 +299,14 @@ gwy_debug("dx %g", zmxfile->dx); if (end == header) goto fail; - /* Use negated positive conditions to catch NaNs */ - if (!((zmxfile->dx = fabs(zmxfile->dx)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - zmxfile->dx = 1.0; - } + sanitise_real_size(&zmxfile->dx, "x step"); header = end; zmxfile->dy = g_ascii_strtod(header, &end); gwy_debug("dy %g", zmxfile->dy); if (end == header) goto fail; - /* Use negated positive conditions to catch NaNs */ - if (!((zmxfile->dy = fabs(zmxfile->dy)) > 0)) { - g_warning("Real x step is 0.0, fixing to 1.0"); - zmxfile->dy = 1.0; - } + sanitise_real_size(&zmxfile->dy, "y step"); header = end; zmxfile->unit = strtol(header, &end, 10); diff -Nru gwyddion-2.62/modules/graph/graph.c gwyddion-2.63/modules/graph/graph.c --- gwyddion-2.62/modules/graph/graph.c 2022-10-17 12:23:17.000000000 +0000 +++ gwyddion-2.63/modules/graph/graph.c 2023-01-06 12:07:27.000000000 +0000 @@ -27,6 +27,7 @@ GwyModuleInfo* _gwy_module_query__graph_invert(void); GwyModuleInfo* _gwy_module_query__graph_level(void); GwyModuleInfo* _gwy_module_query__graph_logscale(void); +GwyModuleInfo* _gwy_module_query__graph_measure_period(void); GwyModuleInfo* _gwy_module_query__graph_peaks(void); GwyModuleInfo* _gwy_module_query__graph_polylevel(void); GwyModuleInfo* _gwy_module_query__graph_sfuncs(void); @@ -51,6 +52,7 @@ { _gwy_module_query__graph_invert, "graph_invert", }, { _gwy_module_query__graph_level, "graph_level", }, { _gwy_module_query__graph_logscale, "graph_logscale", }, + { _gwy_module_query__graph_measure_period, "graph_measure_period", }, { _gwy_module_query__graph_peaks, "graph_peaks", }, { _gwy_module_query__graph_polylevel, "graph_polylevel", }, { _gwy_module_query__graph_sfuncs, "graph_sfuncs", }, diff -Nru gwyddion-2.62/modules/graph/graph_cut.c gwyddion-2.63/modules/graph/graph_cut.c --- gwyddion-2.62/modules/graph/graph_cut.c 2021-10-22 16:05:29.000000000 +0000 +++ gwyddion-2.63/modules/graph/graph_cut.c 2023-02-22 12:54:01.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: graph_cut.c 24414 2021-10-22 16:05:29Z yeti-dn $ - * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. + * $Id: graph_cut.c 25231 2023-02-22 12:49:25Z yeti-dn $ + * Copyright (C) 2007-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or CUTNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -35,58 +31,40 @@ #include #include +enum { + PARAM_CURVE, + PARAM_ALL, + PARAM_RANGE_FROM, + PARAM_RANGE_TO, +}; + typedef struct { - gint curve; - gdouble from; - gdouble to; - GwyGraph *parent_graph; - GwyGraphModel *graph_model; - GwySIValueFormat *abscissa_vf; - gboolean all; -} CutArgs; + GwyParams *params; + GwyGraphModel *gmodel; +} ModuleArgs; typedef struct { - CutArgs *args; + ModuleArgs *args; GtkWidget *dialog; - GtkWidget *graph; - GtkWidget *from; - GtkWidget *to; - GtkWidget *curve; - GtkWidget *all; -} CutControls; - -static gboolean module_register (void); -static void cut (GwyGraph *graph); -static void cut_dialog (CutArgs *args); -static void cut_fetch_entry (CutControls *controls); -static void curve_changed (GtkComboBox *combo, - CutControls *controls); -static void range_changed (GtkWidget *entry, - CutControls *controls); -static void cut_limit_selection (CutControls *controls, - gboolean curve_switch); -static void cut_get_full_x_range(CutControls *controls, - gdouble *xmin, - gdouble *xmax); -static void do_cut (CutArgs *args); -static void graph_selected (GwySelection* selection, - gint i, - CutControls *controls); -static void all_changed (GtkToggleButton *check, - CutControls *controls); -static void pick_curves (CutControls *controls); -static void update_sensitivity (CutControls *controls); -static void load_args (GwyContainer *container, - CutArgs *args); -static void save_args (GwyContainer *container, - CutArgs *args); + GwyParamTable *table; + GwyGraphModel *gmodel; +} ModuleGUI; + +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void cut (GwyGraph *graph); +static GwyDialogOutcome run_gui (ModuleArgs *args); +static void param_changed (ModuleGUI *gui, + gint id); +static void execute (ModuleArgs *args, + GwyContainer *data); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Cut graph"), "Petr Klapetek ", - "1.4", + "2.0", "David Nečas (Yeti) & Petr Klapetek", "2007", }; @@ -106,393 +84,160 @@ return TRUE; } -static void -cut(GwyGraph *graph) +static GwyParamDef* +define_module_params(void) { - CutArgs args; + static GwyParamDef *paramdef = NULL; - gwy_clear(&args, 1); - load_args(gwy_app_settings_get(), &args); - args.parent_graph = graph; - cut_dialog(&args); - save_args(gwy_app_settings_get(), &args); -} + if (paramdef) + return paramdef; -static void -cut_dialog(CutArgs *args) -{ - GtkWidget *label, *dialog, *hbox, *hbox2, *table; - GwyGraphModel *gmodel; - GwyGraphArea *area; - GwySelection *selection; - GwySIUnit *siunit; - CutControls controls; - gint response, row; - gdouble xmin, xmax; - - controls.args = args; - - gmodel = gwy_graph_get_model(GWY_GRAPH(args->parent_graph)); - gwy_graph_model_get_x_range(gmodel, &xmin, &xmax); - g_object_get(gmodel, "si-unit-x", &siunit, NULL); - args->abscissa_vf - = gwy_si_unit_get_format_with_digits(siunit, - GWY_SI_UNIT_FORMAT_VFMARKUP, - MAX(fabs(xmin), fabs(xmax)), 4, - NULL); - g_object_unref(siunit); - - dialog = gtk_dialog_new_with_buttons(_("Cut Graph"), NULL, 0, NULL); - controls.dialog = dialog; - gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_OK, GTK_RESPONSE_OK); - gwy_help_add_to_graph_dialog(GTK_DIALOG(dialog), GWY_HELP_DEFAULT); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - - hbox = gtk_hbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 0); - - table = gtk_table_new(7, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 2); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(table), 4); - row = 0; - - /* Curve to cut */ - controls.curve = gwy_combo_box_graph_curve_new(G_CALLBACK(curve_changed), - &controls, - gmodel, args->curve); - gwy_table_attach_adjbar(table, row, _("_Graph curve:"), NULL, - GTK_OBJECT(controls.curve), - GWY_HSCALE_WIDGET_NO_EXPAND); - row++; - - controls.all = gtk_check_button_new_with_mnemonic(_("Cut _all curves")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls.all), - args->all); - gtk_table_attach(GTK_TABLE(table), controls.all, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls.all, "toggled", - G_CALLBACK(all_changed), &controls); - row++; - - /* Cut area */ - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - hbox2 = gtk_hbox_new(FALSE, 6); - gtk_table_attach(GTK_TABLE(table), hbox2, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - row++; - - label = gtk_label_new(_("Range:")); - gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0); - - controls.from = gtk_entry_new(); - g_object_set_data(G_OBJECT(controls.from), "id", (gpointer)"from"); - gtk_entry_set_width_chars(GTK_ENTRY(controls.from), 8); - gtk_box_pack_start(GTK_BOX(hbox2), controls.from, FALSE, FALSE, 0); - g_signal_connect(controls.from, "activate", - G_CALLBACK(range_changed), &controls); - gwy_widget_set_activate_on_unfocus(controls.from, TRUE); - - label = gtk_label_new(gwy_sgettext("range|to")); - gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0); - - controls.to = gtk_entry_new(); - g_object_set_data(G_OBJECT(controls.to), "id", (gpointer)"to"); - gtk_entry_set_width_chars(GTK_ENTRY(controls.to), 8); - gtk_box_pack_start(GTK_BOX(hbox2), controls.to, FALSE, FALSE, 0); - g_signal_connect(controls.to, "activate", - G_CALLBACK(range_changed), &controls); - gwy_widget_set_activate_on_unfocus(controls.to, TRUE); - - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), args->abscissa_vf->units); - gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0); - - /* Graph */ - args->graph_model = gwy_graph_model_new_alike(gmodel); - controls.graph = gwy_graph_new(args->graph_model); - g_object_unref(args->graph_model); - gtk_widget_set_size_request(controls.graph, 400, 300); - - gwy_graph_enable_user_input(GWY_GRAPH(controls.graph), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), controls.graph, TRUE, TRUE, 0); - gwy_graph_set_status(GWY_GRAPH(controls.graph), GWY_GRAPH_STATUS_XSEL); - - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls.graph))); - selection = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); - gwy_selection_set_max_objects(selection, 1); - g_signal_connect(selection, "changed", - G_CALLBACK(graph_selected), &controls); - - gwy_graph_model_add_curve(controls.args->graph_model, - gwy_graph_model_get_curve(gmodel, args->curve)); - graph_selected(selection, -1, &controls); - - gtk_widget_show_all(dialog); - pick_curves(&controls); - update_sensitivity(&controls); - - response = gtk_dialog_run(GTK_DIALOG(dialog)); - if (response == GTK_RESPONSE_OK) - cut_fetch_entry(&controls); - gtk_widget_destroy(dialog); - if (response == GTK_RESPONSE_OK) - do_cut(args); + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_graph_func_current()); + gwy_param_def_add_graph_curve(paramdef, PARAM_CURVE, "curve", NULL); + gwy_param_def_add_boolean(paramdef, PARAM_ALL, "all", _("Cut _all curves"), TRUE); + /* Not saved to settings. */ + gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, _("Range"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + gwy_param_def_add_double(paramdef, PARAM_RANGE_TO, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + + return paramdef; } static void -do_cut(CutArgs *args) +cut(GwyGraph *graph) { - gint i, j, k, ndata, nndata, cstart, cend; GwyContainer *data; - GwyGraphModel *ngmodel, *gmodel; - GwyGraphCurveModel *gcmodel, *ngcmodel; - const gdouble *xdata, *ydata; - gdouble *nxdata, *nydata; - - gmodel = gwy_graph_get_model(args->parent_graph); - ngmodel = gwy_graph_model_new_alike(gmodel); - - if (args->all) { - cstart = 0; - cend = gwy_graph_model_get_n_curves(gmodel); - } - else { - cstart = args->curve; - cend = args->curve + 1; - } - - for (k = cstart; k < cend; k++) { - gcmodel = gwy_graph_model_get_curve(gmodel, k); - ngcmodel = gwy_graph_curve_model_duplicate(gcmodel); - - xdata = gwy_graph_curve_model_get_xdata(gcmodel); - ydata = gwy_graph_curve_model_get_ydata(gcmodel); - ndata = gwy_graph_curve_model_get_ndata(gcmodel); - - /*TODO this should really work differently*/ - nndata = 0; - for (i = 0; i < ndata; i++) { - if (xdata[i] >= args->from && xdata[i] < args->to) - nndata++; - } - - if (nndata == 0) { - g_object_unref(ngcmodel); - continue; - } - nxdata = g_new(gdouble, nndata); - nydata = g_new(gdouble, nndata); - - j = 0; - for (i = 0; i < ndata; i++) { - if (xdata[i]>=args->from && xdata[i]to) { - nxdata[j] = xdata[i]; - nydata[j] = ydata[i]; - j++; - } - } - gwy_graph_curve_model_set_data(ngcmodel, nxdata, nydata, nndata); - g_free(nxdata); - g_free(nydata); + GwyDialogOutcome outcome; + ModuleArgs args; - gwy_graph_model_add_curve(ngmodel, ngcmodel); - g_object_unref(ngcmodel); - } - - gwy_app_data_browser_get_current(GWY_APP_CONTAINER, &data, NULL); - gwy_app_data_browser_add_graph_model(ngmodel, data, TRUE); + gwy_app_data_browser_get_current(GWY_APP_CONTAINER, &data, 0); + gwy_clear(&args, 1); + args.params = gwy_params_new_from_settings(define_module_params()); + args.gmodel = gwy_graph_get_model(graph); - g_object_unref(ngmodel); + outcome = run_gui(&args); + gwy_params_save_to_settings(args.params); + if (outcome != GWY_DIALOG_CANCEL) + execute(&args, data); + g_object_unref(args.params); } -static void -cut_fetch_entry(CutControls *controls) +static GwyDialogOutcome +run_gui(ModuleArgs *args) { - GtkWidget *entry; + GtkWidget *hbox, *graph; + GwyDialog *dialog; + GwyParamTable *table; + GwyDialogOutcome outcome; + ModuleGUI gui; - entry = gtk_window_get_focus(GTK_WINDOW(controls->dialog)); - if (entry - && GTK_IS_ENTRY(entry) - && g_object_get_data(G_OBJECT(entry), "id")) - gtk_widget_activate(entry); -} + gwy_clear(&gui, 1); + gui.args = args; + gui.gmodel = gwy_graph_model_new_alike(args->gmodel); -static void -pick_curves(CutControls *controls) -{ - GwyGraphModel *parent_gmodel, *graph_model; - GwyGraphCurveModel *gcmodel; - gint i, n; - - graph_model = controls->args->graph_model; - parent_gmodel = gwy_graph_get_model(controls->args->parent_graph); - gwy_graph_model_remove_all_curves(graph_model); - - if (!controls->args->all) { - gcmodel = gwy_graph_model_get_curve(parent_gmodel, - controls->args->curve); - gwy_graph_model_add_curve(graph_model, gcmodel); - } - else { - n = gwy_graph_model_get_n_curves(parent_gmodel); - for (i = 0; i < n; i++) { - gcmodel = gwy_graph_model_get_curve(parent_gmodel, i); - gwy_graph_model_add_curve(graph_model, gcmodel); - } - } - cut_limit_selection(controls, TRUE); -} + gui.dialog = gwy_dialog_new(_("Cut Graph")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); -static void -curve_changed(GtkComboBox *combo, CutControls *controls) -{ - controls->args->curve = gwy_enum_combo_box_get_active(combo); - pick_curves(controls); -} - -static void -graph_selected(GwySelection* selection, - gint i, - CutControls *controls) -{ - CutArgs *args; - gchar buffer[24]; - gdouble range[2]; - gint nselections; - gdouble power10; - - g_return_if_fail(i <= 0); - - args = controls->args; - nselections = gwy_selection_get_data(selection, NULL); - gwy_selection_get_object(selection, 0, range); + hbox = gwy_hbox_new(0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gwy_dialog_add_content(GWY_DIALOG(gui.dialog), hbox, FALSE, FALSE, 0); - if (nselections <= 0 || range[0] == range[1]) - cut_get_full_x_range(controls, &args->from, &args->to); - else { - args->from = MIN(range[0], range[1]); - args->to = MAX(range[0], range[1]); - } - power10 = pow10(args->abscissa_vf->precision); - g_snprintf(buffer, sizeof(buffer), "%.*f", - args->abscissa_vf->precision, - floor(args->from*power10/args->abscissa_vf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(controls->from), buffer); - g_snprintf(buffer, sizeof(buffer), "%.*f", - args->abscissa_vf->precision, - ceil(args->to*power10/args->abscissa_vf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(controls->to), buffer); - -} + graph = gwy_graph_new(gui.gmodel); + gtk_widget_set_size_request(graph, 480, 360); + gtk_box_pack_end(GTK_BOX(hbox), graph, TRUE, TRUE, 0); + gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); -static void -range_changed(GtkWidget *entry, - CutControls *controls) -{ - const gchar *id; - gdouble *x, newval; + table = gui.table = gwy_param_table_new(args->params); - id = g_object_get_data(G_OBJECT(entry), "id"); - if (gwy_strequal(id, "from")) - x = &controls->args->from; - else - x = &controls->args->to; - - newval = atof(gtk_entry_get_text(GTK_ENTRY(entry))); - newval *= controls->args->abscissa_vf->magnitude; - if (newval == *x) - return; - *x = newval; - cut_limit_selection(controls, FALSE); -} + gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); + gwy_param_table_append_checkbox(table, PARAM_ALL); + gwy_create_graph_xrange_with_params(table, PARAM_RANGE_FROM, PARAM_RANGE_TO, GWY_GRAPH(graph), args->gmodel); -static void -cut_limit_selection(CutControls *controls, - gboolean curve_switch) -{ - GwySelection *selection; - GwyGraphArea *area; - gdouble xmin, xmax; - - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls->graph))); - selection = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); - - if (curve_switch && !gwy_selection_get_data(selection, NULL)) { - graph_selected(selection, -1, controls); - return; - } + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, TRUE, 0); + gwy_dialog_add_param_table(dialog, table); - cut_get_full_x_range(controls, &xmin, &xmax); - controls->args->from = CLAMP(controls->args->from, xmin, xmax); - controls->args->to = CLAMP(controls->args->to, xmin, xmax); + g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); + outcome = gwy_dialog_run(dialog); - if (controls->args->from == xmin && controls->args->to == xmax) - gwy_selection_clear(selection); - else { - gdouble range[2]; + g_object_unref(gui.gmodel); - range[0] = controls->args->from; - range[1] = controls->args->to; - gwy_selection_set_object(selection, 0, range); - } + return outcome; } static void -cut_get_full_x_range(CutControls *controls, - gdouble *xmin, - gdouble *xmax) +execute(ModuleArgs *args, GwyContainer *data) { + GwyParams *params = args->params; + gint i, k, ndata, cstart, cend; GwyGraphModel *gmodel; - GwyGraphCurveModel *gcmodel; - - gmodel = gwy_graph_get_model(GWY_GRAPH(controls->graph)); - gcmodel = gwy_graph_model_get_curve(gmodel, 0); - gwy_graph_curve_model_get_x_range(gcmodel, xmin, xmax); -} + GwyGraphCurveModel *gcmodel, *newgcmodel; + const gdouble *xdata, *ydata; + gdouble xfrom = gwy_params_get_double(params, PARAM_RANGE_FROM); + gdouble xto = gwy_params_get_double(params, PARAM_RANGE_TO); + GArray *newxdata, *newydata; -static void -all_changed(GtkToggleButton *check, - CutControls *controls) -{ - controls->args->all = gtk_toggle_button_get_active(check); - pick_curves(controls); - update_sensitivity(controls); -} + if (gwy_params_get_boolean(params, PARAM_ALL)) { + cstart = 0; + cend = gwy_graph_model_get_n_curves(args->gmodel); + } + else { + cstart = gwy_params_get_int(params, PARAM_CURVE); + cend = cstart+1; + } -static void -update_sensitivity(CutControls *controls) -{ - gboolean csens = !controls->args->all; + newxdata = g_array_new(FALSE, FALSE, sizeof(gdouble)); + newydata = g_array_new(FALSE, FALSE, sizeof(gdouble)); + gmodel = gwy_graph_model_new_alike(args->gmodel); + for (k = cstart; k < cend; k++) { + gcmodel = gwy_graph_model_get_curve(args->gmodel, k); + xdata = gwy_graph_curve_model_get_xdata(gcmodel); + ydata = gwy_graph_curve_model_get_ydata(gcmodel); + ndata = gwy_graph_curve_model_get_ndata(gcmodel); - gwy_table_hscale_set_sensitive(GTK_OBJECT(controls->curve), csens); -} + g_array_set_size(newxdata, 0); + g_array_set_size(newydata, 0); + for (i = 0; i < ndata; i++) { + if (xdata[i] >= xfrom && xdata[i] < xto) { + g_array_append_val(newxdata, xdata[i]); + g_array_append_val(newydata, ydata[i]); + } + } + if (newxdata->len) { + newgcmodel = gwy_graph_curve_model_duplicate(gcmodel); + gwy_graph_curve_model_set_data(newgcmodel, + &g_array_index(newxdata, gdouble, 0), &g_array_index(newydata, gdouble, 0), + newxdata->len); + gwy_graph_model_add_curve(gmodel, newgcmodel); + g_object_unref(newgcmodel); + } + } -static const gchar all_key[] = "/module/graph_cut/all"; + /* XXX: This may confuse the user if we do not add anything at all. */ + if (gwy_graph_model_get_n_curves(gmodel)) + gwy_app_data_browser_add_graph_model(gmodel, data, TRUE); -static void -sanitize_args(CutArgs *args) -{ - args->all = !!args->all; + g_object_unref(gmodel); } static void -load_args(GwyContainer *container, CutArgs *args) +param_changed(ModuleGUI *gui, gint id) { - args->all = FALSE; + ModuleArgs *args = gui->args; - gwy_container_gis_boolean_by_name(container, all_key, &args->all); - sanitize_args(args); -} + if (id < 0 || id == PARAM_CURVE || id == PARAM_ALL) { + gint i, n, curve = gwy_params_get_int(args->params, PARAM_CURVE); + gboolean all = gwy_params_get_boolean(args->params, PARAM_ALL); -static void -save_args(GwyContainer *container, CutArgs *args) -{ - gwy_container_set_boolean_by_name(container, all_key, args->all); + gwy_graph_model_remove_all_curves(gui->gmodel); + if (all) { + n = gwy_graph_model_get_n_curves(args->gmodel); + for (i = 0; i < n; i++) + gwy_graph_model_add_curve(gui->gmodel, gwy_graph_model_get_curve(args->gmodel, i)); + } + else + gwy_graph_model_add_curve(gui->gmodel, gwy_graph_model_get_curve(args->gmodel, curve)); + } } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/graph/graph_measure_period.c gwyddion-2.63/modules/graph/graph_measure_period.c --- gwyddion-2.62/modules/graph/graph_measure_period.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/graph/graph_measure_period.c 2023-05-30 14:06:42.000000000 +0000 @@ -0,0 +1,1141 @@ +/* + * $Id: graph_measure_period.c 25382 2023-05-30 14:06:42Z yeti-dn $ + * Copyright (C) 2023 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define CNORM(x) (x[0]*x[0] + x[1]*x[1]) + +enum { + PARAM_CURVE, + PARAM_RANGE_FROM, + PARAM_RANGE_TO, + PARAM_REPORT_STYLE, + PARAM_LEVEL, + PARAM_SHOW_LEVELED, + LABEL_NPOINTS, + WIDGET_RESULTS_FFT, + WIDGET_RESULTS_ACF, + WIDGET_RESULTS_DIRECT, +}; + +typedef struct { + gdouble x; + gdouble l; +} GravityCentre; + +typedef struct { + GwyParams *params; + GwyGraphModel *gmodel; + GwyGraphCurveModel *levelled; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyResults *results; + GwyParamTable *table; + GwyGraphModel *gmodel; + GtkWidget *graph; +} ModuleGUI; + +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void graph_measure_period(GwyGraph *graph); +static void run_gui (ModuleArgs *args, + GwyContainer *data); +static gint execute (ModuleArgs *args, + GwyResults *results); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (ModuleGUI *gui, + gint response); +static void preview (gpointer user_data); +static GwyResults* create_results (GwyContainer *data, + GwyGraphModel *gmodel, + GwySIUnit *xunit, + GwySIUnit *yunit); + +static const gchar* results_period[] = { + "simple-fft", "zoom-fft", + "simple-acf", "multi-acf", + "zero-cross", "grav-centre", +}; + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Evaluates the period of a one-dimensional periodic structure."), + "Yeti ", + "1.0", + "David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, graph_measure_period) + +static gboolean +module_register(void) +{ + gwy_graph_func_register("graph_measure_period", + (GwyGraphFunc)&graph_measure_period, + N_("/Measure _Features/_Period..."), + GWY_STOCK_GRAPH_PERIOD_MEASURE, + GWY_MENU_FLAG_GRAPH_CURVE, + N_("Measure grating period")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_graph_func_current()); + gwy_param_def_add_graph_curve(paramdef, PARAM_CURVE, "curve", NULL); + gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Parameters"), + GWY_RESULTS_EXPORT_PARAMETERS, GWY_RESULTS_REPORT_COLON); + gwy_param_def_add_boolean(paramdef, PARAM_LEVEL, "level", _("_Subtract background"), TRUE); + gwy_param_def_add_boolean(paramdef, PARAM_SHOW_LEVELED, "show-leveled", _("Show _leveled curve"), TRUE); + /* Not saved to settings. */ + gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, _("Range"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + gwy_param_def_add_double(paramdef, PARAM_RANGE_TO, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + return paramdef; +} + +static void +graph_measure_period(GwyGraph *graph) +{ + GwyContainer *data; + ModuleArgs args; + + gwy_app_data_browser_get_current(GWY_APP_CONTAINER, &data, 0); + gwy_clear(&args, 1); + args.params = gwy_params_new_from_settings(define_module_params()); + args.gmodel = gwy_graph_get_model(graph); + + run_gui(&args, data); + gwy_params_save_to_settings(args.params); + g_object_unref(args.params); + GWY_OBJECT_UNREF(args.levelled); +} + +static void +run_gui(ModuleArgs *args, GwyContainer *data) +{ + GtkWidget *hbox, *graph; + GwyDialog *dialog; + GwyParamTable *table; + GwySIUnit *xunit, *yunit; + ModuleGUI gui; + + gwy_clear(&gui, 1); + gui.args = args; + gui.gmodel = gwy_graph_model_new_alike(args->gmodel); + g_object_get(args->gmodel, "si-unit-x", &xunit, "si-unit-y", &yunit, NULL); + gui.results = create_results(data, args->gmodel, xunit, yunit); + + gui.dialog = gwy_dialog_new(_("Measure Period")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_CLEAR, GTK_RESPONSE_OK, 0); + + hbox = gwy_hbox_new(0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gwy_dialog_add_content(GWY_DIALOG(gui.dialog), hbox, FALSE, FALSE, 0); + + graph = gui.graph = gwy_graph_new(gui.gmodel); + gtk_widget_set_size_request(graph, 480, 360); + gtk_box_pack_end(GTK_BOX(hbox), graph, TRUE, TRUE, 0); + gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); + + table = gui.table = gwy_param_table_new(args->params); + + gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); + gwy_param_table_append_checkbox(table, PARAM_LEVEL); + gwy_param_table_append_checkbox(table, PARAM_SHOW_LEVELED); + gwy_create_graph_xrange_with_params(table, PARAM_RANGE_FROM, PARAM_RANGE_TO, GWY_GRAPH(graph), args->gmodel); + gwy_param_table_append_info(table, LABEL_NPOINTS, _("Number of points")); + + gwy_param_table_append_header(table, -1, _("Fourier Transform")); + gwy_param_table_append_results(table, WIDGET_RESULTS_FFT, gui.results, "simple-fft", "zoom-fft", NULL); + gwy_param_table_append_header(table, -1, _("Autocorrelation")); + gwy_param_table_append_results(table, WIDGET_RESULTS_ACF, gui.results, "simple-acf", "multi-acf", NULL); + gwy_param_table_append_header(table, -1, _("Direct Methods")); + gwy_param_table_append_results(table, WIDGET_RESULTS_DIRECT, gui.results, "zero-cross", "grav-centre", NULL); + gwy_param_table_append_report(table, PARAM_REPORT_STYLE); + gwy_param_table_report_set_results(table, PARAM_REPORT_STYLE, gui.results); + + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, TRUE, 0); + gwy_dialog_add_param_table(dialog, table); + + g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); + gwy_dialog_run(dialog); + + g_object_unref(gui.gmodel); + g_object_unref(gui.results); + g_object_unref(xunit); + g_object_unref(yunit); +} + +static void +param_changed(ModuleGUI *gui, gint id) +{ + GwyParams *params = gui->args->params; + + if (id < 0 || id == PARAM_LEVEL) + gwy_param_table_set_sensitive(gui->table, PARAM_SHOW_LEVELED, gwy_params_get_boolean(params, PARAM_LEVEL)); + if (id != PARAM_REPORT_STYLE) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dialog_response(ModuleGUI *gui, gint response) +{ + if (response == GWY_RESPONSE_CLEAR) { + gwy_selection_clear(gwy_graph_area_get_selection(GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(gui->graph))), + GWY_GRAPH_STATUS_XSEL)); + } +} + +static GwyResults* +create_results(GwyContainer *data, GwyGraphModel *gmodel, + GwySIUnit *xunit, GwySIUnit *yunit) +{ + GwyResults *results; + + results = gwy_results_new(); + gwy_results_add_header(results, N_("Grating Period")); + gwy_results_add_value_str(results, "file", N_("File")); + gwy_results_add_value_str(results, "graph", N_("Graph")); + gwy_results_add_value_str(results, "curve", N_("Curve")); + gwy_results_add_format(results, "range", N_("Range"), TRUE, + /* TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. */ + N_("%{from}v to %{to}v"), + "power-x", 1, + NULL); + gwy_results_add_value_int(results, "npts", N_("Number of points")); + + gwy_results_add_separator(results); + gwy_results_add_header(results, _("Results")); + gwy_results_add_value(results, "simple-fft", N_("Simple FFT"), "power-x", 1, "precision", 5, NULL); + gwy_results_add_value(results, "zoom-fft", N_("Refined FFT"), "power-x", 1, "precision", 5, NULL); + gwy_results_add_value(results, "simple-acf", N_("Simple ACF"), "power-x", 1, "precision", 5, NULL); + gwy_results_add_value(results, "multi-acf", N_("Multi-peak ACF"), "power-x", 1, "precision", 5, NULL); + gwy_results_add_value(results, "grav-centre", N_("Gravity centers"), "power-x", 1, "precision", 5, NULL); + gwy_results_add_value(results, "zero-cross", N_("Zero crossings"), "power-x", 1, "precision", 5, NULL); + + gwy_results_set_unit(results, "x", xunit); + gwy_results_set_unit(results, "z", yunit); + + gwy_results_fill_filename(results, "file", data); + gwy_results_fill_graph(results, "graph", gmodel); + + return results; +} + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; + gint curve = gwy_params_get_int(args->params, PARAM_CURVE); + gchar buffer[16]; + gint npts; + + npts = execute(gui->args, gui->results); + gwy_graph_model_remove_all_curves(gui->gmodel); + gwy_graph_model_add_curve(gui->gmodel, gwy_graph_model_get_curve(args->gmodel, curve)); + if (args->levelled) + gwy_graph_model_add_curve(gui->gmodel, args->levelled); + + /* TODO: Show some `not enough points' message if npts = 0. */ + gwy_param_table_results_fill(gui->table, WIDGET_RESULTS_FFT); + gwy_param_table_results_fill(gui->table, WIDGET_RESULTS_ACF); + gwy_param_table_results_fill(gui->table, WIDGET_RESULTS_DIRECT); + gwy_param_table_set_sensitive(gui->table, PARAM_REPORT_STYLE, npts > 0); + g_snprintf(buffer, sizeof(buffer), "%u", npts); + gwy_param_table_info_set_valuestr(gui->table, LABEL_NPOINTS, buffer); +} + +/* An ad-hoc curve regularisation method. If the points are exactly regular, the net result is basically some + * pointless interpolation (which includes points exactly correspoding to the curve points). Otherwise it just + * does some kind of linear averaging/interpolation thing. */ +static GwyDataLine* +regularise_curve(GwyGraphCurveModel *gcmodel, gint pos, gint npts) +{ + GwyDataLine *line, *mask; + gint ndata, i, res = 4*(npts - 1) + 3; + const gdouble *xdata, *ydata; + gdouble *data, *mdata; + gdouble dx, xoff, xbegin, xend; + + xdata = gwy_graph_curve_model_get_xdata(gcmodel); + ydata = gwy_graph_curve_model_get_ydata(gcmodel); + ndata = gwy_graph_curve_model_get_ndata(gcmodel); + xbegin = xdata[pos]; + xend = xdata[pos + npts-1]; + dx = (xend - xbegin)/(res - 3); + xoff = xbegin - dx; + line = gwy_data_line_new(res, dx*res, TRUE); + mask = gwy_data_line_new_alike(line, TRUE); + data = gwy_data_line_get_data(line); + mdata = gwy_data_line_get_data(mask); + + for (i = MAX(pos-3, 0); i < MIN(pos + npts+3, ndata); i++) { + gdouble x = xdata[i], y = ydata[i]; + gdouble ix = (x - xoff)/dx; + gint j = (gint)floor(ix + 0.5); + + if (j > 0 && j < res) { + mdata[j] += 1; + data[j] += y; + } + } + + for (i = 0; i < res; i++) { + if (mdata[i] > 1e-9) { + data[i] /= mdata[i]; + mdata[i] = 0.0; + } + else + mdata[i] = 1.0; + } + + gwy_data_line_correct_laplace(line, mask); + g_object_unref(mask); + + return line; +} + +static gdouble +mean_value_of_positive(gdouble a, gdouble b) +{ + if (a > 0.0) + return b > 0.0 ? 0.5*(a + b) : a; + else + return b > 0.0 ? b : -1.0; +} + +static gint +locate_maximum_complex(const fftw_complex *f, gint n, gint ifrom) +{ + gint i, imax = -1; + gdouble wmax = 0.0; + + for (i = ifrom; i < n; i++) { + gdouble w = CNORM(f[i]); + if (w > wmax) { + imax = i; + wmax = w; + } + } + + return imax; +} + +static gdouble +linear_fit_slope_with_error_estimate(gint n, const gdouble *xdata, const gdouble *ydata, gdouble *err_estim) +{ + gdouble xmean = 0.0, ymean = 0.0; + gdouble Varx = 0.0, Vary = 0.0, Cxy = 0.0; + gdouble a, Vara; + gint i; + + for (i = 0; i < n; i++) { + xmean += xdata[i]; + ymean += ydata[i]; + } + xmean /= n; + ymean /= n; + + for (i = 0; i < n; i++) { + gdouble dx = xdata[i] - xmean, dy = ydata[i] - ymean; + Varx += dx*dx; + Vary += dy*dy; + Cxy += dx*dy; + } + Varx /= n; + Vary /= n; + Cxy /= n; + + a = Cxy/Varx; + if (n > 1) { + Vara = (Vary/Varx - a*a)/(n - 1); + *err_estim = sqrt(fmax(Vara, 0.0)); + } + else + *err_estim = 0.0; + + return a; +} + +/* Estimate period in pixels. */ +static gdouble +coarse_period_estimate(GwyDataLine *line, gdouble oversample) +{ + gint i, imax = 0, res = gwy_data_line_get_res(line); + gint extres = gwy_fft_find_nice_size((gint)ceil(oversample*res)); + GwyDataLine *wline = gwy_data_line_new(res, res, TRUE); + fftw_complex *data = fftw_alloc_complex(extres); + fftw_complex *f = fftw_alloc_complex(extres); + gdouble *wdata; + gdouble x = 0.0; + fftw_plan plan; + + plan = fftw_plan_dft_1d(extres, data, f, FFTW_FORWARD, FFTW_DESTROY_INPUT | FFTW_ESTIMATE); + + gwy_data_line_copy(line, wline); + gwy_data_line_fft_window(wline, GWY_WINDOWING_HANN); + gwy_clear(data, extres); + wdata = gwy_data_line_get_data(wline); + for (i = 0; i < res; i++) + data[i][0] = wdata[i]; + g_object_unref(wline); + + fftw_execute(plan); + fftw_destroy_plan(plan); + fftw_free(data); + imax = locate_maximum_complex(f, extres/3, 5); + if (imax < 0) + return -1.0; + + if (imax > 0 && imax < extres-1) { + gdouble a[3]; + + for (i = 0; i < 3; i++) + a[i] = CNORM(f[imax-1+i]); + gwy_math_refine_maximum_1d(a, &x); + } + fftw_free(f); + + return extres/(imax + x); +} + +/* Estimate period in pixels. */ +static gdouble +zoom_period_estimate(GwyDataLine *line, gdouble Tcoarse) +{ + gint i, imax, res = gwy_data_line_get_res(line); + GwyDataLine *wline = gwy_data_line_duplicate(line); + GwyDataLine *rzfft = gwy_data_line_new_alike(line, FALSE), *izfft = gwy_data_line_new_alike(line, FALSE); + gdouble *rdata, *idata; + gdouble f0, f1, fm, x = 0.0; + + g_return_val_if_fail(Tcoarse > 0.0, -1.0); + + f0 = fmax(res/Tcoarse - 1.05, 0.0); + f1 = res/Tcoarse + 1.05; + gwy_data_line_fft_window(wline, GWY_WINDOWING_HANN); + gwy_data_line_zoom_fft(wline, NULL, rzfft, izfft, res, f0, f1); + g_object_unref(wline); + + rdata = gwy_data_line_get_data(rzfft); + idata = gwy_data_line_get_data(izfft); + imax = res/2; + for (i = 0; i < res; i++) + rdata[i] = rdata[i]*rdata[i] + idata[i]*idata[i]; + g_object_unref(izfft); + + imax = GWY_ROUND(gwy_data_line_max_pos_i(rzfft)); + if (imax > 0 && imax < res-1) + gwy_math_refine_maximum_1d(rdata + imax-1, &x); + + fm = f0 + (f1 - f0)*(imax + x)/(res - 1.0); + g_object_unref(rzfft); + + return res/fm; +} + +static GravityCentre +find_gravity_centre(const gdouble *data, gint n, gdouble threshold) +{ + /* Intersections. */ + gdouble xinter_start, xinter_end, w, x, sxw = 0.0, sw = 0.0; + GravityCentre gc = { -1.0, -1.0 }; + gint i; + + if (!(n > 2)) + return gc; + if ((data[0] - threshold)*(data[1] - threshold) > 0.0) + return gc; + if ((data[n-1] - threshold)*(data[n-2] - threshold) > 0.0) + return gc; + + xinter_start = fabs((data[0] - threshold)/(data[1] - data[0])); + xinter_end = fabs((data[n-2] - threshold)/(data[n-2] - data[n-1])); + + /* Initial triangular segment. */ + w = 0.5*(1.0 - xinter_start)*(data[1] - threshold); + x = (2.0 + xinter_start)/3.0; + sw += w; + sxw += w*x; + + /* Final triangular segment. */ + w = 0.5*xinter_end*(data[n-2] - threshold); + x = n-2 + xinter_end/3.0; + sw += w; + sxw += w*x; + + /* The middle part, formed by trapezoids. */ + for (i = 1; i < n-2; i++) { + x = i + (2*data[i+1] + data[i] - 3.0*threshold)/(data[i+1] + data[i] - 2.0*threshold)/3.0; + w = (data[i+1] + data[i])/2.0 - threshold; + sw += w; + sxw += w*x; + } + + gc.x = sxw/sw; + gc.l = xinter_end + n-1 - xinter_start; + return gc; +} + +/* Destroys the array contents! */ +static gdouble +fit_slope_of_centres(GArray *centres, gdouble tolerance, gdouble *err_estim) +{ + gint i, ngood, firstgood, lastgood, n = centres->len; + GravityCentre *cd = &g_array_index(centres, GravityCentre, 0); + gdouble *xdata = g_new(gdouble, 2*n), *idata = xdata + n; + gdouble T, m, p; + + if (n < 2) + return -1.0; + + /* First figure out what ‘too long’ means here. If there are just a few segments we are basically finding the + * longest one, but that is OK because the prefilter removes only segments much shorter than that. If there are + * many valid segments so that they can be a couple of pixels long, the prefilter is not going to remove any + * segments for being too short, but that is OK too – we just want a negligible probablity of picking a too long + * semgment as the rule and removing valid segments as being too short here. */ + for (i = 0; i < n; i++) + xdata[i] = cd[i].l; + + p = 92.0; + gwy_math_percentiles(n, xdata, GWY_PERCENTILE_INTERPOLATION_HIGHER, 1, &p, &m); + for (i = ngood = 0; i < n; i++) { + if (cd[i].l >= 0.1*m && cd[i].l <= 1.4*m) { + cd[ngood] = cd[i]; + xdata[ngood] = cd[i].l; + ngood++; + } + } + if (ngood < 2) + return -1.0; + n = ngood; + + /* Now we got rid of noise-created too short segments (possibly many) and maybe some too long ones (a few). So + * take percentile closer to median and filter again. */ + p = 50.0; + gwy_math_percentiles(n, xdata, GWY_PERCENTILE_INTERPOLATION_LINEAR, 1, &p, &m); + for (i = ngood = 0; i < n; i++) { + if (cd[i].l >= 0.7*m && cd[i].l <= 1.4*m) { + cd[ngood] = cd[i]; + xdata[ngood] = cd[i].l; + ngood++; + } + } + if (ngood < 2) + return -1.0; + n = ngood; + + /* Calculate distances. */ + for (i = 0; i < n-1; i++) + xdata[i] = cd[i+1].x - cd[i].x; + n = n-1; + + /* Now look at the typical distance (not length). + * + * XXX: Do not use plain mean because it is obviously unstable. However, do not use median either because in + * some odd cases the distances basically form two groups, differing by 1 pixel. So the median will be either + * 1/2 pixel too large or too small, but in either case it will be bad. */ + m = gwy_math_trimmed_mean(n, xdata, n/4, n/4); + + /* Find three consecutive points which are approximately m apart. We cannot trust the first centre to be good. */ + for (firstgood = 0; firstgood < n-3; firstgood++) { + if (fabs(cd[firstgood+1].x - cd[firstgood].x - m)/m <= tolerance + && fabs(cd[firstgood+2].x - cd[firstgood+1].x - m)/m <= tolerance) + break; + } + /* OK, try to find at least two (may be necessary if there are just a handful of bars). */ + if (firstgood >= n-3) { + for (firstgood = 0; firstgood < n-2; firstgood++) { + if (fabs(cd[firstgood+1].x - cd[firstgood].x - m)/m <= tolerance) + break; + } + } + if (firstgood >= n-2) + return -1.0; + + /* There is no good cluster before firstgood so always use firstgood for reference. */ + for (i = ngood = 0; i < firstgood; i++) { + gdouble l = (cd[i].x - cd[firstgood].x)/m; + gint lint = GWY_ROUND(l); + /* Accept only points which are close to an integer multiple from the last good point. */ + if (lint < 0 && fabs(l - lint)/sqrt(lint) <= tolerance) { + xdata[ngood] = cd[i].x; + idata[ngood] = lint; + ngood++; + } + } + /* Then add firstgood with index 0. */ + xdata[ngood] = cd[firstgood].x; + idata[ngood] = 0; + ngood++; + /* Then add everything after firstgood. Here we use lastgood as the reference. */ + lastgood = firstgood; + for (i = firstgood+1; i < n; i++) { + gdouble l = (cd[i].x - cd[lastgood].x)/m; + gint lint = GWY_ROUND(l); + /* Accept only points which are close to an integer multiple from the last good point. */ + if (lint > 0 && fabs(l - lint)/sqrt(lint) <= tolerance) { + //printf("[%d] %d (%g) %g\n", i, lint, l, cd[i].x - cd[lastgood].x); + xdata[ngood] = cd[i].x; + idata[ngood] = idata[ngood-1] + lint; + lastgood = i; + ngood++; + } + } + + //gwy_math_fit_polynom(ngood, idata, xdata, 1, coeffs); + T = linear_fit_slope_with_error_estimate(ngood, idata, xdata, err_estim); + g_free(xdata); + + return T; +} + +static gdouble +gravcentre_period_estimate(GwyDataLine *line, gdouble *err_estim) +{ + const gdouble threshold = 0.0; + gint i, istart, iend, res = gwy_data_line_get_res(line); + const gdouble *d = gwy_data_line_get_data(line); + GArray *xcabove, *xcbelow; + gdouble Tabove, Tbelow, err_above, err_below; + GravityCentre gc; + gboolean above; + + i = 0; + if (d[0] > threshold) { + while (i < res && d[i] > threshold) + i++; + above = FALSE; + } + else { + while (i < res && d[i] < threshold) + i++; + above = TRUE; + } + + xcabove = g_array_new(FALSE, FALSE, sizeof(GravityCentre)); + xcbelow = g_array_new(FALSE, FALSE, sizeof(GravityCentre)); + do { + /* The last sample before the condition is satisfied. */ + istart = i-1; + if (above) { + while (i < res && d[i] > threshold) + i++; + } + else { + while (i < res && d[i] < threshold) + i++; + } + if (i == res) + break; + /* The first sample where the condition fails again. */ + iend = i; + + /* Ignore single pixel noise around the threshold crossing. */ + gc = find_gravity_centre(d + istart, iend+1 - istart, threshold); + if (gc.l > 0.0) { + gc.x += istart; + if (above) + g_array_append_val(xcabove, gc); + else + g_array_append_val(xcbelow, gc); + } + + above = !above; + if (iend == istart+1) + i++; + } while (i < res); + + Tabove = fit_slope_of_centres(xcabove, 0.1, &err_above); + Tbelow = fit_slope_of_centres(xcbelow, 0.1, &err_below); + + g_array_free(xcabove, TRUE); + g_array_free(xcbelow, TRUE); + + *err_estim = 0.0; + if (Tabove > 0.0) + *err_estim = (Tbelow > 0.0) ? 0.5*sqrt(err_above*err_above + err_below*err_below) : err_above; + else if (Tbelow > 0.0) + *err_estim = err_below; + + return mean_value_of_positive(Tabove, Tbelow); +} + +/* Destroys the centres array content! */ +static gdouble +fit_slope_of_crossings(GArray *crossings, gdouble tolerance, gdouble *err_estim) +{ + gint i, ngood, firstgood, lastgood, n = crossings->len; + gdouble *zc = &g_array_index(crossings, gdouble, 0); + gdouble *xdata = g_new(gdouble, 2*n), *idata = xdata + n; + gdouble T, m; + + if (n < 2) + return -1.0; + + /* XXX: This part seems to be common with the second part of GC fit. Factor to a function? */ + + /* Calculate distances. */ + for (i = 0; i < n-1; i++) + xdata[i] = zc[i+1] - zc[i]; + n = n-1; + + /* Now look at the typical distance (not length). + * + * XXX: Do not use plain mean because it is obviously unstable. However, do not use median either because in + * some odd cases the distances basically form two groups, differing by 1 pixel. So the median will be either + * 1/2 pixel too large or too small, but in either case it will be bad. */ + m = gwy_math_trimmed_mean(n, xdata, n/4, n/4); + + /* Find three consecutive points which are approximately m apart. We cannot trust the first centre to be good. */ + for (firstgood = 0; firstgood < n-3; firstgood++) { + if (fabs(zc[firstgood+1] - zc[firstgood] - m)/m <= tolerance + && fabs(zc[firstgood+2] - zc[firstgood+1] - m)/m <= tolerance) + break; + } + /* OK, try to find at least two (may be necessary if there are just a handful of bars). */ + if (firstgood >= n-3) { + for (firstgood = 0; firstgood < n-2; firstgood++) { + if (fabs(zc[firstgood+1] - zc[firstgood] - m)/m <= tolerance) + break; + } + } + if (firstgood >= n-2) + return -1.0; + + /* There is no good cluster before firstgood so always use firstgood for reference. */ + for (i = ngood = 0; i < firstgood; i++) { + gdouble l = (zc[i] - zc[firstgood])/m; + gint lint = GWY_ROUND(l); + /* Accept only points which are close to an integer multiple from the last good point. */ + if (lint < 0 && fabs(l - lint)/sqrt(lint) <= tolerance) { + xdata[ngood] = zc[i]; + idata[ngood] = lint; + ngood++; + } + } + /* Then add firstgood with index 0. */ + xdata[ngood] = zc[firstgood]; + idata[ngood] = 0; + ngood++; + /* Then add everything after firstgood. Here we use lastgood as the reference. */ + lastgood = firstgood; + for (i = firstgood+1; i < n; i++) { + gdouble l = (zc[i] - zc[lastgood])/m; + gint lint = GWY_ROUND(l); + + /* Accept only points which are close to an integer multiple from the last good point. */ + if (lint > 0 && fabs(l - lint)/sqrt(lint) <= tolerance) { + xdata[ngood] = zc[i]; + idata[ngood] = idata[ngood-1] + lint; + lastgood = i; + ngood++; + } + } + + T = linear_fit_slope_with_error_estimate(ngood, idata, xdata, err_estim); + g_free(xdata); + + return T; +} + +static gdouble +zerocross_period_estimate(GwyDataLine *line, gdouble *err_estim) +{ + GArray *zcdown, *zcup, *zxdata; + gint i, istart, iend, res = line->res; + const gdouble *d = line->data; + gdouble threshold = 0.0; + gdouble Tup, Tdown, err_up, err_down; + + zcdown = g_array_new(FALSE, FALSE, sizeof(gdouble)); + zcup = g_array_new(FALSE, FALSE, sizeof(gdouble)); + zxdata = g_array_new(FALSE, FALSE, sizeof(gdouble)); + i = 1; + while (i < res) { + gdouble x, coeffs[2]; + gint ii, seglen; + + /* Find a zero crossing. */ + if (d[i]*d[i-1] > 0.0 || (d[i] == 0.0 && d[i-1] == 0.0)) { + i++; + continue; + } + + /* Expand around it. Try to go one point beyond the theshold if nothing bad seems to happening there. */ + istart = i-1; + while (istart && fabs(d[istart-1]) < threshold) + istart--; + + iend = i; + while (iend < res-1 && fabs(d[iend+1]) < threshold) + iend++; + + /* If the height returns back to the same sign just skip it. */ + if (d[istart]*d[i-1] < 0 || d[iend]*d[i] < 0) { + i = iend+1; + continue; + } + + /* Fit the segment around crossing with a line. + * NB: We fit x=az+b, not z=ax+b. For some weird reason it is more stable. */ + seglen = iend+1 - istart; + g_array_set_size(zxdata, 2*seglen); + for (ii = istart; ii <= iend; ii++) { + g_array_index(zxdata, gdouble, ii-istart) = d[ii]; + g_array_index(zxdata, gdouble, seglen + ii-istart) = ii - i; + } + gwy_math_fit_polynom(seglen, &g_array_index(zxdata, gdouble, 0), &g_array_index(zxdata, gdouble, seglen), + 1, coeffs); + x = i + coeffs[0]; + if (d[i] > 0.0) + g_array_append_val(zcdown, x); + else + g_array_append_val(zcup, x); + + i = iend+1; + } + g_array_free(zxdata, TRUE); + + Tup = fit_slope_of_crossings(zcup, 0.1, &err_up); + Tdown = fit_slope_of_crossings(zcdown, 0.1, &err_down); + + g_array_free(zcup, TRUE); + g_array_free(zcdown, TRUE); + + *err_estim = 0.0; + if (Tup > 0.0) + *err_estim = (Tdown > 0.0) ? 0.5*sqrt(err_up*err_up + err_down*err_down) : err_up; + else if (Tdown > 0.0) + *err_estim = err_down; + + return mean_value_of_positive(Tup, Tdown); +} + +static gint +find_first_acf_peak(const gdouble *d, gint res) +{ + gint i; + + /* Locate the first trough and get out. */ + for (i = 1; i < res/2; i++) { + if (d[i] < 0.0) + break; + } + while (i < res/2) { + if (d[i] > 0.0) + break; + i++; + } + if (i == res/2) + return -1; + + /* Then locate the first peak. */ + while (i < res-2) { + if (d[i] < d[i-1]) + break; + i++; + } + if (i == res-2) + return -1; + return i-1; +} + +static gdouble +acf_period_estimate(GwyDataLine *line) +{ + GwyDataLine *acf = gwy_data_line_new_alike(line, FALSE); + gdouble x = 0.0; + gint peakpos; + + gwy_data_line_acf(line, acf); + peakpos = find_first_acf_peak(acf->data, acf->res); + if (!(peakpos > 0)) + return -1.0; + gwy_math_refine_maximum_1d(acf->data + peakpos-1, &x); + g_object_unref(acf); + + return peakpos + x; +} + +static gdouble +multiacf_period_estimate(GwyDataLine *line, gdouble *err_estim) +{ + GwyDataLine *acf = gwy_data_line_new_alike(line, FALSE); + GArray *xdata, *ydata; + gdouble x = 0.0, sxx, sxy, f, m0, t; + gdouble *d; + gint i, j, res, peakpos; + + gwy_data_line_acf(line, acf); + d = acf->data; + res = acf->res; + peakpos = find_first_acf_peak(d, res); + if (!(peakpos > 0)) + return -1.0; + gwy_math_refine_maximum_1d(d + peakpos-1, &x); + + xdata = g_array_new(FALSE, FALSE, sizeof(gdouble)); + ydata = g_array_new(FALSE, FALSE, sizeof(gdouble)); + + /* This is the 1×T peak; there is also 0×T, but this one contributes zero to the sums. Weight positions by peak + * height d[peakpos]. */ + i = 1; + m0 = d[peakpos]; + sxx = i*i*d[peakpos]; + sxy = i*(peakpos + x)*d[peakpos]; + i++; + while (TRUE) { + f = sxy/sxx; + peakpos = GWY_ROUND(f*i); + if (!peakpos || peakpos+2 >= res) + break; + + /* If we miss the peak by more than 2 samples, abort. */ + for (j = 0; j < 2; j++) { + if (peakpos > 1 && d[peakpos-1] > d[peakpos]) + peakpos--; + } + if (!peakpos || d[peakpos-1] > d[peakpos]) + break; + + for (j = 0; j < 2; j++) { + if (peakpos+2 < res && d[peakpos+1] > d[peakpos]) + peakpos++; + } + if (peakpos+2 >= res || d[peakpos+1] > d[peakpos]) + break; + + if (d[peakpos] < 0.15*m0) + break; + + gwy_math_refine_maximum_1d(d + peakpos-1, &x); + sxx += i*i*d[peakpos]; + sxy += i*(peakpos + x)*d[peakpos]; + + t = i; + g_array_append_val(xdata, t); + t = peakpos + x; + g_array_append_val(ydata, t); + + i++; + } + + g_object_unref(acf); + + /* This overestimates the error because we do not fit the intercept. However, we also underestimate it because + * the inputs do not have uncorrelated errors. In summary, the estimate is not very reliable. */ + linear_fit_slope_with_error_estimate(xdata->len, + &g_array_index(xdata, gdouble, 0), &g_array_index(ydata, gdouble, 0), + err_estim); + g_array_free(xdata, TRUE); + g_array_free(ydata, TRUE); + + return sxy/sxx; +} + +static void +remove_envelope(GwyDataLine *line) +{ + GwyDataField *background; + GwyDataLine *tmp; + gdouble *bg, *d; + gdouble a, b, T; + gint m, i, res; + + /* If the profile is way off zero line, weird things may happen. Get it approximately right first. */ + gwy_data_line_get_line_coeffs(line, &a, &b); + gwy_data_line_line_level(line, a, b); + res = gwy_data_line_get_res(line); + + /* Then use the envelope method. */ + T = coarse_period_estimate(line, 2.0); + if (T < 0.0) + return; + + m = GWY_ROUND(1.4*T) | 1; + if (m >= res-1) + return; + + background = gwy_data_field_new(res, 2, res, 2, FALSE); + tmp = gwy_data_line_new_alike(line, FALSE); + + gwy_data_line_copy(line, tmp); + gwy_data_line_part_filter_kth_rank(tmp, m, 0, res, GWY_ROUND(0.05*m)); + gwy_data_field_set_row(background, tmp, 0); + + gwy_data_line_copy(line, tmp); + gwy_data_line_part_filter_kth_rank(tmp, m, 0, res, GWY_ROUND(0.95*m)); + gwy_data_field_set_row(background, tmp, 1); + + gwy_data_field_row_gaussian(background, 0.5*T); + bg = gwy_data_field_get_data(background); + d = gwy_data_line_get_data(line); + + /* Remove the envelope. */ + for (i = 0; i < res; i++) + d[i] -= 0.5*(bg[i] + bg[i + res]); + + g_object_unref(tmp); + g_object_unref(background); +} + +static void +fix_zero_line(GwyDataLine *line) +{ + /* For some gratings this is not very good, but it is a one-liner and the method based on peaks in height + * distribution has its own problems. Do not use plain median. If the fill ratio is relatively far from 1/2, + * mean becomes just somewhat off, whereas median can easily move to the top or bottom level. */ + gwy_data_line_add(line, -gwy_data_line_get_avg(line)); +} + +/* The way we do levelling makes a bit difficult to show it for the original curve. Try to reconstruct it at least + * in spirit by roughly sampling it back. */ +static GwyGraphCurveModel* +rough_levelled_graph_curve(GwyGraphCurveModel *origmodel, GwyDataLine *dline, gdouble from) +{ + GwyGraphCurveModel *levelledcmodel; + GwyDataLine *resampled; + gint res, ndata; + + res = gwy_data_line_get_res(dline); + ndata = res/4; + resampled = gwy_data_line_new_resampled(dline, ndata, GWY_INTERPOLATION_KEY); + gwy_data_line_set_offset(resampled, from); + levelledcmodel = gwy_graph_curve_model_new_alike(origmodel); + g_object_set(levelledcmodel, + "line-style", GDK_LINE_ON_OFF_DASH, + "description", _("Leveled profile"), + NULL); + gwy_graph_curve_model_set_data_from_dataline(levelledcmodel, resampled, 0, 0); + g_object_unref(resampled); + + return levelledcmodel; +} + +static void +fill_value_if_positive(GwyResults *results, const gchar *name, gdouble value) +{ + if (value > 0.0) + gwy_results_fill_values(results, name, value, NULL); + else + gwy_results_set_na(results, name, NULL); +} + +static void +fill_value_with_error_if_positive(GwyResults *results, const gchar *name, gdouble value, gdouble error) +{ + gwy_results_set_na(results, name, NULL); + if (value > 0.0) { + if (error > 0.0) + gwy_results_fill_values_with_errors(results, name, value, error, NULL); + else + gwy_results_fill_values(results, name, value, NULL); + } +} + +static gint +execute(ModuleArgs *args, GwyResults *results) +{ + GwyParams *params = args->params; + gdouble from = gwy_params_get_double(params, PARAM_RANGE_FROM); + gdouble to = gwy_params_get_double(params, PARAM_RANGE_TO); + gint curve = gwy_params_get_int(params, PARAM_CURVE); + gboolean level = gwy_params_get_boolean(params, PARAM_LEVEL); + gboolean show_levelled = gwy_params_get_boolean(params, PARAM_SHOW_LEVELED); + GwyGraphCurveModel *gcmodel = gwy_graph_model_get_curve(args->gmodel, curve); + GwyDataLine *line; + const gdouble *xdata; + guint ndata, pos, npts; + gdouble xoff, dx, Tfft, Tzoomfft, Tacf, Tmultiacf, Tgc, Tzc, err_gc, err_zc, err_multiacf; + + xdata = gwy_graph_curve_model_get_xdata(gcmodel); + ndata = gwy_graph_curve_model_get_ndata(gcmodel); + gwy_results_fill_graph_curve(results, "curve", gcmodel); + gwy_results_set_nav(results, G_N_ELEMENTS(results_period), results_period); + + for (pos = 0; pos < ndata && xdata[pos] < from; pos++) + pos++; + for (npts = ndata; npts && xdata[npts-1] > to; npts--) + npts--; + + if (npts <= pos + 5) + return 0; + + xoff = fmax(xdata[0], from); + npts -= pos; + gwy_results_fill_values(results, "npts", npts, NULL); + gwy_results_fill_format(results, "range", "from", from, "to", to, NULL); + + line = regularise_curve(gcmodel, pos, npts); + if (level) { + remove_envelope(line); + fix_zero_line(line); + } + + dx = gwy_data_line_get_dx(line); + Tfft = coarse_period_estimate(line, 2.0); + Tzoomfft = Tfft > 0.0 ? zoom_period_estimate(line, Tfft) : -1.0; + Tacf = acf_period_estimate(line); + Tmultiacf = Tacf > 0.0 ? multiacf_period_estimate(line, &err_multiacf) : -1.0; + Tgc = gravcentre_period_estimate(line, &err_gc); + Tzc = zerocross_period_estimate(line, &err_zc); + + GWY_OBJECT_UNREF(args->levelled); + if (level && show_levelled) + args->levelled = rough_levelled_graph_curve(gcmodel, line, xoff); + g_object_unref(line); + + fill_value_if_positive(results, "simple-fft", Tfft*dx); + fill_value_if_positive(results, "zoom-fft", Tzoomfft*dx); + fill_value_if_positive(results, "simple-acf", Tacf*dx); + fill_value_with_error_if_positive(results, "multi-acf", Tmultiacf*dx, err_multiacf*dx); + fill_value_with_error_if_positive(results, "zero-cross", Tzc*dx, err_zc*dx); + fill_value_with_error_if_positive(results, "grav-centre", Tgc*dx, err_gc*dx); + + return npts; +} + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/graph/graph_polylevel.c gwyddion-2.63/modules/graph/graph_polylevel.c --- gwyddion-2.62/modules/graph/graph_polylevel.c 2021-11-07 21:44:50.000000000 +0000 +++ gwyddion-2.63/modules/graph/graph_polylevel.c 2023-02-22 12:54:01.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: graph_polylevel.c 24487 2021-11-07 21:05:57Z yeti-dn $ - * Copyright (C) 2019-2021 David Necas (Yeti). + * $Id: graph_polylevel.c 25230 2023-02-22 12:49:02Z yeti-dn $ + * Copyright (C) 2019-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -28,12 +28,11 @@ typedef enum { - OUTPUT_DATA_FIT = 0, - OUTPUT_LEVELLED = 1, + OUTPUT_DATA_FIT = 0, + OUTPUT_LEVELLED = 1, OUTPUT_NTYPES } OutputType; - enum { PARAM_CURVE, PARAM_RANGE_FROM, @@ -49,8 +48,6 @@ GwyParams *params; GwyGraphModel *gmodel; GwyGraphModel *result; - gdouble xmin; - gdouble xmax; } ModuleArgs; typedef struct { @@ -58,50 +55,34 @@ GtkWidget *dialog; GwyResults *results; GwyParamTable *table; - GtkWidget *xfrom; - GtkWidget *xto; - GwySelection *xsel; - GwySIValueFormat *xvf; } ModuleGUI; -static gboolean module_register (void); -static GwyParamDef* define_module_params (void); -static void graph_polylevel (GwyGraph *graph); -static GwyDialogOutcome run_gui (ModuleArgs *args, - GwyContainer *data); -static void execute (ModuleArgs *args, - GwyResults *results); -static void param_changed (ModuleGUI *gui, - gint id); -static GwyResults* create_results (GwyGraphModel *gmodel, - GwySIUnit *xunit, - GwySIUnit *yunit); - -static void preview (gpointer user_data); -static void graph_selected (GwySelection* selection, - gint i, - ModuleGUI *gui); -static void update_range_entries (ModuleGUI *gui, - gdouble xfrom, - gdouble xto); -static GtkWidget* create_rangebox (gpointer user_data); - +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void graph_polylevel (GwyGraph *graph); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data); +static void execute (ModuleArgs *args, + GwyResults *results); +static void param_changed (ModuleGUI *gui, + gint id); +static GwyResults* create_results (GwySIUnit *xunit, + GwySIUnit *yunit); +static void preview (gpointer user_data); -static const gchar* fitresults[] = { "p0", "p1", "p2", "p3", "p4", "p5",}; +static const gchar* fitresults[] = { "p0", "p1", "p2", "p3", "p4", "p5" }; -static const GwyEnum output_types[] = { +static const GwyEnum output_types[] = { { N_("Data + fit"), OUTPUT_DATA_FIT, }, { N_("Leveled data"), OUTPUT_LEVELLED, }, }; - - static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Remove polynomial background"), "Petr Klapetek ", - "1.0", + "1.1", "David Nečas (Yeti) & Petr Klapetek", "2021", }; @@ -137,9 +118,8 @@ gwy_param_def_add_gwyenum(paramdef, PARAM_OUTPUT_TYPE, "output_type", _("_Output"), output_types, G_N_ELEMENTS(output_types), OUTPUT_DATA_FIT); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, "target_graph", NULL); - - /* Foreign, not saved to settings. */ - gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + /* Not saved to settings. */ + gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, _("Range"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); gwy_param_def_add_double(paramdef, PARAM_RANGE_TO, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); return paramdef; @@ -156,9 +136,6 @@ gwy_clear(&args, 1); args.params = gwy_params_new_from_settings(define_module_params()); args.gmodel = gwy_graph_get_model(graph); - gwy_graph_model_get_x_range(args.gmodel, &args.xmin, &args.xmax); - gwy_params_set_double(args.params, PARAM_RANGE_FROM, args.xmin); - gwy_params_set_double(args.params, PARAM_RANGE_TO, args.xmax); args.result = gwy_graph_model_new_alike(args.gmodel); @@ -183,7 +160,6 @@ GwyDialog *dialog; GwyParamTable *table; GwyAppDataId target_graph_id; - gdouble xrange; GwySIUnit *xunit, *yunit; ModuleGUI gui; @@ -195,9 +171,7 @@ g_object_set(args->result, "label-visible", FALSE, NULL); g_object_get(args->gmodel, "si-unit-x", &xunit, "si-unit-y", &yunit, NULL); - xrange = MAX(fabs(args->xmin), fabs(args->xmax)); - gui.xvf = gwy_si_unit_get_format_with_digits(xunit, GWY_SI_UNIT_FORMAT_VFMARKUP, xrange, 3, NULL); - gui.results = create_results(args->result, xunit, yunit); + gui.results = create_results(xunit, yunit); gui.dialog = gwy_dialog_new(_("Remove Polynomial Background")); dialog = GWY_DIALOG(gui.dialog); @@ -212,17 +186,12 @@ gtk_widget_set_size_request(graph, 480, 300); gtk_box_pack_end(GTK_BOX(hbox), graph, TRUE, TRUE, 0); gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); - gwy_graph_set_status(GWY_GRAPH(graph), GWY_GRAPH_STATUS_XSEL); - gui.xsel = gwy_graph_area_get_selection(GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(graph))), - GWY_GRAPH_STATUS_XSEL); - gwy_selection_set_max_objects(gui.xsel, 1); - table = gui.table = gwy_param_table_new(args->params); gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); gwy_param_table_append_checkbox(table, PARAM_ALL); - gwy_param_table_append_foreign(table, PARAM_RANGE_FROM, create_rangebox, &gui, NULL); + gwy_create_graph_xrange_with_params(table, PARAM_RANGE_FROM, PARAM_RANGE_TO, GWY_GRAPH(graph), args->gmodel); gwy_param_table_append_slider(table, PARAM_ORDER); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, args->result); gwy_param_table_append_combo(table, PARAM_OUTPUT_TYPE); @@ -235,7 +204,6 @@ gwy_dialog_add_param_table(dialog, table); g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); - g_signal_connect(gui.xsel, "changed", G_CALLBACK(graph_selected), &gui); gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); outcome = gwy_dialog_run(dialog); @@ -255,138 +223,25 @@ g_object_unref(gui.results); g_object_unref(xunit); g_object_unref(yunit); - gwy_si_unit_value_format_free(gui.xvf); - return outcome; } static void -update_range_entries(ModuleGUI *gui, gdouble xfrom, gdouble xto) -{ - GwySIValueFormat *xvf = gui->xvf; - gdouble power10 = pow10(xvf->precision); - gchar buffer[24]; - - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, floor(xfrom*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xfrom), buffer); - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, ceil(xto*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xto), buffer); -} - - -static void param_changed(ModuleGUI *gui, gint id) { - GwyParams *params = gui->args->params; - - if (id < 0 || id == PARAM_CURVE || id == PARAM_OUTPUT_TYPE || id == PARAM_ALL || id == PARAM_ORDER) { - gint curve = gwy_params_get_int(params, PARAM_CURVE); - gwy_graph_model_remove_all_curves(gui->args->result); - gwy_graph_model_add_curve(gui->args->result, gwy_graph_model_get_curve(gui->args->gmodel, curve)); - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - - } -} - -static void -limit_selection(ModuleGUI *gui) -{ ModuleArgs *args = gui->args; - gdouble range[2]; - - range[0] = gwy_params_get_double(args->params, PARAM_RANGE_FROM); - range[1] = gwy_params_get_double(args->params, PARAM_RANGE_TO); - if (range[0] <= args->xmin && range[1] >= args->xmax) - gwy_selection_clear(gui->xsel); - else - gwy_selection_set_object(gui->xsel, 0, range); -} - -static void -range_changed(GtkWidget *entry, ModuleGUI *gui) -{ - gdouble newval; - gint id; - - newval = g_strtod(gtk_entry_get_text(GTK_ENTRY(entry)), NULL); - newval *= gui->xvf->magnitude; - id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), "id")); - if (gwy_params_set_double(gui->args->params, id, newval)) { - limit_selection(gui); - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - } -} - -static GtkWidget* -create_range_entry(ModuleGUI *gui, GtkBox *rangebox, gint id) -{ - GtkWidget *entry; - - entry = gtk_entry_new(); - g_object_set_data(G_OBJECT(entry), "id", GINT_TO_POINTER(id)); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 8); - gtk_box_pack_start(GTK_BOX(rangebox), entry, FALSE, FALSE, 0); - g_signal_connect(entry, "activate", G_CALLBACK(range_changed), gui); - gwy_widget_set_activate_on_unfocus(entry, TRUE); - - return entry; -} - -static GtkWidget* -create_rangebox(gpointer user_data) -{ - ModuleGUI *gui = (ModuleGUI*)user_data; - GtkWidget *rangebox, *label; - - rangebox = gwy_hbox_new(6); - - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(_("Range:")), FALSE, FALSE, 0); - gui->xfrom = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_FROM); - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(gwy_sgettext("range|to")), FALSE, FALSE, 0); - gui->xto = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_TO); - - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), gui->xvf->units); - gtk_box_pack_start(GTK_BOX(rangebox), label, FALSE, FALSE, 0); - - return rangebox; -} + GwyParams *params = args->params; -static void -graph_selected(GwySelection* selection, gint i, ModuleGUI *gui) -{ - ModuleArgs *args = gui->args; - gdouble range[2]; - gdouble xfrom, xto; - gboolean have_range = TRUE; - - g_return_if_fail(i <= 0); - - if (gwy_selection_get_data(selection, NULL) <= 0) - have_range = FALSE; - else { - gwy_selection_get_object(selection, 0, range); - if (range[0] == range[1]) - have_range = FALSE; - } - if (have_range) { - xfrom = MIN(range[0], range[1]); - xto = MAX(range[0], range[1]); - } - else { - xfrom = args->xmin; - xto = args->xmax; + if (id < 0 || id == PARAM_CURVE || id == PARAM_ALL) { + gint curve = gwy_params_get_int(params, PARAM_CURVE); + gwy_graph_model_remove_all_curves(args->result); + gwy_graph_model_add_curve(args->result, gwy_graph_model_get_curve(args->gmodel, curve)); } - - update_range_entries(gui, xfrom, xto); - if (gwy_params_set_double(args->params, PARAM_RANGE_FROM, xfrom)) - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - if (gwy_params_set_double(args->params, PARAM_RANGE_TO, xto)) + if (id != PARAM_TARGET_GRAPH) gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } - static void preview(gpointer user_data) { @@ -395,7 +250,6 @@ execute(gui->args, gui->results); gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); gwy_param_table_results_fill(gui->table, WIDGET_RESULTS); - } static void @@ -432,38 +286,42 @@ fitstart = -1; xmin = ymin = G_MAXDOUBLE; xmax = ymax = -G_MAXDOUBLE; - for (i=0; i=from && xdata[i]= from && xdata[i] < to) { + if (xdata[i] < xmin) + xmin = xdata[i]; + if (ydata[i] < ymin) + ymin = ydata[i]; + + if (xdata[i] > xmax) + xmax = xdata[i]; + if (ydata[i] > ymax) + ymax = ydata[i]; - if (xdata[i]>xmax) xmax = xdata[i]; - if (ydata[i]>ymax) ymax = ydata[i]; - - if (fitstart<0) fitstart = i; + if (fitstart < 0) + fitstart = i; n++; } } - if (fitstart<1) fitstart = 0; + if (fitstart < 1) + fitstart = 0; param = g_new(gdouble, 6); param[0] = (ymin+ymax)/2.0; - for (i=1; i<6; i++) - { + for (i = 1; i < 6; i++) { param[i] = 0; //no init yet } param = gwy_math_fit_polynom(n, xdata + fitstart, ydata + fitstart, order, param); if (results) { gwy_results_fill_values(results, - "p0", param[0], - "p1", param[1], - "p2", param[2], - "p3", param[3], - "p4", param[4], - "p5", param[5], - NULL); + "p0", param[0], + "p1", param[1], + "p2", param[2], + "p3", param[3], + "p4", param[4], + "p5", param[5], + NULL); } allxmin = G_MAXDOUBLE; @@ -481,23 +339,23 @@ nxdata = g_new(gdouble, ndata); nydata = g_new(gdouble, ndata); - if (output_type == OUTPUT_DATA_FIT) - { - for (j=0; jallxmax) allxmax = xdata[j]; + if (output_type == OUTPUT_DATA_FIT) { + for (j = 0; j < ndata; j++) { + nxdata[j] = xdata[j]; + nydata[j] = ydata[j]; + + if (xdata[j] < allxmin) + allxmin = xdata[j]; + if (xdata[j] > allxmax) + allxmax = xdata[j]; } - } else { - for (j=0; j", - "1.0", + "1.1", "David Nečas (Yeti) & Petr Klapetek", "2021", }; @@ -135,12 +117,10 @@ gwy_param_def_add_gwyenum(paramdef, PARAM_OUTPUT_TYPE, "output_type", _("_Output"), output_types, G_N_ELEMENTS(output_types), OUTPUT_LEVELLED); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, "target_graph", NULL); - - /* Foreign, not saved to settings. */ - gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + /* Not saved to settings. */ + gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, _("Range"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); gwy_param_def_add_double(paramdef, PARAM_RANGE_TO, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); - return paramdef; } @@ -155,10 +135,6 @@ gwy_clear(&args, 1); args.params = gwy_params_new_from_settings(define_module_params()); args.gmodel = gwy_graph_get_model(graph); - gwy_graph_model_get_x_range(args.gmodel, &args.xmin, &args.xmax); - gwy_params_set_double(args.params, PARAM_RANGE_FROM, args.xmin); - gwy_params_set_double(args.params, PARAM_RANGE_TO, args.xmax); - args.result = gwy_graph_model_new_alike(args.gmodel); outcome = run_gui(&args, data); @@ -182,7 +158,6 @@ GwyDialog *dialog; GwyParamTable *table; GwyAppDataId target_graph_id; - gdouble xrange; GwySIUnit *xunit, *yunit; ModuleGUI gui; @@ -192,11 +167,8 @@ gwy_clear(&gui, 1); gui.args = args; g_object_set(args->result, "label-visible", FALSE, NULL); - g_object_get(args->gmodel, "si-unit-x", &xunit, "si-unit-y", &yunit, NULL); - xrange = MAX(fabs(args->xmin), fabs(args->xmax)); - gui.xvf = gwy_si_unit_get_format_with_digits(xunit, GWY_SI_UNIT_FORMAT_VFMARKUP, xrange, 3, NULL); - gui.results = create_results(args->result, xunit, yunit); + gui.results = create_results(xunit, yunit); gui.dialog = gwy_dialog_new(_("Remove Sine Background")); dialog = GWY_DIALOG(gui.dialog); @@ -211,29 +183,22 @@ gtk_widget_set_size_request(graph, 480, 300); gtk_box_pack_end(GTK_BOX(hbox), graph, TRUE, TRUE, 0); gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); - gwy_graph_set_status(GWY_GRAPH(graph), GWY_GRAPH_STATUS_XSEL); - gui.xsel = gwy_graph_area_get_selection(GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(graph))), - GWY_GRAPH_STATUS_XSEL); - gwy_selection_set_max_objects(gui.xsel, 1); - table = gui.table = gwy_param_table_new(args->params); gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); gwy_param_table_append_checkbox(table, PARAM_ALL); - gwy_param_table_append_foreign(table, PARAM_RANGE_FROM, create_rangebox, &gui, NULL); + gwy_create_graph_xrange_with_params(table, PARAM_RANGE_FROM, PARAM_RANGE_TO, GWY_GRAPH(graph), args->gmodel); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, args->result); gwy_param_table_append_combo(table, PARAM_OUTPUT_TYPE); gwy_param_table_append_header(table, -1, _("Fit results")); - gwy_param_table_append_resultsv(table, WIDGET_RESULTS, gui.results, - fitresults, G_N_ELEMENTS(fitresults)); + gwy_param_table_append_resultsv(table, WIDGET_RESULTS, gui.results, fitresults, G_N_ELEMENTS(fitresults)); gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, TRUE, 0); gwy_dialog_add_param_table(dialog, table); g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); - g_signal_connect(gui.xsel, "changed", G_CALLBACK(graph_selected), &gui); gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); outcome = gwy_dialog_run(dialog); @@ -253,147 +218,24 @@ g_object_unref(gui.results); g_object_unref(xunit); g_object_unref(yunit); - gwy_si_unit_value_format_free(gui.xvf); - return outcome; } static void -update_range_entries(ModuleGUI *gui, gdouble xfrom, gdouble xto) -{ - GwySIValueFormat *xvf = gui->xvf; - gdouble power10 = pow10(xvf->precision); - gchar buffer[24]; - - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, floor(xfrom*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xfrom), buffer); - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, ceil(xto*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xto), buffer); -} - - -static void param_changed(ModuleGUI *gui, gint id) { GwyParams *params = gui->args->params; - //GwyParamTable *table = gui->table; - - /* //we want to be able to choose the fitted curve - if (id < 0 || id == PARAM_ALL) { - gboolean all_curves = gwy_params_get_boolean(params, PARAM_ALL); - gwy_param_table_set_sensitive(table, PARAM_CURVE, !all_curves); - } - */ - if (id < 0 || id == PARAM_CURVE || id == PARAM_OUTPUT_TYPE || id == PARAM_ALL) { + if (id < 0 || id == PARAM_CURVE || id == PARAM_ALL) { gint curve = gwy_params_get_int(params, PARAM_CURVE); gwy_graph_model_remove_all_curves(gui->args->result); gwy_graph_model_add_curve(gui->args->result, gwy_graph_model_get_curve(gui->args->gmodel, curve)); - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - - } - -} - -static void -limit_selection(ModuleGUI *gui) -{ - ModuleArgs *args = gui->args; - gdouble range[2]; - - range[0] = gwy_params_get_double(args->params, PARAM_RANGE_FROM); - range[1] = gwy_params_get_double(args->params, PARAM_RANGE_TO); - if (range[0] <= args->xmin && range[1] >= args->xmax) - gwy_selection_clear(gui->xsel); - else - gwy_selection_set_object(gui->xsel, 0, range); -} - -static void -range_changed(GtkWidget *entry, ModuleGUI *gui) -{ - gdouble newval; - gint id; - - newval = g_strtod(gtk_entry_get_text(GTK_ENTRY(entry)), NULL); - newval *= gui->xvf->magnitude; - id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), "id")); - if (gwy_params_set_double(gui->args->params, id, newval)) { - limit_selection(gui); - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - } -} - -static GtkWidget* -create_range_entry(ModuleGUI *gui, GtkBox *rangebox, gint id) -{ - GtkWidget *entry; - - entry = gtk_entry_new(); - g_object_set_data(G_OBJECT(entry), "id", GINT_TO_POINTER(id)); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 8); - gtk_box_pack_start(GTK_BOX(rangebox), entry, FALSE, FALSE, 0); - g_signal_connect(entry, "activate", G_CALLBACK(range_changed), gui); - gwy_widget_set_activate_on_unfocus(entry, TRUE); - - return entry; -} - -static GtkWidget* -create_rangebox(gpointer user_data) -{ - ModuleGUI *gui = (ModuleGUI*)user_data; - GtkWidget *rangebox, *label; - - rangebox = gwy_hbox_new(6); - - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(_("Range:")), FALSE, FALSE, 0); - gui->xfrom = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_FROM); - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(gwy_sgettext("range|to")), FALSE, FALSE, 0); - gui->xto = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_TO); - - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), gui->xvf->units); - gtk_box_pack_start(GTK_BOX(rangebox), label, FALSE, FALSE, 0); - - return rangebox; -} - -static void -graph_selected(GwySelection* selection, gint i, ModuleGUI *gui) -{ - ModuleArgs *args = gui->args; - gdouble range[2]; - gdouble xfrom, xto; - gboolean have_range = TRUE; - - g_return_if_fail(i <= 0); - - if (gwy_selection_get_data(selection, NULL) <= 0) - have_range = FALSE; - else { - gwy_selection_get_object(selection, 0, range); - if (range[0] == range[1]) - have_range = FALSE; - } - if (have_range) { - xfrom = MIN(range[0], range[1]); - xto = MAX(range[0], range[1]); - } - else { - xfrom = args->xmin; - xto = args->xmax; } - - update_range_entries(gui, xfrom, xto); - if (gwy_params_set_double(args->params, PARAM_RANGE_FROM, xfrom)) - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - if (gwy_params_set_double(args->params, PARAM_RANGE_TO, xto)) + if (id != PARAM_TARGET_GRAPH) gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } - static void preview(gpointer user_data) { @@ -402,21 +244,18 @@ execute(gui->args, gui->results); gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); gwy_param_table_results_fill(gui->table, WIDGET_RESULTS); - } static gdouble func_sine(gdouble x, - G_GNUC_UNUSED gint n_param, - const gdouble *param, - G_GNUC_UNUSED gpointer user_data, - gboolean *fres) + G_GNUC_UNUSED gint n_param, const gdouble *param, + G_GNUC_UNUSED gpointer user_data, + gboolean *fres) { *fres = TRUE; return param[0]*sin(param[1]*x+param[2])+param[3]; } - static void execute(ModuleArgs *args, GwyResults *results) { @@ -452,20 +291,25 @@ fitstart = -1; xmin = ymin = G_MAXDOUBLE; xmax = ymax = -G_MAXDOUBLE; - for (i=0; i=from && xdata[i]= from && xdata[i] < to) { + if (xdata[i] < xmin) + xmin = xdata[i]; + if (ydata[i] < ymin) + ymin = ydata[i]; + + if (xdata[i] > xmax) + xmax = xdata[i]; + if (ydata[i] > ymax) + ymax = ydata[i]; - if (xdata[i]>xmax) xmax = xdata[i]; - if (ydata[i]>ymax) ymax = ydata[i]; - - if (fitstart<0) fitstart = i; + if (fitstart < 0) + fitstart = i; n++; } } - if (fitstart<1) fitstart = 0; + if (fitstart < 1) + fitstart = 0; fitter = gwy_math_nlfit_new((GwyNLFitFunc)func_sine, gwy_math_nlfit_diff); fix[0] = 0; @@ -480,12 +324,13 @@ gwy_math_nlfit_fit_full(fitter, n, xdata + fitstart, ydata + fitstart, NULL, 4, param, fix, NULL, NULL); - if (results) + if (results) { gwy_results_fill_values(results, - "period", param[1], - "amplitude", param[0], - "yoffset", param[3], - NULL); + "period", param[1], + "amplitude", param[0], + "yoffset", param[3], + NULL); + } allxmin = G_MAXDOUBLE; allxmax = -G_MAXDOUBLE; @@ -502,23 +347,22 @@ nxdata = g_new(gdouble, ndata); nydata = g_new(gdouble, ndata); - if (output_type == OUTPUT_DATA_FIT) - { - for (j=0; jallxmax) allxmax = xdata[j]; - + if (output_type == OUTPUT_DATA_FIT) { + for (j = 0; j < ndata; j++) { + nxdata[j] = xdata[j]; + nydata[j] = ydata[j]; + + if (xdata[j] < allxmin) + allxmin = xdata[j]; + if (xdata[j] > allxmax) + allxmax = xdata[j]; } - } else { - for (j=0; j", - "3.0", + "3.1", "David Nečas (Yeti)", "2017", }; @@ -121,9 +108,10 @@ gwy_param_def_add_graph_curve(paramdef, PARAM_CURVE, "curve", NULL); gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Parameters"), GWY_RESULTS_EXPORT_PARAMETERS, GWY_RESULTS_REPORT_COLON); - /* Foreign, not saved to settings. */ - gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + /* Not saved to settings. */ + gwy_param_def_add_double(paramdef, PARAM_RANGE_FROM, NULL, _("Range"), -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); gwy_param_def_add_double(paramdef, PARAM_RANGE_TO, NULL, NULL, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + return paramdef; } @@ -137,9 +125,6 @@ gwy_clear(&args, 1); args.params = gwy_params_new_from_settings(define_module_params()); args.gmodel = gwy_graph_get_model(graph); - gwy_graph_model_get_x_range(args.gmodel, &args.xmin, &args.xmax); - gwy_params_set_double(args.params, PARAM_RANGE_FROM, args.xmin); - gwy_params_set_double(args.params, PARAM_RANGE_TO, args.xmax); run_gui(&args, data); gwy_params_save_to_settings(args.params); g_object_unref(args.params); @@ -151,7 +136,6 @@ GtkWidget *hbox, *graph; GwyDialog *dialog; GwyParamTable *table; - gdouble xrange; GwySIUnit *xunit, *yunit; ModuleGUI gui; @@ -159,8 +143,6 @@ gui.args = args; gui.gmodel = gwy_graph_model_new_alike(args->gmodel); g_object_get(args->gmodel, "si-unit-x", &xunit, "si-unit-y", &yunit, NULL); - xrange = MAX(fabs(args->xmin), fabs(args->xmax)); - gui.xvf = gwy_si_unit_get_format_with_digits(xunit, GWY_SI_UNIT_FORMAT_VFMARKUP, xrange, 3, NULL); gui.results = create_results(data, args->gmodel, xunit, yunit); gui.dialog = gwy_dialog_new(_("Statistical Quantities")); @@ -175,16 +157,11 @@ gtk_widget_set_size_request(graph, 480, 360); gtk_box_pack_end(GTK_BOX(hbox), graph, TRUE, TRUE, 0); gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); - gwy_graph_set_status(GWY_GRAPH(graph), GWY_GRAPH_STATUS_XSEL); - gui.xsel = gwy_graph_area_get_selection(GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(graph))), - GWY_GRAPH_STATUS_XSEL); - gwy_selection_set_max_objects(gui.xsel, 1); table = gui.table = gwy_param_table_new(args->params); gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); - /* Simply pass one of the range parameters – it only serves as a unique id here. */ - gwy_param_table_append_foreign(table, PARAM_RANGE_FROM, create_rangebox, &gui, NULL); + gwy_create_graph_xrange_with_params(table, PARAM_RANGE_FROM, PARAM_RANGE_TO, GWY_GRAPH(graph), args->gmodel); gwy_param_table_append_info(table, LABEL_NPOINTS, _("Number of points")); gwy_param_table_append_header(table, -1, _("Simple Parameters")); @@ -200,126 +177,13 @@ gwy_dialog_add_param_table(dialog, table); g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); - g_signal_connect(gui.xsel, "changed", G_CALLBACK(graph_selected), &gui); gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); - update_range_entries(&gui, args->xmin, args->xmax); gwy_dialog_run(dialog); g_object_unref(gui.gmodel); g_object_unref(gui.results); g_object_unref(xunit); g_object_unref(yunit); - gwy_si_unit_value_format_free(gui.xvf); -} - -static void -limit_selection(ModuleGUI *gui) -{ - ModuleArgs *args = gui->args; - gdouble range[2]; - - range[0] = gwy_params_get_double(args->params, PARAM_RANGE_FROM); - range[1] = gwy_params_get_double(args->params, PARAM_RANGE_TO); - if (range[0] <= args->xmin && range[1] >= args->xmax) - gwy_selection_clear(gui->xsel); - else - gwy_selection_set_object(gui->xsel, 0, range); -} - -static void -range_changed(GtkWidget *entry, ModuleGUI *gui) -{ - gdouble newval; - gint id; - - newval = g_strtod(gtk_entry_get_text(GTK_ENTRY(entry)), NULL); - newval *= gui->xvf->magnitude; - id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), "id")); - if (gwy_params_set_double(gui->args->params, id, newval)) { - limit_selection(gui); - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - } -} - -static GtkWidget* -create_range_entry(ModuleGUI *gui, GtkBox *rangebox, gint id) -{ - GtkWidget *entry; - - entry = gtk_entry_new(); - g_object_set_data(G_OBJECT(entry), "id", GINT_TO_POINTER(id)); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 8); - gtk_box_pack_start(GTK_BOX(rangebox), entry, FALSE, FALSE, 0); - g_signal_connect(entry, "activate", G_CALLBACK(range_changed), gui); - gwy_widget_set_activate_on_unfocus(entry, TRUE); - - return entry; -} - -static GtkWidget* -create_rangebox(gpointer user_data) -{ - ModuleGUI *gui = (ModuleGUI*)user_data; - GtkWidget *rangebox, *label; - - rangebox = gwy_hbox_new(6); - - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(_("Range:")), FALSE, FALSE, 0); - gui->xfrom = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_FROM); - gtk_box_pack_start(GTK_BOX(rangebox), gtk_label_new(gwy_sgettext("range|to")), FALSE, FALSE, 0); - gui->xto = create_range_entry(gui, GTK_BOX(rangebox), PARAM_RANGE_TO); - - label = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(label), gui->xvf->units); - gtk_box_pack_start(GTK_BOX(rangebox), label, FALSE, FALSE, 0); - - return rangebox; -} - -static void -graph_selected(GwySelection* selection, gint i, ModuleGUI *gui) -{ - ModuleArgs *args = gui->args; - gdouble range[2]; - gdouble xfrom, xto; - gboolean have_range = TRUE; - - g_return_if_fail(i <= 0); - - if (gwy_selection_get_data(selection, NULL) <= 0) - have_range = FALSE; - else { - gwy_selection_get_object(selection, 0, range); - if (range[0] == range[1]) - have_range = FALSE; - } - if (have_range) { - xfrom = MIN(range[0], range[1]); - xto = MAX(range[0], range[1]); - } - else { - xfrom = args->xmin; - xto = args->xmax; - } - - update_range_entries(gui, xfrom, xto); - if (gwy_params_set_double(args->params, PARAM_RANGE_FROM, xfrom)) - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); - if (gwy_params_set_double(args->params, PARAM_RANGE_TO, xto)) - gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); -} - -static void -update_range_entries(ModuleGUI *gui, gdouble xfrom, gdouble xto) -{ - GwySIValueFormat *xvf = gui->xvf; - gdouble power10 = pow10(xvf->precision); - gchar buffer[24]; - - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, floor(xfrom*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xfrom), buffer); - g_snprintf(buffer, sizeof(buffer), "%.*f", xvf->precision, ceil(xto*power10/xvf->magnitude)/power10); - gtk_entry_set_text(GTK_ENTRY(gui->xto), buffer); } static void @@ -332,6 +196,7 @@ gwy_graph_model_remove_all_curves(gui->gmodel); gwy_graph_model_add_curve(gui->gmodel, gwy_graph_model_get_curve(args->gmodel, curve)); } + if (id < 0 || id == PARAM_CURVE || id == PARAM_RANGE_FROM || id == PARAM_RANGE_TO) gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } diff -Nru gwyddion-2.62/modules/graph/graph_terraces.c gwyddion-2.63/modules/graph/graph_terraces.c --- gwyddion-2.62/modules/graph/graph_terraces.c 2022-08-26 15:24:57.000000000 +0000 +++ gwyddion-2.63/modules/graph/graph_terraces.c 2023-01-30 14:21:27.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: graph_terraces.c 24952 2022-08-26 15:24:56Z yeti-dn $ - * Copyright (C) 2019-2020 David Necas (Yeti). + * $Id: graph_terraces.c 25217 2023-01-30 14:21:27Z yeti-dn $ + * Copyright (C) 2019-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -48,6 +44,44 @@ #define pwr 0.65 enum { + RESPONSE_SURVEY = 1000, +}; + +enum { + PARAM_CURVE, + PARAM_EDGE_KERNEL_SIZE, + PARAM_EDGE_THRESHOLD, + PARAM_EDGE_BROADENING, + PARAM_MIN_AREA_FRAC, + PARAM_POLY_DEGREE, + PARAM_INDEPENDENT, + PARAM_DISPLAY, + PARAM_USE_SELECTION, + PARAM_FIT_REPORT_STYLE, + PARAM_TERRACE_REPORT_STYLE, + PARAM_OUTPUT, + PARAM_POLY_DEGREE_MAX, + PARAM_POLY_DEGREE_MIN, + PARAM_BROADENING_MAX, + PARAM_BROADENING_MIN, + PARAM_SURVEY_POLY, + PARAM_SURVEY_BROADENING, + WIDGET_RESULTS, + LABEL_FIT_RESULT, + LABEL_SURVEY, + BUTTON_RUN_SURVEY, +}; + +enum { + COLUMN_ID, + COLUMN_HEIGHT, + COLUMN_LEVEL, + COLUMN_AREA, + COLUMN_ERROR, + COLUMN_RESIDUUM, +}; + +enum { MAX_DEGREE = 18, }; @@ -73,33 +107,6 @@ } OutputFlags; typedef struct { - gint curve; - gboolean use_selection; - - gint poly_degree; - gdouble edge_kernel_size; - gdouble edge_threshold; - gdouble edge_broadening; - GwyResultsReportType report_style; - gdouble min_area_frac; - gboolean independent; - guint output_flags; - - gboolean survey_poly; - gint poly_degree_min; - gint poly_degree_max; - gboolean survey_broadening; - gint broadening_min; - gint broadening_max; - - PreviewMode preview_mode; -} TerraceArgs; - -static const gchar *guivalues[] = { - "step", "resid", "discrep", "nterraces", -}; - -typedef struct { guint nterrparam; guint npowers; guint nterraces; @@ -110,45 +117,29 @@ } FitResult; typedef struct { - TerraceArgs *args; - GwyGraphModel *parent_gmodel; - GtkWidget *dialogue; - GtkWidget *graph; - GtkWidget *curve; - GtkObject *edge_kernel_size; - GtkObject *edge_threshold; - GtkObject *edge_broadening; - GtkObject *poly_degree; - GtkObject *min_area_frac; - GtkWidget *preview_mode; - GtkWidget *independent; - GtkWidget *use_selection; - GwyResults *results; - GtkWidget *guivalues[G_N_ELEMENTS(guivalues)]; - GtkWidget *rexport_result; - GtkWidget *message; - GtkWidget *view; - GtkWidget *terracelist; - GtkWidget *rexport_list; - GSList *output_flags; - GtkWidget *survey_table; - GtkWidget *survey_poly; - GtkObject *poly_degree_min; - GtkObject *poly_degree_max; - GtkWidget *survey_broadening; - GtkObject *broadening_min; - GtkObject *broadening_max; - GtkWidget *run_survey; - GtkWidget *survey_message; - GArray *terracesegments; + GwyParams *params; + GwyGraphModel *gmodel; GwyDataLine *edges; GwyDataLine *residuum; GwyDataLine *background; + GArray *terracesegments; + FitResult *fres; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GwyGraphModel *gmodel; + GtkWidget *dialog; + GtkWidget *graph; + GwyResults *results; + GtkWidget *terracelist; GdkPixbuf *colourpixbuf; + GwyParamTable *table_param; + GwyParamTable *table_terraces; + GwyParamTable *table_output; + GwyParamTable *table_survey; GwySIValueFormat *vf; - gulong sid; - FitResult *fres; -} TerraceControls; +} ModuleGUI; typedef struct { gdouble xfrom; @@ -175,84 +166,43 @@ gdouble discrep; } TerraceSurveyRow; -static gboolean module_register (void); -static void graph_terraces (GwyGraph *graph); -static void graph_terraces_dialogue (GwyContainer *data, - GwyGraphModel *parent_gmodel, - TerraceArgs *args); -static void dialogue_response (GtkDialog *dialogue, - gint response_id, - TerraceControls *controls); -static void curve_changed (GtkComboBox *combo, - TerraceControls *controls); -static void poly_degree_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void edge_kernel_size_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void edge_threshold_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void edge_broadening_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void min_area_frac_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void use_selection_changed (GtkToggleButton *toggle, - TerraceControls *controls); -static void independent_changed (GtkToggleButton *toggle, - TerraceControls *controls); -static void preview_mode_changed (GtkComboBox *combo, - TerraceControls *controls); -static void report_style_changed (TerraceControls *controls, - GwyResultsExport *rexport); -static void output_flags_changed (GtkWidget *button, - TerraceControls *controls); -static void survey_poly_changed (GtkToggleButton *toggle, - TerraceControls *controls); -static void poly_degree_min_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void poly_degree_max_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void survey_broadening_changed(GtkToggleButton *toggle, - TerraceControls *controls); -static void broadening_min_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void broadening_max_changed (TerraceControls *controls, - GtkAdjustment *adj); -static void graph_xsel_changed (GwySelection *selection, - gint hint, - TerraceControls *controls); -static void update_sensitivity (TerraceControls *controls); -static void invalidate (TerraceControls *controls); -static gboolean preview_gsource (gpointer user_data); -static void preview (TerraceControls *controls); -static void fill_preview_graph (TerraceControls *controls); -static FitResult* terrace_do (const gdouble *xdata, - const gdouble *ydata, - guint ndata, - GwyDataLine *edges, - GwyDataLine *residuum, - GwyDataLine *background, - GArray *terracesegments, - GwySelection *xsel, - const TerraceArgs *args, - const gchar** message); -static void update_value_formats (TerraceControls *controls); -static GtkWidget* parameters_tab_new (TerraceControls *controls); -static GtkWidget* terrace_list_tab_new (TerraceControls *controls); -static GtkWidget* output_tab_new (TerraceControls *controls); -static GtkWidget* survey_tab_new (TerraceControls *controls); -static void create_output_graphs (TerraceControls *controls, - GwyContainer *data); -static void save_report (TerraceControls *controls); -static void copy_report (TerraceControls *controls); -static gchar* format_report (TerraceControls *controls); -static guint count_survey_items (TerraceArgs *args, - guint *pndegrees, - guint *pnbroadenings); -static void run_survey (TerraceControls *controls); -static void load_args (GwyContainer *settings, - TerraceArgs *args); -static void save_args (GwyContainer *settings, - TerraceArgs *args); +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void graph_terraces (GwyGraph *graph); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (ModuleGUI *gui, + gint response); +static void graph_xsel_changed (ModuleGUI *gui); +static void preview (gpointer user_data); +static void fill_preview_graph (ModuleGUI *gui); +static FitResult* terrace_do (const gdouble *xdata, + const gdouble *ydata, + guint ndata, + GwyDataLine *edges, + GwyDataLine *residuum, + GwyDataLine *background, + GArray *terracesegments, + GwySelection *xsel, + GwyParams *params, + const gchar** message); +static void update_value_formats(ModuleGUI *gui); +static GtkWidget* parameters_tab_new (ModuleGUI *gui); +static GtkWidget* terrace_list_tab_new(ModuleGUI *gui); +static GtkWidget* output_tab_new (ModuleGUI *gui); +static GtkWidget* survey_tab_new (ModuleGUI *gui); +static GwyResults* create_results (GwyContainer *data, + GwyGraphModel *gmodel); +static void create_output_graphs(ModuleArgs *args, + GwyContainer *data); +static void free_fit_result (FitResult *fres); +static gchar* format_report (gpointer user_data); +static guint prepare_survey (GwyParams *params, + GArray *degrees, + GArray *broadenings); +static void run_survey (ModuleGUI *gui); static const GwyEnum output_flags[] = { { N_("Data + fit"), OUTPUT_DATA_FIT, }, @@ -263,30 +213,13 @@ { N_("Polynomial background"), OUTPUT_BACKGROUND, }, }; -enum { - OUTPUT_NFLAGS = G_N_ELEMENTS(output_flags) -}; - -static const TerraceArgs terraces_defaults = { - 0, FALSE, - 4, - 3.5, 40.0, 6.0, - GWY_RESULTS_REPORT_TABSEP, - 1.5, - FALSE, - OUTPUT_DATA_POLY, - FALSE, 0, MAX_DEGREE, - FALSE, 0, MAX_BROADEN, - - PREVIEW_DATA_FIT, -}; static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Fits terraces with polynomial background."), "Yeti ", - "1.5", + "2.0", "David Nečas (Yeti)", "2019", }; @@ -306,475 +239,297 @@ return TRUE; } +static GwyParamDef* +define_module_params(void) +{ + static const GwyEnum displays[] = { + { N_("Data + fit"), PREVIEW_DATA_FIT, }, + { N_("Data + polynomials"), PREVIEW_DATA_POLY, }, + { N_("Difference"), PREVIEW_RESIDUUM, }, + { N_("Terraces (ideal)"), PREVIEW_TERRACES, }, + { N_("Leveled surface"), PREVIEW_LEVELLED, }, + { N_("Polynomial background"), PREVIEW_BACKGROUND, }, + { N_("Step detection"), PREVIEW_STEPS, }, + }; + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_graph_func_current()); + gwy_param_def_add_graph_curve(paramdef, PARAM_CURVE, "curve", NULL); + gwy_param_def_add_double(paramdef, PARAM_EDGE_KERNEL_SIZE, "edge_kernel_size", _("_Step detection kernel"), + 1.0, 64.0, 3.5); + gwy_param_def_add_percentage(paramdef, PARAM_EDGE_THRESHOLD, "edge_threshold", _("Step detection _threshold"), + 0.4); + gwy_param_def_add_double(paramdef, PARAM_EDGE_BROADENING, "edge_broadening", _("Step _broadening"), + 0.0, 128.0, 6.0); + gwy_param_def_add_double(paramdef, PARAM_MIN_AREA_FRAC, "min_area_frac", _("Minimum terrace _length"), + 0.0, 0.4, 0.015); + gwy_param_def_add_int(paramdef, PARAM_POLY_DEGREE, "poly_degree", _("_Polynomial degree"), 0, MAX_DEGREE, 4); + gwy_param_def_add_boolean(paramdef, PARAM_INDEPENDENT, "independent", _("_Independent heights"), FALSE); + gwy_param_def_add_gwyenum(paramdef, PARAM_DISPLAY, NULL, gwy_sgettext("verb|Display"), + displays, G_N_ELEMENTS(displays), PREVIEW_DATA_FIT); + gwy_param_def_add_boolean(paramdef, PARAM_USE_SELECTION, "use_selection", _("Select regions _manually"), FALSE); + gwy_param_def_add_report_type(paramdef, PARAM_FIT_REPORT_STYLE, "fit_report_style", _("Save Fit Report"), + GWY_RESULTS_EXPORT_PARAMETERS, GWY_RESULTS_REPORT_COLON); + gwy_param_def_add_report_type(paramdef, PARAM_TERRACE_REPORT_STYLE, "terrace_report_style", _("Save Terrace Table"), + GWY_RESULTS_EXPORT_TABULAR_DATA, GWY_RESULTS_REPORT_TABSEP); + gwy_param_def_add_gwyflags(paramdef, PARAM_OUTPUT, "output", _("Output"), + output_flags, G_N_ELEMENTS(output_flags), OUTPUT_DATA_POLY); + gwy_param_def_add_boolean(paramdef, PARAM_SURVEY_POLY, "survey_poly", _("_Polynomial degree"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_SURVEY_BROADENING, "survey_broadening", _("Step _broadening"), FALSE); + gwy_param_def_add_int(paramdef, PARAM_POLY_DEGREE_MIN, "poly_degree_min", _("M_inimum polynomial degree"), + 0, MAX_DEGREE, 0); + gwy_param_def_add_int(paramdef, PARAM_POLY_DEGREE_MAX, "poly_degree_max", _("_Maximum polynomial degree"), + 0, MAX_DEGREE, MAX_DEGREE); + gwy_param_def_add_double(paramdef, PARAM_BROADENING_MIN, "broadening_min", _("Minimum broadening"), + 0, MAX_BROADEN, 0.0); + gwy_param_def_add_double(paramdef, PARAM_BROADENING_MAX, "broadening_max", _("Maximum broadening"), + 0, MAX_BROADEN, MAX_BROADEN); + + return paramdef; +} + static void graph_terraces(GwyGraph *graph) { GwyContainer *data; - TerraceArgs args; + GwyDialogOutcome outcome; + GwySIUnit *unit; + ModuleArgs args; + gwy_clear(&args, 1); + args.params = gwy_params_new_from_settings(define_module_params()); + args.gmodel = gwy_graph_get_model(graph); gwy_app_data_browser_get_current(GWY_APP_CONTAINER, &data, 0); - load_args(gwy_app_settings_get(), &args); - graph_terraces_dialogue(data, gwy_graph_get_model(graph), &args); - save_args(gwy_app_settings_get(), &args); -} -static void -graph_terraces_dialogue(GwyContainer *data, GwyGraphModel *parent_gmodel, - TerraceArgs *args) -{ - GtkWidget *dialogue, *hbox, *notebook, *widget; - GwyDataLine *dline; - GwyGraphModel *gmodel; + args.background = gwy_data_line_new(1, 1.0, TRUE); + g_object_get(args.gmodel, "si-unit-x", &unit, NULL); + gwy_si_unit_assign(gwy_data_line_get_si_unit_x(args.background), unit); + g_object_unref(unit); + g_object_get(args.gmodel, "si-unit-y", &unit, NULL); + gwy_si_unit_assign(gwy_data_line_get_si_unit_y(args.background), unit); + args.edges = gwy_data_line_duplicate(args.background); + args.residuum = gwy_data_line_duplicate(args.background); + args.terracesegments = g_array_new(FALSE, FALSE, sizeof(TerraceSegment)); + + outcome = run_gui(&args, data); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_HAVE_RESULT) + create_output_graphs(&args, data); + + g_object_unref(args.edges); + g_object_unref(args.residuum); + g_object_unref(args.background); + g_object_unref(args.params); + g_array_free(args.terracesegments, TRUE); + free_fit_result(args.fres); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data) +{ + GwyDialogOutcome outcome; + GwyDialog *dialog; + GtkWidget *hbox, *notebook; GwyGraphArea *area; - GwyResults *results; - GwySIUnit *unit; - TerraceControls controls; GwySelection *xsel; - gint width, height, response; + ModuleGUI gui; + gint width, height; - gwy_clear(&controls, 1); - controls.args = args; - controls.parent_gmodel = parent_gmodel; - controls.terracesegments = g_array_new(FALSE, FALSE, - sizeof(TerraceSegment)); - gmodel = gwy_graph_model_new_alike(parent_gmodel); - - dline = gwy_data_line_new(1, 1.0, TRUE); - g_object_get(gmodel, "si-unit-x", &unit, NULL); - gwy_si_unit_assign(gwy_data_line_get_si_unit_x(dline), unit); - g_object_unref(unit); - g_object_get(gmodel, "si-unit-y", &unit, NULL); - gwy_si_unit_assign(gwy_data_line_get_si_unit_y(dline), unit); - controls.edges = gwy_data_line_duplicate(dline); - controls.residuum = gwy_data_line_duplicate(dline); - controls.background = dline; + gwy_clear(&gui, 1); + gui.args = args; + gui.results = create_results(data, args->gmodel); gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); height |= 1; - controls.colourpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, - height, height); + gui.colourpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, height, height); - controls.results = results = gwy_results_new(); - gwy_results_add_header(results, N_("Fit Results")); - gwy_results_add_value_str(results, "file", N_("File")); - gwy_results_add_value_str(results, "graph", N_("Graph")); - gwy_results_add_value_str(results, "curve", N_("Curve")); - gwy_results_add_separator(results); - /* TODO: We might also want to output the segmentation & fit settings. */ - gwy_results_add_value_z(results, "step", N_("Fitted step height")); - gwy_results_add_value_z(results, "resid", N_("Mean square difference")); - gwy_results_add_value_z(results, "discrep", N_("Terrace discrepancy")); - gwy_results_add_value_int(results, "nterraces", N_("Number of terraces")); - gwy_results_set_unit(results, "z", unit); - gwy_results_fill_filename(results, "file", data); - gwy_results_fill_graph(results, "graph", parent_gmodel); - g_object_unref(unit); + gui.gmodel = gwy_graph_model_new_alike(args->gmodel); + g_object_set(gui.gmodel, "label-visible", FALSE, NULL); - dialogue = gtk_dialog_new_with_buttons(_("Fit Terraces"), NULL, 0, NULL); - controls.dialogue = dialogue; - gtk_dialog_add_button(GTK_DIALOG(dialogue), GTK_STOCK_CLEAR, - RESPONSE_CLEAR); - gtk_dialog_add_button(GTK_DIALOG(dialogue), GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(GTK_DIALOG(dialogue), GTK_STOCK_OK, GTK_RESPONSE_OK); - gwy_help_add_to_graph_dialog(GTK_DIALOG(dialogue), GWY_HELP_DEFAULT); - gtk_dialog_set_default_response(GTK_DIALOG(dialogue), GTK_RESPONSE_OK); - g_signal_connect(dialogue, "response", - G_CALLBACK(dialogue_response), &controls); - - hbox = gtk_hbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogue)->vbox), hbox, - TRUE, TRUE, 0); + gui.dialog = gwy_dialog_new(_("Fit Terraces")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_CLEAR, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + hbox = gwy_hbox_new(0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); + gwy_dialog_add_content(dialog, hbox, FALSE, FALSE, 0); notebook = gtk_notebook_new(); gtk_box_pack_start(GTK_BOX(hbox), notebook, FALSE, FALSE, 0); - widget = parameters_tab_new(&controls); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, - gtk_label_new(_("Parameters"))); - - widget = terrace_list_tab_new(&controls); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, - gtk_label_new(_("Terrace List"))); - - widget = output_tab_new(&controls); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, - gtk_label_new(_("Output"))); - - widget = survey_tab_new(&controls); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, - gtk_label_new(_("Survey"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), parameters_tab_new(&gui), gtk_label_new(_("Parameters"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), terrace_list_tab_new(&gui), gtk_label_new(_("Terrace List"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), output_tab_new(&gui), gtk_label_new(_("Output"))); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), survey_tab_new(&gui), gtk_label_new(_("Survey"))); /* Graph */ - controls.graph = gwy_graph_new(gmodel); - g_object_set(gmodel, "label-visible", FALSE, NULL); - g_object_unref(gmodel); - gtk_widget_set_size_request(controls.graph, 480, 300); - - gwy_graph_enable_user_input(GWY_GRAPH(controls.graph), FALSE); - gtk_box_pack_start(GTK_BOX(hbox), controls.graph, TRUE, TRUE, 0); - gwy_graph_set_status(GWY_GRAPH(controls.graph), GWY_GRAPH_STATUS_XSEL); + gui.graph = gwy_graph_new(gui.gmodel); + gtk_widget_set_size_request(gui.graph, 480, 300); + gwy_graph_enable_user_input(GWY_GRAPH(gui.graph), FALSE); + gtk_box_pack_start(GTK_BOX(hbox), gui.graph, TRUE, TRUE, 0); + gwy_graph_set_status(GWY_GRAPH(gui.graph), GWY_GRAPH_STATUS_XSEL); - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls.graph))); + area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(gui.graph))); gwy_graph_area_set_selection_editable(area, TRUE); xsel = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); gwy_selection_set_max_objects(xsel, 1024); - g_signal_connect(xsel, "changed", - G_CALLBACK(graph_xsel_changed), &controls); - curve_changed(GTK_COMBO_BOX(controls.curve), &controls); - use_selection_changed(GTK_TOGGLE_BUTTON(controls.use_selection), &controls); + g_signal_connect_swapped(xsel, "changed", G_CALLBACK(graph_xsel_changed), &gui); + g_signal_connect_swapped(gui.table_param, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_terraces, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_output, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_survey, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); - gtk_widget_show_all(dialogue); - response = gtk_dialog_run(GTK_DIALOG(dialogue)); - if (controls.sid) { - g_source_remove(controls.sid); - controls.sid = 0; - } - /* Prevent invalidate during dialogue destruction. */ - controls.sid = G_MAXINT; - if (response == GTK_RESPONSE_OK) - create_output_graphs(&controls, data); - gtk_widget_destroy(dialogue); - - gwy_si_unit_value_format_free(controls.vf); - g_object_unref(controls.results); - g_object_unref(controls.edges); - g_object_unref(controls.residuum); - g_object_unref(controls.background); - g_object_unref(controls.colourpixbuf); - g_array_free(controls.terracesegments, TRUE); + g_object_unref(gui.results); + g_object_unref(gui.gmodel); + gwy_si_unit_value_format_free(gui.vf); + + return outcome; } static void -update_value_formats(TerraceControls *controls) +update_value_formats(ModuleGUI *gui) { - GwyGraphModel *gmodel; - GwyGraphCurveModel *gcmodel; + gint curve = gwy_params_get_int(gui->args->params, PARAM_CURVE); + GwyGraphCurveModel *gcmodel = gwy_graph_model_get_curve(gui->args->gmodel, curve); GtkTreeView *treeview; GList *columns, *l; GwySIUnit *yunit; gdouble min, max, yrange; - gmodel = gwy_graph_get_model(GWY_GRAPH(controls->graph)); - gcmodel = gwy_graph_model_get_curve(gmodel, 0); - g_object_get(gmodel, "si-unit-y", &yunit, NULL); + g_object_get(gui->gmodel, "si-unit-y", &yunit, NULL); gwy_graph_curve_model_get_y_range(gcmodel, &min, &max); yrange = max - min; - controls->vf - = gwy_si_unit_get_format_with_digits(yunit, - GWY_SI_UNIT_FORMAT_MARKUP, - yrange, 4, controls->vf); + gui->vf = gwy_si_unit_get_format_with_digits(yunit, GWY_SI_UNIT_FORMAT_MARKUP, yrange, 4, gui->vf); g_object_unref(yunit); - treeview = GTK_TREE_VIEW(controls->terracelist); + treeview = GTK_TREE_VIEW(gui->terracelist); columns = gtk_tree_view_get_columns(treeview); for (l = columns; l; l = g_list_next(l)) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(l->data); - gboolean is_z = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), - "is_z")); + gboolean is_z = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "is_z")); const gchar *title = g_object_get_data(G_OBJECT(column), "title"); - GtkWidget *label; + GtkWidget *label = gtk_tree_view_column_get_widget(column); gchar *s; - label = gtk_tree_view_column_get_widget(column); - if (is_z && *controls->vf->units) - s = g_strdup_printf("%s [%s]", title, controls->vf->units); + if (is_z && *gui->vf->units) + s = g_strdup_printf("%s [%s]", title, gui->vf->units); else s = g_strdup_printf("%s", title); gtk_label_set_markup(GTK_LABEL(label), s); + g_free(s); } g_list_free(columns); } static GtkWidget* -parameters_tab_new(TerraceControls *controls) +parameters_tab_new(ModuleGUI *gui) { - TerraceArgs *args = controls->args; - GtkWidget *table, *spin, *label; - GwyResultsExport *rexport; - GwyResults *results; - GString *str; - guint i; - gint row; + ModuleArgs *args = gui->args; + GwyParamTable *table; - /* Parameters */ - table = gtk_table_new(13, 3, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 2); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 4); - row = 0; - - controls->curve = gwy_combo_box_graph_curve_new(G_CALLBACK(curve_changed), - controls, - controls->parent_gmodel, - args->curve); - gwy_table_attach_adjbar(table, row++, _("_Graph curve:"), NULL, - GTK_OBJECT(controls->curve), - GWY_HSCALE_WIDGET_NO_EXPAND); - - controls->edge_kernel_size = gtk_adjustment_new(args->edge_kernel_size, - 1.0, 64.0, 0.1, 5.0, 0.0); - gwy_table_attach_adjbar(table, row, _("_Step detection kernel:"), _("px"), - controls->edge_kernel_size, GWY_HSCALE_SQRT); - g_signal_connect_swapped(controls->edge_kernel_size, "value-changed", - G_CALLBACK(edge_kernel_size_changed), controls); - row++; - - controls->edge_threshold = gtk_adjustment_new(args->edge_threshold, - 0.0, 100.0, 0.01, 0.1, 0.0); - gwy_table_attach_adjbar(table, row, _("Step detection _threshold:"), "%", - controls->edge_threshold, GWY_HSCALE_SQRT); - g_signal_connect_swapped(controls->edge_threshold, "value-changed", - G_CALLBACK(edge_threshold_changed), controls); - row++; - - controls->edge_broadening = gtk_adjustment_new(args->edge_broadening, - 0.0, MAX_BROADEN, 1.0, 10.0, - 0.0); - spin = gwy_table_attach_adjbar(table, row, _("Step _broadening:"), _("px"), - controls->edge_broadening, GWY_HSCALE_SQRT); - gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 1); - g_signal_connect_swapped(controls->edge_broadening, "value-changed", - G_CALLBACK(edge_broadening_changed), controls); - row++; - - controls->min_area_frac = gtk_adjustment_new(args->min_area_frac, - 0.1, 40.0, 0.01, 1.0, 0.0); - gwy_table_attach_adjbar(table, row, _("Minimum terrace _length:"), "%", - controls->min_area_frac, GWY_HSCALE_SQRT); - g_signal_connect_swapped(controls->min_area_frac, "value-changed", - G_CALLBACK(min_area_frac_changed), controls); - row++; - - controls->poly_degree = gtk_adjustment_new(args->poly_degree, - 0.0, MAX_DEGREE, 1.0, 2.0, 0.0); - gwy_table_attach_adjbar(table, row, _("_Polynomial degree:"), NULL, - controls->poly_degree, - GWY_HSCALE_LINEAR | GWY_HSCALE_SNAP); - g_signal_connect_swapped(controls->poly_degree, "value-changed", - G_CALLBACK(poly_degree_changed), controls); - row++; - - controls->independent - = gtk_check_button_new_with_mnemonic(_("_Independent heights")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->independent), - args->independent); - gtk_table_attach(GTK_TABLE(table), controls->independent, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls->independent, "toggled", - G_CALLBACK(independent_changed), controls); - row++; - - controls->preview_mode - = gwy_enum_combo_box_newl(G_CALLBACK(preview_mode_changed), controls, - args->preview_mode, - _("Data + fit"), PREVIEW_DATA_FIT, - _("Data + polynomials"), PREVIEW_DATA_POLY, - _("Difference"), PREVIEW_RESIDUUM, - _("Terraces (ideal)"), PREVIEW_TERRACES, - _("Leveled surface"), PREVIEW_LEVELLED, - _("Polynomial background"), PREVIEW_BACKGROUND, - _("Step detection"), PREVIEW_STEPS, - NULL); - gwy_table_attach_adjbar(table, row++, _("_Display:"), NULL, - GTK_OBJECT(controls->preview_mode), - GWY_HSCALE_WIDGET_NO_EXPAND); - - controls->use_selection - = gtk_check_button_new_with_mnemonic(_("Select regions _manually")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->use_selection), - args->use_selection); - gtk_table_attach(GTK_TABLE(table), controls->use_selection, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls->use_selection, "toggled", - G_CALLBACK(use_selection_changed), controls); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - - label = gwy_label_new_header(_("Result")); - gtk_table_attach(GTK_TABLE(table), label, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - row++; - - str = g_string_new(NULL); - results = controls->results; - for (i = 0; i < G_N_ELEMENTS(guivalues); i++) { - g_string_assign(str, gwy_results_get_label_with_symbol(results, - guivalues[i])); - g_string_append_c(str, ':'); - controls->guivalues[i] = gtk_label_new(NULL); - gwy_table_attach_adjbar(table, row++, str->str, NULL, - GTK_OBJECT(controls->guivalues[i]), - GWY_HSCALE_WIDGET_NO_EXPAND); - } - g_string_free(str, TRUE); + table = gui->table_param = gwy_param_table_new(args->params); - controls->message = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(controls->message), 0.0, 0.5); - set_widget_as_error_message(controls->message); - gtk_table_attach(GTK_TABLE(table), controls->message, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - row++; - - controls->rexport_result = gwy_results_export_new(args->report_style); - rexport = GWY_RESULTS_EXPORT(controls->rexport_result); - gwy_results_export_set_results(rexport, results); - gwy_results_export_set_title(rexport, _("Save Fit Report")); - gwy_results_export_set_actions_sensitive(rexport, FALSE); - gtk_table_attach(GTK_TABLE(table), controls->rexport_result, - 0, 3, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect_swapped(rexport, "format-changed", - G_CALLBACK(report_style_changed), controls); - - return table; + gwy_param_table_append_graph_curve(table, PARAM_CURVE, args->gmodel); + gwy_param_table_append_slider(table, PARAM_EDGE_KERNEL_SIZE); + /* FIXME: Use alts for real sizes? Pixels are a bit shady anyway. */ + gwy_param_table_set_unitstr(table, PARAM_EDGE_KERNEL_SIZE, _("px")); + gwy_param_table_append_slider(table, PARAM_EDGE_THRESHOLD); + gwy_param_table_append_slider(table, PARAM_EDGE_BROADENING); + gwy_param_table_slider_set_steps(table, PARAM_EDGE_BROADENING, 0.1, 1.0); + gwy_param_table_set_unitstr(table, PARAM_EDGE_BROADENING, _("px")); + gwy_param_table_slider_set_digits(table, PARAM_EDGE_BROADENING, 1); + gwy_param_table_append_slider(table, PARAM_MIN_AREA_FRAC); + gwy_param_table_slider_set_factor(table, PARAM_MIN_AREA_FRAC, 100.0); + gwy_param_table_set_unitstr(table, PARAM_MIN_AREA_FRAC, "%"); + gwy_param_table_append_slider(table, PARAM_POLY_DEGREE); + gwy_param_table_slider_set_mapping(table, PARAM_POLY_DEGREE, GWY_SCALE_MAPPING_LINEAR); + gwy_param_table_append_checkbox(table, PARAM_INDEPENDENT); + gwy_param_table_append_combo(table, PARAM_DISPLAY); + gwy_param_table_append_checkbox(table, PARAM_USE_SELECTION); + + gwy_param_table_append_header(table, -1, _("Result")); + gwy_param_table_append_results(table, WIDGET_RESULTS, gui->results, "step", "resid", "discrep", "nterraces", NULL); + gwy_param_table_append_message(table, LABEL_FIT_RESULT, NULL); + gwy_param_table_message_set_type(table, LABEL_FIT_RESULT, GTK_MESSAGE_ERROR); + gwy_param_table_append_report(table, PARAM_FIT_REPORT_STYLE); + gwy_param_table_report_set_results(table, PARAM_FIT_REPORT_STYLE, gui->results); + + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), table); + + return gwy_param_table_widget(table); } static void -render_id(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - G_GNUC_UNUSED gpointer user_data) -{ - gchar buf[16]; +render_text_column(GtkTreeViewColumn *column, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data) +{ + guint column_id = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(column), "column-id")); + ModuleGUI *gui = (ModuleGUI*)user_data; + GwySIValueFormat *vf = gui->vf; + TerraceSegment *seg; + gchar buf[32]; guint i; gtk_tree_model_get(model, iter, 0, &i, -1); - g_snprintf(buf, sizeof(buf), "%u", i+1); + seg = &terrace_index(gui->args->terracesegments, i); + if (column_id == COLUMN_ID) + g_snprintf(buf, sizeof(buf), "%u", i+1); + else if (column_id == COLUMN_AREA) + g_snprintf(buf, sizeof(buf), "%u", seg->npixels); + else if (column_id == COLUMN_HEIGHT) + g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, seg->height/vf->magnitude); + else if (column_id == COLUMN_LEVEL) + g_snprintf(buf, sizeof(buf), "%d", seg->level); + else if (column_id == COLUMN_ERROR) + g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, seg->error/vf->magnitude); + else if (column_id == COLUMN_RESIDUUM) + g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, seg->residuum/vf->magnitude); + else { + g_assert_not_reached(); + } g_object_set(renderer, "text", buf, NULL); } static void -render_colour(G_GNUC_UNUSED GtkTreeViewColumn *column, - G_GNUC_UNUSED GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, +render_colour(G_GNUC_UNUSED GtkTreeViewColumn *column, G_GNUC_UNUSED GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - TerraceControls *controls = (TerraceControls*)user_data; + ModuleGUI *gui = (ModuleGUI*)user_data; guint i, pixel; gtk_tree_model_get(model, iter, 0, &i, -1); pixel = 0xff | gwy_rgba_to_pixbuf_pixel(gwy_graph_get_preset_color(i+1)); - gdk_pixbuf_fill(controls->colourpixbuf, pixel); -} - -static void -render_height(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - GwySIValueFormat *vf = controls->vf; - TerraceSegment *seg; - gchar buf[32]; - guint i; - - gtk_tree_model_get(model, iter, 0, &i, -1); - seg = &terrace_index(controls->terracesegments, i); - g_snprintf(buf, sizeof(buf), "%.*f", - vf->precision, seg->height/vf->magnitude); - g_object_set(renderer, "text", buf, NULL); -} - -static void -render_level(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - TerraceSegment *seg; - gchar buf[16]; - guint i; - - gtk_tree_model_get(model, iter, 0, &i, -1); - seg = &terrace_index(controls->terracesegments, i); - g_snprintf(buf, sizeof(buf), "%d", seg->level); - g_object_set(renderer, "text", buf, NULL); -} - -static void -render_area(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - TerraceSegment *seg; - gchar buf[16]; - guint i; - - gtk_tree_model_get(model, iter, 0, &i, -1); - seg = &terrace_index(controls->terracesegments, i); - g_snprintf(buf, sizeof(buf), "%u", seg->npixels); - g_object_set(renderer, "text", buf, NULL); -} - -static void -render_error(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - GwySIValueFormat *vf = controls->vf; - TerraceSegment *seg; - gchar buf[32]; - guint i; - - gtk_tree_model_get(model, iter, 0, &i, -1); - seg = &terrace_index(controls->terracesegments, i); - g_snprintf(buf, sizeof(buf), "%.*f", - vf->precision, seg->error/vf->magnitude); - g_object_set(renderer, "text", buf, NULL); -} - -static void -render_residuum(G_GNUC_UNUSED GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - GwySIValueFormat *vf = controls->vf; - TerraceSegment *seg; - gchar buf[32]; - guint i; - - gtk_tree_model_get(model, iter, 0, &i, -1); - seg = &terrace_index(controls->terracesegments, i); - g_snprintf(buf, sizeof(buf), "%.*f", - vf->precision, seg->residuum/vf->magnitude); - g_object_set(renderer, "text", buf, NULL); + gdk_pixbuf_fill(gui->colourpixbuf, pixel); } static GtkTreeViewColumn* -append_text_column(GtkTreeCellDataFunc render_func, const gchar *title, - TerraceControls *controls, gboolean is_z) +append_text_column(ModuleGUI *gui, guint column_id, const gchar *title, gboolean is_z) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; GtkWidget *label; column = gtk_tree_view_column_new(); + g_object_set_data(G_OBJECT(column), "column-id", GUINT_TO_POINTER(column_id)); gtk_tree_view_column_set_expand(column, TRUE); gtk_tree_view_column_set_alignment(column, 0.5); renderer = gtk_cell_renderer_text_new(); g_object_set(renderer, "xalign", 1.0, NULL); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(column), renderer, TRUE); - gtk_tree_view_column_set_cell_data_func(column, renderer, - render_func, controls, NULL); + gtk_tree_view_column_set_cell_data_func(column, renderer, render_text_column, gui, NULL); label = gtk_label_new(NULL); g_object_set_data(G_OBJECT(column), "title", (gpointer)title); @@ -782,461 +537,227 @@ gtk_tree_view_column_set_widget(column, label); gtk_widget_show(label); - gtk_tree_view_append_column(GTK_TREE_VIEW(controls->terracelist), column); + gtk_tree_view_append_column(GTK_TREE_VIEW(gui->terracelist), column); return column; } static GtkWidget* -terrace_list_tab_new(TerraceControls *controls) +terrace_list_tab_new(ModuleGUI *gui) { - TerraceArgs *args = controls->args; - GtkWidget *vbox, *scwin; + ModuleArgs *args = gui->args; + GtkWidget *vbox, *hbox, *scwin; GtkTreeViewColumn *column; GtkCellRenderer *renderer; GwyNullStore *store; - GwyResultsExport *rexport; + GwyParamTable *table; vbox = gtk_vbox_new(FALSE, 2); gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); scwin = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(vbox), scwin, TRUE, TRUE, 0); store = gwy_null_store_new(0); - controls->terracelist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_container_add(GTK_CONTAINER(scwin), controls->terracelist); + gui->terracelist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + gtk_container_add(GTK_CONTAINER(scwin), gui->terracelist); - column = append_text_column(render_id, "n", controls, FALSE); + column = append_text_column(gui, COLUMN_ID, "n", FALSE); renderer = gtk_cell_renderer_pixbuf_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(column), renderer, FALSE); - g_object_set(renderer, "pixbuf", controls->colourpixbuf, NULL); - gtk_tree_view_column_set_cell_data_func(column, renderer, - render_colour, controls, NULL); - append_text_column(render_height, "h", controls, TRUE); - append_text_column(render_level, "k", controls, FALSE); - append_text_column(render_area, "Npx", controls, FALSE); - append_text_column(render_error, "Δ", controls, TRUE); - append_text_column(render_residuum, "r", controls, TRUE); - - controls->rexport_list = gwy_results_export_new(args->report_style); - rexport = GWY_RESULTS_EXPORT(controls->rexport_list); - gwy_results_export_set_style(rexport, GWY_RESULTS_EXPORT_TABULAR_DATA); - gwy_results_export_set_title(rexport, _("Save Terrace Table")); - gwy_results_export_set_actions_sensitive(rexport, FALSE); - gtk_box_pack_start(GTK_BOX(vbox), controls->rexport_list, FALSE, FALSE, 0); - g_signal_connect_swapped(rexport, "format-changed", - G_CALLBACK(report_style_changed), controls); - g_signal_connect_swapped(rexport, "copy", - G_CALLBACK(copy_report), controls); - g_signal_connect_swapped(rexport, "save", - G_CALLBACK(save_report), controls); + g_object_set(renderer, "pixbuf", gui->colourpixbuf, NULL); + gtk_tree_view_column_set_cell_data_func(column, renderer, render_colour, gui, NULL); + append_text_column(gui, COLUMN_HEIGHT, "h", TRUE); + append_text_column(gui, COLUMN_LEVEL, "k", FALSE); + append_text_column(gui, COLUMN_AREA, "Npx", FALSE); + append_text_column(gui, COLUMN_ERROR, "Δ", TRUE); + append_text_column(gui, COLUMN_RESIDUUM, "r", TRUE); + + table = gui->table_terraces = gwy_param_table_new(args->params); + gwy_param_table_append_report(table, PARAM_TERRACE_REPORT_STYLE); + gwy_param_table_report_set_formatter(table, PARAM_TERRACE_REPORT_STYLE, format_report, gui, NULL); + /* XXX: Silly. Just want to right-align the export controls for consistency. */ + hbox = gwy_hbox_new(0); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), table); return vbox; } static GtkWidget* -output_tab_new(TerraceControls *controls) -{ - TerraceArgs *args = controls->args; - GtkWidget *table; - gint row; - - table = gtk_table_new(OUTPUT_NFLAGS, 1, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 2); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 4); - row = 0; - - controls->output_flags - = gwy_check_boxes_create(output_flags, OUTPUT_NFLAGS, - G_CALLBACK(output_flags_changed), controls, - args->output_flags); - row = gwy_check_boxes_attach_to_table(controls->output_flags, - GTK_TABLE(table), 1, row); - - return table; -} - -static GtkWidget* -survey_tab_new(TerraceControls *controls) -{ - TerraceArgs *args = controls->args; - GtkWidget *table, *align, *spin; - gint row; - - table = controls->survey_table = gtk_table_new(8, 3, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 2); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_container_set_border_width(GTK_CONTAINER(table), 4); - row = 0; - - controls->survey_poly - = gtk_check_button_new_with_mnemonic(_("_Polynomial degree")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->survey_poly), - args->survey_poly); - gtk_table_attach(GTK_TABLE(table), controls->survey_poly, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls->survey_poly, "toggled", - G_CALLBACK(survey_poly_changed), controls); - row++; - - controls->poly_degree_min = gtk_adjustment_new(args->poly_degree_min, - 0.0, MAX_DEGREE, 1.0, 2.0, - 0.0); - gwy_table_attach_adjbar(table, row, _("M_inimum polynomial degree:"), NULL, - controls->poly_degree_min, - GWY_HSCALE_LINEAR | GWY_HSCALE_SNAP); - g_signal_connect_swapped(controls->poly_degree_min, "value-changed", - G_CALLBACK(poly_degree_min_changed), controls); - row++; - - controls->poly_degree_max = gtk_adjustment_new(args->poly_degree_max, - 0.0, MAX_DEGREE, 1.0, 2.0, - 0.0); - gwy_table_attach_adjbar(table, row, _("_Maximum polynomial degree:"), NULL, - controls->poly_degree_max, - GWY_HSCALE_LINEAR | GWY_HSCALE_SNAP); - g_signal_connect_swapped(controls->poly_degree_max, "value-changed", - G_CALLBACK(poly_degree_max_changed), controls); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - controls->survey_broadening - = gtk_check_button_new_with_mnemonic(_("Step _broadening")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->survey_broadening), - args->survey_broadening); - gtk_table_attach(GTK_TABLE(table), controls->survey_broadening, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls->survey_broadening, "toggled", - G_CALLBACK(survey_broadening_changed), controls); - row++; - - controls->broadening_min = gtk_adjustment_new(args->broadening_min, - 0.0, MAX_BROADEN, 1.0, 10.0, - 0.0); - spin = gwy_table_attach_adjbar(table, row, - _("Minimum broadening:"), _("px"), - controls->broadening_min, GWY_HSCALE_SQRT); - gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 1); - g_signal_connect_swapped(controls->broadening_min, "value-changed", - G_CALLBACK(broadening_min_changed), controls); - row++; - - controls->broadening_max = gtk_adjustment_new(args->broadening_max, - 0.0, MAX_BROADEN, 1.0, 10.0, - 0.0); - spin = gwy_table_attach_adjbar(table, row, - _("Maximum broadening:"), _("px"), - controls->broadening_max, GWY_HSCALE_SQRT); - gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 1); - g_signal_connect_swapped(controls->broadening_max, "value-changed", - G_CALLBACK(broadening_max_changed), controls); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - controls->survey_message = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(controls->survey_message), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), controls->survey_message, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - controls->run_survey = gtk_button_new_from_stock(GTK_STOCK_EXECUTE); - align = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); - gtk_container_add(GTK_CONTAINER(align), controls->run_survey); - gtk_table_attach(GTK_TABLE(table), align, - 0, 1, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect_swapped(controls->run_survey, "clicked", - G_CALLBACK(run_survey), controls); - row++; - - return table; -} - -static void -dialogue_response(GtkDialog *dialogue, - gint response_id, - TerraceControls *controls) +output_tab_new(ModuleGUI *gui) { - static guint signal_id = 0; - GwySelection *xsel; - GwyGraphArea *area; + ModuleArgs *args = gui->args; + GwyParamTable *table; - if (response_id != RESPONSE_CLEAR) - return; + table = gui->table_output = gwy_param_table_new(args->params); + gwy_param_table_append_checkboxes(table, PARAM_OUTPUT); + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), table); - if (G_UNLIKELY(!signal_id)) - signal_id = g_signal_lookup("response", GTK_TYPE_DIALOG); - - g_signal_stop_emission(dialogue, signal_id, 0); - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls->graph))); - xsel = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); - gwy_selection_clear(xsel); + return gwy_param_table_widget(table); } - -static void -curve_changed(GtkComboBox *combo, TerraceControls *controls) -{ - TerraceArgs *args = controls->args; - GwyGraphModel *gmodel; - GwyGraphCurveModel *gcmodel; - guint ndata; - - args->curve = gwy_enum_combo_box_get_active(combo); - gmodel = gwy_graph_get_model(GWY_GRAPH(controls->graph)); - gwy_graph_model_remove_all_curves(gmodel); - gcmodel = gwy_graph_model_get_curve(controls->parent_gmodel, args->curve); - gwy_graph_model_add_curve(gmodel, gcmodel); - ndata = gwy_graph_curve_model_get_ndata(gcmodel); - gwy_data_line_resample(controls->edges, ndata, GWY_INTERPOLATION_NONE); - gwy_data_line_resample(controls->residuum, ndata, GWY_INTERPOLATION_NONE); - gwy_data_line_resample(controls->background, ndata, GWY_INTERPOLATION_NONE); - invalidate(controls); - update_value_formats(controls); -} - -static void -poly_degree_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->poly_degree = gwy_adjustment_get_int(adj); - invalidate(controls); -} - -static void -edge_kernel_size_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->edge_kernel_size = gtk_adjustment_get_value(adj); - invalidate(controls); -} - -static void -edge_threshold_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->edge_threshold = gtk_adjustment_get_value(adj); - invalidate(controls); -} - -static void -edge_broadening_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->edge_broadening = gtk_adjustment_get_value(adj); - invalidate(controls); -} - -static void -min_area_frac_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->min_area_frac = gtk_adjustment_get_value(adj); - invalidate(controls); -} - -static void -use_selection_changed(GtkToggleButton *toggle, TerraceControls *controls) -{ - TerraceArgs *args = controls->args; - GwyGraph *graph = GWY_GRAPH(controls->graph); - - args->use_selection = gtk_toggle_button_get_active(toggle); - gwy_graph_enable_user_input(graph, args->use_selection); - if (args->use_selection) { - gwy_graph_set_status(graph, GWY_GRAPH_STATUS_XSEL); - } - else { - gwy_graph_set_status(graph, GWY_GRAPH_STATUS_PLAIN); - } - update_sensitivity(controls); - invalidate(controls); -} - -static void -independent_changed(GtkToggleButton *toggle, TerraceControls *controls) +static GtkWidget* +survey_tab_new(ModuleGUI *gui) { - TerraceArgs *args = controls->args; - args->independent = gtk_toggle_button_get_active(toggle); - update_sensitivity(controls); - invalidate(controls); -} + ModuleArgs *args = gui->args; + GwyParamTable *table; -static void -preview_mode_changed(GtkComboBox *combo, TerraceControls *controls) + table = gui->table_survey = gwy_param_table_new(args->params); + gwy_param_table_append_checkbox(table, PARAM_SURVEY_POLY); + gwy_param_table_append_slider(table, PARAM_POLY_DEGREE_MIN); + gwy_param_table_slider_set_mapping(table, PARAM_POLY_DEGREE_MIN, GWY_SCALE_MAPPING_LINEAR); + gwy_param_table_append_slider(table, PARAM_POLY_DEGREE_MAX); + gwy_param_table_slider_set_mapping(table, PARAM_POLY_DEGREE_MAX, GWY_SCALE_MAPPING_LINEAR); + gwy_param_table_append_separator(table); + gwy_param_table_append_checkbox(table, PARAM_SURVEY_BROADENING); + gwy_param_table_append_slider(table, PARAM_BROADENING_MIN); + gwy_param_table_set_unitstr(table, PARAM_BROADENING_MIN, _("px")); + gwy_param_table_append_slider(table, PARAM_BROADENING_MAX); + gwy_param_table_set_unitstr(table, PARAM_BROADENING_MAX, _("px")); + gwy_param_table_append_separator(table); + gwy_param_table_append_button(table, BUTTON_RUN_SURVEY, -1, RESPONSE_SURVEY, _("_Execute")); + gwy_param_table_append_separator(table); + gwy_param_table_append_message(table, LABEL_SURVEY, NULL); + + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), table); + + return gwy_param_table_widget(table); +} + +static GwyResults* +create_results(GwyContainer *data, + GwyGraphModel *gmodel) { - TerraceArgs *args = controls->args; + GwySIUnit *yunit; + GwyResults *results = gwy_results_new(); - args->preview_mode = gwy_enum_combo_box_get_active(combo); - fill_preview_graph(controls); -} + gwy_results_add_header(results, N_("Fit Results")); + gwy_results_add_value_str(results, "file", N_("File")); + gwy_results_add_value_str(results, "graph", N_("Graph")); + gwy_results_add_value_str(results, "curve", N_("Curve")); + gwy_results_add_separator(results); + /* TODO: We might also want to output the segmentation & fit settings. */ + gwy_results_add_value_z(results, "step", N_("Fitted step height")); + gwy_results_add_value_z(results, "resid", N_("Mean square difference")); + gwy_results_add_value_z(results, "discrep", N_("Terrace discrepancy")); + gwy_results_add_value_int(results, "nterraces", N_("Number of terraces")); + g_object_get(gmodel, "si-unit-y", &yunit, NULL); + gwy_results_set_unit(results, "z", yunit); + g_object_unref(yunit); + gwy_results_fill_filename(results, "file", data); + gwy_results_fill_graph(results, "graph", gmodel); -static void -report_style_changed(TerraceControls *controls, GwyResultsExport *rexport) -{ - controls->args->report_style = gwy_results_export_get_format(rexport); + return results; } static void -update_sensitivity(TerraceControls *controls) +param_changed(ModuleGUI *gui, gint id) { - TerraceArgs *args = controls->args; - GwyResultsExport *rexport_list, *rexport_result; - gboolean sens; - - sens = !!controls->fres; - gtk_dialog_set_response_sensitive(GTK_DIALOG(controls->dialogue), - GTK_RESPONSE_OK, sens); - rexport_list = GWY_RESULTS_EXPORT(controls->rexport_list); - rexport_result = GWY_RESULTS_EXPORT(controls->rexport_result); - gwy_results_export_set_actions_sensitive(rexport_list, sens); - gwy_results_export_set_actions_sensitive(rexport_result, sens); - - sens = !args->use_selection; - gwy_table_hscale_set_sensitive(controls->edge_kernel_size, sens); - gwy_table_hscale_set_sensitive(controls->edge_threshold, sens); - gwy_table_hscale_set_sensitive(controls->edge_broadening, sens); - /* Unlike in 2D, where the mask can be still anything, here we do not - * attempt to filter user's selection. */ - gwy_table_hscale_set_sensitive(controls->min_area_frac, sens); - - gtk_widget_set_sensitive(controls->survey_table, !args->independent); - if (args->independent) { - gtk_label_set_text(GTK_LABEL(controls->survey_message), - _("Survey cannot be run with independent degrees.")); - } - else { - sens = args->survey_poly || args->survey_broadening; - if (sens) { - TerraceArgs myargs = *args; - guint n = count_survey_items(&myargs, NULL, NULL); - gchar *s = g_strdup_printf(_("Number of combinations: %u."), n); - - gtk_label_set_text(GTK_LABEL(controls->survey_message), s); - g_free(s); + ModuleArgs *args = gui->args; + GwyParams *params = args->params; + GwyParamTable *table; + gboolean survey_changed = (id == PARAM_SURVEY_POLY || id == PARAM_SURVEY_BROADENING); + + table = gui->table_param; + if (id < 0 || id == PARAM_USE_SELECTION) { + gboolean use_selection = gwy_params_get_boolean(params, PARAM_USE_SELECTION); + GwyGraph *graph = GWY_GRAPH(gui->graph); + + gwy_param_table_set_sensitive(table, PARAM_EDGE_KERNEL_SIZE, !use_selection); + gwy_param_table_set_sensitive(table, PARAM_EDGE_THRESHOLD, !use_selection); + gwy_param_table_set_sensitive(table, PARAM_EDGE_BROADENING, !use_selection); + gwy_param_table_set_sensitive(table, PARAM_MIN_AREA_FRAC, !use_selection); + gwy_graph_enable_user_input(graph, use_selection); + gwy_graph_set_status(GWY_GRAPH(gui->graph), use_selection ? GWY_GRAPH_STATUS_XSEL : GWY_GRAPH_STATUS_PLAIN); + } + if (id < 0 || id == PARAM_CURVE) { + gint ndata, curve = gwy_params_get_int(params, PARAM_CURVE); + GwyGraphCurveModel *gcmodel; + + gwy_graph_model_remove_all_curves(gui->gmodel); + gcmodel = gwy_graph_model_get_curve(args->gmodel, curve); + gwy_graph_model_add_curve(gui->gmodel, gcmodel); + ndata = gwy_graph_curve_model_get_ndata(gcmodel); + gwy_data_line_resample(args->edges, ndata, GWY_INTERPOLATION_NONE); + gwy_data_line_resample(args->residuum, ndata, GWY_INTERPOLATION_NONE); + gwy_data_line_resample(args->background, ndata, GWY_INTERPOLATION_NONE); + } + if (id == PARAM_DISPLAY) + fill_preview_graph(gui); + + table = gui->table_survey; + if (id == PARAM_POLY_DEGREE_MIN || id == PARAM_POLY_DEGREE_MAX) { + gint min_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE_MIN); + gint max_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE_MAX); + if (min_degree > max_degree) { + if (id == PARAM_POLY_DEGREE_MAX) + gwy_param_table_set_int(table, PARAM_POLY_DEGREE_MIN, (min_degree = max_degree)); + else + gwy_param_table_set_int(table, PARAM_POLY_DEGREE_MAX, (max_degree = min_degree)); } - else { - gtk_label_set_text(GTK_LABEL(controls->survey_message), - _("No free parameters are selected.")); + survey_changed = TRUE; + } + if (id == PARAM_BROADENING_MIN || id == PARAM_BROADENING_MAX) { + gdouble min_broadening = gwy_params_get_double(params, PARAM_BROADENING_MIN); + gdouble max_broadening = gwy_params_get_double(params, PARAM_BROADENING_MAX); + if (min_broadening > max_broadening) { + if (id == PARAM_BROADENING_MAX) + gwy_param_table_set_double(table, PARAM_BROADENING_MIN, (min_broadening = max_broadening)); + else + gwy_param_table_set_double(table, PARAM_BROADENING_MAX, (max_broadening = min_broadening)); } - gtk_widget_set_sensitive(controls->run_survey, sens); - sens = args->survey_poly; - gwy_table_hscale_set_sensitive(controls->poly_degree_min, sens); - gwy_table_hscale_set_sensitive(controls->poly_degree_max, sens); - sens = args->survey_broadening; - gwy_table_hscale_set_sensitive(controls->broadening_min, sens); - gwy_table_hscale_set_sensitive(controls->broadening_max, sens); + survey_changed = TRUE; } -} - -static void -output_flags_changed(GtkWidget *button, TerraceControls *controls) -{ - GSList *group = gwy_check_box_get_group(button); - TerraceArgs *args = controls->args; - args->output_flags = gwy_check_boxes_get_selected(group); -} - -static void -survey_poly_changed(GtkToggleButton *toggle, TerraceControls *controls) -{ - TerraceArgs *args = controls->args; - args->survey_poly = gtk_toggle_button_get_active(toggle); - update_sensitivity(controls); -} + if (id < 0 || id == PARAM_INDEPENDENT || survey_changed) { + gboolean independent = gwy_params_get_boolean(params, PARAM_INDEPENDENT); + gboolean survey_poly = gwy_params_get_boolean(params, PARAM_SURVEY_POLY); + gboolean survey_broadening = gwy_params_get_boolean(params, PARAM_SURVEY_BROADENING); + const gchar *message; + gchar *s = NULL; + + gwy_param_table_set_sensitive(table, PARAM_SURVEY_POLY, !independent); + gwy_param_table_set_sensitive(table, PARAM_POLY_DEGREE_MIN, !independent && survey_poly); + gwy_param_table_set_sensitive(table, PARAM_POLY_DEGREE_MAX, !independent && survey_poly); + gwy_param_table_set_sensitive(table, PARAM_SURVEY_BROADENING, !independent); + gwy_param_table_set_sensitive(table, PARAM_BROADENING_MIN, !independent && survey_broadening); + gwy_param_table_set_sensitive(table, PARAM_BROADENING_MAX, !independent && survey_broadening); + gwy_param_table_set_sensitive(table, BUTTON_RUN_SURVEY, !independent && (survey_poly || survey_broadening)); + if (independent) + message = _("Survey cannot be run with independent heights."); + else if (!survey_poly && !survey_broadening) + message = _("No free parameters are selected."); + else + message = s = g_strdup_printf(_("Number of combinations: %u."), prepare_survey(params, NULL, NULL)); -static void -poly_degree_min_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->poly_degree_min = gwy_adjustment_get_int(adj); - if (args->poly_degree_min > args->poly_degree_max) { - gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->poly_degree_max), - args->poly_degree_min); + gwy_param_table_set_label(table, LABEL_SURVEY, message); + g_free(s); } - update_sensitivity(controls); -} -static void -poly_degree_max_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->poly_degree_max = gwy_adjustment_get_int(adj); - if (args->poly_degree_min > args->poly_degree_max) { - gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->poly_degree_min), - args->poly_degree_max); - } - update_sensitivity(controls); + if (!survey_changed && id != PARAM_OUTPUT) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void -survey_broadening_changed(GtkToggleButton *toggle, TerraceControls *controls) +dialog_response(ModuleGUI *gui, gint response) { - TerraceArgs *args = controls->args; - args->survey_broadening = gtk_toggle_button_get_active(toggle); - update_sensitivity(controls); -} - -static void -broadening_min_changed(TerraceControls *controls, GtkAdjustment *adj) -{ - TerraceArgs *args = controls->args; - args->broadening_min = gtk_adjustment_get_value(adj); - if (args->broadening_min > args->broadening_max + 1e-14) { - gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->broadening_max), - args->broadening_min); + if (response == RESPONSE_SURVEY) + run_survey(gui); + else if (response == RESPONSE_CLEAR) { + GwyGraphArea *area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(gui->graph))); + GwySelection *xsel = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); + gwy_selection_clear(xsel); } - update_sensitivity(controls); } static void -broadening_max_changed(TerraceControls *controls, GtkAdjustment *adj) +graph_xsel_changed(ModuleGUI *gui) { - TerraceArgs *args = controls->args; - args->broadening_max = gtk_adjustment_get_value(adj); - if (args->broadening_min > args->broadening_max + 1e-14) { - gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->broadening_min), - args->broadening_max); - } - update_sensitivity(controls); -} - -static void -graph_xsel_changed(G_GNUC_UNUSED GwySelection *selection, - G_GNUC_UNUSED gint hint, - TerraceControls *controls) -{ - if (controls->args->use_selection) - invalidate(controls); -} - -static void -invalidate(TerraceControls *controls) -{ - if (controls->sid) - return; - - controls->sid = g_idle_add_full(G_PRIORITY_LOW, preview_gsource, - controls, NULL); -} - -static gboolean -preview_gsource(gpointer user_data) -{ - TerraceControls *controls = (TerraceControls*)user_data; - - if (!controls->sid) - return FALSE; - - controls->sid = 0; - preview(controls); - - return FALSE; + if (gwy_params_get_boolean(gui->args->params, PARAM_USE_SELECTION)) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void @@ -1264,13 +785,8 @@ const TerraceSegment *seg = &terrace_index(terracesegments, g); gcmodel2 = gwy_graph_curve_model_duplicate(gcmodel); g_string_printf(str, _("Segment %u"), g+1); - g_object_set(gcmodel2, - "color", gwy_graph_get_preset_color(g+1), - "description", str->str, - NULL); - gwy_graph_curve_model_set_data(gcmodel2, - xdata + seg->i, ydata + seg->i, - seg->npixels); + g_object_set(gcmodel2, "color", gwy_graph_get_preset_color(g+1), "description", str->str, NULL); + gwy_graph_curve_model_set_data(gcmodel2, xdata + seg->i, ydata + seg->i, seg->npixels); gwy_graph_model_add_curve(gmodel, gcmodel2); g_object_unref(gcmodel2); } @@ -1291,38 +807,36 @@ } static void -create_one_output_graph(GwyGraphModel *gmodel, - GwyGraphModel *parent_gmodel, - TerraceArgs *args, - PreviewMode preview_mode, +create_one_output_graph(ModuleArgs *args, + GwyGraphModel *gmodel, + PreviewMode mode, GArray *terracesegments, - GwyDataLine *edges, - GwyDataLine *residuum, - GwyDataLine *background, FitResult *fres, gboolean for_preview) { - GwyGraphCurveModel *gcmodel; + GwyParams *params = args->params; + GwyDataLine *edges = args->edges, *residuum = args->residuum, *background = args->background; + gint curve = gwy_params_get_int(params, PARAM_CURVE); + gboolean independent = gwy_params_get_boolean(params, PARAM_INDEPENDENT); + gdouble edge_threshold = gwy_params_get_double(params, PARAM_EDGE_THRESHOLD); + GwyGraphCurveModel *gcmodel = gwy_graph_model_get_curve(args->gmodel, curve); const gdouble *xdata, *ydata; GwyDataLine *dline; gdouble *d; guint i, j, ndata, nterraces; - gcmodel = gwy_graph_model_get_curve(parent_gmodel, args->curve); xdata = gwy_graph_curve_model_get_xdata(gcmodel); ydata = gwy_graph_curve_model_get_ydata(gcmodel); ndata = gwy_graph_curve_model_get_ndata(gcmodel); - if (preview_mode == PREVIEW_DATA_FIT || preview_mode == PREVIEW_DATA_POLY) { + if (mode == PREVIEW_DATA_FIT || mode == PREVIEW_DATA_POLY) { gcmodel = gwy_graph_curve_model_duplicate(gcmodel); - g_object_set(gcmodel, - "color", gwy_graph_get_preset_color(0), - NULL); + g_object_set(gcmodel, "color", gwy_graph_get_preset_color(0), NULL); gwy_graph_model_add_curve(gmodel, gcmodel); g_object_unref(gcmodel); } - if (!fres && preview_mode != PREVIEW_STEPS) + if (!fres && mode != PREVIEW_STEPS) return; gcmodel = gwy_graph_curve_model_new(); @@ -1332,38 +846,32 @@ NULL); nterraces = terracesegments->len; - if (preview_mode == PREVIEW_DATA_FIT) { + if (mode == PREVIEW_DATA_FIT) { /* Add segmented fit */ dline = gwy_data_line_duplicate(residuum); d = gwy_data_line_get_data(dline); for (i = 0; i < ndata; i++) d[i] = ydata[i] - d[i]; g_object_set(gcmodel, "line-width", 2, NULL); - create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, - d); + create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, d); g_object_unref(dline); } - else if (preview_mode == PREVIEW_DATA_POLY) { + else if (mode == PREVIEW_DATA_POLY) { /* Add full polynomial background shifted to all discrete levels. */ const gdouble *solution = fres->solution; GwyGraphCurveModel *gcmodel2; GString *str = g_string_new(NULL); dline = gwy_data_line_duplicate(background); - if (args->independent) { + if (independent) { for (i = 0; i < nterraces; i++) { gwy_data_line_copy(background, dline); gwy_data_line_add(dline, solution[i]); gcmodel2 = gwy_graph_curve_model_duplicate(gcmodel); g_string_printf(str, _("Segment %u"), i+1); - g_object_set(gcmodel2, - "color", gwy_graph_get_preset_color(i+1), - "description", str->str, - NULL); - gwy_graph_curve_model_set_data(gcmodel2, xdata, - gwy_data_line_get_data(dline), - ndata); + g_object_set(gcmodel2, "color", gwy_graph_get_preset_color(i+1), "description", str->str, NULL); + gwy_graph_curve_model_set_data(gcmodel2, xdata, gwy_data_line_get_data(dline), ndata); gwy_graph_model_add_curve(gmodel, gcmodel2); g_object_unref(gcmodel2); } @@ -1385,9 +893,7 @@ gcmodel2 = gwy_graph_curve_model_duplicate(gcmodel); g_string_printf(str, _("Level %d"), levels[i]); g_object_set(gcmodel2, "description", str->str, NULL); - gwy_graph_curve_model_set_data(gcmodel2, xdata, - gwy_data_line_get_data(dline), - ndata); + gwy_graph_curve_model_set_data(gcmodel2, xdata, gwy_data_line_get_data(dline), ndata); gwy_graph_model_add_curve(gmodel, gcmodel2); g_object_unref(gcmodel2); } @@ -1396,12 +902,11 @@ g_object_unref(dline); g_string_free(str, TRUE); } - else if (preview_mode == PREVIEW_RESIDUUM) { + else if (mode == PREVIEW_RESIDUUM) { /* Add segmented residuum. */ - create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, - gwy_data_line_get_data(residuum)); + create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, gwy_data_line_get_data(residuum)); } - else if (preview_mode == PREVIEW_TERRACES) { + else if (mode == PREVIEW_TERRACES) { /* Add segmented ideal terraces. */ const gdouble *solution = fres->solution; @@ -1409,61 +914,46 @@ d = gwy_data_line_get_data(dline); for (i = 0; i < nterraces; i++) { const TerraceSegment *seg = &terrace_index(terracesegments, i); - gdouble h = (args->independent - ? solution[i] - : solution[1] + seg->level*solution[0]); + gdouble h = (independent ? solution[i] : solution[1] + seg->level*solution[0]); for (j = 0; j < seg->npixels; j++) d[seg->i + j] = h; } - create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, - d); + create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, d); g_object_unref(dline); } - else if (preview_mode == PREVIEW_LEVELLED) { + else if (mode == PREVIEW_LEVELLED) { /* Add segmented data minus background. */ dline = gwy_data_line_duplicate(background); d = gwy_data_line_get_data(dline); for (i = 0; i < ndata; i++) d[i] = ydata[i] - d[i]; gwy_graph_curve_model_set_data(gcmodel, xdata, d, ndata); - g_object_set(gcmodel, - "color", gwy_graph_get_preset_color(0), - "description", _("Leveled surface"), - NULL); + g_object_set(gcmodel, "color", gwy_graph_get_preset_color(0), "description", _("Leveled surface"), NULL); gwy_graph_model_add_curve(gmodel, gcmodel); - if (for_preview) { - create_segmented_graph_curve(gmodel, gcmodel, terracesegments, - xdata, d); - } + if (for_preview) + create_segmented_graph_curve(gmodel, gcmodel, terracesegments, xdata, d); g_object_unref(dline); } - else if (preview_mode == PREVIEW_BACKGROUND) { + else if (mode == PREVIEW_BACKGROUND) { /* Add full background. */ - gwy_graph_curve_model_set_data(gcmodel, xdata, - gwy_data_line_get_data(background), - ndata); - g_object_set(gcmodel, - "description", _("Polynomial background"), - NULL); + gwy_graph_curve_model_set_data(gcmodel, xdata, gwy_data_line_get_data(background), ndata); + g_object_set(gcmodel, "description", _("Polynomial background"), NULL); gwy_graph_model_add_curve(gmodel, gcmodel); } - else if (preview_mode == PREVIEW_STEPS) { + else if (mode == PREVIEW_STEPS) { gdouble stepxdata[2], stepydata[2]; /* Add full step filter result. */ g_object_set(gcmodel, "color", gwy_graph_get_preset_color(0), NULL); - gwy_graph_curve_model_set_data(gcmodel, xdata, - gwy_data_line_get_data(edges), - ndata); + gwy_graph_curve_model_set_data(gcmodel, xdata, gwy_data_line_get_data(edges), ndata); gwy_graph_model_add_curve(gmodel, gcmodel); g_object_unref(gcmodel); gcmodel = gwy_graph_curve_model_new(); stepxdata[0] = xdata[0]; stepxdata[1] = xdata[ndata-1]; - stepydata[0] = stepydata[1] - = args->edge_threshold/100.0*gwy_data_line_get_max(edges); + stepydata[0] = stepydata[1] = edge_threshold*gwy_data_line_get_max(edges); gwy_graph_curve_model_set_data(gcmodel, stepxdata, stepydata, 2); g_object_set(gcmodel, "mode", GWY_GRAPH_CURVE_LINE, @@ -1477,90 +967,77 @@ } static void -fill_preview_graph(TerraceControls *controls) +fill_preview_graph(ModuleGUI *gui) { - GwyGraphModel *gmodel; - - gmodel = gwy_graph_get_model(GWY_GRAPH(controls->graph)); - gwy_graph_model_remove_all_curves(gmodel); - create_one_output_graph(gmodel, controls->parent_gmodel, - controls->args, controls->args->preview_mode, - controls->terracesegments, - controls->edges, - controls->residuum, - controls->background, - controls->fres, - TRUE); + ModuleArgs *args = gui->args; + PreviewMode mode = gwy_params_get_enum(args->params, PARAM_DISPLAY); + gwy_graph_model_remove_all_curves(gui->gmodel); + create_one_output_graph(args, gui->gmodel, mode, args->terracesegments, args->fres, TRUE); } static void -preview(TerraceControls *controls) -{ - GwyDataLine *edges = controls->edges; - GwyDataLine *residuum = controls->residuum; - GwyDataLine *background = controls->background; - GwyResults *results = controls->results; +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; + GwyDataLine *edges = args->edges, *residuum = args->residuum, *background = args->background; + GwyParams *params = args->params; + gint curve = gwy_params_get_int(params, PARAM_CURVE); + gboolean independent = gwy_params_get_boolean(params, PARAM_INDEPENDENT); + GwyResults *results = gui->results; GwyGraphCurveModel *gcmodel; GwyGraphArea *area; GtkTreeModel *model; - TerraceArgs *args = controls->args; FitResult *fres; const gchar *message = ""; GwySelection *xsel; - guint i; - gwy_app_wait_cursor_start(GTK_WINDOW(controls->dialogue)); + gtk_dialog_set_response_sensitive(GTK_DIALOG(gui->dialog), GTK_RESPONSE_OK, FALSE); + gwy_app_wait_cursor_start(GTK_WINDOW(gui->dialog)); + update_value_formats(gui); - free_fit_result(controls->fres); - controls->fres = NULL; + free_fit_result(args->fres); + args->fres = NULL; - gcmodel = gwy_graph_model_get_curve(controls->parent_gmodel, args->curve); + gcmodel = gwy_graph_model_get_curve(args->gmodel, curve); gwy_results_fill_graph_curve(results, "curve", gcmodel); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(controls->terracelist)); + model = gtk_tree_view_get_model(GTK_TREE_VIEW(gui->terracelist)); gwy_null_store_set_n_rows(GWY_NULL_STORE(model), 0); - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls->graph))); + area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(gui->graph))); xsel = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); fres = terrace_do(gwy_graph_curve_model_get_xdata(gcmodel), gwy_graph_curve_model_get_ydata(gcmodel), gwy_graph_curve_model_get_ndata(gcmodel), edges, residuum, background, - controls->terracesegments, xsel, args, &message); + args->terracesegments, xsel, args->params, &message); - gtk_label_set_text(GTK_LABEL(controls->message), message); - controls->fres = fres; + gwy_param_table_set_label(gui->table_param, LABEL_FIT_RESULT, message); + args->fres = fres; if (fres) { - gwy_null_store_set_n_rows(GWY_NULL_STORE(model), - controls->terracesegments->len); + gwy_null_store_set_n_rows(GWY_NULL_STORE(model), args->terracesegments->len); gwy_results_fill_values(results, "nterraces", fres->nterraces, "resid", fres->msq, NULL); - if (controls->args->independent) + if (independent) gwy_results_set_na(results, "step", "discrep", NULL); else { gwy_results_fill_values_with_errors(results, - "step", - fres->solution[0], - sqrt(fres->invdiag[0])*fres->msq, + "step", fres->solution[0], sqrt(fres->invdiag[0])*fres->msq, NULL); gwy_results_fill_values(results, "discrep", fres->deltares, NULL); } - - for (i = 0; i < G_N_ELEMENTS(guivalues); i++) { - gtk_label_set_markup(GTK_LABEL(controls->guivalues[i]), - gwy_results_get_full(results, guivalues[i])); - } - } - else { - for (i = 0; i < G_N_ELEMENTS(guivalues); i++) - gtk_label_set_text(GTK_LABEL(controls->guivalues[i]), ""); + gwy_param_table_results_fill(gui->table_param, WIDGET_RESULTS); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); } + else + gwy_param_table_results_clear(gui->table_param, WIDGET_RESULTS); #ifdef DEBUG if (fres) { printf("%d %g %g %g %g %u\n", - controls->args->poly_degree, + gwy_params_get_int(params, PARAM_POLY_DEGREE), fres->solution[0], sqrt(fres->invdiag[0])*fres->msq, fres->msq, @@ -1569,9 +1046,9 @@ } #endif - update_sensitivity(controls); - fill_preview_graph(controls); - gwy_app_wait_cursor_finish(GTK_WINDOW(controls->dialogue)); + fill_preview_graph(gui); + gwy_app_wait_cursor_finish(GTK_WINDOW(gui->dialog)); + gtk_dialog_set_response_sensitive(GTK_DIALOG(gui->dialog), GTK_RESPONSE_OK, !!fres); } static void @@ -1593,8 +1070,7 @@ xseg[1] += epsilon; GWY_ORDER(gdouble, xseg[0], xseg[1]); - /* Find integer index ranges corresponding to the selection. Be - * careful to skip empty segments. */ + /* Find integer index ranges corresponding to the selection. Be careful to skip empty segments. */ gwy_clear(&seg, 1); seg.xfrom = xseg[0]; seg.xto = xseg[1]; @@ -1636,9 +1112,8 @@ *pu = u2; } -/* Perform Gaussian step filter analogous to the 2D case, but try trapezoid - * integration. The result values are in units of height and generally should - * roughly estimate the edge heights. */ +/* Perform Gaussian step filter analogous to the 2D case, but try trapezoid integration. The result values are in + * units of height and generally should roughly estimate the edge heights. */ static void apply_gaussian_step_filter(const gdouble *xdata, const gdouble *ydata, @@ -1671,8 +1146,7 @@ x2 = xdata[j] - xorigin; y2 = ydata[j]; t = x2/(sigma*dx); - step_gauss_line_integrals(t, x1, x2, y1, y2, - &u, &s1, &sx, &sxx, &sy, &sxy); + step_gauss_line_integrals(t, x1, x2, y1, y2, &u, &s1, &sx, &sxx, &sy, &sxy); if (t > 8.0) break; } @@ -1688,8 +1162,7 @@ x2 = xorigin - xdata[j]; y2 = ydata[j]; t = x2/(sigma*dx); - step_gauss_line_integrals(t, x1, x2, y1, y2, - &u, &s1, &sx, &sxx, &sy, &sxy); + step_gauss_line_integrals(t, x1, x2, y1, y2, &u, &s1, &sx, &sxx, &sy, &sxy); if (t > 8.0) break; } @@ -1719,16 +1192,13 @@ if (md[i] == 0.0) { /* Downwards edge. The previous segment is a grain. */ gwy_clear(&seg, 1); - seg.xfrom = (prevedge - ? 0.5*(xdata[prevedge-1] + xdata[prevedge]) - : 1.5*xdata[0] - 0.5*xdata[1]); + seg.xfrom = (prevedge ? 0.5*(xdata[prevedge-1] + xdata[prevedge]) : 1.5*xdata[0] - 0.5*xdata[1]); seg.xto = 0.5*(xdata[i-1] + xdata[i]); seg.i = prevedge; seg.npixels = i-prevedge; g_array_append_val(terracesegments, seg); } - /* If it's an upwards edge, just remember its position. Do that - * in any case. */ + /* If it's an upwards edge, just remember its position. Do that in any case. */ prevedge = i; } } @@ -1736,9 +1206,7 @@ /* Data ending inside a grain is the same as downwards edge. */ if (md[n-1]) { gwy_clear(&seg, 1); - seg.xfrom = (prevedge - ? 0.5*(xdata[prevedge-1] + xdata[prevedge]) - : 1.5*xdata[0] - 0.5*xdata[1]); + seg.xfrom = (prevedge ? 0.5*(xdata[prevedge-1] + xdata[prevedge]) : 1.5*xdata[0] - 0.5*xdata[1]); seg.xto = 1.5*xdata[n-1] - 0.5*xdata[n-2]; seg.i = prevedge; seg.npixels = n-prevedge; @@ -1748,8 +1216,7 @@ /* Shrink grains using real distance (i.e. possibly non-uniform sampling). */ static void -shrink_grains(GwyDataLine *marked, const gdouble *xdata, gdouble distance, - GArray *terracesegments) +shrink_grains(GwyDataLine *marked, const gdouble *xdata, gdouble distance, GArray *terracesegments) { gint j, n = gwy_data_line_get_res(marked); gdouble *md = gwy_data_line_get_data(marked); @@ -1776,17 +1243,15 @@ } } -/* Remove grains by size using real distance (i.e. possibly non-uniform - * sampling). */ +/* Remove grains by size using real distance (i.e. possibly non-uniform sampling). */ static void -remove_grains_by_size(GwyDataLine *marked, gdouble minsize, - GArray *terracesegments) +remove_grains_by_size(GwyDataLine *marked, gdouble minsize, GArray *terracesegments) { gdouble *md = gwy_data_line_get_data(marked); guint g, nseg; - /* Iterate backwards. We do not need to care how the array changes beyond - * the current item and the removals are slightly more efficient. */ + /* Iterate backwards. We do not need to care how the array changes beyond the current item and the removals are + * slightly more efficient. */ nseg = terracesegments->len; for (g = nseg; g; g--) { const TerraceSegment *seg = &terrace_index(terracesegments, g-1); @@ -1803,13 +1268,18 @@ const gdouble *xdata, const gdouble *ydata, guint ndata, - const TerraceArgs *args, + GwyParams *params, GwyDataLine *edges, GwyDataLine *marked, GwySelection *xsel, gdouble *pxc, gdouble *pxq) { + gdouble edge_kernel_size = gwy_params_get_double(params, PARAM_EDGE_KERNEL_SIZE); + gdouble edge_threshold = gwy_params_get_double(params, PARAM_EDGE_THRESHOLD); + gdouble edge_broadening = gwy_params_get_double(params, PARAM_EDGE_BROADENING); + gdouble min_area_frac = gwy_params_get_double(params, PARAM_MIN_AREA_FRAC); + gboolean use_selection = gwy_params_get_boolean(params, PARAM_USE_SELECTION); gint i, npixels; gdouble threshold, xlen, min, max, dx, xc, xq; guint g, nseg; @@ -1825,27 +1295,25 @@ xlen = max - min; dx = xlen/ndata; - /* Always calculate the Gaussian filter to have something to display - * even when we do not use the result for fitting. */ - apply_gaussian_step_filter(xdata, ydata, edges, dx, args->edge_kernel_size); + /* Always calculate the Gaussian filter to have something to display even when we do not use the result for + * fitting. */ + apply_gaussian_step_filter(xdata, ydata, edges, dx, edge_kernel_size); gwy_data_line_copy(edges, marked); - if (args->use_selection) { + if (use_selection) { /* Use provided selection as requested. */ make_segments_from_xsel(terracesegments, xdata, ndata, xsel); } else { /* Mark flat areas in the profile. */ - threshold = args->edge_threshold/100.0*gwy_data_line_get_max(marked); + threshold = edge_threshold*gwy_data_line_get_max(marked); gwy_data_line_threshold(marked, threshold, 1.0, 0.0); enumerate_line_segments(marked, xdata, terracesegments); - shrink_grains(marked, xdata, args->edge_broadening*dx, terracesegments); + shrink_grains(marked, xdata, edge_broadening*dx, terracesegments); - /* Keep only large areas. This inherently limits the maximum number of - * areas too. */ + /* Keep only large areas. This inherently limits the maximum number of areas too. */ enumerate_line_segments(marked, xdata, terracesegments); - remove_grains_by_size(marked, args->min_area_frac/100.0 * xlen, - terracesegments); + remove_grains_by_size(marked, min_area_frac*xlen, terracesegments); } nseg = terracesegments->len; @@ -1854,8 +1322,8 @@ return FALSE; } - /* Normalise coordinates to have centre of mass at 0 and effective range in - * the order of unity (we normalise the integral of x² to 1). */ + /* Normalise coordinates to have centre of mass at 0 and effective range in the order of unity (we normalise the + * integral of x² to 1). */ xc = 0.0; npixels = 0; for (g = 0; g < nseg; g++) { @@ -1884,9 +1352,8 @@ return TRUE; } -/* Diagonal power-power matrix block. Some of the entries could be - * calculated from the per-terrace averages; the higher powers are only - * used here though. This is the slow part. */ +/* Diagonal power-power matrix block. Some of the entries could be calculated from the per-terrace averages; the + * higher powers are only used here though. This is the slow part. */ static gdouble* calculate_power_matrix_block(GArray *terracesegments, const gdouble *xdata, gdouble xc, gdouble xq, gint poly_degree) @@ -1897,10 +1364,9 @@ if (!poly_degree) return NULL; - /* We multiply two powers together so the maximum power in the product is - * twice the single maximum power. Also, there would be poly_degree+1 - * powers, but we omit the 0th power so we have exactly poly_degree powers, - * starting from 1. */ + /* We multiply two powers together so the maximum power in the product is twice the single maximum power. Also, + * there would be poly_degree+1 powers, but we omit the 0th power so we have exactly poly_degree powers, starting + * from 1. */ nterraces = terracesegments->len; power_block = g_new0(gdouble, poly_degree*poly_degree); @@ -1910,8 +1376,7 @@ #endif { gdouble *xpowers = g_new(gdouble, 2*poly_degree+1); - gdouble *tpower_block = gwy_omp_if_threads_new0(power_block, - poly_degree*poly_degree); + gdouble *tpower_block = gwy_omp_if_threads_new0(power_block, poly_degree*poly_degree); guint gfrom = gwy_omp_chunk_start(nterraces); guint gto = gwy_omp_chunk_end(nterraces); guint m, k, g, i; @@ -1935,8 +1400,7 @@ } } g_free(xpowers); - gwy_omp_if_threads_sum_double(power_block, tpower_block, - poly_degree*poly_degree); + gwy_omp_if_threads_sum_double(power_block, tpower_block, poly_degree*poly_degree); } /* Redundant, but keep for simplicity. */ @@ -2016,14 +1480,14 @@ fres->npowers = poly_degree; matn = nterraces + poly_degree; - /* Calculate the matrix by pieces, the put it together. The terrace block - * is identity matrix I so we do not need to compute it. */ + /* Calculate the matrix by pieces, the put it together. The terrace block is identity matrix I so we do not need + * to compute it. */ mixed_block = g_new0(gdouble, poly_degree*nterraces); rhs = fres->solution = g_new0(gdouble, nterraces + poly_degree); fres->invdiag = g_new0(gdouble, matn); - /* Mixed off-diagonal power-terrace matrix block (we represent it as the - * upper right block) and power block on the right hand side. */ + /* Mixed off-diagonal power-terrace matrix block (we represent it as the upper right block) and power block on the + * right hand side. */ for (g = 0; g < nterraces; g++) { TerraceSegment *seg = &terrace_index(terracesegments, g); guint ifrom = seg->i, n = seg->npixels; @@ -2063,9 +1527,8 @@ for (j = 0; j <= i; j++) { gdouble t; - if (i < nterraces && j < nterraces) { + if (i < nterraces && j < nterraces) t = (i == j)*(terrace_index(terracesegments, i).npixels); - } else if (j < nterraces) t = mixed_block[j*poly_degree + (i - nterraces)]; else @@ -2094,8 +1557,7 @@ gwy_math_choleski_solve(matn, matrix, rhs); if (residuum) { - calculate_residuum(terracesegments, fres, residuum, - xdata, ydata, xc, xq, poly_degree, TRUE); + calculate_residuum(terracesegments, fres, residuum, xdata, ydata, xc, xq, poly_degree, TRUE); } ok = gwy_math_choleski_invert(matn, invmat); @@ -2144,8 +1606,7 @@ rhs = fres->solution = g_new0(gdouble, matn); fres->invdiag = g_new0(gdouble, matn); - /* Mixed two first upper right matrix rows and power block of right hand - * side. */ + /* Mixed two first upper right matrix rows and power block of right hand side. */ for (g = 0; g < nterraces; g++) { TerraceSegment *seg = &terrace_index(terracesegments, g); guint ifrom = seg->i, n = seg->npixels; @@ -2165,8 +1626,7 @@ } } - /* Remaining three independent elements in the top left corner of the - * matrix. */ + /* Remaining three independent elements in the top left corner of the matrix. */ stepstep = stepoff = 0.0; npixels = 0; for (g = 0; g < nterraces; g++) { @@ -2174,8 +1634,7 @@ guint n = seg->npixels; gint ng = seg->level; - /* Ensure ng does not converted to unsigned, with disasterous - * consequences. */ + /* Ensure ng does not converted to unsigned, with disasterous consequences. */ stepstep += ng*ng*(gdouble)n; stepoff += ng*(gdouble)n; npixels += n; @@ -2245,8 +1704,7 @@ gwy_math_choleski_solve(matn, matrix, rhs); if (residuum) { - calculate_residuum(terracesegments, fres, residuum, - xdata, ydata, xc, xq, poly_degree, FALSE); + calculate_residuum(terracesegments, fres, residuum, xdata, ydata, xc, xq, poly_degree, FALSE); } ok = gwy_math_choleski_invert(matn, invmat); @@ -2290,8 +1748,7 @@ } p = 85.0; - gwy_math_percentiles(ns, steps, GWY_PERCENTILE_INTERPOLATION_LINEAR, - 1, &p, &sh); + gwy_math_percentiles(ns, steps, GWY_PERCENTILE_INTERPOLATION_LINEAR, 1, &p, &sh); gwy_debug("estimated step height %g nm", sh/1e-9); g_free(steps); @@ -2317,9 +1774,8 @@ return levels; } -/* XXX: The background is generally bogus far outside the fitted region. This - * usually means profile ends because they contain too small terrace bits. It - * is more meaningful to only calculate it for marked area. */ +/* XXX: The background is generally bogus far outside the fitted region. This usually means profile ends because they + * contain too small terrace bits. It is more meaningful to only calculate it for marked area. */ static void fill_background(GwyDataLine *background, const gdouble *xdata, gdouble xc, gdouble xq, @@ -2347,36 +1803,33 @@ terrace_do(const gdouble *xdata, const gdouble *ydata, guint ndata, GwyDataLine *edges, GwyDataLine *residuum, GwyDataLine *background, GArray *terracesegments, GwySelection *xsel, - const TerraceArgs *args, - const gchar** message) + GwyParams *params, + const gchar **message) { guint nterraces; FitResult *fres; gdouble sheight, offset, xc, xq; gdouble *power_block; - gboolean indep = args->independent; - gint g, poly_degree = args->poly_degree; + gboolean independent = gwy_params_get_boolean(params, PARAM_INDEPENDENT); + gint g, poly_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE); gint *levels; /* Use background dataline as a scratch space. */ - if (!find_terrace_segments(terracesegments, xdata, ydata, ndata, args, - edges, background, xsel, &xc, &xq)) { + if (!find_terrace_segments(terracesegments, xdata, ydata, ndata, params, edges, background, xsel, &xc, &xq)) { *message = _("No terraces were found"); return NULL; } nterraces = terracesegments->len; - power_block = calculate_power_matrix_block(terracesegments, xdata, xc, xq, - poly_degree); + power_block = calculate_power_matrix_block(terracesegments, xdata, xc, xq, poly_degree); if (!(fres = fit_terraces_arbitrary(terracesegments, xdata, ydata, xc, xq, poly_degree, power_block, - indep ? residuum : NULL, + independent ? residuum : NULL, message))) goto finalise; - if (!(levels = estimate_step_parameters(fres->solution, nterraces, - &sheight, &offset, message))) { + if (!(levels = estimate_step_parameters(fres->solution, nterraces, &sheight, &offset, message))) { g_array_set_size(terracesegments, 0); free_fit_result(fres); fres = NULL; @@ -2388,27 +1841,21 @@ /* This does not depend on whether we run the second stage fit. */ seg->level = levels[g]; seg->height = fres->solution[g]; - /* This will be recalculated in the second stage fit. Note that error - * is anyway with respect to the multiple of estimated step height - * and normally similar in both fit types. */ + /* This will be recalculated in the second stage fit. Note that error is anyway with respect to the multiple + * of estimated step height and normally similar in both fit types. */ seg->error = fres->solution[g] - offset - seg->level*sheight; } g_free(levels); - /* Normally also perform the second stage fitting with a single common - * step height. But if requested, avoid it, keeping the heights - * independents. */ - if (!indep) { + /* Normally also perform the second stage fitting with a single common step height. But if requested, avoid it, + * keeping the heights independents. */ + if (!independent) { free_fit_result(fres); - if (!(fres = fit_terraces_same_step(terracesegments, - xdata, ydata, xc, xq, poly_degree, - power_block, - indep ? NULL : residuum, - message))) + if (!(fres = fit_terraces_same_step(terracesegments, xdata, ydata, xc, xq, poly_degree, power_block, + residuum, message))) goto finalise; } - fill_background(background, xdata, xc, xq, poly_degree, - fres->solution + (indep ? nterraces : 2)); + fill_background(background, xdata, xc, xq, poly_degree, fres->solution + (independent ? nterraces : 2)); finalise: g_free(power_block); @@ -2417,72 +1864,42 @@ } static void -create_output_graphs(TerraceControls *controls, GwyContainer *data) +create_output_graphs(ModuleArgs *args, GwyContainer *data) { - const guint output_map[2*OUTPUT_NFLAGS] = { - PREVIEW_DATA_FIT, OUTPUT_DATA_FIT, - PREVIEW_DATA_POLY, OUTPUT_DATA_POLY, - PREVIEW_RESIDUUM, OUTPUT_RESIDUUM, - PREVIEW_TERRACES, OUTPUT_TERRACES, - PREVIEW_LEVELLED, OUTPUT_LEVELLED, + const guint output_map[2*G_N_ELEMENTS(output_flags)] = { + PREVIEW_DATA_FIT, OUTPUT_DATA_FIT, + PREVIEW_DATA_POLY, OUTPUT_DATA_POLY, + PREVIEW_RESIDUUM, OUTPUT_RESIDUUM, + PREVIEW_TERRACES, OUTPUT_TERRACES, + PREVIEW_LEVELLED, OUTPUT_LEVELLED, PREVIEW_BACKGROUND, OUTPUT_BACKGROUND, }; - TerraceArgs *args = controls->args; - GArray *terracesegments = controls->terracesegments; - GwyDataLine *edges = controls->edges, - *residuum = controls->residuum, - *background = controls->background; - FitResult *fres = controls->fres; - guint i, oflags = controls->args->output_flags; - GwyGraphModel *gmodel, *parent_gmodel = controls->parent_gmodel; + guint i, oflags = gwy_params_get_flags(args->params, PARAM_OUTPUT); + GArray *terracesegments = args->terracesegments; + FitResult *fres = args->fres; + GwyGraphModel *gmodel; const gchar *title; - for (i = 0; i < OUTPUT_NFLAGS; i++) { + for (i = 0; i < G_N_ELEMENTS(output_flags); i++) { if (!(output_map[2*i + 1] & oflags)) continue; - gmodel = gwy_graph_model_new_alike(parent_gmodel); - create_one_output_graph(gmodel, parent_gmodel, args, output_map[2*i], - terracesegments, edges, residuum, background, - fres, FALSE); - title = gwy_enum_to_string(output_map[2*i + 1], - output_flags, OUTPUT_NFLAGS); + gmodel = gwy_graph_model_new_alike(args->gmodel); + create_one_output_graph(args, gmodel, output_map[2*i], terracesegments, fres, FALSE); + title = gwy_enum_to_string(output_map[2*i + 1], output_flags, G_N_ELEMENTS(output_flags)); g_object_set(gmodel, "title", _(title), NULL); gwy_app_data_browser_add_graph_model(gmodel, data, TRUE); g_object_unref(gmodel); } } -static void -save_report(TerraceControls *controls) -{ - gchar *text; - - text = format_report(controls); - gwy_save_auxiliary_data(_("Save Table"), - GTK_WINDOW(controls->dialogue), -1, text); - g_free(text); -} - -static void -copy_report(TerraceControls *controls) -{ - GtkClipboard *clipboard; - GdkDisplay *display; - gchar *text; - - text = format_report(controls); - display = gtk_widget_get_display(controls->dialogue); - clipboard = gtk_clipboard_get_for_display(display, GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text(clipboard, text, -1); - g_free(text); -} - static gchar* -format_report(TerraceControls *controls) +format_report(gpointer user_data) { - GwyResultsReportType report_style = controls->args->report_style; - GArray *terracesegments = controls->terracesegments; + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; + GwyResultsReportType report_style = gwy_params_get_report_type(args->params, PARAM_TERRACE_REPORT_STYLE); + GArray *terracesegments = args->terracesegments; GwySIUnitFormatStyle style = GWY_SI_UNIT_FORMAT_UNICODE; GwySIValueFormat *vfz; GwySIUnit *yunit; @@ -2492,11 +1909,10 @@ guint g, nterraces; text = g_string_new(NULL); - if (!(report_style & GWY_RESULTS_REPORT_MACHINE)) { - vfz = controls->vf; - } + if (!(report_style & GWY_RESULTS_REPORT_MACHINE)) + vfz = gui->vf; else { - g_object_get(controls->parent_gmodel, "si-unit-y", &yunit, NULL); + g_object_get(args->gmodel, "si-unit-y", &yunit, NULL); vfz = gwy_si_unit_get_format_for_power10(yunit, style, 0, NULL); g_object_unref(yunit); } @@ -2506,9 +1922,7 @@ Npx_header = "Npx"; Delta_header = g_strdup_printf("Δ [%s]", vfz->units); r_header = g_strdup_printf("r [%s]", vfz->units); - gwy_format_result_table_strings(text, report_style, 5, - h_header, k_header, Npx_header, - Delta_header, r_header); + gwy_format_result_table_strings(text, report_style, 5, h_header, k_header, Npx_header, Delta_header, r_header); g_free(h_header); g_free(Delta_header); g_free(r_header); @@ -2518,11 +1932,9 @@ TerraceSegment *seg = &terrace_index(terracesegments, g); gwy_format_result_table_mixed(text, report_style, "viivv", - seg->height/vfz->magnitude, - seg->level, + seg->height/vfz->magnitude, seg->level, seg->npixels, - seg->error/vfz->magnitude, - seg->residuum/vfz->magnitude); + seg->error/vfz->magnitude, seg->residuum/vfz->magnitude); } retval = text->str; @@ -2537,101 +1949,94 @@ return pow((1.0 - t)*pow(a, pwr) + t*pow(b, pwr), 1.0/pwr); } -/* NB: Modifies args! */ static guint -count_survey_items(TerraceArgs *args, - guint *pndegrees, guint *pnbroadenings) +prepare_survey(GwyParams *params, GArray *degrees, GArray *broadenings) { - guint ndegrees, nbroadenings; - - if (!args->survey_poly) - args->poly_degree_min = args->poly_degree_max = args->poly_degree; - - ndegrees = args->poly_degree_max - args->poly_degree_min + 1; - if (pndegrees) - *pndegrees = ndegrees; - - if (!args->survey_broadening) - args->broadening_min = args->broadening_max = args->edge_broadening; - nbroadenings = GWY_ROUND(2.0*(pow(args->broadening_max, pwr) - - pow(args->broadening_min, pwr))) + 1; - - if (pnbroadenings) - *pnbroadenings = nbroadenings; + gint min_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE_MIN); + gint max_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE_MAX); + gdouble min_broadening = gwy_params_get_double(params, PARAM_BROADENING_MIN); + gdouble max_broadening = gwy_params_get_double(params, PARAM_BROADENING_MAX); + guint i, ndegrees, nbroadenings; + + if (!gwy_params_get_boolean(params, PARAM_SURVEY_POLY)) + min_degree = max_degree = gwy_params_get_int(params, PARAM_POLY_DEGREE); + if (!gwy_params_get_boolean(params, PARAM_SURVEY_BROADENING)) + min_broadening = max_broadening = gwy_params_get_double(params, PARAM_EDGE_BROADENING); + + ndegrees = max_degree+1 - min_degree; + nbroadenings = GWY_ROUND(2.0*(pow(max_broadening, pwr) - pow(min_broadening, pwr))) + 1; + + if (degrees) { + g_array_set_size(degrees, ndegrees); + for (i = 0; i < ndegrees; i++) + g_array_index(degrees, gint, i) = min_degree + i; + } + if (broadenings) { + g_array_set_size(broadenings, nbroadenings); + for (i = 0; i < nbroadenings; i++) { + gdouble t = (nbroadenings == 1 ? 0.5 : i/(nbroadenings - 1.0)); + g_array_index(broadenings, gdouble, i) = interpolate_broadening(min_broadening, max_broadening, t); + } + } return nbroadenings*ndegrees; } static void -run_survey(TerraceControls *controls) +run_survey(ModuleGUI *gui) { + ModuleArgs *args = gui->args; + GwyParams *surveyparams = gwy_params_duplicate(args->params); + GwyResultsReportType report_style = gwy_params_get_report_type(args->params, PARAM_TERRACE_REPORT_STYLE); + gint curve = gwy_params_get_int(args->params, PARAM_CURVE); + GArray *terracesegments = NULL, *surveyout, *degrees, *broadenings; GwyDataLine *edges, *residuum, *background; GwyGraphCurveModel *gcmodel; GwyGraphArea *area; - TerraceArgs myargs; FitResult *fres; GwySelection *xsel; - GArray *terracesegments, *surveyout; - GwyResultsReportType report_style; gint ndata; const gdouble *xdata, *ydata; const gchar *message; GString *str; - guint i, w, ndegrees, nbroadenings, totalwork; - gdouble *broadening_values; - gint *degree_values; - - myargs = *controls->args; - - report_style = myargs.report_style & ~GWY_RESULTS_REPORT_MACHINE; - if (report_style == GWY_RESULTS_REPORT_COLON) - report_style = GWY_RESULTS_REPORT_TABSEP; - report_style |= GWY_RESULTS_REPORT_MACHINE; + guint i, w, totalwork, ndegrees; - gcmodel = gwy_graph_model_get_curve(controls->parent_gmodel, myargs.curve); - area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(controls->graph))); + report_style |= GWY_RESULTS_REPORT_MACHINE; + gcmodel = gwy_graph_model_get_curve(args->gmodel, curve); + area = GWY_GRAPH_AREA(gwy_graph_get_area(GWY_GRAPH(gui->graph))); xsel = gwy_graph_area_get_selection(area, GWY_GRAPH_STATUS_XSEL); xdata = gwy_graph_curve_model_get_xdata(gcmodel); ydata = gwy_graph_curve_model_get_ydata(gcmodel); ndata = gwy_graph_curve_model_get_ndata(gcmodel); - edges = gwy_data_line_new_alike(controls->edges, FALSE); - residuum = gwy_data_line_new_alike(controls->residuum, FALSE); - background = gwy_data_line_new_alike(controls->background, FALSE); + edges = gwy_data_line_new_alike(args->edges, FALSE); + residuum = gwy_data_line_new_alike(args->residuum, FALSE); + background = gwy_data_line_new_alike(args->background, FALSE); terracesegments = g_array_new(FALSE, FALSE, sizeof(TerraceSegment)); surveyout = g_array_new(FALSE, FALSE, sizeof(TerraceSurveyRow)); - totalwork = count_survey_items(&myargs, &ndegrees, &nbroadenings); - degree_values = g_new(gint, ndegrees); - for (i = 0; i < ndegrees; i++) - degree_values[i] = myargs.poly_degree_min + i; - - broadening_values = g_new(gdouble, nbroadenings); - for (i = 0; i < nbroadenings; i++) { - gdouble t = (nbroadenings == 1 ? 0.5 : i/(nbroadenings - 1.0)); - broadening_values[i] = interpolate_broadening(myargs.broadening_min, - myargs.broadening_max, - t); - } + degrees = g_array_new(FALSE, FALSE, sizeof(gint)); + broadenings = g_array_new(FALSE, FALSE, sizeof(gdouble)); + totalwork = prepare_survey(args->params, degrees, broadenings); + ndegrees = degrees->len; - gwy_app_wait_start(GTK_WINDOW(controls->dialogue), - _("Fitting in progress...")); + gwy_app_wait_start(GTK_WINDOW(gui->dialog), _("Fitting in progress...")); for (w = 0; w < totalwork; w++) { TerraceSurveyRow srow; - myargs.poly_degree = degree_values[w/nbroadenings]; - myargs.edge_broadening = broadening_values[w % nbroadenings]; - fres = terrace_do(xdata, ydata, ndata, edges, residuum, background, - terracesegments, xsel, &myargs, &message); + gwy_params_set_int(surveyparams, PARAM_POLY_DEGREE, g_array_index(degrees, gint, w % ndegrees)); + gwy_params_set_double(surveyparams, PARAM_EDGE_BROADENING, g_array_index(broadenings, gdouble, w/ndegrees)); + fres = terrace_do(xdata, ydata, ndata, edges, residuum, background, terracesegments, xsel, surveyparams, + &message); gwy_clear(&srow, 1); - srow.poly_degree = myargs.poly_degree; - srow.edge_kernel_size = myargs.edge_kernel_size; - srow.edge_threshold = myargs.edge_threshold; - srow.edge_broadening = myargs.edge_broadening; - srow.min_area_frac = myargs.min_area_frac; + srow.poly_degree = gwy_params_get_int(surveyparams, PARAM_POLY_DEGREE); + srow.edge_kernel_size = gwy_params_get_double(surveyparams, PARAM_EDGE_KERNEL_SIZE); + srow.edge_threshold = gwy_params_get_double(surveyparams, PARAM_EDGE_THRESHOLD); + srow.edge_broadening = gwy_params_get_double(surveyparams, PARAM_EDGE_BROADENING); + srow.min_area_frac = gwy_params_get_double(surveyparams, PARAM_MIN_AREA_FRAC); srow.fit_ok = !!fres; if (fres) { srow.nterraces = fres->nterraces; @@ -2650,8 +2055,8 @@ gwy_app_wait_finish(); - g_free(degree_values); - g_free(broadening_values); + g_array_free(degrees, TRUE); + g_array_free(broadenings, TRUE); g_array_free(terracesegments, TRUE); g_object_unref(edges); g_object_unref(residuum); @@ -2664,142 +2069,22 @@ str = g_string_new(NULL); gwy_format_result_table_strings(str, report_style, 11, - "Poly degree", "Edge kernel size", - "Edge threshold", "Edge broadening", - "Min area frac", "Fit OK", "Num terraces", - "Step height", "Step height err", + "Poly degree", "Edge kernel size", "Edge threshold", "Edge broadening", + "Min area frac", "Fit OK", "Num terraces", "Step height", "Step height err", "Msq residual", "Discrepancy"); for (i = 0; i < surveyout->len; i++) { TerraceSurveyRow *srow = &g_array_index(surveyout, TerraceSurveyRow, i); gwy_format_result_table_mixed(str, report_style, "ivvvvyivvvv", srow->poly_degree, - srow->edge_kernel_size, - srow->edge_threshold, - srow->edge_broadening, + srow->edge_kernel_size, srow->edge_threshold, srow->edge_broadening, srow->min_area_frac, srow->fit_ok, - srow->nterraces, - srow->step, - srow->step_err, - srow->msq, - srow->discrep); + srow->nterraces, srow->step, srow->step_err, srow->msq, srow->discrep); } g_array_free(surveyout, TRUE); - gwy_save_auxiliary_data(_("Save Terrace Fit Survey"), - GTK_WINDOW(controls->dialogue), - str->len, str->str); + gwy_save_auxiliary_data(_("Save Terrace Fit Survey"), GTK_WINDOW(gui->dialog), str->len, str->str); g_string_free(str, TRUE); } -static const gchar edge_broadening_key[] = "/module/graph_terraces/edge_broadening"; -static const gchar edge_kernel_size_key[] = "/module/graph_terraces/edge_kernel_size"; -static const gchar edge_threshold_key[] = "/module/graph_terraces/edge_threshold"; -static const gchar independent_key[] = "/module/graph_terraces/independent"; -static const gchar min_area_frac_key[] = "/module/graph_terraces/min_area_frac"; -static const gchar output_flags_key[] = "/module/graph_terraces/output_flags"; -static const gchar poly_degree_key[] = "/module/graph_terraces/poly_degree"; -static const gchar poly_degree_max_key[] = "/module/graph_terraces/poly_degree_max"; -static const gchar poly_degree_min_key[] = "/module/graph_terraces/poly_degree_min"; -static const gchar broadening_max_key[] = "/module/graph_terraces/broadening_max"; -static const gchar broadening_min_key[] = "/module/graph_terraces/broadening_min"; -static const gchar report_style_key[] = "/module/graph_terraces/report_style"; -static const gchar survey_poly_key[] = "/module/graph_terraces/survey_poly"; -static const gchar survey_broadening_key[] = "/module/graph_terraces/survey_broadening"; -static const gchar use_selection_key[] = "/module/graph_terraces/use_selection"; - -static void -sanitize_args(TerraceArgs *args) -{ - args->poly_degree = CLAMP(args->poly_degree, 0, MAX_DEGREE); - args->edge_kernel_size = CLAMP(args->edge_kernel_size, 1.0, 64.0); - args->edge_threshold = CLAMP(args->edge_threshold, 0.0, 100.0); - args->edge_broadening = CLAMP(args->edge_broadening, 0.0, MAX_BROADEN); - args->min_area_frac = CLAMP(args->min_area_frac, 0.1, 40.0); - args->independent = !!args->independent; - args->use_selection = !!args->use_selection; - args->output_flags &= OUTPUT_ALL; - args->survey_poly = !!args->survey_poly; - args->survey_broadening = !!args->survey_broadening; - args->poly_degree_min = CLAMP(args->poly_degree_min, 0, MAX_DEGREE); - args->poly_degree_max = CLAMP(args->poly_degree_max, - args->poly_degree_min, MAX_DEGREE); - args->broadening_min = CLAMP(args->broadening_min, 0, MAX_BROADEN); - args->broadening_max = CLAMP(args->broadening_max, - args->broadening_min, MAX_BROADEN); -} - -static void -load_args(GwyContainer *settings, TerraceArgs *args) -{ - *args = terraces_defaults; - - gwy_container_gis_int32_by_name(settings, poly_degree_key, - &args->poly_degree); - gwy_container_gis_double_by_name(settings, edge_kernel_size_key, - &args->edge_kernel_size); - gwy_container_gis_double_by_name(settings, edge_threshold_key, - &args->edge_threshold); - gwy_container_gis_enum_by_name(settings, report_style_key, - &args->report_style); - gwy_container_gis_double_by_name(settings, min_area_frac_key, - &args->min_area_frac); - gwy_container_gis_double_by_name(settings, edge_broadening_key, - &args->edge_broadening); - gwy_container_gis_boolean_by_name(settings, independent_key, - &args->independent); - gwy_container_gis_boolean_by_name(settings, use_selection_key, - &args->use_selection); - gwy_container_gis_int32_by_name(settings, output_flags_key, - (gint32*)&args->output_flags); - gwy_container_gis_boolean_by_name(settings, survey_poly_key, - &args->survey_poly); - gwy_container_gis_int32_by_name(settings, poly_degree_min_key, - &args->poly_degree_min); - gwy_container_gis_int32_by_name(settings, poly_degree_max_key, - &args->poly_degree_max); - gwy_container_gis_boolean_by_name(settings, survey_broadening_key, - &args->survey_broadening); - gwy_container_gis_int32_by_name(settings, broadening_min_key, - &args->broadening_min); - gwy_container_gis_int32_by_name(settings, broadening_max_key, - &args->broadening_max); - sanitize_args(args); -} - -static void -save_args(GwyContainer *settings, TerraceArgs *args) -{ - gwy_container_set_int32_by_name(settings, poly_degree_key, - args->poly_degree); - gwy_container_set_double_by_name(settings, edge_kernel_size_key, - args->edge_kernel_size); - gwy_container_set_double_by_name(settings, edge_threshold_key, - args->edge_threshold); - gwy_container_set_enum_by_name(settings, report_style_key, - args->report_style); - gwy_container_set_double_by_name(settings, min_area_frac_key, - args->min_area_frac); - gwy_container_set_double_by_name(settings, edge_broadening_key, - args->edge_broadening); - gwy_container_set_boolean_by_name(settings, independent_key, - args->independent); - gwy_container_set_boolean_by_name(settings, use_selection_key, - args->use_selection); - gwy_container_set_int32_by_name(settings, output_flags_key, - args->output_flags); - gwy_container_set_boolean_by_name(settings, survey_poly_key, - args->survey_poly); - gwy_container_set_int32_by_name(settings, poly_degree_min_key, - args->poly_degree_min); - gwy_container_set_int32_by_name(settings, poly_degree_max_key, - args->poly_degree_max); - gwy_container_set_boolean_by_name(settings, survey_broadening_key, - args->survey_broadening); - gwy_container_set_int32_by_name(settings, broadening_min_key, - args->broadening_min); - gwy_container_set_int32_by_name(settings, broadening_max_key, - args->broadening_max); -} - -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/graph/Makefile.am gwyddion-2.63/modules/graph/Makefile.am --- gwyddion-2.62/modules/graph/Makefile.am 2022-10-06 15:01:28.000000000 +0000 +++ gwyddion-2.63/modules/graph/Makefile.am 2023-01-05 16:39:21.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25189 2023-01-05 16:39:20Z yeti-dn $ graphdir = $(pkglibdir)/modules/graph @@ -21,6 +21,7 @@ graph_invert.la \ graph_level.la \ graph_logscale.la \ + graph_measure_period.la \ graph_peaks.la \ graph_polylevel.la \ graph_sfuncs.la \ @@ -63,28 +64,29 @@ AM_LDFLAGS = -avoid-version -module $(no_undefined) $(module_libadd) # Bundlable modules, must be listed in tools_la_SOURCES below. -graph_align_la_SOURCES = graph_align.c -graph_cd_la_SOURCES = graph_cd.c -graph_cut_la_SOURCES = graph_cut.c -graph_dos_spectrum_la_SOURCES = graph_dos_spectrum.c -graph_export_ascii_la_SOURCES = graph_export_ascii.c -graph_export_bitmap_la_SOURCES = graph_export_bitmap.c -graph_export_vector_la_SOURCES = graph_export_vector.c -graph_fdfit_la_SOURCES = graph_fdfit.c -graph_filter_la_SOURCES = graph_filter.c -graph_fit_la_SOURCES = graph_fit.c -graph_flip_la_SOURCES = graph_flip.c -graph_fztofd_la_SOURCES = graph_fztofd.c -graph_invert_la_SOURCES = graph_invert.c -graph_level_la_SOURCES = graph_level.c -graph_logscale_la_SOURCES = graph_logscale.c -graph_peaks_la_SOURCES = graph_peaks.c -graph_polylevel_la_SOURCES = graph_polylevel.c -graph_sfuncs_la_SOURCES = graph_sfuncs.c -graph_simplemech_la_SOURCES = graph_simplemech.c -graph_sinebg_la_SOURCES = graph_sinebg.c -graph_stats_la_SOURCES = graph_stats.c -graph_terraces_la_SOURCES = graph_terraces.c +graph_align_la_SOURCES = graph_align.c +graph_cd_la_SOURCES = graph_cd.c +graph_cut_la_SOURCES = graph_cut.c +graph_dos_spectrum_la_SOURCES = graph_dos_spectrum.c +graph_export_ascii_la_SOURCES = graph_export_ascii.c +graph_export_bitmap_la_SOURCES = graph_export_bitmap.c +graph_export_vector_la_SOURCES = graph_export_vector.c +graph_fdfit_la_SOURCES = graph_fdfit.c +graph_filter_la_SOURCES = graph_filter.c +graph_fit_la_SOURCES = graph_fit.c +graph_flip_la_SOURCES = graph_flip.c +graph_fztofd_la_SOURCES = graph_fztofd.c +graph_invert_la_SOURCES = graph_invert.c +graph_level_la_SOURCES = graph_level.c +graph_logscale_la_SOURCES = graph_logscale.c +graph_measure_period_la_SOURCES = graph_measure_period.c +graph_peaks_la_SOURCES = graph_peaks.c +graph_polylevel_la_SOURCES = graph_polylevel.c +graph_sfuncs_la_SOURCES = graph_sfuncs.c +graph_simplemech_la_SOURCES = graph_simplemech.c +graph_sinebg_la_SOURCES = graph_sinebg.c +graph_stats_la_SOURCES = graph_stats.c +graph_terraces_la_SOURCES = graph_terraces.c graph_la_SOURCES = \ $(graph_align_la_SOURCES) \ @@ -102,6 +104,7 @@ $(graph_invert_la_SOURCES) \ $(graph_level_la_SOURCES) \ $(graph_logscale_la_SOURCES) \ + $(graph_measure_period_la_SOURCES) \ $(graph_peaks_la_SOURCES) \ $(graph_polylevel_la_SOURCES) \ $(graph_sfuncs_la_SOURCES) \ diff -Nru gwyddion-2.62/modules/graph/Makefile.in gwyddion-2.63/modules/graph/Makefile.in --- gwyddion-2.62/modules/graph/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/graph/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25189 2023-01-05 16:39:20Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -156,13 +156,14 @@ am__objects_13 = graph_la-graph_invert.lo am__objects_14 = graph_la-graph_level.lo am__objects_15 = graph_la-graph_logscale.lo -am__objects_16 = graph_la-graph_peaks.lo -am__objects_17 = graph_la-graph_polylevel.lo -am__objects_18 = graph_la-graph_sfuncs.lo -am__objects_19 = graph_la-graph_simplemech.lo -am__objects_20 = graph_la-graph_sinebg.lo -am__objects_21 = graph_la-graph_stats.lo -am__objects_22 = graph_la-graph_terraces.lo +am__objects_16 = graph_la-graph_measure_period.lo +am__objects_17 = graph_la-graph_peaks.lo +am__objects_18 = graph_la-graph_polylevel.lo +am__objects_19 = graph_la-graph_sfuncs.lo +am__objects_20 = graph_la-graph_simplemech.lo +am__objects_21 = graph_la-graph_sinebg.lo +am__objects_22 = graph_la-graph_stats.lo +am__objects_23 = graph_la-graph_terraces.lo am_graph_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ @@ -170,7 +171,8 @@ $(am__objects_12) $(am__objects_13) $(am__objects_14) \ $(am__objects_15) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ - $(am__objects_21) $(am__objects_22) graph_la-graph.lo + $(am__objects_21) $(am__objects_22) $(am__objects_23) \ + graph_la-graph.lo graph_la_OBJECTS = $(am_graph_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -244,6 +246,12 @@ am_graph_logscale_la_OBJECTS = graph_logscale.lo graph_logscale_la_OBJECTS = $(am_graph_logscale_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_graph_logscale_la_rpath = -rpath $(graphdir) +graph_measure_period_la_LIBADD = +am_graph_measure_period_la_OBJECTS = graph_measure_period.lo +graph_measure_period_la_OBJECTS = \ + $(am_graph_measure_period_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_graph_measure_period_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(graphdir) graph_peaks_la_LIBADD = am_graph_peaks_la_OBJECTS = graph_peaks.lo graph_peaks_la_OBJECTS = $(am_graph_peaks_la_OBJECTS) @@ -314,6 +322,7 @@ ./$(DEPDIR)/graph_la-graph_invert.Plo \ ./$(DEPDIR)/graph_la-graph_level.Plo \ ./$(DEPDIR)/graph_la-graph_logscale.Plo \ + ./$(DEPDIR)/graph_la-graph_measure_period.Plo \ ./$(DEPDIR)/graph_la-graph_peaks.Plo \ ./$(DEPDIR)/graph_la-graph_polylevel.Plo \ ./$(DEPDIR)/graph_la-graph_sfuncs.Plo \ @@ -322,6 +331,7 @@ ./$(DEPDIR)/graph_la-graph_stats.Plo \ ./$(DEPDIR)/graph_la-graph_terraces.Plo \ ./$(DEPDIR)/graph_level.Plo ./$(DEPDIR)/graph_logscale.Plo \ + ./$(DEPDIR)/graph_measure_period.Plo \ ./$(DEPDIR)/graph_peaks.Plo ./$(DEPDIR)/graph_polylevel.Plo \ ./$(DEPDIR)/graph_sfuncs.Plo ./$(DEPDIR)/graph_simplemech.Plo \ ./$(DEPDIR)/graph_sinebg.Plo ./$(DEPDIR)/graph_stats.Plo \ @@ -354,7 +364,8 @@ $(graph_filter_la_SOURCES) $(graph_fit_la_SOURCES) \ $(graph_flip_la_SOURCES) $(graph_fztofd_la_SOURCES) \ $(graph_invert_la_SOURCES) $(graph_level_la_SOURCES) \ - $(graph_logscale_la_SOURCES) $(graph_peaks_la_SOURCES) \ + $(graph_logscale_la_SOURCES) \ + $(graph_measure_period_la_SOURCES) $(graph_peaks_la_SOURCES) \ $(graph_polylevel_la_SOURCES) $(graph_sfuncs_la_SOURCES) \ $(graph_simplemech_la_SOURCES) $(graph_sinebg_la_SOURCES) \ $(graph_stats_la_SOURCES) $(graph_terraces_la_SOURCES) @@ -367,7 +378,8 @@ $(graph_filter_la_SOURCES) $(graph_fit_la_SOURCES) \ $(graph_flip_la_SOURCES) $(graph_fztofd_la_SOURCES) \ $(graph_invert_la_SOURCES) $(graph_level_la_SOURCES) \ - $(graph_logscale_la_SOURCES) $(graph_peaks_la_SOURCES) \ + $(graph_logscale_la_SOURCES) \ + $(graph_measure_period_la_SOURCES) $(graph_peaks_la_SOURCES) \ $(graph_polylevel_la_SOURCES) $(graph_sfuncs_la_SOURCES) \ $(graph_simplemech_la_SOURCES) $(graph_sinebg_la_SOURCES) \ $(graph_stats_la_SOURCES) $(graph_terraces_la_SOURCES) @@ -590,6 +602,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -669,6 +683,7 @@ graph_invert.la \ graph_level.la \ graph_logscale.la \ + graph_measure_period.la \ graph_peaks.la \ graph_polylevel.la \ graph_sfuncs.la \ @@ -717,6 +732,7 @@ graph_invert_la_SOURCES = graph_invert.c graph_level_la_SOURCES = graph_level.c graph_logscale_la_SOURCES = graph_logscale.c +graph_measure_period_la_SOURCES = graph_measure_period.c graph_peaks_la_SOURCES = graph_peaks.c graph_polylevel_la_SOURCES = graph_polylevel.c graph_sfuncs_la_SOURCES = graph_sfuncs.c @@ -740,6 +756,7 @@ $(graph_invert_la_SOURCES) \ $(graph_level_la_SOURCES) \ $(graph_logscale_la_SOURCES) \ + $(graph_measure_period_la_SOURCES) \ $(graph_peaks_la_SOURCES) \ $(graph_polylevel_la_SOURCES) \ $(graph_sfuncs_la_SOURCES) \ @@ -868,6 +885,9 @@ graph_logscale.la: $(graph_logscale_la_OBJECTS) $(graph_logscale_la_DEPENDENCIES) $(EXTRA_graph_logscale_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_graph_logscale_la_rpath) $(graph_logscale_la_OBJECTS) $(graph_logscale_la_LIBADD) $(LIBS) +graph_measure_period.la: $(graph_measure_period_la_OBJECTS) $(graph_measure_period_la_DEPENDENCIES) $(EXTRA_graph_measure_period_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_graph_measure_period_la_rpath) $(graph_measure_period_la_OBJECTS) $(graph_measure_period_la_LIBADD) $(LIBS) + graph_peaks.la: $(graph_peaks_la_OBJECTS) $(graph_peaks_la_DEPENDENCIES) $(EXTRA_graph_peaks_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_graph_peaks_la_rpath) $(graph_peaks_la_OBJECTS) $(graph_peaks_la_LIBADD) $(LIBS) @@ -924,6 +944,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_invert.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_level.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_logscale.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_measure_period.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_peaks.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_polylevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_sfuncs.Plo@am__quote@ # am--include-marker @@ -933,6 +954,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_la-graph_terraces.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_level.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_logscale.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_measure_period.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_peaks.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_polylevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_sfuncs.Plo@am__quote@ # am--include-marker @@ -1073,6 +1095,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(graph_la_CFLAGS) $(CFLAGS) -c -o graph_la-graph_logscale.lo `test -f 'graph_logscale.c' || echo '$(srcdir)/'`graph_logscale.c +graph_la-graph_measure_period.lo: graph_measure_period.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(graph_la_CFLAGS) $(CFLAGS) -MT graph_la-graph_measure_period.lo -MD -MP -MF $(DEPDIR)/graph_la-graph_measure_period.Tpo -c -o graph_la-graph_measure_period.lo `test -f 'graph_measure_period.c' || echo '$(srcdir)/'`graph_measure_period.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/graph_la-graph_measure_period.Tpo $(DEPDIR)/graph_la-graph_measure_period.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='graph_measure_period.c' object='graph_la-graph_measure_period.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(graph_la_CFLAGS) $(CFLAGS) -c -o graph_la-graph_measure_period.lo `test -f 'graph_measure_period.c' || echo '$(srcdir)/'`graph_measure_period.c + graph_la-graph_peaks.lo: graph_peaks.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(graph_la_CFLAGS) $(CFLAGS) -MT graph_la-graph_peaks.lo -MD -MP -MF $(DEPDIR)/graph_la-graph_peaks.Tpo -c -o graph_la-graph_peaks.lo `test -f 'graph_peaks.c' || echo '$(srcdir)/'`graph_peaks.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/graph_la-graph_peaks.Tpo $(DEPDIR)/graph_la-graph_peaks.Plo @@ -1295,6 +1324,7 @@ -rm -f ./$(DEPDIR)/graph_la-graph_invert.Plo -rm -f ./$(DEPDIR)/graph_la-graph_level.Plo -rm -f ./$(DEPDIR)/graph_la-graph_logscale.Plo + -rm -f ./$(DEPDIR)/graph_la-graph_measure_period.Plo -rm -f ./$(DEPDIR)/graph_la-graph_peaks.Plo -rm -f ./$(DEPDIR)/graph_la-graph_polylevel.Plo -rm -f ./$(DEPDIR)/graph_la-graph_sfuncs.Plo @@ -1304,6 +1334,7 @@ -rm -f ./$(DEPDIR)/graph_la-graph_terraces.Plo -rm -f ./$(DEPDIR)/graph_level.Plo -rm -f ./$(DEPDIR)/graph_logscale.Plo + -rm -f ./$(DEPDIR)/graph_measure_period.Plo -rm -f ./$(DEPDIR)/graph_peaks.Plo -rm -f ./$(DEPDIR)/graph_polylevel.Plo -rm -f ./$(DEPDIR)/graph_sfuncs.Plo @@ -1385,6 +1416,7 @@ -rm -f ./$(DEPDIR)/graph_la-graph_invert.Plo -rm -f ./$(DEPDIR)/graph_la-graph_level.Plo -rm -f ./$(DEPDIR)/graph_la-graph_logscale.Plo + -rm -f ./$(DEPDIR)/graph_la-graph_measure_period.Plo -rm -f ./$(DEPDIR)/graph_la-graph_peaks.Plo -rm -f ./$(DEPDIR)/graph_la-graph_polylevel.Plo -rm -f ./$(DEPDIR)/graph_la-graph_sfuncs.Plo @@ -1394,6 +1426,7 @@ -rm -f ./$(DEPDIR)/graph_la-graph_terraces.Plo -rm -f ./$(DEPDIR)/graph_level.Plo -rm -f ./$(DEPDIR)/graph_logscale.Plo + -rm -f ./$(DEPDIR)/graph_measure_period.Plo -rm -f ./$(DEPDIR)/graph_peaks.Plo -rm -f ./$(DEPDIR)/graph_polylevel.Plo -rm -f ./$(DEPDIR)/graph_sfuncs.Plo diff -Nru gwyddion-2.62/modules/layer/Makefile.in gwyddion-2.63/modules/layer/Makefile.in --- gwyddion-2.62/modules/layer/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/layer/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -475,6 +475,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/Makefile.in gwyddion-2.63/modules/Makefile.in --- gwyddion-2.62/modules/Makefile.in 2022-11-03 09:56:37.000000000 +0000 +++ gwyddion-2.63/modules/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -457,6 +457,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/process/arithmetic.c gwyddion-2.63/modules/process/arithmetic.c --- gwyddion-2.62/modules/process/arithmetic.c 2022-08-08 13:56:14.000000000 +0000 +++ gwyddion-2.63/modules/process/arithmetic.c 2023-06-02 13:52:08.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: arithmetic.c 24861 2022-08-08 13:56:14Z yeti-dn $ + * $Id: arithmetic.c 25402 2023-06-02 13:52:07Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -641,8 +641,7 @@ if (!nd[i]) continue; - dfield = gwy_params_get_image(args->params, PARAM_IMAGE + i); - data_fields[i] = dfield; + dfield = data_fields[i] = gwy_params_get_image(args->params, PARAM_IMAGE + i); d[evdata->pos[i]] = gwy_data_field_get_data_const(dfield); gwy_debug("d[%u] set to PRIMARY %u", evdata->pos[i], i); if (first) { diff -Nru gwyddion-2.62/modules/process/dune_synth.c gwyddion-2.63/modules/process/dune_synth.c --- gwyddion-2.62/modules/process/dune_synth.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/process/dune_synth.c 2023-01-10 13:33:03.000000000 +0000 @@ -0,0 +1,663 @@ +/* + * $Id: dune_synth.c 25200 2023-01-10 13:33:03Z yeti-dn $ + * Copyright (C) 2022 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "preview.h" +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) + +/* Cannot change this without losing reproducibility again! */ +enum { + NRANDOM_GENERATORS = 24 +}; + +enum { + PARAM_COVERAGE, + PARAM_NITERS, + PARAM_PHI, + PARAM_PHI_SPREAD, + PARAM_STEP, + PARAM_STEP_RANGE, + PARAM_P0, + PARAM_P1, + PARAM_MAX_SLOPE, + PARAM_HEIGHT, + PARAM_SEED, + PARAM_RANDOMIZE, + PARAM_ANIMATED, + PARAM_ACTIVE_PAGE, + BUTTON_LIKE_CURRENT_IMAGE, + + PARAM_DIMS0 +}; + +enum { + DENOM_SHIFT = 64 +}; + +typedef enum { + RIGHT, + UP, + LEFT, + DOWN +} MainDirection; + +typedef struct { + GwyParams *params; + GwyDataField *field; + GwyDataField *result; + /* Cached input image parameters. */ + gdouble zscale; /* Negative value means there is no input image. */ +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_dimensions; + GwyParamTable *table_generator; + GwyContainer *data; + GwyDataField *template_; +} ModuleGUI; + +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void dune_synth (GwyContainer *data, + GwyRunType runtype); +static gboolean execute (ModuleArgs *args, + GtkWindow *wait_window); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static GtkWidget* dimensions_tab_new (ModuleGUI *gui); +static GtkWidget* generator_tab_new (ModuleGUI *gui); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (ModuleGUI *gui, + gint response); +static void preview (gpointer user_data); + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Generates images by simulating formation of sand dunes."), + "Yeti ", + "1.0", + "David Nečas (Yeti)", + "2022", +}; + +GWY_MODULE_QUERY2(module_info, dune_synth) + +static gboolean +module_register(void) +{ + gwy_process_func_register("dune_synth", + (GwyProcessFunc)&dune_synth, + N_("/S_ynthetic/_Deposition/_Dunes..."), + GWY_STOCK_SYNTHETIC_DUNES, + RUN_MODES, + 0, + N_("Generate image by transporting sand")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_process_func_current()); + gwy_param_def_add_double(paramdef, PARAM_COVERAGE, "coverage", _("Co_verage"), 0.1, 1000.0, 5.0); + gwy_param_def_add_int(paramdef, PARAM_NITERS, "niters", _("_Number of iterations"), 1, 100000, 1000); + gwy_param_def_add_angle(paramdef, PARAM_PHI, "phi", _("_Direction"), FALSE, 1, 0.0); + gwy_param_def_add_double(paramdef, PARAM_PHI_SPREAD, "phi_spread", _("Spread"), 0.0, 1.0, 0.2); + gwy_param_def_add_double(paramdef, PARAM_STEP, "step", _("_Minimum step"), 0.25, 100.0, 2.0); + gwy_param_def_add_double(paramdef, PARAM_STEP_RANGE, "step_range", _("Step range"), 0.0, 100.0, 2.0); + gwy_param_def_add_double(paramdef, PARAM_P0, "p0", _("Sticking probability on _rock"), 0.0, 1.0, 0.2); + gwy_param_def_add_double(paramdef, PARAM_P1, "p1", _("Sticking _probability on sand"), 0.0, 1.0, 0.5); + gwy_param_def_add_int(paramdef, PARAM_MAX_SLOPE, "max_slope", _("Maximum s_lope"), 1, 10, 5); + gwy_param_def_add_double(paramdef, PARAM_HEIGHT, "height", _("_Height scale"), 1e-4, 1000.0, 1.0); + gwy_param_def_add_seed(paramdef, PARAM_SEED, "seed", NULL); + gwy_param_def_add_randomize(paramdef, PARAM_RANDOMIZE, PARAM_SEED, "randomize", NULL, TRUE); + gwy_param_def_add_boolean(paramdef, PARAM_ANIMATED, "animated", _("Progressive preview"), TRUE); + gwy_param_def_add_active_page(paramdef, PARAM_ACTIVE_PAGE, "active_page", NULL); + + gwy_synth_define_dimensions_params(paramdef, PARAM_DIMS0); + return paramdef; +} + +static void +dune_synth(GwyContainer *data, GwyRunType runtype) +{ + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + ModuleArgs args; + GwyDataField *field; + gint id; + + g_return_if_fail(runtype & RUN_MODES); + gwy_clear(&args, 1); + gwy_app_data_browser_get_current(GWY_APP_DATA_FIELD, &field, + GWY_APP_DATA_FIELD_ID, &id, + 0); + args.field = field; + args.zscale = field ? gwy_data_field_get_rms(field) : -1.0; + + args.params = gwy_params_new_from_settings(define_module_params()); + gwy_synth_sanitise_params(args.params, PARAM_DIMS0, field); + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, id); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + args.result = gwy_synth_make_result_data_field((args.field = field), args.params, FALSE); + if (gwy_params_get_boolean(args.params, PARAM_ANIMATED)) + gwy_app_wait_preview_data_field(args.result, data, id); + if (!execute(&args, gwy_app_find_window_for_channel(data, id))) + goto end; + gwy_synth_add_result_to_file(args.result, data, id, args.params); + +end: + GWY_OBJECT_UNREF(args.result); + g_object_unref(args.params); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GwyDialogOutcome outcome; + GwyDialog *dialog; + GtkWidget *hbox, *dataview; + GtkNotebook *notebook; + ModuleGUI gui; + + gwy_clear(&gui, 1); + gui.args = args; + gui.template_ = args->field; + + if (gui.template_) + args->field = gwy_synth_make_preview_data_field(gui.template_, PREVIEW_SIZE); + else + args->field = gwy_data_field_new(PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, TRUE); + args->result = gwy_synth_make_result_data_field(args->field, args->params, TRUE); + + gui.data = gwy_container_new(); + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), args->result); + if (gui.template_) + gwy_app_sync_data_items(data, gui.data, id, 0, FALSE, GWY_DATA_ITEM_GRADIENT, 0); + + gui.dialog = gwy_dialog_new(_("Dunes")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + notebook = GTK_NOTEBOOK(gtk_notebook_new()); + gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(notebook), TRUE, TRUE, 0); + + gtk_notebook_append_page(notebook, dimensions_tab_new(&gui), gtk_label_new(_("Dimensions"))); + gtk_notebook_append_page(notebook, generator_tab_new(&gui), gtk_label_new(_("Generator"))); + gwy_param_active_page_link_to_notebook(args->params, PARAM_ACTIVE_PAGE, notebook); + + g_signal_connect_swapped(gui.table_dimensions, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_generator, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_UPON_REQUEST, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + GWY_OBJECT_UNREF(args->field); + GWY_OBJECT_UNREF(args->result); + + return outcome; +} + +static GtkWidget* +dimensions_tab_new(ModuleGUI *gui) +{ + gui->table_dimensions = gwy_param_table_new(gui->args->params); + gwy_synth_append_dimensions_to_param_table(gui->table_dimensions, 0); + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), gui->table_dimensions); + + return gwy_param_table_widget(gui->table_dimensions); +} + +static GtkWidget* +generator_tab_new(ModuleGUI *gui) +{ + GwyParamTable *table; + + table = gui->table_generator = gwy_param_table_new(gui->args->params); + + gwy_param_table_append_header(table, -1, _("Simulation Parameters")); + gwy_param_table_append_slider(table, PARAM_COVERAGE); + gwy_param_table_slider_set_mapping(table, PARAM_COVERAGE, GWY_SCALE_MAPPING_LOG); + gwy_param_table_append_slider(table, PARAM_NITERS); + gwy_param_table_slider_set_mapping(table, PARAM_NITERS, GWY_SCALE_MAPPING_LOG); + gwy_param_table_append_separator(table); + gwy_param_table_append_slider(table, PARAM_PHI); + gwy_param_table_append_slider(table, PARAM_PHI_SPREAD); + gwy_param_table_append_separator(table); + gwy_param_table_append_slider(table, PARAM_STEP); + gwy_param_table_slider_set_digits(table, PARAM_STEP, 2); + gwy_param_table_append_slider(table, PARAM_STEP_RANGE); + gwy_param_table_slider_set_digits(table, PARAM_STEP, 2); + gwy_param_table_append_separator(table); + gwy_param_table_append_slider(table, PARAM_P0); + gwy_param_table_append_slider(table, PARAM_P1); + gwy_param_table_append_slider(table, PARAM_MAX_SLOPE); + + gwy_param_table_append_header(table, -1, _("Output")); + gwy_param_table_append_slider(table, PARAM_HEIGHT); + gwy_param_table_slider_set_mapping(table, PARAM_HEIGHT, GWY_SCALE_MAPPING_LOG); + if (gui->template_) { + gwy_param_table_append_button(table, BUTTON_LIKE_CURRENT_IMAGE, -1, GWY_RESPONSE_SYNTH_INIT_Z, + _("_Like Current Image")); + } + + gwy_param_table_append_header(table, -1, _("Options")); + gwy_param_table_append_seed(table, PARAM_SEED); + gwy_param_table_append_checkbox(table, PARAM_RANDOMIZE); + gwy_param_table_append_separator(table); + gwy_param_table_append_checkbox(table, PARAM_ANIMATED); + + gwy_dialog_add_param_table(GWY_DIALOG(gui->dialog), table); + + return gwy_param_table_widget(table); +} + +static void +param_changed(ModuleGUI *gui, gint id) +{ + GwyParamTable *table = gui->table_generator; + + if (gwy_synth_handle_param_changed(gui->table_dimensions, id)) + id = -1; + + if (id < 0 || id == PARAM_DIMS0 + GWY_DIMS_PARAM_ZUNIT) { + static const gint zids[] = { PARAM_HEIGHT }; + + gwy_synth_update_value_unitstrs(table, zids, G_N_ELEMENTS(zids)); + gwy_synth_update_like_current_button_sensitivity(table, BUTTON_LIKE_CURRENT_IMAGE); + } +} + +static void +dialog_response(ModuleGUI *gui, gint response) +{ + ModuleArgs *args = gui->args; + + if (response == GWY_RESPONSE_SYNTH_INIT_Z) { + gdouble zscale = args->zscale; + gint power10z; + + if (zscale > 0.0) { + gwy_params_get_unit(args->params, PARAM_DIMS0 + GWY_DIMS_PARAM_ZUNIT, &power10z); + gwy_param_table_set_double(gui->table_generator, PARAM_HEIGHT, zscale/pow10(power10z)); + } + } + else if (response == GWY_RESPONSE_SYNTH_TAKE_DIMS) { + gwy_synth_use_dimensions_template(gui->table_dimensions); + } +} + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + + if (execute(gui->args, GTK_WINDOW(gui->dialog))) + gwy_data_field_data_changed(gui->args->result); +} + +/* Steepest descent trickle down, starting at the bottom from newly dug hole. */ +static inline void +fill_hole_if_too_steep(gint *desert, gint xres, gint yres, gint j, gint i, gint maxslope) +{ + gint ym1block = (yres - 1)*xres; + gint k = i*xres + j; + + while (TRUE) { + gint kup = (k >= xres ? k - xres : k + ym1block); + gint kdown = (k < ym1block ? k + xres : k - ym1block); + gint kleft = (k % xres ? k-1 : k + xres-1); + gint kright = ((k + 1) % xres ? k+1 : k - (xres-1)); + gint hup = desert[kup], hdown = desert[kdown], hleft = desert[kleft], hright = desert[kright]; + gint kmax; + + if (hup > hdown) { + if (hup > hleft) + kmax = (hup > hright ? kup : kright); + else + kmax = (hleft > hright ? kleft : kright); + } + else { + if (hdown > hleft) + kmax = (hdown > hright ? kdown : kright); + else + kmax = (hleft > hright ? kleft : kright); + } + + if (desert[kmax] - desert[k] <= maxslope) + return; + + desert[k]++; + desert[kmax]--; + k = kmax; + } +} + +/* Steepest descent trickle down, starting at the top from a newly deposited sand slab. */ +static inline void +slide_down_if_too_steep(gint *desert, gint xres, gint yres, gint j, gint i, gint maxslope) +{ + gint ym1block = (yres - 1)*xres; + gint k = i*xres + j; + + while (TRUE) { + gint kup = (k >= xres ? k - xres : k + ym1block); + gint kdown = (k < ym1block ? k + xres : k - ym1block); + gint kleft = (k % xres ? k-1 : k + xres-1); + gint kright = ((k + 1) % xres ? k+1 : k - (xres-1)); + gint hup = desert[kup], hdown = desert[kdown], hleft = desert[kleft], hright = desert[kright]; + gint kmin; + + if (hup < hdown) { + if (hup < hleft) + kmin = (hup < hright ? kup : kright); + else + kmin = (hleft < hright ? kleft : kright); + } + else { + if (hdown < hleft) + kmin = (hdown < hright ? kdown : kright); + else + kmin = (hleft < hright ? kleft : kright); + } + + if (desert[k] - desert[kmin] <= maxslope) + return; + + desert[k]--; + desert[kmin]++; + k = kmin; + } +} + +static void +copy_desert_to_field(GwyDataField *field, const gint *desert) +{ + gdouble *d = gwy_data_field_get_data(field); + gint i, n = gwy_data_field_get_xres(field)*gwy_data_field_get_yres(field); + + for (i = 0; i < n; i++) + d[i] = desert[i]; +} + +static void +compute_local_properties(const gint *desert, gint xres, gint yres, gint j, gint i, + gdouble *h, gdouble *gx, gdouble *gy, gdouble *curv) +{ + gint sz_up, sz_down, sz_left, sz_right, sz_cross; + gint k = i*xres + j; + + if (G_LIKELY(i && j && j+1 < xres && i+1 < yres)) { + sz_up = desert[k-xres-1] + desert[k-xres] + desert[k-xres+1]; + sz_down = desert[k+xres-1] + desert[k+xres] + desert[k+xres+1]; + sz_left = desert[k-xres-1] + desert[k-1] + desert[k+xres-1]; + sz_right = desert[k-xres+1] + desert[k+1] + desert[k+xres+1]; + sz_cross = desert[k-xres] + desert[k-1] + desert[k+1] + desert[k+xres]; + } + else { + gint jplus = (j + 1) % xres, jminus = (j + xres-1) % xres; + gint iplus = (i + 1) % yres, iminus = (i + yres-1) % yres; + sz_up = (desert[iminus*xres + jminus] + desert[iminus*xres + j] + desert[iminus*xres + jplus]); + sz_down = (desert[iplus*xres + jminus] + desert[iplus*xres + j] + desert[iplus*xres + jplus]); + sz_left = (desert[iminus*xres + jminus] + desert[i*xres + jminus] + desert[iplus*xres + jminus]); + sz_right = (desert[iminus*xres + jplus] + desert[i*xres + jplus] + desert[iplus*xres + jplus]); + sz_cross = desert[iminus*xres + j] + desert[i*xres + jminus] + desert[i*xres + jplus] + desert[iplus*xres + j]; + } + + *h = desert[k]; + *gx = (sz_right - sz_left)/6.0; + *gy = (sz_down - sz_up)/6.0; + *curv = 0.25*sz_cross - desert[k]; +} + +static guint +take_rand_int(GwyRandGenSet *rngset, gint *navail, gint size, guint *random_values) +{ + if (G_LIKELY(*navail)) + return random_values[size - (*navail)--]; + gwy_rand_gen_set_fill_ints(rngset, random_values, size); + *navail = size-1; + return random_values[0]; +} + +static guint +take_rand_int_range(GwyRandGenSet *rngset, gint *navail, gint size, guint *random_values, + guint minvalue, guint maxvalue) +{ + guint r, R = maxvalue+1 - minvalue; + + g_return_val_if_fail(maxvalue >= minvalue, minvalue); + if (G_UNLIKELY(minvalue == 0 && maxvalue == G_MAXUINT32)) + return take_rand_int(rngset, navail, size, random_values); + + do { + r = take_rand_int(rngset, navail, size, random_values); + } while (r/R == G_MAXUINT32/R); + + return minvalue + r % R; +} + +static gdouble +take_rand_double(GwyRandGenSet *rngset, gint *navail, gint size, gdouble *random_values) +{ + if (G_LIKELY(*navail)) + return random_values[size - (*navail)--]; + gwy_rand_gen_set_fill_doubles(rngset, random_values, size); + *navail = size-1; + return random_values[0]; +} + +static gboolean +execute(ModuleArgs *args, GtkWindow *wait_window) +{ + GwyParams *params = args->params; + gboolean do_initialise = gwy_params_get_boolean(params, PARAM_DIMS0 + GWY_DIMS_PARAM_INITIALIZE); + gdouble height = gwy_params_get_double(params, PARAM_HEIGHT); + gboolean animated = gwy_params_get_boolean(params, PARAM_ANIMATED); + gsize niters_param = gwy_params_get_int(params, PARAM_NITERS); + gdouble coverage = gwy_params_get_double(params, PARAM_COVERAGE); + gdouble p0 = gwy_params_get_double(params, PARAM_P0); + gdouble p1 = gwy_params_get_double(params, PARAM_P1); + gdouble phi_mean = gwy_params_get_double(params, PARAM_PHI); + gdouble phi_spread = gwy_params_get_double(params, PARAM_PHI_SPREAD); + gdouble step = gwy_params_get_double(params, PARAM_STEP); + gdouble step_range = gwy_params_get_double(params, PARAM_STEP_RANGE); + gint maxslope = gwy_params_get_int(params, PARAM_MAX_SLOPE); + GwyRandGenSet *rngset; + GwySynthUpdateType update; + GwyDataField *field = args->field, *result = args->result; + gsize iter, niters; + gint power10z, xres, yres, n, k, i, j, rngbufsize; + guint r, p0_int, p1_int; + gint n_ints = 0, n_doubles = 0; + gint *desert; + const gdouble *f; + gdouble preview_time = (animated ? 1.25 : 0.0); + guint32 *random_ints; + gdouble *random_doubles; + GTimer *timer; + gboolean finished = FALSE; + + gwy_app_wait_start(wait_window, _("Initializing...")); + + gwy_params_get_unit(params, PARAM_DIMS0 + GWY_DIMS_PARAM_ZUNIT, &power10z); + height *= pow10(power10z); + + rngset = gwy_rand_gen_set_new(NRANDOM_GENERATORS); + gwy_rand_gen_set_init(rngset, gwy_params_get_int(params, PARAM_SEED)); + + xres = gwy_data_field_get_xres(result); + yres = gwy_data_field_get_yres(result); + n = xres*yres; + /* One iteration given by user is one complete pass through the image, but we count individual sand chunk + * movements. */ + niters = niters_param*n; + p0_int = (guint)floor(G_MAXUINT32*p0 + 0.5); + p1_int = (guint)floor(G_MAXUINT32*p1 + 0.5); + rngbufsize = 4*n; + + desert = g_new0(gint, n); + random_ints = g_new(guint32, rngbufsize); + random_doubles = g_new(gdouble, rngbufsize); + if (field && do_initialise) { + gdouble min, avg, q; + + min = gwy_data_field_get_min(field); + avg = gwy_data_field_get_avg(field); + if (avg > min) { + q = coverage/(avg - min); + f = gwy_data_field_get_data_const(field); + for (k = 0; k < n; k++) + desert[k] = GWY_ROUND(q*(f[k] - min)); + } + } + else { + gint h0 = floor(coverage); + gdouble hplus = coverage - h0; + + gwy_rand_gen_set_fill_doubles(rngset, random_doubles, n); + for (k = 0; k < n; k++) + desert[k] = h0 + (random_doubles[k] < hplus); + } + + timer = g_timer_new(); + gwy_synth_update_progress(NULL, 0, 0, 0); + if (!gwy_app_wait_set_message(_("Running computation..."))) + goto end; + + for (iter = 0; iter < niters; iter++) { + gint x, y, dx, dy, scaled_xres = xres*DENOM_SHIFT, scaled_yres = yres*DENOM_SHIFT; + gdouble vx, vy, h, gx, gy, curv, w, p_height, p_slope, p_curv; + + k = take_rand_int_range(rngset, &n_ints, rngbufsize, random_ints, 0, n-1); + if (!desert[k]) + continue; + + /* XXX: There may be various direction generation methods, even dynamically changing ones. */ + if (TRUE) { + gdouble phi = take_rand_double(rngset, &n_doubles, rngbufsize, random_doubles); + gdouble v = step + step_range*take_rand_double(rngset, &n_doubles, rngbufsize, random_doubles); + + phi = phi_mean + 2.0*G_PI*phi_spread*(phi - 0.5); + vx = v*cos(phi); + vy = v*sin(phi); + } + + /* This is generic once we have vx and vy. */ + dx = GWY_ROUND(vx*DENOM_SHIFT); + dy = GWY_ROUND(vy*DENOM_SHIFT); + i = k/xres; + j = k % xres; + + /* Compute pick-up probability using + * (a) possibly height, with higher elevation (h) corresponding to higher pick-up probability, even though + * there is no clear overall normalisation; we can use probability like + * p(h) = h/(h + c₀) + * (b) possibly slope in the wind direction, with higher upslope (g) meaning lower pick-up probability; again, + * we can use an increasing function like a sigmoid + * p(g) = 1/2*(1 - g/√(g² + c₁)) + * (c) possibly curvature, with smaller curvature (k) meaning higher pick-up probability (i.e. negative + * curvature means higher probability); + * p(k) = 1/2*(1 - k/√(k² + c₂)) + */ + compute_local_properties(desert, xres, yres, j, i, &h, &gx, &gy, &curv); + p_height = h/(1.0 + h); + w = (gx*dx + gy*dy)/sqrt(dx*dx + dy*dy); + p_slope = 0.5*(1 + w/sqrt(w*w + 1.0)); + p_curv = 0.5*(1 - curv/sqrt(curv*curv + 5.0)); + if (take_rand_double(rngset, &n_doubles, rngbufsize, random_doubles) > p_height*p_slope*p_curv) + continue; + + x = take_rand_int_range(rngset, &n_ints, rngbufsize, random_ints, 0, DENOM_SHIFT*DENOM_SHIFT-1); + y = i*DENOM_SHIFT + x/DENOM_SHIFT; + x = j*DENOM_SHIFT + x % DENOM_SHIFT; + + desert[k]--; + fill_hole_if_too_steep(desert, xres, yres, j, i, maxslope); + while (TRUE) { + x = (x + scaled_xres + dx) % scaled_xres; + y = (y + scaled_yres + dy) % scaled_yres; + j = x/DENOM_SHIFT; + i = y/DENOM_SHIFT; + k = i*xres + j; + r = take_rand_int(rngset, &n_ints, rngbufsize, random_ints); + if ((desert[k] && r < p1_int) || r < p0_int) + break; + } + desert[k]++; + slide_down_if_too_steep(desert, xres, yres, j, i, maxslope); + + if (iter % 100000 == 0) { + update = gwy_synth_update_progress(timer, preview_time, iter, niters); + if (update == GWY_SYNTH_UPDATE_CANCELLED) + return FALSE; + if (update == GWY_SYNTH_UPDATE_DO_PREVIEW) { + copy_desert_to_field(result, desert); + gwy_data_field_data_changed(result); + } + } + } + + copy_desert_to_field(result, desert); + gwy_data_field_multiply(result, height); + finished = TRUE; + +end: + gwy_app_wait_finish(); + gwy_rand_gen_set_free(rngset); + g_timer_destroy(timer); + g_free(desert); + g_free(random_ints); + g_free(random_doubles); + + return finished; +} + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/process/facet_measure.c gwyddion-2.63/modules/process/facet_measure.c --- gwyddion-2.62/modules/process/facet_measure.c 2022-03-03 12:59:05.000000000 +0000 +++ gwyddion-2.63/modules/process/facet_measure.c 2023-06-09 15:24:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: facet_measure.c 24626 2022-03-03 12:59:05Z yeti-dn $ + * $Id: facet_measure.c 25420 2023-06-09 15:24:12Z yeti-dn $ * Copyright (C) 2019-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -137,6 +137,7 @@ static void dialog_response (ModuleGUI *gui, gint response); static void save_facet_selection (ModuleGUI *gui); +static GtkWidget* create_theta_box (ModuleGUI *gui); static GtkWidget* create_point_list (ModuleGUI *gui); static void point_list_selection_changed (GtkTreeSelection *treesel, ModuleGUI *gui); @@ -205,6 +206,7 @@ gdouble theta0, gdouble phi0, gdouble tolerance); +static GwyDataField* make_fdist_field (GwyDataField *field); static void sanitise_params (ModuleArgs *args); static GwyModuleInfo module_info = { @@ -212,7 +214,7 @@ &module_register, N_("Visualizes, marks and measures facet orientation."), "Yeti ", - "2.1", + "2.2", "David Nečas (Yeti)", "2019", }; @@ -249,11 +251,10 @@ /* The real folding is 4, not 2, but the facet map contains regions outside the possible angles. */ gwy_param_def_add_angle(paramdef, PARAM_THETA0, "theta0", _("Selected ϑ"), TRUE, 2, 0.0); gwy_param_def_add_instant_updates(paramdef, PARAM_UPDATE, "update", _("I_nstant facet marking"), FALSE); - gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", NULL, + gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Facet Vectors"), GWY_RESULTS_EXPORT_TABULAR_DATA, GWY_RESULTS_REPORT_TABSEP); gwy_param_def_add_boolean(paramdef, PARAM_COMBINE, "combine", NULL, FALSE); - gwy_param_def_add_enum(paramdef, PARAM_COMBINE_TYPE, "combine_type", NULL, - GWY_TYPE_MERGE_TYPE, GWY_MERGE_INTERSECTION); + gwy_param_def_add_enum(paramdef, PARAM_COMBINE_TYPE, "combine_type", NULL, GWY_TYPE_MERGE_TYPE, GWY_MERGE_UNION); gwy_param_def_add_mask_color(paramdef, PARAM_MASK_COLOR, NULL, NULL); return paramdef; } @@ -312,13 +313,12 @@ { static const GwyRGBA facet_mask_color = { 0.56, 0.39, 0.07, 0.5 }; - GtkWidget *hbox, *vbox, *label, *auxbox, *scwin, *button, *dataview, *alignment, *pointlist, *widget; + GtkWidget *hbox, *vbox, *auxbox, *scwin, *button, *dataview, *alignment, *pointlist, *widget; GwyDialogOutcome outcome; GwyDialog *dialog; GwyParamTable *table, *extable; ModuleGUI gui; GtkSizeGroup *sizegroup; - gint n, fres; gwy_clear(&gui, 1); gui.args = args; @@ -336,13 +336,9 @@ GWY_DATA_ITEM_REAL_SQUARE, 0); - n = gwy_data_field_get_xres(args->field)*gwy_data_field_get_yres(args->field); - fres = 2*GWY_ROUND(cbrt(3.49*n)) + 1; - gui.dist = gwy_data_field_new(fres, fres, 1.0, 1.0, FALSE); - gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(gui.dist), NULL); - gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(gui.dist), NULL); - gui.mask = gwy_data_field_new_alike(gui.dist, TRUE); gui.fdata = gwy_container_new(); + gui.dist = make_fdist_field(args->field); + gui.mask = gwy_data_field_new_alike(gui.dist, TRUE); gwy_container_set_object_by_name(gui.fdata, "/0/data", gui.dist); gwy_container_set_object_by_name(gui.fdata, "/0/mask", gui.mask); gwy_container_set_const_string_by_name(gui.fdata, "/0/base/palette", FVIEW_GRADIENT); @@ -407,20 +403,7 @@ gui.fselection = gwy_create_preview_vector_layer(GWY_DATA_VIEW(dataview), 0, "Point", 1, TRUE); g_object_ref(gui.fselection); - auxbox = gwy_hbox_new(0); - gtk_box_pack_start(GTK_BOX(vbox), auxbox, FALSE, FALSE, 0); - - label = gui.theta_min_label = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(auxbox), label, TRUE, TRUE, 0); - - label = gui.theta_0_label = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); - gtk_box_pack_start(GTK_BOX(auxbox), label, TRUE, TRUE, 0); - - label = gui.theta_max_label = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); - gtk_box_pack_start(GTK_BOX(auxbox), label, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), create_theta_box(&gui), FALSE, FALSE, 0); vbox = gwy_vbox_new(0); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); @@ -478,6 +461,26 @@ return outcome; } +static GtkWidget* +create_theta_box(ModuleGUI *gui) +{ + GtkWidget *thetabox = gwy_hbox_new(0); + + gui->theta_min_label = gtk_label_new(NULL); + gtk_misc_set_alignment(GTK_MISC(gui->theta_min_label), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(thetabox), gui->theta_min_label, TRUE, TRUE, 0); + + gui->theta_0_label = gtk_label_new(NULL); + gtk_misc_set_alignment(GTK_MISC(gui->theta_0_label), 0.5, 0.5); + gtk_box_pack_start(GTK_BOX(thetabox), gui->theta_0_label, TRUE, TRUE, 0); + + gui->theta_max_label = gtk_label_new(NULL); + gtk_misc_set_alignment(GTK_MISC(gui->theta_max_label), 1.0, 0.5); + gtk_box_pack_start(GTK_BOX(thetabox), gui->theta_max_label, TRUE, TRUE, 0); + + return thetabox; +} + static void create_point_list_column(GtkTreeView *treeview, GtkCellRenderer *renderer, ModuleGUI *gui, @@ -559,7 +562,7 @@ gdouble *theta, gdouble *phi) { *phi = atan2(yder, -xder); - *theta = atan(hypot(xder, yder)); + *theta = atan(sqrt(xder*xder + yder*yder)); } static inline void @@ -570,7 +573,7 @@ *yder = tan(theta)*sin(phi); } -/* Transforms (ϑ, φ) to Cartesian selection coordinates [0,2q], which is [-1,1] for the full range of angles. */ +/* Transforms (ϑ, φ) to Cartesian selection coordinates [0,2q], which is [0,2] for the full range of angles. */ static inline void angles_to_xy(gdouble theta, gdouble phi, gdouble q, gdouble *x, gdouble *y) @@ -1289,6 +1292,19 @@ fmeas->error = sqrt(s2/(count - 1)); } +static GwyDataField* +make_fdist_field(GwyDataField *field) +{ + gint n = gwy_data_field_get_xres(field)*gwy_data_field_get_yres(field); + gint fres = 2*GWY_ROUND(cbrt(3.49*n)) + 1; + GwyDataField *fdist; + + fdist = gwy_data_field_new(fres, fres, 1.0, 1.0, FALSE); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_xy(fdist), NULL); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(fdist), NULL); + return fdist; +} + static void sanitise_params(ModuleArgs *args) { diff -Nru gwyddion-2.62/modules/process/Makefile.am gwyddion-2.63/modules/process/Makefile.am --- gwyddion-2.62/modules/process/Makefile.am 2022-11-02 11:30:08.000000000 +0000 +++ gwyddion-2.63/modules/process/Makefile.am 2023-06-12 08:57:10.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25418 2023-06-07 16:01:22Z yeti-dn $ # Put sources that are for some reason disabled yet present in svn checkouts # here. This makes them distributed and translations of their messages are @@ -44,6 +44,7 @@ disc_synth.la \ domain_synth.la \ drift.la \ + dune_synth.la \ dwt.la \ dwtanisotropy.la \ edge.la \ @@ -229,6 +230,7 @@ disc_synth_la_SOURCES = disc_synth.c preview.h domain_synth_la_SOURCES = domain_synth.c preview.h drift_la_SOURCES = drift.c preview.h +dune_synth_la_SOURCES = dune_synth.c preview.h dwt_la_SOURCES = dwt.c preview.h dwtanisotropy_la_SOURCES = dwtanisotropy.c edge_la_SOURCES = edge.c preview.h @@ -316,7 +318,6 @@ raveraging_la_SOURCES = raveraging.c relate_la_SOURCES = relate.c resample_la_SOURCES = resample.c -#resolution_la_SOURCES = resolution.c roddeposit_synth_la_SOURCES = roddeposit_synth.c dimensions.h preview.h rotate_la_SOURCES = rotate.c preview.h scale_la_SOURCES = scale.c preview.h @@ -380,6 +381,7 @@ $(disc_synth_la_SOURCES) \ $(domain_synth_la_SOURCES) \ $(drift_la_SOURCES) \ + $(dune_synth_la_SOURCES) \ $(dwt_la_SOURCES) \ $(dwtanisotropy_la_SOURCES) \ $(edge_la_SOURCES) \ diff -Nru gwyddion-2.62/modules/process/Makefile.in gwyddion-2.63/modules/process/Makefile.in --- gwyddion-2.62/modules/process/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/process/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25418 2023-06-07 16:01:22Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -279,6 +279,10 @@ am_drift_la_OBJECTS = drift.lo drift_la_OBJECTS = $(am_drift_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_drift_la_rpath = -rpath $(processdir) +dune_synth_la_LIBADD = +am_dune_synth_la_OBJECTS = dune_synth.lo +dune_synth_la_OBJECTS = $(am_dune_synth_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_dune_synth_la_rpath = -rpath $(processdir) dwt_la_LIBADD = am_dwt_la_OBJECTS = dwt.lo dwt_la_OBJECTS = $(am_dwt_la_OBJECTS) @@ -639,121 +643,122 @@ am__objects_30 = process_la-disc_synth.lo am__objects_31 = process_la-domain_synth.lo am__objects_32 = process_la-drift.lo -am__objects_33 = process_la-dwt.lo -am__objects_34 = process_la-dwtanisotropy.lo -am__objects_35 = process_la-edge.lo -am__objects_36 = process_la-entropy.lo -am__objects_37 = process_la-extend.lo -am__objects_38 = process_la-extract_path.lo -am__objects_39 = process_la-facet_analysis.lo -am__objects_40 = process_la-facet_measure.lo -am__objects_41 = process_la-facet-level.lo -am__objects_42 = process_la-fbm_synth.lo -am__objects_43 = process_la-fft_filter_1d.lo -am__objects_44 = process_la-fft_filter_2d.lo -am__objects_45 = process_la-fft.lo -am__objects_46 = process_la-fft_synth.lo -am__objects_47 = process_la-fibre_synth.lo -am__objects_48 = process_la-fit-shape.lo -am__objects_49 = process_la-flatten_base.lo -am__objects_50 = process_la-fractal.lo -am__objects_51 = process_la-fraccor.lo -am__objects_52 = process_la-freq_split.lo -am__objects_53 = process_la-gaussian_step.lo -am__objects_54 = process_la-good_profile.lo -am__objects_55 = process_la-gradient.lo -am__objects_56 = process_la-grain_cross.lo -am__objects_57 = process_la-grain_dist.lo -am__objects_58 = process_la-grain_edge.lo -am__objects_59 = process_la-grain_filter.lo -am__objects_60 = process_la-grain_makesel.lo -am__objects_61 = process_la-grain_mark.lo -am__objects_62 = process_la-grain_stat.lo -am__objects_63 = process_la-grain_summary.lo -am__objects_64 = process_la-grain_wshed.lo -am__objects_65 = process_la-hertz.lo -am__objects_66 = process_la-hough.lo -am__objects_67 = process_la-immerse.lo -am__objects_68 = process_la-indent_analyze.lo -am__objects_69 = process_la-laplace.lo -am__objects_70 = process_la-lat_synth.lo -am__objects_71 = process_la-latsim.lo -am__objects_72 = process_la-level.lo -am__objects_73 = process_la-level_grains.lo -am__objects_74 = process_la-linecorrect.lo -am__objects_75 = process_la-linematch.lo -am__objects_76 = process_la-lno_synth.lo -am__objects_77 = process_la-local_contrast.lo -am__objects_78 = process_la-logistic.lo -am__objects_79 = process_la-mark_disconn.lo -am__objects_80 = process_la-mark_with.lo -am__objects_81 = process_la-maskcor.lo -am__objects_82 = process_la-mask_distribute.lo -am__objects_83 = process_la-mask_edt.lo -am__objects_84 = process_la-mask_morph.lo -am__objects_85 = process_la-mask_noisify.lo -am__objects_86 = process_la-mask_shift.lo -am__objects_87 = process_la-maskops.lo -am__objects_88 = process_la-mcrop.lo -am__objects_89 = process_la-measure_lattice.lo -am__objects_90 = process_la-median-bg.lo -am__objects_91 = process_la-merge.lo -am__objects_92 = process_la-mfm_current.lo -am__objects_93 = process_la-mfm_field.lo -am__objects_94 = process_la-mfm_findshift.lo -am__objects_95 = process_la-mfm_parallel.lo -am__objects_96 = process_la-mfm_recalc.lo -am__objects_97 = process_la-mfm_shift.lo -am__objects_98 = process_la-multiprofile.lo -am__objects_99 = process_la-neural.lo -am__objects_100 = process_la-noise_synth.lo -am__objects_101 = process_la-obj_synth.lo -am__objects_102 = process_la-otsu_threshold.lo -am__objects_103 = process_la-outliers.lo -am__objects_104 = process_la-pat_synth.lo -am__objects_105 = process_la-phase_synth.lo -am__objects_106 = process_la-pid.lo -am__objects_107 = process_la-pileup_synth.lo -am__objects_108 = process_la-polylevel.lo -am__objects_109 = process_la-polydistort.lo -am__objects_110 = process_la-presentationops.lo -am__objects_111 = process_la-psdf2d.lo -am__objects_112 = process_la-psdf_logphi.lo -am__objects_113 = process_la-psf.lo -am__objects_114 = process_la-psf-fit.lo -am__objects_115 = process_la-rank.lo -am__objects_116 = process_la-rank-filter.lo -am__objects_117 = process_la-raveraging.lo -am__objects_118 = process_la-relate.lo -am__objects_119 = process_la-resample.lo -am__objects_120 = process_la-roddeposit_synth.lo -am__objects_121 = process_la-rotate.lo -am__objects_122 = process_la-scale.lo -am__objects_123 = process_la-scars.lo -am__objects_124 = process_la-semsim.lo -am__objects_125 = process_la-shade.lo -am__objects_126 = process_la-slope_dist.lo -am__objects_127 = process_la-sphere-revolve.lo -am__objects_128 = process_la-stitch.lo -am__objects_129 = process_la-straighten_path.lo -am__objects_130 = process_la-terracefit.lo -am__objects_131 = process_la-threshold.lo -am__objects_132 = process_la-tilt.lo -am__objects_133 = process_la-tip_blind.lo -am__objects_134 = process_la-tip_model.lo -am__objects_135 = process_la-tipops.lo -am__objects_136 = process_la-tipshape.lo -am__objects_137 = process_la-trimmed-mean.lo -am__objects_138 = process_la-volumize.lo -am__objects_139 = process_la-volumize_layers.lo -am__objects_140 = process_la-wave_synth.lo -am__objects_141 = process_la-wfr_synth.lo -am__objects_142 = process_la-wpour_mark.lo -am__objects_143 = process_la-wrapvalue.lo -am__objects_144 = process_la-xydenoise.lo -am__objects_145 = process_la-xyz_channels.lo -am__objects_146 = process_la-xyzize.lo -am__objects_147 = process_la-zero_crossing.lo +am__objects_33 = process_la-dune_synth.lo +am__objects_34 = process_la-dwt.lo +am__objects_35 = process_la-dwtanisotropy.lo +am__objects_36 = process_la-edge.lo +am__objects_37 = process_la-entropy.lo +am__objects_38 = process_la-extend.lo +am__objects_39 = process_la-extract_path.lo +am__objects_40 = process_la-facet_analysis.lo +am__objects_41 = process_la-facet_measure.lo +am__objects_42 = process_la-facet-level.lo +am__objects_43 = process_la-fbm_synth.lo +am__objects_44 = process_la-fft_filter_1d.lo +am__objects_45 = process_la-fft_filter_2d.lo +am__objects_46 = process_la-fft.lo +am__objects_47 = process_la-fft_synth.lo +am__objects_48 = process_la-fibre_synth.lo +am__objects_49 = process_la-fit-shape.lo +am__objects_50 = process_la-flatten_base.lo +am__objects_51 = process_la-fractal.lo +am__objects_52 = process_la-fraccor.lo +am__objects_53 = process_la-freq_split.lo +am__objects_54 = process_la-gaussian_step.lo +am__objects_55 = process_la-good_profile.lo +am__objects_56 = process_la-gradient.lo +am__objects_57 = process_la-grain_cross.lo +am__objects_58 = process_la-grain_dist.lo +am__objects_59 = process_la-grain_edge.lo +am__objects_60 = process_la-grain_filter.lo +am__objects_61 = process_la-grain_makesel.lo +am__objects_62 = process_la-grain_mark.lo +am__objects_63 = process_la-grain_stat.lo +am__objects_64 = process_la-grain_summary.lo +am__objects_65 = process_la-grain_wshed.lo +am__objects_66 = process_la-hertz.lo +am__objects_67 = process_la-hough.lo +am__objects_68 = process_la-immerse.lo +am__objects_69 = process_la-indent_analyze.lo +am__objects_70 = process_la-laplace.lo +am__objects_71 = process_la-lat_synth.lo +am__objects_72 = process_la-latsim.lo +am__objects_73 = process_la-level.lo +am__objects_74 = process_la-level_grains.lo +am__objects_75 = process_la-linecorrect.lo +am__objects_76 = process_la-linematch.lo +am__objects_77 = process_la-lno_synth.lo +am__objects_78 = process_la-local_contrast.lo +am__objects_79 = process_la-logistic.lo +am__objects_80 = process_la-mark_disconn.lo +am__objects_81 = process_la-mark_with.lo +am__objects_82 = process_la-maskcor.lo +am__objects_83 = process_la-mask_distribute.lo +am__objects_84 = process_la-mask_edt.lo +am__objects_85 = process_la-mask_morph.lo +am__objects_86 = process_la-mask_noisify.lo +am__objects_87 = process_la-mask_shift.lo +am__objects_88 = process_la-maskops.lo +am__objects_89 = process_la-mcrop.lo +am__objects_90 = process_la-measure_lattice.lo +am__objects_91 = process_la-median-bg.lo +am__objects_92 = process_la-merge.lo +am__objects_93 = process_la-mfm_current.lo +am__objects_94 = process_la-mfm_field.lo +am__objects_95 = process_la-mfm_findshift.lo +am__objects_96 = process_la-mfm_parallel.lo +am__objects_97 = process_la-mfm_recalc.lo +am__objects_98 = process_la-mfm_shift.lo +am__objects_99 = process_la-multiprofile.lo +am__objects_100 = process_la-neural.lo +am__objects_101 = process_la-noise_synth.lo +am__objects_102 = process_la-obj_synth.lo +am__objects_103 = process_la-otsu_threshold.lo +am__objects_104 = process_la-outliers.lo +am__objects_105 = process_la-pat_synth.lo +am__objects_106 = process_la-phase_synth.lo +am__objects_107 = process_la-pid.lo +am__objects_108 = process_la-pileup_synth.lo +am__objects_109 = process_la-polylevel.lo +am__objects_110 = process_la-polydistort.lo +am__objects_111 = process_la-presentationops.lo +am__objects_112 = process_la-psdf2d.lo +am__objects_113 = process_la-psdf_logphi.lo +am__objects_114 = process_la-psf.lo +am__objects_115 = process_la-psf-fit.lo +am__objects_116 = process_la-rank.lo +am__objects_117 = process_la-rank-filter.lo +am__objects_118 = process_la-raveraging.lo +am__objects_119 = process_la-relate.lo +am__objects_120 = process_la-resample.lo +am__objects_121 = process_la-roddeposit_synth.lo +am__objects_122 = process_la-rotate.lo +am__objects_123 = process_la-scale.lo +am__objects_124 = process_la-scars.lo +am__objects_125 = process_la-semsim.lo +am__objects_126 = process_la-shade.lo +am__objects_127 = process_la-slope_dist.lo +am__objects_128 = process_la-sphere-revolve.lo +am__objects_129 = process_la-stitch.lo +am__objects_130 = process_la-straighten_path.lo +am__objects_131 = process_la-terracefit.lo +am__objects_132 = process_la-threshold.lo +am__objects_133 = process_la-tilt.lo +am__objects_134 = process_la-tip_blind.lo +am__objects_135 = process_la-tip_model.lo +am__objects_136 = process_la-tipops.lo +am__objects_137 = process_la-tipshape.lo +am__objects_138 = process_la-trimmed-mean.lo +am__objects_139 = process_la-volumize.lo +am__objects_140 = process_la-volumize_layers.lo +am__objects_141 = process_la-wave_synth.lo +am__objects_142 = process_la-wfr_synth.lo +am__objects_143 = process_la-wpour_mark.lo +am__objects_144 = process_la-wrapvalue.lo +am__objects_145 = process_la-xydenoise.lo +am__objects_146 = process_la-xyz_channels.lo +am__objects_147 = process_la-xyzize.lo +am__objects_148 = process_la-zero_crossing.lo am_process_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ @@ -803,7 +808,7 @@ $(am__objects_138) $(am__objects_139) $(am__objects_140) \ $(am__objects_141) $(am__objects_142) $(am__objects_143) \ $(am__objects_144) $(am__objects_145) $(am__objects_146) \ - $(am__objects_147) process_la-process.lo + $(am__objects_147) $(am__objects_148) process_la-process.lo process_la_OBJECTS = $(am_process_la_OBJECTS) process_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(process_la_CFLAGS) \ @@ -993,45 +998,46 @@ ./$(DEPDIR)/deposit_synth.Plo ./$(DEPDIR)/diff_synth.Plo \ ./$(DEPDIR)/disc_synth.Plo ./$(DEPDIR)/displfield.Plo \ ./$(DEPDIR)/domain_synth.Plo ./$(DEPDIR)/drift.Plo \ - ./$(DEPDIR)/dwt.Plo ./$(DEPDIR)/dwtanisotropy.Plo \ - ./$(DEPDIR)/edge.Plo ./$(DEPDIR)/entropy.Plo \ - ./$(DEPDIR)/extend.Plo ./$(DEPDIR)/extract_path.Plo \ - ./$(DEPDIR)/facet-level.Plo ./$(DEPDIR)/facet_analysis.Plo \ - ./$(DEPDIR)/facet_measure.Plo ./$(DEPDIR)/fbm_synth.Plo \ - ./$(DEPDIR)/fft.Plo ./$(DEPDIR)/fft_filter_1d.Plo \ - ./$(DEPDIR)/fft_filter_2d.Plo ./$(DEPDIR)/fft_synth.Plo \ - ./$(DEPDIR)/fibre_synth.Plo ./$(DEPDIR)/fit-shape.Plo \ - ./$(DEPDIR)/flatten_base.Plo ./$(DEPDIR)/fraccor.Plo \ - ./$(DEPDIR)/fractal.Plo ./$(DEPDIR)/freq_split.Plo \ - ./$(DEPDIR)/gaussian_step.Plo ./$(DEPDIR)/good_profile.Plo \ - ./$(DEPDIR)/gradient.Plo ./$(DEPDIR)/grain_cross.Plo \ - ./$(DEPDIR)/grain_dist.Plo ./$(DEPDIR)/grain_edge.Plo \ - ./$(DEPDIR)/grain_filter.Plo ./$(DEPDIR)/grain_makesel.Plo \ - ./$(DEPDIR)/grain_mark.Plo ./$(DEPDIR)/grain_stat.Plo \ - ./$(DEPDIR)/grain_summary.Plo ./$(DEPDIR)/grain_wshed.Plo \ - ./$(DEPDIR)/hertz.Plo ./$(DEPDIR)/hough.Plo \ - ./$(DEPDIR)/immerse.Plo ./$(DEPDIR)/indent_analyze.Plo \ - ./$(DEPDIR)/laplace.Plo ./$(DEPDIR)/lat_synth.Plo \ - ./$(DEPDIR)/latsim.Plo ./$(DEPDIR)/level.Plo \ - ./$(DEPDIR)/level_grains.Plo ./$(DEPDIR)/linecorrect.Plo \ - ./$(DEPDIR)/linematch.Plo ./$(DEPDIR)/lno_synth.Plo \ - ./$(DEPDIR)/local_contrast.Plo ./$(DEPDIR)/logistic.Plo \ - ./$(DEPDIR)/mark_disconn.Plo ./$(DEPDIR)/mark_with.Plo \ - ./$(DEPDIR)/mask_distribute.Plo ./$(DEPDIR)/mask_edt.Plo \ - ./$(DEPDIR)/mask_morph.Plo ./$(DEPDIR)/mask_noisify.Plo \ - ./$(DEPDIR)/mask_shift.Plo ./$(DEPDIR)/maskcor.Plo \ - ./$(DEPDIR)/maskops.Plo ./$(DEPDIR)/mcrop.Plo \ - ./$(DEPDIR)/measure_lattice.Plo ./$(DEPDIR)/median-bg.Plo \ - ./$(DEPDIR)/merge.Plo ./$(DEPDIR)/mfm_current.Plo \ - ./$(DEPDIR)/mfm_field.Plo ./$(DEPDIR)/mfm_findshift.Plo \ - ./$(DEPDIR)/mfm_parallel.Plo ./$(DEPDIR)/mfm_recalc.Plo \ - ./$(DEPDIR)/mfm_shift.Plo ./$(DEPDIR)/multiprofile.Plo \ - ./$(DEPDIR)/neural.Plo ./$(DEPDIR)/noise_synth.Plo \ - ./$(DEPDIR)/obj_synth.Plo ./$(DEPDIR)/otsu_threshold.Plo \ - ./$(DEPDIR)/outliers.Plo ./$(DEPDIR)/pat_synth.Plo \ - ./$(DEPDIR)/phase_synth.Plo ./$(DEPDIR)/pid.Plo \ - ./$(DEPDIR)/pileup_synth.Plo ./$(DEPDIR)/polydistort.Plo \ - ./$(DEPDIR)/polylevel.Plo ./$(DEPDIR)/presentationops.Plo \ + ./$(DEPDIR)/dune_synth.Plo ./$(DEPDIR)/dwt.Plo \ + ./$(DEPDIR)/dwtanisotropy.Plo ./$(DEPDIR)/edge.Plo \ + ./$(DEPDIR)/entropy.Plo ./$(DEPDIR)/extend.Plo \ + ./$(DEPDIR)/extract_path.Plo ./$(DEPDIR)/facet-level.Plo \ + ./$(DEPDIR)/facet_analysis.Plo ./$(DEPDIR)/facet_measure.Plo \ + ./$(DEPDIR)/fbm_synth.Plo ./$(DEPDIR)/fft.Plo \ + ./$(DEPDIR)/fft_filter_1d.Plo ./$(DEPDIR)/fft_filter_2d.Plo \ + ./$(DEPDIR)/fft_synth.Plo ./$(DEPDIR)/fibre_synth.Plo \ + ./$(DEPDIR)/fit-shape.Plo ./$(DEPDIR)/flatten_base.Plo \ + ./$(DEPDIR)/fraccor.Plo ./$(DEPDIR)/fractal.Plo \ + ./$(DEPDIR)/freq_split.Plo ./$(DEPDIR)/gaussian_step.Plo \ + ./$(DEPDIR)/good_profile.Plo ./$(DEPDIR)/gradient.Plo \ + ./$(DEPDIR)/grain_cross.Plo ./$(DEPDIR)/grain_dist.Plo \ + ./$(DEPDIR)/grain_edge.Plo ./$(DEPDIR)/grain_filter.Plo \ + ./$(DEPDIR)/grain_makesel.Plo ./$(DEPDIR)/grain_mark.Plo \ + ./$(DEPDIR)/grain_stat.Plo ./$(DEPDIR)/grain_summary.Plo \ + ./$(DEPDIR)/grain_wshed.Plo ./$(DEPDIR)/hertz.Plo \ + ./$(DEPDIR)/hough.Plo ./$(DEPDIR)/immerse.Plo \ + ./$(DEPDIR)/indent_analyze.Plo ./$(DEPDIR)/laplace.Plo \ + ./$(DEPDIR)/lat_synth.Plo ./$(DEPDIR)/latsim.Plo \ + ./$(DEPDIR)/level.Plo ./$(DEPDIR)/level_grains.Plo \ + ./$(DEPDIR)/linecorrect.Plo ./$(DEPDIR)/linematch.Plo \ + ./$(DEPDIR)/lno_synth.Plo ./$(DEPDIR)/local_contrast.Plo \ + ./$(DEPDIR)/logistic.Plo ./$(DEPDIR)/mark_disconn.Plo \ + ./$(DEPDIR)/mark_with.Plo ./$(DEPDIR)/mask_distribute.Plo \ + ./$(DEPDIR)/mask_edt.Plo ./$(DEPDIR)/mask_morph.Plo \ + ./$(DEPDIR)/mask_noisify.Plo ./$(DEPDIR)/mask_shift.Plo \ + ./$(DEPDIR)/maskcor.Plo ./$(DEPDIR)/maskops.Plo \ + ./$(DEPDIR)/mcrop.Plo ./$(DEPDIR)/measure_lattice.Plo \ + ./$(DEPDIR)/median-bg.Plo ./$(DEPDIR)/merge.Plo \ + ./$(DEPDIR)/mfm_current.Plo ./$(DEPDIR)/mfm_field.Plo \ + ./$(DEPDIR)/mfm_findshift.Plo ./$(DEPDIR)/mfm_parallel.Plo \ + ./$(DEPDIR)/mfm_recalc.Plo ./$(DEPDIR)/mfm_shift.Plo \ + ./$(DEPDIR)/multiprofile.Plo ./$(DEPDIR)/neural.Plo \ + ./$(DEPDIR)/noise_synth.Plo ./$(DEPDIR)/obj_synth.Plo \ + ./$(DEPDIR)/otsu_threshold.Plo ./$(DEPDIR)/outliers.Plo \ + ./$(DEPDIR)/pat_synth.Plo ./$(DEPDIR)/phase_synth.Plo \ + ./$(DEPDIR)/pid.Plo ./$(DEPDIR)/pileup_synth.Plo \ + ./$(DEPDIR)/polydistort.Plo ./$(DEPDIR)/polylevel.Plo \ + ./$(DEPDIR)/presentationops.Plo \ ./$(DEPDIR)/process_la-acf2d.Plo \ ./$(DEPDIR)/process_la-angle_dist.Plo \ ./$(DEPDIR)/process_la-anneal_synth.Plo \ @@ -1064,6 +1070,7 @@ ./$(DEPDIR)/process_la-displfield.Plo \ ./$(DEPDIR)/process_la-domain_synth.Plo \ ./$(DEPDIR)/process_la-drift.Plo \ + ./$(DEPDIR)/process_la-dune_synth.Plo \ ./$(DEPDIR)/process_la-dwt.Plo \ ./$(DEPDIR)/process_la-dwtanisotropy.Plo \ ./$(DEPDIR)/process_la-edge.Plo \ @@ -1234,8 +1241,9 @@ $(deposit_synth_la_SOURCES) $(diff_synth_la_SOURCES) \ $(disc_synth_la_SOURCES) $(displfield_la_SOURCES) \ $(domain_synth_la_SOURCES) $(drift_la_SOURCES) \ - $(dwt_la_SOURCES) $(dwtanisotropy_la_SOURCES) \ - $(edge_la_SOURCES) $(entropy_la_SOURCES) $(extend_la_SOURCES) \ + $(dune_synth_la_SOURCES) $(dwt_la_SOURCES) \ + $(dwtanisotropy_la_SOURCES) $(edge_la_SOURCES) \ + $(entropy_la_SOURCES) $(extend_la_SOURCES) \ $(extract_path_la_SOURCES) $(facet_level_la_SOURCES) \ $(facet_analysis_la_SOURCES) $(facet_measure_la_SOURCES) \ $(fbm_synth_la_SOURCES) $(fft_la_SOURCES) \ @@ -1307,8 +1315,9 @@ $(deposit_synth_la_SOURCES) $(diff_synth_la_SOURCES) \ $(disc_synth_la_SOURCES) $(displfield_la_SOURCES) \ $(domain_synth_la_SOURCES) $(drift_la_SOURCES) \ - $(dwt_la_SOURCES) $(dwtanisotropy_la_SOURCES) \ - $(edge_la_SOURCES) $(entropy_la_SOURCES) $(extend_la_SOURCES) \ + $(dune_synth_la_SOURCES) $(dwt_la_SOURCES) \ + $(dwtanisotropy_la_SOURCES) $(edge_la_SOURCES) \ + $(entropy_la_SOURCES) $(extend_la_SOURCES) \ $(extract_path_la_SOURCES) $(facet_level_la_SOURCES) \ $(facet_analysis_la_SOURCES) $(facet_measure_la_SOURCES) \ $(fbm_synth_la_SOURCES) $(fft_la_SOURCES) \ @@ -1583,6 +1592,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -1686,6 +1697,7 @@ disc_synth.la \ domain_synth.la \ drift.la \ + dune_synth.la \ dwt.la \ dwtanisotropy.la \ edge.la \ @@ -1862,6 +1874,7 @@ disc_synth_la_SOURCES = disc_synth.c preview.h domain_synth_la_SOURCES = domain_synth.c preview.h drift_la_SOURCES = drift.c preview.h +dune_synth_la_SOURCES = dune_synth.c preview.h dwt_la_SOURCES = dwt.c preview.h dwtanisotropy_la_SOURCES = dwtanisotropy.c edge_la_SOURCES = edge.c preview.h @@ -1949,7 +1962,6 @@ raveraging_la_SOURCES = raveraging.c relate_la_SOURCES = relate.c resample_la_SOURCES = resample.c -#resolution_la_SOURCES = resolution.c roddeposit_synth_la_SOURCES = roddeposit_synth.c dimensions.h preview.h rotate_la_SOURCES = rotate.c preview.h scale_la_SOURCES = scale.c preview.h @@ -2012,6 +2024,7 @@ $(disc_synth_la_SOURCES) \ $(domain_synth_la_SOURCES) \ $(drift_la_SOURCES) \ + $(dune_synth_la_SOURCES) \ $(dwt_la_SOURCES) \ $(dwtanisotropy_la_SOURCES) \ $(edge_la_SOURCES) \ @@ -2296,6 +2309,9 @@ drift.la: $(drift_la_OBJECTS) $(drift_la_DEPENDENCIES) $(EXTRA_drift_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_drift_la_rpath) $(drift_la_OBJECTS) $(drift_la_LIBADD) $(LIBS) +dune_synth.la: $(dune_synth_la_OBJECTS) $(dune_synth_la_DEPENDENCIES) $(EXTRA_dune_synth_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_dune_synth_la_rpath) $(dune_synth_la_OBJECTS) $(dune_synth_la_LIBADD) $(LIBS) + dwt.la: $(dwt_la_OBJECTS) $(dwt_la_DEPENDENCIES) $(EXTRA_dwt_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_dwt_la_rpath) $(dwt_la_OBJECTS) $(dwt_la_LIBADD) $(LIBS) @@ -2682,6 +2698,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displfield.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/domain_synth.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drift.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dune_synth.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dwtanisotropy.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@ # am--include-marker @@ -2792,6 +2809,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-displfield.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-domain_synth.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-drift.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-dune_synth.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-dwt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-dwtanisotropy.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process_la-edge.Plo@am__quote@ # am--include-marker @@ -3197,6 +3215,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(process_la_CFLAGS) $(CFLAGS) -c -o process_la-drift.lo `test -f 'drift.c' || echo '$(srcdir)/'`drift.c +process_la-dune_synth.lo: dune_synth.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(process_la_CFLAGS) $(CFLAGS) -MT process_la-dune_synth.lo -MD -MP -MF $(DEPDIR)/process_la-dune_synth.Tpo -c -o process_la-dune_synth.lo `test -f 'dune_synth.c' || echo '$(srcdir)/'`dune_synth.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/process_la-dune_synth.Tpo $(DEPDIR)/process_la-dune_synth.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dune_synth.c' object='process_la-dune_synth.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(process_la_CFLAGS) $(CFLAGS) -c -o process_la-dune_synth.lo `test -f 'dune_synth.c' || echo '$(srcdir)/'`dune_synth.c + process_la-dwt.lo: dwt.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(process_la_CFLAGS) $(CFLAGS) -MT process_la-dwt.lo -MD -MP -MF $(DEPDIR)/process_la-dwt.Tpo -c -o process_la-dwt.lo `test -f 'dwt.c' || echo '$(srcdir)/'`dwt.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/process_la-dwt.Tpo $(DEPDIR)/process_la-dwt.Plo @@ -4178,6 +4203,7 @@ -rm -f ./$(DEPDIR)/displfield.Plo -rm -f ./$(DEPDIR)/domain_synth.Plo -rm -f ./$(DEPDIR)/drift.Plo + -rm -f ./$(DEPDIR)/dune_synth.Plo -rm -f ./$(DEPDIR)/dwt.Plo -rm -f ./$(DEPDIR)/dwtanisotropy.Plo -rm -f ./$(DEPDIR)/edge.Plo @@ -4288,6 +4314,7 @@ -rm -f ./$(DEPDIR)/process_la-displfield.Plo -rm -f ./$(DEPDIR)/process_la-domain_synth.Plo -rm -f ./$(DEPDIR)/process_la-drift.Plo + -rm -f ./$(DEPDIR)/process_la-dune_synth.Plo -rm -f ./$(DEPDIR)/process_la-dwt.Plo -rm -f ./$(DEPDIR)/process_la-dwtanisotropy.Plo -rm -f ./$(DEPDIR)/process_la-edge.Plo @@ -4518,6 +4545,7 @@ -rm -f ./$(DEPDIR)/displfield.Plo -rm -f ./$(DEPDIR)/domain_synth.Plo -rm -f ./$(DEPDIR)/drift.Plo + -rm -f ./$(DEPDIR)/dune_synth.Plo -rm -f ./$(DEPDIR)/dwt.Plo -rm -f ./$(DEPDIR)/dwtanisotropy.Plo -rm -f ./$(DEPDIR)/edge.Plo @@ -4628,6 +4656,7 @@ -rm -f ./$(DEPDIR)/process_la-displfield.Plo -rm -f ./$(DEPDIR)/process_la-domain_synth.Plo -rm -f ./$(DEPDIR)/process_la-drift.Plo + -rm -f ./$(DEPDIR)/process_la-dune_synth.Plo -rm -f ./$(DEPDIR)/process_la-dwt.Plo -rm -f ./$(DEPDIR)/process_la-dwtanisotropy.Plo -rm -f ./$(DEPDIR)/process_la-edge.Plo diff -Nru gwyddion-2.62/modules/process/maskcor.c gwyddion-2.63/modules/process/maskcor.c --- gwyddion-2.62/modules/process/maskcor.c 2021-05-27 15:24:41.000000000 +0000 +++ gwyddion-2.63/modules/process/maskcor.c 2023-06-06 09:53:46.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: maskcor.c 23727 2021-05-16 21:41:20Z yeti-dn $ - * Copyright (C) 2004-2021 David Necas (Yeti), Petr Klapetek. + * $Id: maskcor.c 25414 2023-06-06 09:53:45Z yeti-dn $ + * Copyright (C) 2004-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -27,6 +27,7 @@ #include #include #include +#include "preview.h" #define RUN_MODES GWY_RUN_INTERACTIVE @@ -56,6 +57,8 @@ ModuleArgs *args; GtkWidget *dialog; GwyParamTable *table; + GwyContainer *data; + GtkWidget *dataview; } ModuleGUI; static gboolean module_register (void); @@ -63,9 +66,12 @@ static void maskcor (GwyContainer *data, GwyRunType runtype); static void execute (ModuleArgs *args); -static GwyDialogOutcome run_gui (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); static void param_changed (ModuleGUI *gui, gint id); +static void preview (gpointer user_data); static gboolean kernel_filter (GwyContainer *data, gint id, gpointer user_data); @@ -75,7 +81,7 @@ &module_register, N_("Searches for a detail in another image using correlation."), "Petr Klapetek , Yeti ", - "3.0", + "3.1", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -106,6 +112,7 @@ { N_("Height difference, raw"), GWY_CORR_SEARCH_HEIGHT_DIFF_RAW }, { N_("Height difference, leveled"), GWY_CORR_SEARCH_HEIGHT_DIFF }, { N_("Height difference score"), GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE }, + { N_("Phase-only score"), GWY_CORR_SEARCH_PHASE_ONLY_SCORE }, }; static const GwyEnum results[] = { { N_("Objects marked"), MASKCOR_OBJECTS, }, @@ -151,7 +158,7 @@ gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(args.result), NULL); args.params = gwy_params_new_from_settings(define_module_params()); - outcome = run_gui(&args); + outcome = run_gui(&args, data, id); gwy_params_save_to_settings(args.params); if (outcome == GWY_DIALOG_CANCEL) goto end; @@ -177,17 +184,30 @@ } static GwyDialogOutcome -run_gui(ModuleArgs *args) +run_gui(ModuleArgs *args, + GwyContainer *data, gint id) { + GwyDialogOutcome outcome; GwyDialog *dialog; GwyParamTable *table; ModuleGUI gui; + GtkWidget *hbox; gui.args = args; + gui.data = gwy_container_new(); + gwy_container_set_object_by_name(gui.data, "/0/data", args->result); + gwy_app_sync_data_items(data, gui.data, id, 0, FALSE, + GWY_DATA_ITEM_PALETTE, + GWY_DATA_ITEM_REAL_SQUARE, + 0); + gui.dialog = gwy_dialog_new(_("Correlation Search")); dialog = GWY_DIALOG(gui.dialog); - gwy_dialog_add_buttons(dialog, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + gui.dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(gui.dataview), FALSE); table = gui.table = gwy_param_table_new(args->params); gwy_param_table_append_image_id(table, PARAM_KERNEL); @@ -203,12 +223,17 @@ gwy_param_table_append_combo(table, PARAM_RESULT); gwy_param_table_append_checkbox(table, PARAM_PLOT_MASK); - gwy_dialog_add_content(dialog, gwy_param_table_widget(table), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), TRUE, TRUE, 0); gwy_dialog_add_param_table(dialog, table); g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_UPON_REQUEST, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); - return gwy_dialog_run(dialog); + return outcome; } static void @@ -236,9 +261,24 @@ if (id < 0 || id == PARAM_METHOD) { GwyCorrSearchType method = gwy_params_get_enum(params, PARAM_METHOD); gboolean is_score = (method == GWY_CORR_SEARCH_COVARIANCE_SCORE - || method == GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE); + || method == GWY_CORR_SEARCH_HEIGHT_DIFF_SCORE + || method == GWY_CORR_SEARCH_PHASE_ONLY_SCORE); gwy_param_table_set_sensitive(table, PARAM_REGCOEFF, is_score); } + + if (id != PARAM_RESULT) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; + + execute(args); + gwy_data_field_data_changed(args->result); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); } static gboolean @@ -248,8 +288,8 @@ if (!gwy_container_gis_object(data, gwy_app_get_data_key_for_id(id), &kernel)) return FALSE; - if (gwy_data_field_get_xreal(kernel) <= gwy_data_field_get_xreal(field)/3 - && gwy_data_field_get_yreal(kernel) <= gwy_data_field_get_yreal(field)/3 + if (gwy_data_field_get_xreal(kernel) < gwy_data_field_get_xreal(field) + && gwy_data_field_get_yreal(kernel) < gwy_data_field_get_yreal(field) && !gwy_data_field_check_compatibility(kernel, field, GWY_DATA_COMPATIBILITY_LATERAL | GWY_DATA_COMPATIBILITY_MEASURE)) return TRUE; @@ -311,6 +351,7 @@ gwy_data_field_correlation_search(args->field, kernel, kmask, result, method, regcoeff, GWY_EXTERIOR_BORDER_EXTEND, 0.0); + gwy_data_field_invalidate(result); if (output == MASKCOR_SCORE) return; diff -Nru gwyddion-2.62/modules/process/maskops.c gwyddion-2.63/modules/process/maskops.c --- gwyddion-2.62/modules/process/maskops.c 2021-05-05 09:07:49.000000000 +0000 +++ gwyddion-2.63/modules/process/maskops.c 2023-03-06 11:19:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: maskops.c 23632 2021-05-03 23:01:27Z yeti-dn $ + * $Id: maskops.c 25259 2023-03-06 11:19:12Z yeti-dn $ * Copyright (C) 2003-2021 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -26,24 +26,26 @@ #define RUN_MODES GWY_RUN_IMMEDIATE -static gboolean module_register(void); -static void mask_remove (GwyContainer *data, - GwyRunType runtype); -static void mask_invert (GwyContainer *data, - GwyRunType runtype); -static void mask_extract (GwyContainer *data, - GwyRunType runtype); -static void remove_touching(GwyContainer *data, - GwyRunType runtype); -static void mask_thin (GwyContainer *data, - GwyRunType runtype); +static gboolean module_register (void); +static void mask_remove (GwyContainer *data, + GwyRunType runtype); +static void mask_invert (GwyContainer *data, + GwyRunType runtype); +static void mask_extract (GwyContainer *data, + GwyRunType runtype); +static void extract_grain_numbers(GwyContainer *data, + GwyRunType runtype); +static void remove_touching (GwyContainer *data, + GwyRunType runtype); +static void mask_thin (GwyContainer *data, + GwyRunType runtype); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Basic operations with mask: inversion, removal, extraction."), "Yeti ", - "1.6", + "1.7", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -74,6 +76,13 @@ RUN_MODES, GWY_MENU_FLAG_DATA_MASK | GWY_MENU_FLAG_DATA, N_("Extract mask to a new image")); + gwy_process_func_register("grain_extract_numbers", + (GwyProcessFunc)&extract_grain_numbers, + N_("/_Grains/_Extract Numbers"), + NULL, + RUN_MODES, + GWY_MENU_FLAG_DATA_MASK | GWY_MENU_FLAG_DATA, + N_("Extract grain numbers to a new image")); gwy_process_func_register("grain_rem_touching", (GwyProcessFunc)&remove_touching, N_("/_Grains/_Remove Edge-Touching"), @@ -132,25 +141,59 @@ static void mask_extract(GwyContainer *data, GwyRunType runtype) { - GwyDataField *field; + GwyDataField *mfield; gint id, newid; g_return_if_fail(runtype & RUN_MODES); - gwy_app_data_browser_get_current(GWY_APP_MASK_FIELD, &field, + gwy_app_data_browser_get_current(GWY_APP_MASK_FIELD, &mfield, GWY_APP_DATA_FIELD_ID, &id, 0); - g_return_if_fail(field); + g_return_if_fail(mfield); - field = gwy_data_field_duplicate(field); - gwy_data_field_clamp(field, 0.0, 1.0); - gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(field), NULL); + mfield = gwy_data_field_duplicate(mfield); + gwy_data_field_clamp(mfield, 0.0, 1.0); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(mfield), NULL); - newid = gwy_app_data_browser_add_data_field(field, data, TRUE); - g_object_unref(field); + newid = gwy_app_data_browser_add_data_field(mfield, data, TRUE); + g_object_unref(mfield); gwy_app_set_data_field_title(data, newid, _("Mask")); gwy_app_sync_data_items(data, data, id, newid, FALSE, GWY_DATA_ITEM_GRADIENT, GWY_DATA_ITEM_REAL_SQUARE, + 0); + gwy_app_channel_log_add_proc(data, id, newid); +} + +static void +extract_grain_numbers(GwyContainer *data, GwyRunType runtype) +{ + GwyDataField *mfield; + gint *grains; + gint id, newid, n, i; + gdouble *d; + + g_return_if_fail(runtype & RUN_MODES); + gwy_app_data_browser_get_current(GWY_APP_MASK_FIELD, &mfield, + GWY_APP_DATA_FIELD_ID, &id, + 0); + g_return_if_fail(mfield); + + n = gwy_data_field_get_xres(mfield)*gwy_data_field_get_yres(mfield); + grains = g_new0(gint, n); + gwy_data_field_number_grains(mfield, grains); + mfield = gwy_data_field_duplicate(mfield); + d = gwy_data_field_get_data(mfield); + for (i = 0; i < n; i++) + d[i] = grains[i]; + g_free(grains); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(mfield), NULL); + + newid = gwy_app_data_browser_add_data_field(mfield, data, TRUE); + g_object_unref(mfield); + gwy_app_set_data_field_title(data, newid, _("Grain Numbers")); + gwy_app_sync_data_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + GWY_DATA_ITEM_REAL_SQUARE, 0); gwy_app_channel_log_add_proc(data, id, newid); } diff -Nru gwyddion-2.62/modules/process/process.c gwyddion-2.63/modules/process/process.c --- gwyddion-2.62/modules/process/process.c 2022-11-02 13:24:43.000000000 +0000 +++ gwyddion-2.63/modules/process/process.c 2023-06-12 08:57:37.000000000 +0000 @@ -44,6 +44,7 @@ GwyModuleInfo* _gwy_module_query__disc_synth(void); GwyModuleInfo* _gwy_module_query__domain_synth(void); GwyModuleInfo* _gwy_module_query__drift(void); +GwyModuleInfo* _gwy_module_query__dune_synth(void); GwyModuleInfo* _gwy_module_query__dwt(void); GwyModuleInfo* _gwy_module_query__dwtanisotropy(void); GwyModuleInfo* _gwy_module_query__edge(void); @@ -193,6 +194,7 @@ { _gwy_module_query__disc_synth, "disc_synth", }, { _gwy_module_query__domain_synth, "domain_synth", }, { _gwy_module_query__drift, "drift", }, + { _gwy_module_query__dune_synth, "dune_synth", }, { _gwy_module_query__dwt, "dwt", }, { _gwy_module_query__dwtanisotropy, "dwtanisotropy", }, { _gwy_module_query__edge, "edge", }, diff -Nru gwyddion-2.62/modules/process/terracefit.c gwyddion-2.63/modules/process/terracefit.c --- gwyddion-2.62/modules/process/terracefit.c 2022-03-22 13:03:47.000000000 +0000 +++ gwyddion-2.63/modules/process/terracefit.c 2023-01-30 14:15:32.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: terracefit.c 24719 2022-03-22 13:03:46Z yeti-dn $ + * $Id: terracefit.c 25216 2023-01-30 14:15:32Z yeti-dn $ * Copyright (C) 2019-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -978,8 +978,7 @@ } } - /* Keep only large areas. This inherently limits the maximum number of - * areas too. */ + /* Keep only large areas. This inherently limits the maximum number of areas too. */ minsize = GWY_ROUND(min_area_frac*n); gwy_data_field_grains_remove_by_size(marked, minsize); @@ -1082,9 +1081,8 @@ return maxpower; } -/* Diagonal power-power matrix block. Some of the entries could be - * calculated from the per-terrace averages; the higher powers are only - * used here though. This is the slow part. */ +/* Diagonal power-power matrix block. Some of the entries could be calculated from the per-terrace averages; the + * higher powers are only used here though. This is the slow part. */ static gdouble* calculate_power_matrix_block(GArray *terracecoords, guint npowers, const gint *term_powers) @@ -1092,8 +1090,7 @@ guint maxpower, nterraces, kp, mp; gdouble *power_block; - /* We multiply two powers together so the maximum power in the product is - * twice the single maximum power. */ + /* We multiply two powers together so the maximum power in the product is twice the single maximum power. */ maxpower = 2*find_maximum_power(npowers, term_powers); nterraces = terracecoords->len; power_block = g_new0(gdouble, npowers*npowers); @@ -2089,21 +2086,17 @@ /* This does not depend on whether we run the second stage fit. */ info->level = tc->level; info->height = fres->solution[g]; - /* This will be recalculated in the second stage fit. Note that error - * is anyway with respect to the multiple of estimated step height - * and normally similar in both fit types. */ + /* This will be recalculated in the second stage fit. Note that error is anyway with respect to the multiple + * of estimated step height and normally similar in both fit types. */ info->error = fres->solution[g] - offset - tc->level*sheight; info->residuum = sqrt(tc->msq); } - /* Normally also perform the second stage fitting with a single common - * step height. But if requested, avoid it, keeping the heights - * independents. */ + /* Normally also perform the second stage fitting with a single common step height. But if requested, avoid it, + * keeping the heights independent. */ if (!independent) { free_fit_result(fres); - if (!(fres = fit_terraces_same_step(terracecoords, term_powers, npowers, power_block, - independent ? NULL : residuum, - message))) + if (!(fres = fit_terraces_same_step(terracecoords, term_powers, npowers, power_block, residuum, message))) goto end; for (g = 0; g < nterraces; g++) { @@ -2221,7 +2214,7 @@ ModuleArgs *args = gui->args; GwyDataField *marked, *residuum, *terraces, *terraceids, *field = args->field, *mask = args->mask; GwyParams *surveyparams = gwy_params_duplicate(args->params); - GwyResultsReportType report_style = gwy_params_get_report_type(surveyparams, PARAM_TERRACE_REPORT_STYLE); + GwyResultsReportType report_style = gwy_params_get_report_type(args->params, PARAM_TERRACE_REPORT_STYLE); GArray *terracecoords = NULL, *degrees, *broadenings, *terraceinfo, *surveyout; guint i, w, ndegrees, nbroadenings, totalwork; const gchar *message; @@ -2241,7 +2234,7 @@ degrees = g_array_new(FALSE, FALSE, sizeof(gint)); broadenings = g_array_new(FALSE, FALSE, sizeof(gdouble)); - totalwork = prepare_survey(surveyparams, degrees, broadenings); + totalwork = prepare_survey(args->params, degrees, broadenings); ndegrees = degrees->len; nbroadenings = broadenings->len; diff -Nru gwyddion-2.62/modules/process/tipshape.c gwyddion-2.63/modules/process/tipshape.c --- gwyddion-2.62/modules/process/tipshape.c 2021-05-27 15:24:41.000000000 +0000 +++ gwyddion-2.63/modules/process/tipshape.c 2023-04-17 08:38:06.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: tipshape.c 23666 2021-05-10 21:56:10Z yeti-dn $ + * @(#) $Id: tipshape.c 25300 2023-04-13 09:39:33Z yeti-dn $ * Copyright (C) 2018-2021 David Necas (Yeti), Anna Charvatova Campbell * E-mail: yeti@gwyddion.net, acampbellova@cmi.cz * @@ -77,7 +77,7 @@ &module_register, N_("Calculates the tip area function."), "Anna Charvatova Campbell ", - "2.0", + "2.1", "Anna Charvatova Campbell", "2018", }; @@ -108,7 +108,7 @@ paramdef = gwy_param_def_new(); gwy_param_def_set_function_name(paramdef, gwy_process_func_current()); - gwy_param_def_add_int(paramdef, PARAM_RESOLUTION, "resolution", _("_Resolution"), 10, 1000, 100); + gwy_param_def_add_int(paramdef, PARAM_RESOLUTION, "resolution", _("_Resolution"), 10, 10000, 100); gwy_param_def_add_double(paramdef, PARAM_RANGEMIN, "rangemin", _("Range minimum"), 0.0, G_MAXDOUBLE, 0.0); gwy_param_def_add_double(paramdef, PARAM_RANGEMAX, "rangemax", _("Range maximum"), 0.0, G_MAXDOUBLE, 0.0); gwy_param_def_add_boolean(paramdef, PARAM_CALC_UNC, "calc_unc", _("Calculate uncertainties"), FALSE); diff -Nru gwyddion-2.62/modules/pygwy/gwyutils.py gwyddion-2.63/modules/pygwy/gwyutils.py --- gwyddion-2.62/modules/pygwy/gwyutils.py 2018-04-11 12:02:04.000000000 +0000 +++ gwyddion-2.63/modules/pygwy/gwyutils.py 2022-12-07 15:26:00.000000000 +0000 @@ -99,9 +99,7 @@ class gwydfdatap(): def __init__(self,addr,shape): data = (addr, False) - stride = (8,) self.__array_interface__= { - 'strides' : stride, 'shape' : shape, 'data' : data, 'typestr' : "|f8", @@ -123,16 +121,14 @@ class gwydfdatap(): def __init__(self,addr,shape): data = (addr, False) - stride = (8, shape[0]*8) self.__array_interface__= { - 'strides' : stride, 'shape' : shape, 'data' : data, 'typestr' : "|f8", 'version' : 3} addr = field.get_data_pointer() - shape = (field.get_xres(), field.get_yres()) + shape = (field.get_yres(), field.get_xres()) return np.array(gwydfdatap(addr, shape), copy=False) def brick_data_as_array(brick): @@ -147,16 +143,14 @@ class gwydfdatap(): def __init__(self,addr,shape): data = (addr, False) - stride = (8, shape[0]*8, shape[0]*shape[1]*8) self.__array_interface__= { - 'strides' : stride, 'shape' : shape, 'data' : data, 'typestr' : "|f8", 'version' : 3} addr = brick.get_data_pointer() - shape = (brick.get_xres(), brick.get_yres(), brick.get_zres()) + shape = (brick.get_zres(), brick.get_yres(), brick.get_xres()) return np.array(gwydfdatap(addr, shape), copy=False) def data_field_get_data(datafield): diff -Nru gwyddion-2.62/modules/pygwy/Makefile.in gwyddion-2.63/modules/pygwy/Makefile.in --- gwyddion-2.62/modules/pygwy/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/pygwy/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -448,6 +448,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/pygwy/pygwy-fix-defs-2.py gwyddion-2.63/modules/pygwy/pygwy-fix-defs-2.py --- gwyddion-2.62/modules/pygwy/pygwy-fix-defs-2.py 2021-11-09 15:10:46.000000000 +0000 +++ gwyddion-2.63/modules/pygwy/pygwy-fix-defs-2.py 2023-02-23 16:21:43.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/python2 -# $Id: pygwy-fix-defs-2.py 24502 2021-11-09 15:10:45Z yeti-dn $ +# $Id: pygwy-fix-defs-2.py 25246 2023-02-23 16:21:43Z yeti-dn $ # alter defs, fix parameters and return types import sys, re from optparse import OptionParser @@ -346,6 +346,7 @@ gwy_md5_get_digest gwy_gstring_replace gwy_gstring_to_native_eol +gwy_append_doubles_to_gstring gwy_app_data_browser_get_current gwy_container_set_string gwy_container_get_value diff -Nru gwyddion-2.62/modules/pygwy/wrap_calls.c gwyddion-2.63/modules/pygwy/wrap_calls.c --- gwyddion-2.62/modules/pygwy/wrap_calls.c 2020-05-18 10:19:00.000000000 +0000 +++ gwyddion-2.63/modules/pygwy/wrap_calls.c 2023-03-06 11:25:17.000000000 +0000 @@ -1,25 +1,20 @@ /* - * $Id: wrap_calls.c 22822 2020-05-18 10:19:00Z yeti-dn $ - * Copyright (C) 2008 Jan Horak, 2015-2018 David Necas (Yeti) + * $Id: wrap_calls.c 25260 2023-03-06 11:25:17Z yeti-dn $ + * Copyright (C) 2008 Jan Horak, 2015-2023 David Necas (Yeti) * E-mail: xhorak@gmail.com, yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * Description: This file contains custom fuctions for automatically - * generated wrapping by using pygwy-codegen. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Description: This file contains custom fuctions for automatically generated wrapping by using pygwy-codegen. */ #include "wrap_calls.h" @@ -30,21 +25,21 @@ static GwyDoubleArray* create_double_array(const gdouble *data, guint len, gboolean free_data) { - GArray *ret = g_array_new(FALSE, FALSE, sizeof(gdouble)); - g_array_append_vals(ret, data, len); - if (free_data) - g_free((gpointer)data); - return ret; + GArray *ret = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_append_vals(ret, data, len); + if (free_data) + g_free((gpointer)data); + return ret; } static GwyIntArray* create_int_array(const gint *data, guint len, gboolean free_data) { - GArray *ret = g_array_new(FALSE, FALSE, sizeof(gint)); - g_array_append_vals(ret, data, len); - if (free_data) - g_free((gpointer)data); - return ret; + GArray *ret = g_array_new(FALSE, FALSE, sizeof(gint)); + g_array_append_vals(ret, data, len); + if (free_data) + g_free((gpointer)data); + return ret; } static void @@ -113,8 +108,7 @@ gwy_math_trimmed_mean_pygwy(GwyDoubleArray *array, guint nlowest, guint nhighest) { - gdouble retval = gwy_math_trimmed_mean(array->len, (gdouble*)array->data, - nlowest, nhighest); + gdouble retval = gwy_math_trimmed_mean(array->len, (gdouble*)array->data, nlowest, nhighest); g_array_free(array, TRUE); return retval; } @@ -126,10 +120,8 @@ gdouble *xc, gdouble *yc, gdouble *zc) { gboolean ok = (coeffs->len == 6); - if (ok) { - *dimen = gwy_math_curvature((gdouble*)coeffs->data, - kappa1, kappa2, phi1, phi2, xc, yc, zc); - } + if (ok) + *dimen = gwy_math_curvature((gdouble*)coeffs->data, kappa1, kappa2, phi1, phi2, xc, yc, zc); g_array_free(coeffs, TRUE); return ok; } @@ -172,10 +164,8 @@ gboolean *is_inside) { gboolean ok = !(poly->len % 2); - if (ok) { - *is_inside = gwy_math_is_in_polygon(x, y, - (gdouble*)poly->data, poly->len/2); - } + if (ok) + *is_inside = gwy_math_is_in_polygon(x, y, (gdouble*)poly->data, poly->len/2); g_array_free(poly, TRUE); return ok; } @@ -187,8 +177,7 @@ { gboolean ok = !(coords->len % 4) && (!metric || metric->len == 4); if (ok) { - *idx = gwy_math_find_nearest_line(x, y, d2min, coords->len/2, - (gdouble*)coords->data, + *idx = gwy_math_find_nearest_line(x, y, d2min, coords->len/2, (gdouble*)coords->data, metric ? (gdouble*)metric->data : NULL); } g_array_free(coords, TRUE); @@ -204,8 +193,7 @@ { gboolean ok = !(coords->len % 2) && (!metric || metric->len == 4); if (ok) { - *idx = gwy_math_find_nearest_point(x, y, d2min, coords->len/2, - (gdouble*)coords->data, + *idx = gwy_math_find_nearest_point(x, y, d2min, coords->len/2, (gdouble*)coords->data, metric ? (gdouble*)metric->data : NULL); } g_array_free(coords, TRUE); @@ -222,8 +210,7 @@ gboolean ok = (ydata->len == xdata->len); if (ok) { g_array_set_size(coeffs, n+1); - gwy_math_fit_polynom(xdata->len, - (gdouble*)xdata->data, (gdouble*)ydata->data, + gwy_math_fit_polynom(xdata->len, (gdouble*)xdata->data, (gdouble*)ydata->data, n, (gdouble*)coeffs->data); } else @@ -260,9 +247,7 @@ { g_return_val_if_fail(data->len == height*rowstride, data); g_return_val_if_fail(width <= rowstride, data); - gwy_interpolation_resolve_coeffs_2d(width, height, rowstride, - (gdouble*)data->data, - interpolation); + gwy_interpolation_resolve_coeffs_2d(width, height, rowstride, (gdouble*)data->data, interpolation); /* This is the same as freeing data and returning a new array. */ return data; } @@ -275,10 +260,8 @@ { guint suplen = gwy_interpolation_get_support_size(interpolation); gboolean ok = (data->len == suplen || suplen == 0); - if (ok) { - *result = gwy_interpolation_get_dval_of_equidists(x, (gdouble*)data->data, - interpolation); - } + if (ok) + *result = gwy_interpolation_get_dval_of_equidists(x, (gdouble*)data->data, interpolation); g_array_free(data, TRUE); return ok; } @@ -291,10 +274,8 @@ { guint suplen = gwy_interpolation_get_support_size(interpolation); gboolean ok = (coeff->len == suplen || suplen == 0); - if (ok) { - *result = gwy_interpolation_interpolate_1d(x, (gdouble*)coeff->data, - interpolation); - } + if (ok) + *result = gwy_interpolation_interpolate_1d(x, (gdouble*)coeff->data, interpolation); g_array_free(coeff, TRUE); return ok; } @@ -308,11 +289,8 @@ { guint suplen = gwy_interpolation_get_support_size(interpolation); gboolean ok = (coeff->len == suplen*rowstride || suplen == 0); - if (ok) { - *result = gwy_interpolation_interpolate_2d(x, y, rowstride, - (gdouble*)coeff->data, - interpolation); - } + if (ok) + *result = gwy_interpolation_interpolate_2d(x, y, rowstride, (gdouble*)coeff->data, interpolation); g_array_free(coeff, TRUE); return ok; } @@ -343,10 +321,8 @@ GwyDoubleArray *ret = g_array_new(FALSE, TRUE, sizeof(gdouble)); g_array_set_size(ret, newrowstride*newheight); g_return_val_if_fail(data->len == height*rowstride, ret); - gwy_interpolation_resample_block_2d(width, height, rowstride, - (gdouble*)data->data, - newwidth, newheight, newrowstride, - (gdouble*)ret->data, + gwy_interpolation_resample_block_2d(width, height, rowstride, (gdouble*)data->data, + newwidth, newheight, newrowstride, (gdouble*)ret->data, interpolation, FALSE); return ret; } @@ -361,8 +337,7 @@ GwyDoubleArray *ret = g_array_new(FALSE, FALSE, sizeof(gdouble)); gwy_interpolation_shift_block_1d(data->len, (gdouble*)data->data, offset, (gdouble*)ret->data, - interpolation, exterior, fill_value, - FALSE); + interpolation, exterior, fill_value, FALSE); return ret; } @@ -427,8 +402,7 @@ * * Extract the data of a data line. * - * The returned list contains a copy of the data. Changing its contents does - * not change the data line's data. + * The returned list contains a copy of the data. Changing its contents does not change the data line's data. * * Returns: List containing extracted data line data. **/ @@ -443,8 +417,7 @@ * * Extract the data of a data field. * - * The returned list contains a copy of the data. Changing its contents does - * not change the data field's data. + * The returned list contains a copy of the data. Changing its contents does not change the data field's data. * * Returns: List containing extracted data field data. **/ @@ -459,16 +432,53 @@ * * Extract the data of a data brick. * - * The returned list contains a copy of the data. Changing its contents does - * not change the data brick's data. + * The returned list contains a copy of the data. Changing its contents does not change the data brick's data. * * Returns: List containing extracted data brick data. **/ GwyDoubleArray* gwy_brick_get_data_pygwy(GwyBrick *brick) { - return create_double_array(brick->data, - brick->xres*brick->yres*brick->zres, FALSE); + return create_double_array(brick->data, brick->xres*brick->yres*brick->zres, FALSE); +} + +/** + * gwy_lawn_get_curve_data_pygwy: + * @col: Position in the lawn (column index). + * @row: Position in the lawn (row index). + * @n: Index of a curve in @lawn. + * + * Extract the data of one curve at given position in a curve map. + * + * The returned list contains a copy of the data. Changing its contents does not change the lawn's data. + * + * Returns: List containing extracted curve data. + **/ +GwyDoubleArray* +gwy_lawn_get_curve_data_pygwy(GwyLawn *lawn, gint col, gint row, gint n) +{ + gint len = 0; + const gdouble *data = gwy_lawn_get_curve_data_const(lawn, col, row, n, &len); + return create_double_array(data, len, FALSE); +} + +/** + * gwy_lawn_get_curves_data_pygwy: + * @col: Position in the lawn (column index). + * @row: Position in the lawn (row index). + * + * Extract the data of all curves at given position in a curve map. + * + * The returned list contains a copy of the data. Changing its contents does not change the lawn's data. + * + * Returns: Flat list containing extracted data of all curves. + **/ +GwyDoubleArray* +gwy_lawn_get_curves_data_pygwy(GwyLawn *lawn, gint col, gint row) +{ + gint len = 0; + const gdouble *data = gwy_lawn_get_curves_data_const(lawn, col, row, &len); + return create_double_array(data, len, FALSE); } /** @@ -477,8 +487,7 @@ * * Sets the entire contents of a data line. * - * The length of @data must be equal to the number of elements of the data - * line. + * The length of @data must be equal to the number of elements of the data line. **/ GwyArrayFuncStatus gwy_data_line_set_data_pygwy(GwyDataLine *data_line, @@ -500,8 +509,7 @@ * * Sets the entire contents of a data field. * - * The length of @data must be equal to the number of elements of the data - * field. + * The length of @data must be equal to the number of elements of the data field. **/ GwyArrayFuncStatus gwy_data_field_set_data_pygwy(GwyDataField *data_field, @@ -523,8 +531,7 @@ * * Sets the entire contents of a data brick. * - * The length of @data must be equal to the number of elements of the data - * brick. + * The length of @data must be equal to the number of elements of the data brick. **/ GwyArrayFuncStatus gwy_brick_set_data_pygwy(GwyBrick *brick, @@ -541,6 +548,34 @@ } /** + * gwy_lawn_set_curve_data_pygwy: + * @col: Position in the lawn (column index). + * @row: Position in the lawn (row index). + * @n: Index of a curve in @lawn. + * @data: Sequence of floating point values. + * + * Sets the data of one curve in a curve map. + * + * The number of points remains the same since all curves at give pixel must have the same number of points. If you + * want to change the number of points set the data of all curves together using gwy_lawn_set_curves(). + **/ +GwyArrayFuncStatus +gwy_lawn_set_curve_data_pygwy(GwyLawn *lawn, + gint col, + gint row, + gint n, + GwyDoubleArray *data) +{ + gboolean ok; + gint len = 0; + gwy_lawn_get_curve_data_const(lawn, col, row, n, &len); + if ((ok = (data->len == len))) + gwy_lawn_set_curve_data(lawn, col, row, n, (gdouble*)data->data); + g_array_free(data, TRUE); + return ok; +} + +/** * gwy_data_field_fit_polynom_pygwy: * @data_field: A data field. * @col_degree: Degree of polynomial to fit column-wise (x-coordinate). @@ -556,8 +591,7 @@ { GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(coeffs, (col_degree+1)*(row_degree+1)); - gwy_data_field_fit_polynom(data_field, col_degree, row_degree, - (gdouble*)coeffs->data); + gwy_data_field_fit_polynom(data_field, col_degree, row_degree, (gdouble*)coeffs->data); return coeffs; } @@ -573,11 +607,11 @@ * * Fits a two-dimensional polynomial to a rectangular part of a data field. * - * The coefficients are stored by row into @coeffs, like data in a datafield. - * Row index is y-degree, column index is x-degree. + * The coefficients are stored by row into @coeffs, like data in a datafield. Row index is y-degree, column index is + * x-degree. * - * Note naive x^n y^m polynomial fitting is numerically unstable, therefore - * this method works only up to @col_degree = @row_degree = 6. + * Note naive x^n y^m polynomial fitting is numerically unstable, therefore this method works only up to @col_degree + * = @row_degree = 6. * * Returns: a newly allocated array with coefficients. * @@ -590,8 +624,7 @@ { GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(coeffs, (col_degree+1)*(row_degree+1)); - gwy_data_field_area_fit_polynom(data_field, col, row, width, height, - col_degree, row_degree, + gwy_data_field_area_fit_polynom(data_field, col, row, width, height, col_degree, row_degree, (gdouble*)coeffs->data); return coeffs; } @@ -603,10 +636,8 @@ GwyDoubleArray *coeffs) { gboolean ok = (coeffs->len == (col_degree+1)*(row_degree+1)); - if (ok) { - gwy_data_field_subtract_polynom(data_field, col_degree, row_degree, - (gdouble*)coeffs->data); - } + if (ok) + gwy_data_field_subtract_polynom(data_field, col_degree, row_degree, (gdouble*)coeffs->data); g_array_free(coeffs, TRUE); return ok; } @@ -621,10 +652,8 @@ { gboolean ok = (coeffs->len == (col_degree+1)*(row_degree+1)); if (ok) { - gwy_data_field_area_subtract_polynom(data_field, - col, row, width, height, - col_degree, row_degree, - (gdouble*)coeffs->data); + gwy_data_field_area_subtract_polynom(data_field, col, row, width, height, + col_degree, row_degree, (gdouble*)coeffs->data); } g_array_free(coeffs, TRUE); return ok; @@ -637,8 +666,7 @@ { GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(coeffs, (col_degree+1)*(row_degree+1)); - gwy_data_field_fit_legendre(data_field, col_degree, row_degree, - (gdouble*)coeffs->data); + gwy_data_field_fit_legendre(data_field, col_degree, row_degree, (gdouble*)coeffs->data); return coeffs; } @@ -651,8 +679,7 @@ { GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(coeffs, (col_degree+1)*(row_degree+1)); - gwy_data_field_area_fit_legendre(data_field, col, row, width, height, - col_degree, row_degree, + gwy_data_field_area_fit_legendre(data_field, col, row, width, height, col_degree, row_degree, (gdouble*)coeffs->data); return coeffs; } @@ -664,10 +691,8 @@ GwyDoubleArray *coeffs) { gboolean ok = (coeffs->len == (col_degree+1)*(row_degree+1)); - if (ok) { - gwy_data_field_subtract_legendre(data_field, col_degree, row_degree, - (gdouble*)coeffs->data); - } + if (ok) + gwy_data_field_subtract_legendre(data_field, col_degree, row_degree, (gdouble*)coeffs->data); g_array_free(coeffs, TRUE); return ok; } @@ -682,9 +707,7 @@ { gboolean ok = (coeffs->len == (col_degree+1)*(row_degree+1)); if (ok) { - gwy_data_field_area_subtract_legendre(data_field, - col, row, width, height, - col_degree, row_degree, + gwy_data_field_area_subtract_legendre(data_field, col, row, width, height, col_degree, row_degree, (gdouble*)coeffs->data); } g_array_free(coeffs, TRUE); @@ -720,10 +743,8 @@ GwyDoubleArray *coeffs) { gboolean ok = (coeffs->len == (max_degree+1)*(max_degree+2)/2); - if (ok) { - gwy_data_field_subtract_poly_max(data_field, max_degree, - (gdouble*)coeffs->data); - } + if (ok) + gwy_data_field_subtract_poly_max(data_field, max_degree, (gdouble*)coeffs->data); g_array_free(coeffs, TRUE); return ok; } @@ -736,12 +757,8 @@ GwyDoubleArray *coeffs) { gboolean ok = (coeffs->len == (max_degree+1)*(max_degree+2)/2); - if (ok) { - gwy_data_field_area_subtract_poly_max(data_field, - col, row, width, height, - max_degree, - (gdouble*)coeffs->data); - } + if (ok) + gwy_data_field_area_subtract_poly_max(data_field, col, row, width, height, max_degree, (gdouble*)coeffs->data); g_array_free(coeffs, TRUE); return ok; } @@ -758,8 +775,7 @@ guint nterms = term_powers->len/2; g_array_set_size(coeffs, nterms); gwy_data_field_fit_poly(data_field, mask_field, - nterms, (gint*)term_powers->data, exclude, - (gdouble*)coeffs->data); + nterms, (gint*)term_powers->data, exclude, (gdouble*)coeffs->data); } else g_array_free(coeffs, TRUE); @@ -780,10 +796,8 @@ if (ok) { guint nterms = term_powers->len/2; g_array_set_size(coeffs, nterms); - gwy_data_field_area_fit_poly(data_field, mask_field, - col, row, width, height, - nterms, (gint*)term_powers->data, exclude, - (gdouble*)coeffs->data); + gwy_data_field_area_fit_poly(data_field, mask_field, col, row, width, height, + nterms, (gint*)term_powers->data, exclude, (gdouble*)coeffs->data); } else g_array_free(coeffs, TRUE); @@ -798,11 +812,8 @@ { guint nterms = coeffs->len; gboolean ok = (term_powers->len == 2*nterms); - if (ok) { - gwy_data_field_subtract_poly(data_field, - nterms, (gint*)term_powers->data, - (gdouble*)coeffs->data); - } + if (ok) + gwy_data_field_subtract_poly(data_field, nterms, (gint*)term_powers->data, (gdouble*)coeffs->data); g_array_free(term_powers, TRUE); g_array_free(coeffs, TRUE); return ok; @@ -819,8 +830,7 @@ gboolean ok = (term_powers->len == 2*nterms); if (ok) { gwy_data_field_area_subtract_poly(data_field, col, row, width, height, - nterms, (gint*)term_powers->data, - (gdouble*)coeffs->data); + nterms, (gint*)term_powers->data, (gdouble*)coeffs->data); } g_array_free(term_powers, TRUE); g_array_free(coeffs, TRUE); @@ -836,12 +846,8 @@ { guint nresults = types->len; GwyPlaneFitQuantity *qtypes = &g_array_index(types, GwyPlaneFitQuantity, 0); - GwyDataField **results = gwy_data_field_area_fit_local_planes(data_field, - size, - col, row, - width, height, - nresults, - qtypes, NULL); + GwyDataField **results = gwy_data_field_area_fit_local_planes(data_field, size, col, row, width, height, + nresults, qtypes, NULL); return create_data_field_array(results, nresults, TRUE); } @@ -852,10 +858,7 @@ { guint nresults = types->len; GwyPlaneFitQuantity *qtypes = &g_array_index(types, GwyPlaneFitQuantity, 0); - GwyDataField **results = gwy_data_field_fit_local_planes(data_field, - size, - nresults, - qtypes, NULL); + GwyDataField **results = gwy_data_field_fit_local_planes(data_field, size, nresults, qtypes, NULL); return create_data_field_array(results, nresults, TRUE); } @@ -880,10 +883,8 @@ gint width, gint height) { GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); - g_array_set_size(array, gwy_data_field_get_elliptic_area_size(width, - height)); - gwy_data_field_elliptic_area_extract(data_field, col, row, width, height, - (gdouble*)array->data); + g_array_set_size(array, gwy_data_field_get_elliptic_area_size(width, height)); + gwy_data_field_elliptic_area_extract(data_field, col, row, width, height, (gdouble*)array->data); return array; } @@ -894,12 +895,9 @@ GwyDoubleArray *data) { GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); - gboolean ok = (data->len == gwy_data_field_get_elliptic_area_size(width, - height)); + gboolean ok = (data->len == gwy_data_field_get_elliptic_area_size(width, height)); if (ok) { - gwy_data_field_elliptic_area_unextract(data_field, - col, row, width, height, - (gdouble*)array->data); + gwy_data_field_elliptic_area_unextract(data_field, col, row, width, height, (gdouble*)array->data); } g_array_free(data, TRUE); return ok; @@ -910,8 +908,7 @@ * @data_field: A data field. * @col: Row index of circular area centre. * @row: Column index of circular area centre. - * @radius: Circular area radius (in pixels). See - * gwy_data_field_circular_area_extract_with_pos() for caveats. + * @radius: Circular area radius (in pixels). See gwy_data_field_circular_area_extract_with_pos() for caveats. * * Extracts values from a circular region of a data field. * @@ -924,8 +921,7 @@ { GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(array, gwy_data_field_get_circular_area_size(radius)); - gwy_data_field_circular_area_extract(data_field, col, row, radius, - (gdouble*)array->data); + gwy_data_field_circular_area_extract(data_field, col, row, radius, (gdouble*)array->data); return array; } @@ -937,10 +933,8 @@ { GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); gboolean ok = (data->len == gwy_data_field_get_circular_area_size(radius)); - if (ok) { - gwy_data_field_circular_area_unextract(data_field, col, row, radius, - (gdouble*)array->data); - } + if (ok) + gwy_data_field_circular_area_unextract(data_field, col, row, radius, (gdouble*)array->data); g_array_free(data, TRUE); return ok; } @@ -958,9 +952,7 @@ g_array_set_size(xpos, size); g_array_set_size(ypos, size); gwy_data_field_circular_area_extract_with_pos(data_field, col, row, radius, - (gdouble*)array->data, - (gint*)xpos->data, - (gint*)ypos->data); + (gdouble*)array->data, (gint*)xpos->data, (gint*)ypos->data); return array; } @@ -984,10 +976,8 @@ gdouble fill_value) { gboolean ok = (affine->len == 6); - if (ok) { - gwy_data_field_affine(data_field, dest, (gdouble*)affine->data, - interp, exterior, fill_value); - } + if (ok) + gwy_data_field_affine(data_field, dest, (gdouble*)affine->data, interp, exterior, fill_value); g_array_free(affine, TRUE); return ok; } @@ -1035,8 +1025,7 @@ *succeeded = FALSE; if (ok) { gwy_assign((gdouble*)a1a2_out->data, (gdouble*)a1a2->data, 4); - *succeeded = gwy_data_field_measure_lattice_acf(acf2d, - (gdouble*)a1a2_out->data); + *succeeded = gwy_data_field_measure_lattice_acf(acf2d, (gdouble*)a1a2_out->data); } if (!*succeeded || !ok) gwy_clear((gdouble*)a1a2_out->data, 4); @@ -1056,8 +1045,7 @@ *succeeded = FALSE; if (ok) { gwy_assign((gdouble*)a1a2_out->data, (gdouble*)a1a2->data, 4); - *succeeded = gwy_data_field_measure_lattice_psdf(psdf2d, - (gdouble*)a1a2_out->data); + *succeeded = gwy_data_field_measure_lattice_psdf(psdf2d, (gdouble*)a1a2_out->data); } if (!*succeeded || !ok) gwy_clear((gdouble*)a1a2_out->data, 4); @@ -1090,11 +1078,8 @@ g_array_set_size(ydata, ndata); g_array_set_size(zdata, ndata); ndata = gwy_data_field_get_local_maxima_list(dfield, - (gdouble*)xdata->data, - (gdouble*)ydata->data, - (gdouble*)zdata->data, - ndata, skip, threshold, - subpixel); + (gdouble*)xdata->data, (gdouble*)ydata->data, (gdouble*)zdata->data, + ndata, skip, threshold, subpixel); g_array_set_size(xdata, ndata); g_array_set_size(ydata, ndata); g_array_set_size(zdata, ndata); @@ -1123,8 +1108,7 @@ gint ndata; GwyXY *xy; - xy = gwy_data_field_get_profile_mask(dfield, &ndata, mask, masking, - xfrom, yfrom, xto, yto, + xy = gwy_data_field_get_profile_mask(dfield, &ndata, mask, masking, xfrom, yfrom, xto, yto, res, thickness, interpolation); xyarray = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(xyarray, 2*ndata); @@ -1141,8 +1125,7 @@ { GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(coeffs, n+1); - gwy_data_line_part_fit_polynom(data_line, n, (gdouble*)coeffs->data, - from, to); + gwy_data_line_part_fit_polynom(data_line, n, (gdouble*)coeffs->data, from, to); return coeffs; } @@ -1162,9 +1145,7 @@ gint from, gint to) { - gwy_data_line_part_subtract_polynom(data_line, - coeffs->len, (gdouble*)coeffs->data, - from, to); + gwy_data_line_part_subtract_polynom(data_line, coeffs->len, (gdouble*)coeffs->data, from, to); g_array_free(coeffs, TRUE); } @@ -1172,8 +1153,7 @@ gwy_data_line_subtract_polynom_pygwy(GwyDataLine *data_line, GwyDoubleArray *coeffs) { - gwy_data_line_subtract_polynom(data_line, - coeffs->len, (gdouble*)coeffs->data); + gwy_data_line_subtract_polynom(data_line, coeffs->len, (gdouble*)coeffs->data); g_array_free(coeffs, TRUE); } @@ -1181,32 +1161,23 @@ * gwy_data_line_get_kth_peaks_pygwy: * @data_line: A data line. * @m: Number of sampling lengths the line is split into. - * @rank: Rank of the peak to find. One means the highest peak, three the - * third highers, etc. - * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap - * the meanings of peaks and valleys in the description. Valley - * depths are positive. - * @average: Calculate the average of the first @rank peaks instead of the - * height of @rank-th peak. + * @rank: Rank of the peak to find. One means the highest peak, three the third highers, etc. + * @peaks: %TRUE for peaks, %FALSE for valleys. If you pass %FALSE, swap the meanings of peaks and valleys in the + * description. Valley depths are positive. + * @average: Calculate the average of the first @rank peaks instead of the height of @rank-th peak. * @pthreshold: Peak height threshold. Peaks must stick above this threshold. - * @vthreshold: Valley depth threshold. Valleys must fall below this - * threshold. The depth is a positive value. + * @vthreshold: Valley depth threshold. Valleys must fall below this threshold. The depth is a positive value. + * + * Calculate k-th largers peaks or valleys in a data line split into given number of sampling lengths. + * + * This is a general function that can be used as the base for various standard roughness quantities such as Rp, Rpm, + * Rv, Rvm or R3z. It is assumed the line is already levelled, the form removed, etc. * - * Calculate k-th largers peaks or valleys in a data line split into given - * number of sampling lengths. + * See gwy_data_line_count_peaks() for the description what is considered a peak. * - * This is a general function that can be used as the base for various standard - * roughness quantities such as Rp, Rpm, Rv, Rvm or R3z. It is assumed - * the line is already levelled, the form removed, etc. - * - * See gwy_data_line_count_peaks() for the description what is considered - * a peak. - * - * For larger thresholds and/or short lines some sampling lengths may not - * contain the requested number of peaks. If there are any peaks at all, the - * smallest peak height (even though it is not @rank-th) is used. If there - * are no peaks, a large negative value is stored in the corresponding - * @peakvalues item. + * For larger thresholds and/or short lines some sampling lengths may not contain the requested number of peaks. If + * there are any peaks at all, the smallest peak height (even though it is not @rank-th) is used. If there are no + * peaks, a large negative value is stored in the corresponding @peakvalues item. * * Returns: List with @m items containing the peak heights. **/ @@ -1219,8 +1190,7 @@ GwyDoubleArray *peakvalues = g_array_new(FALSE, FALSE, sizeof(gdouble)); if (m > 0) { g_array_set_size(peakvalues, m); - gwy_data_line_get_kth_peaks(data_line, m, rank, - peaks, average, pthreshold, vthreshold, + gwy_data_line_get_kth_peaks(data_line, m, rank, peaks, average, pthreshold, vthreshold, &g_array_index(peakvalues, gdouble, 0)); } else { @@ -1249,9 +1219,8 @@ * * Convert numerical representation of key to string. * - * The argument may only be identifier actually corresponding to string key, - * for instance obtained with gwy_key_from_name(). Do not pass random integers - * to this function. + * The argument may only be identifier actually corresponding to string key, for instance obtained with + * gwy_key_from_name(). Do not pass random integers to this function. * * Returns: Corresponding string key. **/ @@ -1265,17 +1234,14 @@ gwy_container_keys_pygwy(GwyContainer *container) { g_assert(sizeof(GQuark) == sizeof(gint)); - return create_int_array((gint*)gwy_container_keys(container), - gwy_container_get_n_items(container), TRUE); + return create_int_array((gint*)gwy_container_keys(container), gwy_container_get_n_items(container), TRUE); } GwyConstStringArray* gwy_container_keys_by_name_pygwy(GwyContainer *container) { const gchar **keys = gwy_container_keys_by_name(container); - return create_const_string_array((const gchar*const*)keys, - gwy_container_get_n_items(container), - TRUE); + return create_const_string_array((const gchar*const*)keys, gwy_container_get_n_items(container), TRUE); } GwyContainer* @@ -1283,9 +1249,7 @@ GwyStringArray *keys) { GwyContainer *ret; - ret = gwy_container_duplicate_by_prefixv(container, - keys->len, - (const gchar**)keys->data); + ret = gwy_container_duplicate_by_prefixv(container, keys->len, (const gchar**)keys->data); free_string_array(keys); return ret; } @@ -1294,8 +1258,7 @@ gwy_container_serialize_to_text_pygwy(GwyContainer *container) { GPtrArray *strs = gwy_container_serialize_to_text(container); - GwyStringArray *array = create_string_array((const gchar**)strs->pdata, - strs->len, FALSE); + GwyStringArray *array = create_string_array((const gchar**)strs->pdata, strs->len, FALSE); g_ptr_array_free(strs, TRUE); return array; } @@ -1313,8 +1276,7 @@ * gwy_app_data_browser_get_data_ids_pygwy: * @container: A data container. * - * Gets the list of all channels in a data container (presumably representing - * a file). + * Gets the list of all channels in a data container (presumably representing a file). * * Returns: List of channel ids. **/ @@ -1328,8 +1290,7 @@ * gwy_app_data_browser_get_graph_ids_pygwy: * @container: A data container. * - * Gets the list of all graphs in a data container (presumably representing - * a file). + * Gets the list of all graphs in a data container (presumably representing a file). * * Returns: List of graph ids. **/ @@ -1343,8 +1304,7 @@ * gwy_app_data_browser_get_spectra_ids_pygwy: * @container: A data container. * - * Gets the list of all spectra in a data container (presumably representing - * a file). + * Gets the list of all spectra in a data container (presumably representing a file). * * Returns: List of spectra ids. **/ @@ -1358,8 +1318,7 @@ * gwy_app_data_browser_get_volume_ids_pygwy: * @container: A data container. * - * Gets the list of all volume data in a data container (presumably - * representing a file). + * Gets the list of all volume data in a data container (presumably representing a file). * * Returns: List of volume data ids. **/ @@ -1373,8 +1332,7 @@ * gwy_app_data_browser_get_xyz_ids_pygwy: * @container: A data container. * - * Gets the list of all XYZ data in a data container (presumably representing - * a file). + * Gets the list of all XYZ data in a data container (presumably representing a file). * * Returns: List of XYZ data ids. **/ @@ -1384,44 +1342,60 @@ return create_id_array(gwy_app_data_browser_get_xyz_ids(container)); } +/** + * gwy_app_data_browser_get_curve_map_ids_pygwy: + * @container: A data container. + * + * Gets the list of all curve map data in a data container (presumably representing a file). + * + * Returns: List of curve map data ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_curve_map_ids_pygwy(GwyContainer *container) +{ + return create_id_array(gwy_app_data_browser_get_curve_map_ids(container)); +} + GwyIntArray* gwy_app_data_browser_find_data_by_title_pygwy(GwyContainer *data, const gchar *titleglob) { - return create_id_array(gwy_app_data_browser_find_data_by_title(data, - titleglob)); + return create_id_array(gwy_app_data_browser_find_data_by_title(data, titleglob)); } GwyIntArray* gwy_app_data_browser_find_graphs_by_title_pygwy(GwyContainer *data, const gchar *titleglob) { - return create_id_array(gwy_app_data_browser_find_graphs_by_title(data, - titleglob)); + return create_id_array(gwy_app_data_browser_find_graphs_by_title(data, titleglob)); } GwyIntArray* gwy_app_data_browser_find_spectra_by_title_pygwy(GwyContainer *data, const gchar *titleglob) { - return create_id_array(gwy_app_data_browser_find_spectra_by_title(data, - titleglob)); + return create_id_array(gwy_app_data_browser_find_spectra_by_title(data, titleglob)); } GwyIntArray* gwy_app_data_browser_find_volume_by_title_pygwy(GwyContainer *data, const gchar *titleglob) { - return create_id_array(gwy_app_data_browser_find_volume_by_title(data, - titleglob)); + return create_id_array(gwy_app_data_browser_find_volume_by_title(data, titleglob)); } GwyIntArray* gwy_app_data_browser_find_xyz_by_title_pygwy(GwyContainer *data, const gchar *titleglob) { - return create_id_array(gwy_app_data_browser_find_xyz_by_title(data, - titleglob)); + return create_id_array(gwy_app_data_browser_find_xyz_by_title(data, titleglob)); +} + +GwyIntArray* +gwy_app_data_browser_find_curve_map_by_title_pygwy(GwyContainer *data, + const gchar *titleglob) +{ + return create_id_array(gwy_app_data_browser_find_curve_map_by_title(data, titleglob)); } /** @@ -1430,8 +1404,7 @@ * * Constructs an array with grain numbers from a mask data field. * - * Returns: A list of integers, containing 0 outside grains and the grain - * number inside a grain. + * Returns: A list of integers, containing 0 outside grains and the grain number inside a grain. **/ GwyIntArray* gwy_data_field_number_grains_pygwy(GwyDataField *mask_field) @@ -1448,11 +1421,9 @@ * gwy_data_field_number_grains_periodic_pygwy: * @mask_field: A data field representing a mask. * - * Constructs an array with grain numbers from a mask data field treated as - * periodic. + * Constructs an array with grain numbers from a mask data field treated as periodic. * - * Returns: A list of integers, containing 0 outside grains and the grain - * number inside a grain. + * Returns: A list of integers, containing 0 outside grains and the grain number inside a grain. **/ GwyIntArray* gwy_data_field_number_grains_periodic_pygwy(GwyDataField *mask_field) @@ -1486,13 +1457,11 @@ * * Finds bounding boxes of all grains in a mask data field. * - * The array @grains must have the same number of elements as @mask_field. - * Normally it is obtained from a function such as - * gwy_data_field_number_grains(). - * - * Returns: An array of quadruples of integers, each representing the bounding - * box of the corresponding grain (the zeroth quadrupe does not - * correspond to any as grain numbers start from 1). + * The array @grains must have the same number of elements as @mask_field. Normally it is obtained from a function + * such as gwy_data_field_number_grains(). + * + * Returns: An array of quadruples of integers, each representing the bounding box of the corresponding grain (the + * zeroth quadrupe does not correspond to any as grain numbers start from 1). **/ GwyArrayFuncStatus gwy_data_field_get_grain_bounding_boxes_pygwy(GwyDataField *data_field, @@ -1505,9 +1474,7 @@ if (ok) { guint ngrains = find_ngrains(grains); g_array_set_size(bboxes, 4*(ngrains+1)); - gwy_data_field_get_grain_bounding_boxes(data_field, ngrains, - (gint*)grains->data, - (gint*)bboxes->data); + gwy_data_field_get_grain_bounding_boxes(data_field, ngrains, (gint*)grains->data, (gint*)bboxes->data); } else g_array_free(bboxes, TRUE); @@ -1520,16 +1487,13 @@ * @data_field: A data field representing a mask. * @grains: Array of grain numbers. * - * Finds bounding boxes of all grains in a mask data field, assuming periodic - * boundary condition. + * Finds bounding boxes of all grains in a mask data field, assuming periodic boundary condition. + * + * The array @grains must have the same number of elements as @mask_field. Normally it is obtained from a function + * such as gwy_data_field_number_grains(). * - * The array @grains must have the same number of elements as @mask_field. - * Normally it is obtained from a function such as - * gwy_data_field_number_grains(). - * - * Returns: An array of quadruples of integers, each representing the bounding - * box of the corresponding grain (the zeroth quadruple does not - * correspond to any as grain numbers start from 1). + * Returns: An array of quadruples of integers, each representing the bounding box of the corresponding grain (the + * zeroth quadruple does not correspond to any as grain numbers start from 1). **/ GwyArrayFuncStatus gwy_data_field_get_grain_bounding_boxes_periodic_pygwy(GwyDataField *data_field, @@ -1542,9 +1506,7 @@ if (ok) { guint ngrains = find_ngrains(grains); g_array_set_size(bboxes, 4*(ngrains+1)); - gwy_data_field_get_grain_bounding_boxes_periodic(data_field, ngrains, - (gint*)grains->data, - (gint*)bboxes->data); + gwy_data_field_get_grain_bounding_boxes_periodic(data_field, ngrains, (gint*)grains->data, (gint*)bboxes->data); } else g_array_free(bboxes, TRUE); @@ -1559,13 +1521,11 @@ * * Finds maximum-area inscribed boxes of all grains in a mask data field. * - * The array @grains must have the same number of elements as @mask_field. - * Normally it is obtained from a function such as - * gwy_data_field_number_grains(). - * - * Returns: An array of quadruples of integers, each representing the inscribed - * box of the corresponding grain (the zeroth quadruple does not - * correspond to any as grain numbers start from 1). + * The array @grains must have the same number of elements as @mask_field. Normally it is obtained from a function + * such as gwy_data_field_number_grains(). + * + * Returns: An array of quadruples of integers, each representing the inscribed box of the corresponding grain (the + * zeroth quadruple does not correspond to any as grain numbers start from 1). **/ GwyArrayFuncStatus gwy_data_field_get_grain_inscribed_boxes_pygwy(GwyDataField *data_field, @@ -1578,9 +1538,7 @@ if (ok) { guint ngrains = find_ngrains(grains); g_array_set_size(iboxes, 4*(ngrains+1)); - gwy_data_field_get_grain_inscribed_boxes(data_field, ngrains, - (gint*)grains->data, - (gint*)iboxes->data); + gwy_data_field_get_grain_inscribed_boxes(data_field, ngrains, (gint*)grains->data, (gint*)iboxes->data); } else g_array_free(iboxes, TRUE); @@ -1599,8 +1557,7 @@ if (ok) { guint ngrains = find_ngrains(grains); g_array_set_size(sizes, ngrains+1); - gwy_data_field_get_grain_sizes(data_field, ngrains, - (gint*)grains->data, (gint*)sizes->data); + gwy_data_field_get_grain_sizes(data_field, ngrains, (gint*)grains->data, (gint*)sizes->data); } else g_array_free(sizes, TRUE); @@ -1616,13 +1573,11 @@ * * Finds a speficied quantity for all grains in a data field. * - * The array @grains must have the same number of elements as @data_field. - * Normally it is obtained from a function such as - * gwy_data_field_number_grains() for the corresponding mask. - * - * Returns: An array of floating point values, each representing the requested - * quantity for corresponding grain (the zeroth item does not - * correspond to any as grain numbers start from 1). + * The array @grains must have the same number of elements as @data_field. Normally it is obtained from a function + * such as gwy_data_field_number_grains() for the corresponding mask. + * + * Returns: An array of floating point values, each representing the requested quantity for corresponding grain (the + * zeroth item does not correspond to any as grain numbers start from 1). **/ GwyArrayFuncStatus gwy_data_field_grains_get_values_pygwy(GwyDataField *data_field, @@ -1636,9 +1591,7 @@ if (ok) { guint ngrains = find_ngrains(grains); g_array_set_size(values, ngrains+1); - gwy_data_field_grains_get_values(data_field, (gdouble*)values->data, - ngrains, (gint*)grains->data, - quantity); + gwy_data_field_grains_get_values(data_field, (gdouble*)values->data, ngrains, (gint*)grains->data, quantity); } else g_array_free(values, TRUE); @@ -1649,18 +1602,16 @@ /** * gwy_data_field_grains_get_distribution_pygwy: * @data_field: A data field representing a surface. - * @grain_field: A data field representing the mask. It must have the same - * dimensions as the data field. + * @grain_field: A data field representing the mask. It must have the same dimensions as the data field. * @grains: Array of grain numbers. * @quantity: The quantity to calculate, identified by GwyGrainQuantity. - * @nstats: The number of bins in the histogram. Pass a non-positive value to - * determine the number of bins automatically. + * @nstats: The number of bins in the histogram. Pass a non-positive value to determine the number of bins + * automatically. * * Calculates the distribution of a speficied grain quantity. * - * The array @grains must have the same number of elements as @data_field. - * Normally it is obtained from a function such as - * gwy_data_field_number_grains() for the corresponding mask. + * The array @grains must have the same number of elements as @data_field. Normally it is obtained from a function + * such as gwy_data_field_number_grains() for the corresponding mask. * * Returns: The distribution as a data line. **/ @@ -1681,9 +1632,7 @@ g_return_val_if_fail(grain_field->yres == yres, NULL); ngrains = find_ngrains(grains); dist = gwy_data_field_grains_get_distribution(data_field, grain_field, - NULL, ngrains, - (gint*)grains->data, - quantity, nstats); + NULL, ngrains, (gint*)grains->data, quantity, nstats); g_array_free(grains, TRUE); return dist; } @@ -1691,24 +1640,19 @@ GwyDataField* gwy_tip_dilation_pygwy(GwyDataField *tip, GwyDataField *surface) { - return gwy_tip_dilation(tip, surface, - gwy_data_field_new_alike(surface, FALSE), - NULL, NULL); + return gwy_tip_dilation(tip, surface, gwy_data_field_new_alike(surface, FALSE), NULL, NULL); } GwyDataField* gwy_tip_erosion_pygwy(GwyDataField *tip, GwyDataField *surface) { - return gwy_tip_erosion(tip, surface, - gwy_data_field_new_alike(surface, FALSE), - NULL, NULL); + return gwy_tip_erosion(tip, surface, gwy_data_field_new_alike(surface, FALSE), NULL, NULL); } GwyDataField* gwy_tip_cmap_pygwy(GwyDataField *tip, GwyDataField *surface) { - return gwy_tip_cmap(tip, surface, - gwy_data_field_new_alike(surface, FALSE), NULL, NULL); + return gwy_tip_cmap(tip, surface, gwy_data_field_new_alike(surface, FALSE), NULL, NULL); } GwyDataField* @@ -1749,10 +1693,8 @@ { guint n = points->len; gboolean ok = (n % 3 == 0); - if (ok) { - gwy_data_field_average_xyz(dfield, densitymap, - (GwyXYZ*)points->data, n); - } + if (ok) + gwy_data_field_average_xyz(dfield, densitymap, (GwyXYZ*)points->data, n); g_array_free(points, TRUE); return ok; } @@ -1770,16 +1712,14 @@ GwyDoubleArray* gwy_graph_curve_model_get_xdata_pygwy(GwyGraphCurveModel *gcmodel) { - return create_double_array(gwy_graph_curve_model_get_xdata(gcmodel), - gwy_graph_curve_model_get_ndata(gcmodel), + return create_double_array(gwy_graph_curve_model_get_xdata(gcmodel), gwy_graph_curve_model_get_ndata(gcmodel), FALSE); } GwyDoubleArray* gwy_graph_curve_model_get_ydata_pygwy(GwyGraphCurveModel *gcmodel) { - return create_double_array(gwy_graph_curve_model_get_ydata(gcmodel), - gwy_graph_curve_model_get_ndata(gcmodel), + return create_double_array(gwy_graph_curve_model_get_ydata(gcmodel), gwy_graph_curve_model_get_ndata(gcmodel), FALSE); } @@ -1789,12 +1729,8 @@ GwyDoubleArray *ydata) { gboolean ok = (ydata->len == xdata->len); - if (ok) { - gwy_graph_curve_model_set_data(gcmodel, - (gdouble*)xdata->data, - (gdouble*)ydata->data, - xdata->len); - } + if (ok) + gwy_graph_curve_model_set_data(gcmodel, (gdouble*)xdata->data, (gdouble*)ydata->data, xdata->len); g_array_free(xdata, TRUE); g_array_free(ydata, TRUE); return ok; @@ -1805,11 +1741,8 @@ GwyDoubleArray *xydata) { gboolean ok = !(xydata->len % 2); - if (ok) { - gwy_graph_curve_model_set_data_interleaved(gcmodel, - (gdouble*)xydata->data, - xydata->len/2); - } + if (ok) + gwy_graph_curve_model_set_data_interleaved(gcmodel, (gdouble*)xydata->data, xydata->len/2); g_array_free(xydata, TRUE); return ok; } @@ -1818,8 +1751,7 @@ gwy_graph_area_set_x_grid_data_pygwy(GwyGraphArea *area, GwyDoubleArray *grid_data) { - gwy_graph_area_set_x_grid_data(area, - grid_data->len, (gdouble*)grid_data->data); + gwy_graph_area_set_x_grid_data(area, grid_data->len, (gdouble*)grid_data->data); g_array_free(grid_data, TRUE); } @@ -1827,8 +1759,7 @@ gwy_graph_area_set_y_grid_data_pygwy(GwyGraphArea *area, GwyDoubleArray *grid_data) { - gwy_graph_area_set_y_grid_data(area, - grid_data->len, (gdouble*)grid_data->data); + gwy_graph_area_set_y_grid_data(area, grid_data->len, (gdouble*)grid_data->data); g_array_free(grid_data, TRUE); } @@ -1854,9 +1785,7 @@ { GwyDoubleArray *mapped = g_array_new(FALSE, FALSE, sizeof(gdouble)); g_array_set_size(mapped, z->len); - gwy_draw_data_field_map_adaptive(data_field, - (gdouble*)z->data, (gdouble*)mapped->data, - z->len); + gwy_draw_data_field_map_adaptive(data_field, (gdouble*)z->data, (gdouble*)mapped->data, z->len); g_array_free(z, TRUE); return mapped; } @@ -1883,9 +1812,8 @@ { gulong id = 0; g_assert(sizeof(GQuark) == sizeof(gint)); - if (keys->len) { + if (keys->len) id = gwy_undo_qcheckpointv(container, keys->len, (GQuark*)keys->data); - } g_array_free(keys, TRUE); return id; } @@ -1894,10 +1822,8 @@ gwy_undo_checkpoint_pygwy(GwyContainer *container, GwyStringArray *keys) { gulong id = 0; - if (keys->len) { - id = gwy_undo_checkpointv(container, keys->len, - (const gchar**)keys->data); - } + if (keys->len) + id = gwy_undo_checkpointv(container, keys->len, (const gchar**)keys->data); free_string_array(keys); return id; } @@ -1907,10 +1833,8 @@ { gulong id = 0; g_assert(sizeof(GQuark) == sizeof(gint)); - if (keys->len) { - id = gwy_app_undo_qcheckpointv(container, - keys->len, (GQuark*)keys->data); - } + if (keys->len) + id = gwy_app_undo_qcheckpointv(container, keys->len, (GQuark*)keys->data); g_array_free(keys, TRUE); return id; } @@ -1919,10 +1843,8 @@ gwy_app_undo_checkpoint_pygwy(GwyContainer *container, GwyStringArray *keys) { gulong id = 0; - if (keys->len) { - id = gwy_app_undo_checkpointv(container, - keys->len, (const gchar**)keys->data); - } + if (keys->len) + id = gwy_app_undo_checkpointv(container, keys->len, (const gchar**)keys->data); free_string_array(keys); return id; } @@ -2012,8 +1934,7 @@ return; } if (!type->rename) { - g_warning("Attempting to rename object in Inventory that " - "does not support renaming."); + g_warning("Attempting to rename object in Inventory that does not support renaming."); return; } gwy_inventory_rename_item(inventory, name, newname); @@ -2030,8 +1951,7 @@ return NULL; } if (!type->rename || !type->copy) { - g_warning("Attempting to rename object in Inventory that " - "does not support copying."); + g_warning("Attempting to rename object in Inventory that does not support copying."); return NULL; } return (GObject*)gwy_inventory_new_item(inventory, name, newname); @@ -2080,12 +2000,8 @@ guint *npeaks) { gboolean ok = (ydata->len == xdata->len); - if (ok) { - *npeaks = gwy_peaks_analyze(peaks, - (gdouble*)xdata->data, - (gdouble*)ydata->data, - xdata->len, maxpeaks); - } + if (ok) + *npeaks = gwy_peaks_analyze(peaks, (gdouble*)xdata->data, (gdouble*)ydata->data, xdata->len, maxpeaks); g_array_free(xdata, TRUE); g_array_free(ydata, TRUE); return ok; @@ -2132,10 +2048,8 @@ GwyDoubleArray *params) { gboolean ok = (params->len == gwy_tip_model_get_preset_nparams(preset)); - if (ok) { - gwy_tip_model_preset_create_for_zrange(preset, tip, zrange, square, - (const gdouble*)params->data); - } + if (ok) + gwy_tip_model_preset_create_for_zrange(preset, tip, zrange, square, (const gdouble*)params->data); return ok; } @@ -2151,9 +2065,7 @@ GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); guint n = gwy_spline_get_npoints(spline); g_array_set_size(array, 2*n); - gwy_assign((gdouble*)array->data, - (const gdouble*)gwy_spline_get_points(spline), - 2*n); + gwy_assign((gdouble*)array->data, (const gdouble*)gwy_spline_get_points(spline), 2*n); return array; } @@ -2163,9 +2075,7 @@ GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); guint n = gwy_spline_get_npoints(spline); g_array_set_size(array, 2*n); - gwy_assign((gdouble*)array->data, - (const gdouble*)gwy_spline_get_tangents(spline), - 2*n); + gwy_assign((gdouble*)array->data, (const gdouble*)gwy_spline_get_tangents(spline), 2*n); return array; } @@ -2188,16 +2098,13 @@ { g_array_set_size(xy, 2*n); g_array_set_size(t, 2*n); - return gwy_spline_sample_uniformly(spline, - (GwyXY*)xy->data, (GwyXY*)t->data, n); + return gwy_spline_sample_uniformly(spline, (GwyXY*)xy->data, (GwyXY*)t->data, n); } GwyDoubleArray* gwy_marker_box_get_markers_pygwy(GwyMarkerBox *mbox) { - return create_double_array(gwy_marker_box_get_markers(mbox), - gwy_marker_box_get_nmarkers(mbox), - FALSE); + return create_double_array(gwy_marker_box_get_markers(mbox), gwy_marker_box_get_nmarkers(mbox), FALSE); } GtkWidget* @@ -2266,8 +2173,7 @@ GwyIntArray *items) { g_assert(sizeof(GwyDataItem) == sizeof(gint)); - gwy_app_sync_data_itemsv(source, dest, from_id, to_id, delete_too, - (GwyDataItem*)items->data, items->len); + gwy_app_sync_data_itemsv(source, dest, from_id, to_id, delete_too, (GwyDataItem*)items->data, items->len); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/pygwy/wrap_calls.h gwyddion-2.63/modules/pygwy/wrap_calls.h --- gwyddion-2.62/modules/pygwy/wrap_calls.h 2019-02-15 13:14:55.000000000 +0000 +++ gwyddion-2.63/modules/pygwy/wrap_calls.h 2023-03-06 11:25:17.000000000 +0000 @@ -1,25 +1,20 @@ /* - * $Id: wrap_calls.h 21886 2019-02-15 13:14:48Z yeti-dn $ - * Copyright (C) 2008 Jan Horak, 2015-2018 David Necas (Yeti) + * $Id: wrap_calls.h 25260 2023-03-06 11:25:17Z yeti-dn $ + * Copyright (C) 2008 Jan Horak, 2015-2023 David Necas (Yeti) * E-mail: xhorak@gmail.com, yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Description: This file contains custom fuctions for automatically - * generated wrapping by using pygwy-codegen. + * Description: This file contains custom fuctions for automatically generated wrapping by using pygwy-codegen. */ #ifndef __PYGWY_WRAP_CALLS_H__ @@ -138,12 +133,24 @@ GwyDoubleArray* gwy_data_line_get_data_pygwy (GwyDataLine *data_line); GwyDoubleArray* gwy_data_field_get_data_pygwy (GwyDataField *data_field); GwyDoubleArray* gwy_brick_get_data_pygwy (GwyBrick *brick); +GwyDoubleArray* gwy_lawn_get_curve_data_pygwy (GwyLawn *lawn, + gint col, + gint row, + gint n); +GwyDoubleArray* gwy_lawn_get_curves_data_pygwy (GwyLawn *lawn, + gint col, + gint row); GwyArrayFuncStatus gwy_data_line_set_data_pygwy (GwyDataLine *data_line, GwyDoubleArray *data); GwyArrayFuncStatus gwy_data_field_set_data_pygwy (GwyDataField *data_field, GwyDoubleArray *data); GwyArrayFuncStatus gwy_brick_set_data_pygwy (GwyBrick *brick, GwyDoubleArray *data); +GwyArrayFuncStatus gwy_lawn_set_curve_data_pygwy (GwyLawn *lawn, + gint col, + gint row, + gint n, + GwyDoubleArray *data); GwyDoubleArray* gwy_data_field_fit_polynom_pygwy (GwyDataField *data_field, gint col_degree, gint row_degree); @@ -350,6 +357,7 @@ GwyIntArray* gwy_app_data_browser_get_spectra_ids_pygwy (GwyContainer *container); GwyIntArray* gwy_app_data_browser_get_volume_ids_pygwy (GwyContainer *container); GwyIntArray* gwy_app_data_browser_get_xyz_ids_pygwy (GwyContainer *container); +GwyIntArray* gwy_app_data_browser_get_curve_map_ids_pygwy (GwyContainer *container); GwyIntArray* gwy_app_data_browser_find_data_by_title_pygwy (GwyContainer *data, const gchar *titleglob); GwyIntArray* gwy_app_data_browser_find_graphs_by_title_pygwy (GwyContainer *data, @@ -360,6 +368,8 @@ const gchar *titleglob); GwyIntArray* gwy_app_data_browser_find_xyz_by_title_pygwy (GwyContainer *data, const gchar *titleglob); +GwyIntArray* gwy_app_data_browser_find_curve_map_by_title_pygwy (GwyContainer *data, + const gchar *titleglob); GwyIntArray* gwy_data_field_number_grains_pygwy (GwyDataField *mask_field); GwyIntArray* gwy_data_field_number_grains_periodic_pygwy (GwyDataField *mask_field); GwyArrayFuncStatus gwy_data_field_get_grain_sizes_pygwy (GwyDataField *data_field, @@ -502,4 +512,4 @@ #endif -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/tools/corrlen.c gwyddion-2.63/modules/tools/corrlen.c --- gwyddion-2.62/modules/tools/corrlen.c 2022-08-22 14:41:43.000000000 +0000 +++ gwyddion-2.63/modules/tools/corrlen.c 2022-12-16 13:24:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: corrlen.c 24913 2022-08-22 14:41:43Z yeti-dn $ + * $Id: corrlen.c 25178 2022-12-16 13:24:16Z yeti-dn $ * Copyright (C) 2020-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -38,6 +38,7 @@ PARAM_ORIENTATION, PARAM_INSTANT_UPDATE, PARAM_REPORT_STYLE, + PARAM_HOLD_SELECTION, WIDGET_RESULTS_CORRLEN, WIDGET_RESULTS_IMAGE, @@ -118,7 +119,7 @@ &module_register, N_("Correlation length tool."), "Yeti ", - "2.0", + "2.2", "David Nečas (Yeti)", "2020", }; @@ -158,6 +159,7 @@ gwy_param_def_add_instant_updates(paramdef, PARAM_INSTANT_UPDATE, "instant_update", NULL, TRUE); gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Statistical Quantities"), GWY_RESULTS_EXPORT_PARAMETERS, GWY_RESULTS_REPORT_COLON); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); return paramdef; } @@ -214,6 +216,7 @@ gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_rect, "rectangle"); memset(tool->isel_prev, 0xff, 4*sizeof(gint)); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_corr_len_init_dialog(tool); } @@ -253,6 +256,7 @@ gwy_param_table_append_combo(table, PARAM_LEVEL); gwy_param_table_append_combo(table, PARAM_ORIENTATION); gwy_param_table_append_checkbox(table, PARAM_INSTANT_UPDATE); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -268,6 +272,7 @@ NULL); gwy_param_table_append_separator(table); gwy_param_table_append_report(table, PARAM_REPORT_STYLE); + gwy_param_table_report_set_results(table, PARAM_REPORT_STYLE, tool->results); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -309,6 +314,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); update_units(tool); } update_labels(tool); diff -Nru gwyddion-2.62/modules/tools/cprofile.c gwyddion-2.63/modules/tools/cprofile.c --- gwyddion-2.62/modules/tools/cprofile.c 2022-08-29 14:48:11.000000000 +0000 +++ gwyddion-2.63/modules/tools/cprofile.c 2023-02-21 09:38:06.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: cprofile.c 24963 2022-08-29 14:48:10Z yeti-dn $ + * $Id: cprofile.c 25221 2023-02-21 09:38:06Z yeti-dn $ * Copyright (C) 2019-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -36,6 +36,7 @@ PARAM_MASKING, PARAM_THICKNESS, PARAM_ZERO_CROSS, + PARAM_HOLD_SELECTION, PARAM_OPTIONS_VISIBLE, PARAM_TARGET_GRAPH, }; @@ -112,7 +113,7 @@ &module_register, N_("Profile tool which reads horizontal and/or vertical scan lines."), "Yeti ", - "2.0", + "2.1", "David Nečas (Yeti)", "2019", }; @@ -151,6 +152,7 @@ gwy_param_def_add_boolean(paramdef, PARAM_ZERO_CROSS, "zero_cross", _("Cross at _zero"), TRUE); gwy_param_def_add_boolean(paramdef, PARAM_OPTIONS_VISIBLE, "options_visible", NULL, FALSE); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, NULL, NULL); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); return paramdef; } @@ -218,6 +220,7 @@ tool->colorpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, height, height); gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_cross, "cross"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_cprofile_init_dialog(tool); } @@ -291,6 +294,7 @@ gwy_param_table_set_unitstr(table, PARAM_THICKNESS, _("px")); gwy_param_table_append_checkbox(table, PARAM_ZERO_CROSS); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, tool->gmodel); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_container_add(GTK_CONTAINER(options), gwy_param_table_widget(table)); @@ -471,6 +475,7 @@ "editable", TRUE, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1024); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } gwy_graph_model_remove_all_curves(tool->gmodel); diff -Nru gwyddion-2.62/modules/tools/crop.c gwyddion-2.63/modules/tools/crop.c --- gwyddion-2.62/modules/tools/crop.c 2022-08-24 15:43:45.000000000 +0000 +++ gwyddion-2.63/modules/tools/crop.c 2022-12-16 13:24:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: crop.c 24935 2022-08-24 15:43:45Z yeti-dn $ + * $Id: crop.c 25178 2022-12-16 13:24:16Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -28,6 +28,7 @@ enum { PARAM_KEEP_OFFSETS, PARAM_NEW_CHANNEL, + PARAM_HOLD_SELECTION, }; #define GWY_TYPE_TOOL_CROP (gwy_tool_crop_get_type()) @@ -76,7 +77,7 @@ &module_register, N_("Crop tool, crops data to smaller size."), "Yeti ", - "3.0", + "3.1", "David Nečas (Yeti) & Petr Klapetek", "2003", }; @@ -105,6 +106,7 @@ gwy_param_def_set_function_name(paramdef, "crop"); gwy_param_def_add_boolean(paramdef, PARAM_KEEP_OFFSETS, "keep_offsets", _("Keep lateral offsets"), FALSE); gwy_param_def_add_boolean(paramdef, PARAM_NEW_CHANNEL, "new_channel", _("Create new image"), TRUE); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); return paramdef; } @@ -153,6 +155,7 @@ plain_tool->lazy_updates = TRUE; gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_rect, "rectangle"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_crop_init_dialog(tool); } @@ -177,6 +180,7 @@ table = tool->table = gwy_param_table_new(tool->params); gwy_param_table_append_checkbox(table, PARAM_KEEP_OFFSETS); gwy_param_table_append_checkbox(table, PARAM_NEW_CHANNEL); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(dialog->vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -210,6 +214,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } } diff -Nru gwyddion-2.62/modules/tools/distance.c gwyddion-2.63/modules/tools/distance.c --- gwyddion-2.62/modules/tools/distance.c 2022-08-22 13:29:34.000000000 +0000 +++ gwyddion-2.63/modules/tools/distance.c 2022-12-15 15:31:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: distance.c 24911 2022-08-22 13:29:34Z yeti-dn $ + * $Id: distance.c 25170 2022-12-15 15:31:35Z yeti-dn $ * Copyright (C) 2003-2022 Nenad Ocelic, David Necas (Yeti), Petr Klapetek. * E-mail: ocelic@biochem.mpg.de, yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -33,6 +33,7 @@ enum { PARAM_REPORT_STYLE, PARAM_NUMBER_LINES, + PARAM_HOLD_SELECTION, }; #define GWY_TYPE_TOOL_DISTANCE (gwy_tool_distance_get_type()) @@ -50,10 +51,7 @@ GtkTreeView *treeview; GtkTreeModel *model; - GtkWidget *rexport; - GtkWidget *copy; - GtkWidget *save; - GtkWidget *number_lines; + GwyParamTable *table; GwyDataField *xunc; GwyDataField *yunc; @@ -72,7 +70,7 @@ static gboolean module_register (void); static GwyParamDef* define_module_params (void); -static GType gwy_tool_distance_get_type (void) G_GNUC_CONST; +static GType gwy_tool_distance_get_type (void) G_GNUC_CONST; static void gwy_tool_distance_finalize (GObject *object); static void gwy_tool_distance_init_dialog (GwyToolDistance *tool); static void gwy_tool_distance_data_switched (GwyTool *gwytool, @@ -80,24 +78,22 @@ static void gwy_tool_distance_data_changed (GwyPlainTool *plain_tool); static void gwy_tool_distance_selection_changed(GwyPlainTool *plain_tool, gint hint); -static void number_lines_changed (GwyToolDistance *tool, - GtkToggleButton *check); -static void report_style_changed (GwyToolDistance *tool, - GwyResultsExport *rexport); +static void param_changed (GwyToolDistance *tool, + gint id); static void update_headers (GwyToolDistance *tool); static void render_cell (GtkCellLayout *layout, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); -static gchar* create_report (gpointer user_data); +static gchar* format_report (gpointer user_data); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Distance measurement tool, measures distances and angles."), "Nenad Ocelic ", - "3.0", + "3.1", "Nenad Ocelic & David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -124,9 +120,11 @@ paramdef = gwy_param_def_new(); gwy_param_def_set_function_name(paramdef, "distance"); - gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", NULL, + gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Distance Table"), GWY_RESULTS_EXPORT_TABULAR_DATA, GWY_RESULTS_REPORT_TABSEP); + /* TRANSLATORS: Number is verb here. */ gwy_param_def_add_boolean(paramdef, PARAM_NUMBER_LINES, "number_lines", _("_Number lines"), TRUE); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); return paramdef; } @@ -181,6 +179,7 @@ tool->params = gwy_params_new_from_settings(define_module_params()); tool->angle_format = gwy_si_unit_value_format_new(1.0, 1, _("deg")); gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_line, "line"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_distance_init_dialog(tool); } @@ -192,7 +191,7 @@ GtkTreeViewColumn *column; GtkCellRenderer *renderer; GtkWidget *scwin, *label; - GwyResultsExport *rexport; + GwyParamTable *table; GwyNullStore *store; guint i; @@ -221,21 +220,13 @@ gtk_container_add(GTK_CONTAINER(scwin), GTK_WIDGET(tool->treeview)); gtk_box_pack_start(GTK_BOX(dialog->vbox), scwin, TRUE, TRUE, 0); - tool->rexport = gwy_results_export_new(gwy_params_get_report_type(tool->params, PARAM_REPORT_STYLE)); - rexport = GWY_RESULTS_EXPORT(tool->rexport); - gwy_results_export_set_style(rexport, GWY_RESULTS_EXPORT_TABULAR_DATA); - gwy_results_export_set_title(rexport, _("Save Distance Table")); - gwy_results_export_set_actions_sensitive(rexport, FALSE); - gwy_results_export_set_format_func(rexport, create_report, tool); - gtk_box_pack_start(GTK_BOX(dialog->vbox), tool->rexport, FALSE, FALSE, 0); - g_signal_connect_swapped(tool->rexport, "format-changed", G_CALLBACK(report_style_changed), tool); - - /* TRANSLATORS: Number is verb here. */ - tool->number_lines = gtk_check_button_new_with_mnemonic(_("_Number lines")); - gtk_box_pack_start(GTK_BOX(tool->rexport), tool->number_lines, FALSE, FALSE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tool->number_lines), - gwy_params_get_boolean(tool->params, PARAM_NUMBER_LINES)); - g_signal_connect_swapped(tool->number_lines, "toggled", G_CALLBACK(number_lines_changed), tool); + table = tool->table = gwy_param_table_new(tool->params); + gwy_param_table_append_report(table, PARAM_REPORT_STYLE); + gwy_param_table_report_set_formatter(table, PARAM_REPORT_STYLE, format_report, tool, NULL); + gwy_param_table_append_checkbox(table, PARAM_NUMBER_LINES); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); + gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); + gtk_box_pack_start(GTK_BOX(dialog->vbox), gwy_param_table_widget(table), FALSE, TRUE, 0); gwy_plain_tool_add_clear_button(GWY_PLAIN_TOOL(tool)); gwy_tool_add_hide_button(GWY_TOOL(tool), TRUE); @@ -243,6 +234,8 @@ update_headers(tool); + g_signal_connect_swapped(tool->table, "param-changed", G_CALLBACK(param_changed), tool); + gtk_widget_show_all(dialog->vbox); } @@ -252,7 +245,7 @@ GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(gwytool); GwyToolDistance *tool = GWY_TOOL_DISTANCE(gwytool); gboolean ignore = (data_view == plain_tool->data_view); - gchar xukey[24], yukey[24], zukey[24]; + gchar xukey[32], yukey[32], zukey[32]; GWY_TOOL_CLASS(gwy_tool_distance_parent_class)->data_switched(gwytool, data_view); @@ -271,14 +264,10 @@ g_snprintf(yukey, sizeof(yukey), "/%d/data/cal_yunc", plain_tool->id); g_snprintf(zukey, sizeof(zukey), "/%d/data/cal_zunc", plain_tool->id); - if (gwy_container_gis_object_by_name(plain_tool->container, xukey, &tool->xunc) - && gwy_container_gis_object_by_name(plain_tool->container, yukey, &tool->yunc) - && gwy_container_gis_object_by_name(plain_tool->container, zukey, &tool->zunc)) { - tool->has_calibration = TRUE; - } - else { - tool->has_calibration = FALSE; - } + tool->has_calibration = (gwy_container_gis_object_by_name(plain_tool->container, xukey, &tool->xunc) + && gwy_container_gis_object_by_name(plain_tool->container, yukey, &tool->yunc) + && gwy_container_gis_object_by_name(plain_tool->container, zukey, &tool->zunc)); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } update_headers(tool); } @@ -325,24 +314,20 @@ } ok = (plain_tool->selection && gwy_selection_get_data(plain_tool->selection, NULL)); - gwy_results_export_set_actions_sensitive(GWY_RESULTS_EXPORT(tool->rexport), ok); -} - -static void -number_lines_changed(GwyToolDistance *tool, GtkToggleButton *check) -{ - GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); - gboolean number_lines = gtk_toggle_button_get_active(check); - - gwy_params_set_boolean(tool->params, PARAM_NUMBER_LINES, number_lines); - if (plain_tool->layer) - g_object_set(plain_tool->layer, "line-numbers", number_lines, NULL); + gwy_param_table_set_sensitive(tool->table, PARAM_REPORT_STYLE, ok); } static void -report_style_changed(GwyToolDistance *tool, GwyResultsExport *rexport) +param_changed(GwyToolDistance *tool, gint id) { - gwy_params_set_report_type(tool->params, PARAM_REPORT_STYLE, gwy_results_export_get_format(rexport)); + if (id < 0 || id == PARAM_NUMBER_LINES) { + GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); + if (plain_tool->layer) { + g_object_set(plain_tool->layer, + "line-numbers", gwy_params_get_boolean(tool->params, PARAM_NUMBER_LINES), + NULL); + } + } } static void @@ -380,7 +365,7 @@ g_string_free(str, TRUE); ok = (plain_tool->selection && gwy_selection_get_data(plain_tool->selection, NULL)); - gwy_results_export_set_actions_sensitive(GWY_RESULTS_EXPORT(tool->rexport), ok); + gwy_param_table_set_sensitive(tool->table, PARAM_REPORT_STYLE, ok); } static gdouble @@ -474,7 +459,7 @@ } static gchar* -create_report(gpointer user_data) +format_report(gpointer user_data) { GwyToolDistance *tool = (GwyToolDistance*)user_data; GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); diff -Nru gwyddion-2.62/modules/tools/icolorange.c gwyddion-2.63/modules/tools/icolorange.c --- gwyddion-2.62/modules/tools/icolorange.c 2022-08-29 16:12:22.000000000 +0000 +++ gwyddion-2.63/modules/tools/icolorange.c 2023-02-03 13:24:35.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: icolorange.c 24965 2022-08-29 16:12:22Z yeti-dn $ + * $Id: icolorange.c 25219 2023-02-03 13:24:35Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -40,16 +40,19 @@ RESPONSE_SET_TO_UNMASKED, RESPONSE_SET_TO_FULL, RESPONSE_INVERT, + RESPONSE_SET_ZERO, }; enum { PARAM_START, PARAM_END, + PARAM_USE_SELECTION, BUTTON_SET_TO_MASKED, BUTTON_SET_TO_UNMASKED, BUTTON_SET_TO_FULL, BUTTON_INVERT, + BUTTON_SET_ZERO, INFO_MINIMUM, INFO_MAXIMUM, @@ -132,6 +135,7 @@ static void param_changed (GwyToolColorRange *tool, gint id); static void invert_mapping (GwyToolColorRange *tool); +static void set_zero_to_minimum (GwyToolColorRange *tool); static void update_selected_rectangle (GwyToolColorRange *tool); static GwyModuleInfo module_info = { @@ -140,7 +144,7 @@ N_("Interactive color range tool, allows selecting the data range false color scale should map to, " "either on data or on height distribution histogram."), "Yeti ", - "4.0", + "4.2", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -169,6 +173,8 @@ gwy_param_def_set_function_name(paramdef, "colorrange"); gwy_param_def_add_double(paramdef, PARAM_START, NULL, _("_Start"), -1e6, 1e6, 0); gwy_param_def_add_double(paramdef, PARAM_END, NULL, _("_End"), -1e6, 1e6, 0); + gwy_param_def_add_boolean(paramdef, PARAM_USE_SELECTION, "use-selection", _("_Adapt color range to selection"), + TRUE); return paramdef; } @@ -199,7 +205,7 @@ { GwyToolColorRange *tool = GWY_TOOL_COLOR_RANGE(object); - /* No params to save: gwy_params_save_to_settings(tool->params); */ + gwy_params_save_to_settings(tool->params); GWY_OBJECT_UNREF(tool->params); GWY_OBJECT_UNREF(tool->heightdist); @@ -332,9 +338,13 @@ RESPONSE_SET_TO_UNMASKED, _("Set to _Unmasked")); gwy_param_table_append_button(table, BUTTON_SET_TO_FULL, -1, RESPONSE_SET_TO_FULL, _("Set to _Full Range")); gwy_param_table_append_button(table, BUTTON_INVERT, BUTTON_SET_TO_FULL, RESPONSE_INVERT, _("_Invert Mapping")); + gwy_param_table_append_checkbox(table, PARAM_USE_SELECTION); + gwy_param_table_append_header(table, -1, _("Data Range")); gwy_param_table_append_info(table, INFO_MINIMUM, _("Minimum")); gwy_param_table_append_info(table, INFO_MAXIMUM, _("Maximum")); + gwy_param_table_append_button(table, BUTTON_SET_ZERO, -1, RESPONSE_SET_ZERO, _("Set Zero to Color Map Minimum")); + gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(dialog->vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -381,6 +391,9 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); + /* This is a potentially useful operation no matter the mode. In full-range mode it basically replicates + * the standard ‘Set Zero’ function. */ + gwy_param_table_set_sensitive(tool->table, BUTTON_SET_ZERO, TRUE); } else { gtk_widget_set_sensitive(GTK_WIDGET(tool->histogram), FALSE); @@ -388,6 +401,8 @@ gwy_param_table_set_sensitive(tool->table, PARAM_END, FALSE); gwy_param_table_set_sensitive(tool->table, BUTTON_INVERT, FALSE); gwy_param_table_set_sensitive(tool->table, BUTTON_SET_TO_FULL, FALSE); + gwy_param_table_set_sensitive(tool->table, BUTTON_SET_ZERO, FALSE); + gwy_param_table_set_sensitive(tool->table, PARAM_USE_SELECTION, FALSE); gwy_selection_clear(tool->graph_selection); } @@ -455,7 +470,9 @@ update_fullrange(tool); /* When the range is defined by selection, follow data updates. When it is given on the histogram or numerically, * don't. */ - if (plain_tool->data_field && tool->range_source == USE_SELECTION) + if (plain_tool->data_field + && tool->range_source == USE_SELECTION + && gwy_params_get_boolean(tool->params, PARAM_USE_SELECTION)) gwy_tool_color_range_selection_changed(plain_tool, -1); } @@ -487,7 +504,7 @@ is_selected = gwy_selection_get_data(plain_tool->selection, NULL); range_type = get_range_type(tool); - if (range_type != GWY_LAYER_BASIC_RANGE_FIXED) + if (range_type != GWY_LAYER_BASIC_RANGE_FIXED || !gwy_params_get_boolean(tool->params, PARAM_USE_SELECTION)) return; if (!tool->programmatic_update) @@ -531,7 +548,8 @@ tool->programmatic_update = FALSE; } else { - tool->range_source = USE_SELECTION; + if (gwy_params_get_boolean(tool->params, PARAM_USE_SELECTION)) + tool->range_source = USE_SELECTION; tool->programmatic_update = TRUE; gwy_tool_color_range_selection_changed(GWY_PLAIN_TOOL(tool), -1); tool->programmatic_update = FALSE; @@ -569,6 +587,7 @@ gwy_param_table_set_sensitive(tool->table, PARAM_END, fixed_sens); gwy_param_table_set_sensitive(tool->table, BUTTON_INVERT, fixed_sens); gwy_param_table_set_sensitive(tool->table, BUTTON_SET_TO_FULL, fixed_sens); + gwy_param_table_set_sensitive(tool->table, PARAM_USE_SELECTION, fixed_sens); old_mode = -1; gwy_container_gis_enum_by_name(gwy_app_settings_get(), APP_RANGE_KEY, &old_mode); @@ -749,7 +768,7 @@ } static void -param_changed(GwyToolColorRange *tool, G_GNUC_UNUSED gint id) +param_changed(GwyToolColorRange *tool, gint id) { GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); const GwySIValueFormat *vf = plain_tool->value_format; @@ -759,6 +778,13 @@ if (tool->programmatic_update) return; + /* The logic what should happen is unclear. Switching immediately to range defined by the rectangle seems to be + * intuitive only when the user manipulated the rectangle more recently than other things. */ + if (id == PARAM_USE_SELECTION + && gwy_params_get_boolean(tool->params, PARAM_USE_SELECTION) + && tool->range_source == USE_SELECTION) + gwy_tool_color_range_selection_changed(plain_tool, -1); + for (i = 0; i < 2; i++) { sel[i] = gwy_params_get_double(tool->params, PARAM_START + i)*vf->magnitude; gwy_container_set_double(plain_tool->container, tool->key_min_max[i], sel[i]); @@ -811,6 +837,8 @@ set_range_using_mask(tool, GWY_MASK_IGNORE); else if (response_id == RESPONSE_INVERT) invert_mapping(tool); + else if (response_id == RESPONSE_SET_ZERO) + set_zero_to_minimum(tool); } static void @@ -830,6 +858,31 @@ tool->programmatic_update = FALSE; gwy_param_table_param_changed(tool->table, -1); +} + +static void +set_zero_to_minimum(GwyToolColorRange *tool) +{ + GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); + GwyDataField *dfield = plain_tool->data_field; + const GwySIValueFormat *vf = plain_tool->value_format; + gdouble min, max; + + if (!dfield) + return; + + min = gwy_params_get_double(tool->params, PARAM_START) * vf->magnitude; + max = gwy_params_get_double(tool->params, PARAM_END) * vf->magnitude; + + tool->programmatic_update = TRUE; + gwy_data_field_add(dfield, -min); + gwy_data_field_data_changed(dfield); + /* XXX: Is this always correct when vf changes? */ + gwy_param_table_set_double(tool->table, PARAM_START, 0.0); + gwy_param_table_set_double(tool->table, PARAM_END, (max - min)/vf->magnitude); + tool->programmatic_update = FALSE; + + gwy_param_table_param_changed(tool->table, -1); } static void diff -Nru gwyddion-2.62/modules/tools/linestats.c gwyddion-2.63/modules/tools/linestats.c --- gwyddion-2.62/modules/tools/linestats.c 2022-08-29 14:22:53.000000000 +0000 +++ gwyddion-2.63/modules/tools/linestats.c 2022-12-16 13:24:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: linestats.c 24961 2022-08-29 14:22:53Z yeti-dn $ + * $Id: linestats.c 25178 2022-12-16 13:24:16Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -34,6 +34,7 @@ PARAM_DIRECTION, PARAM_INSTANT_UPDATE, PARAM_TARGET_GRAPH, + PARAM_HOLD_SELECTION, PARAM_OPTIONS_VISIBLE, INFO_AVERAGE, @@ -104,7 +105,7 @@ &module_register, N_("Row/column statistical function tool, mean values, medians, maxima, minima, RMS, ..., of rows or columns."), "Yeti ", - "3.0", + "3.1", "David Nečas (Yeti) & Petr Klapetek", "2006", }; @@ -163,6 +164,7 @@ GWY_ORIENTATION_HORIZONTAL); gwy_param_def_add_instant_updates(paramdef, PARAM_INSTANT_UPDATE, "instant_update", NULL, TRUE); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, NULL, NULL); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); gwy_param_def_add_boolean(paramdef, PARAM_OPTIONS_VISIBLE, "options_visible", NULL, FALSE); return paramdef; @@ -223,6 +225,7 @@ memset(tool->isel_prev, 0xff, 4*sizeof(gint)); gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_rect, "rectangle"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_line_stats_init_dialog(tool); } @@ -271,6 +274,7 @@ gwy_param_table_append_radio(table, PARAM_DIRECTION); gwy_param_table_append_combo(table, PARAM_MASKING); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, tool->gmodel); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_container_add(GTK_CONTAINER(options), gwy_param_table_widget(table)); @@ -315,6 +319,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } update_curve(tool); diff -Nru gwyddion-2.62/modules/tools/Makefile.in gwyddion-2.63/modules/tools/Makefile.in --- gwyddion-2.62/modules/tools/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/tools/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -570,6 +570,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/modules/tools/maskedit.c gwyddion-2.63/modules/tools/maskedit.c --- gwyddion-2.62/modules/tools/maskedit.c 2022-08-26 15:35:02.000000000 +0000 +++ gwyddion-2.63/modules/tools/maskedit.c 2023-01-26 10:15:23.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: maskedit.c 24953 2022-08-26 15:35:02Z yeti-dn $ + * $Id: maskedit.c 25205 2023-01-26 10:15:20Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -44,6 +44,7 @@ PARAM_FILL_NONSIMPLE, PARAM_FROM_BORDER, PARAM_PREVENT_MERGE, + PARAM_LINES_4_CONNECTED, WIDGET_ACTIONS, WIDGET_FILL_VOIDS, @@ -88,6 +89,9 @@ } MaskEditTool; typedef void (*FieldFillFunc)(GwyDataField*, gint, gint, gint, gint, gdouble); +typedef void (*FieldExtractFunc)(GwyDataField*, gint, gint, gint, gint, gdouble*); +typedef void (*FieldUnextractFunc)(GwyDataField*, gint, gint, gint, gint, const gdouble*); +typedef gint (*FieldSizeFunc)(gint, gint); #define GWY_TYPE_TOOL_MASK_EDITOR (gwy_tool_mask_editor_get_type()) #define GWY_TOOL_MASK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GWY_TYPE_TOOL_MASK_EDITOR, GwyToolMaskEditor)) @@ -150,7 +154,7 @@ &module_register, N_("Mask editor tool, allows interactive modification of parts of the mask."), "Yeti ", - "4.0", + "4.2", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -231,6 +235,8 @@ gwy_param_def_add_boolean(paramdef, PARAM_FROM_BORDER, "from_border", _("Shrink from _border"), TRUE); gwy_param_def_add_boolean(paramdef, PARAM_PREVENT_MERGE, "prevent_merge", _("_Prevent grain merging by growing"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_LINES_4_CONNECTED, "lines-4-connected", + _("Thin lines are 4-connected"), FALSE); return paramdef; } @@ -303,6 +309,7 @@ gwy_param_table_append_radio_item(table, PARAM_STYLE, MASK_EDIT_STYLE_SHAPES); gwy_param_table_append_radio_buttons(table, PARAM_MODE, mode_icons); gwy_param_table_append_radio_buttons(table, PARAM_SHAPE, shape_icons); + gwy_param_table_append_checkbox(table, PARAM_LINES_4_CONNECTED); gwy_param_table_append_separator(table); gwy_param_table_append_radio_item(table, PARAM_STYLE, MASK_EDIT_STYLE_DRAWING); @@ -535,10 +542,9 @@ /* Then we can handle the changes specifically. */ if (id < 0 || id == PARAM_STYLE || id == PARAM_SHAPE || id == PARAM_TOOL) { - MaskEditStyle style = gwy_params_get_enum(tool->params, PARAM_STYLE); connect_selection(tool); setup_layer(tool); - if (style == MASK_EDIT_STYLE_DRAWING && plain_tool->selection) + if (plain_tool->selection) gwy_selection_clear(plain_tool->selection); } } @@ -634,145 +640,186 @@ gwy_plain_tool_log_add(plain_tool); } +typedef enum { + MASK_COUNT, + MASK_FILL, + MASK_EXTRACT, + MASK_UNEXTRACT, +} MaskPixelOp; + +static inline void +mask_pixel_op(gdouble *field, gint i, + gdouble *values, gint *j, + MaskPixelOp op) +{ + if (op == MASK_EXTRACT) + values[(*j)++] = field[i]; + else if (op == MASK_UNEXTRACT) + field[i] = values[(*j)++]; + else if (op == MASK_FILL) + field[i] = *values; + else + (*j)++; +} + +/* Width is always positive; height can be negative to indicate line direction. */ static void -gwy_data_field_linear_area_fill(GwyDataField *dfield, - gint col, gint row, - gint width, gint height, - gdouble value) +gwy_data_field_general_linear_area_operation(GwyDataField *dfield, + gint col, gint row, + gint width, gint height, + gdouble *data, + const gboolean is_4_connected, + const MaskPixelOp op) { - gint i, q, xres; + gboolean is_const = (op == MASK_COUNT || op == MASK_EXTRACT); + gint i, j, q, xres, yres; gdouble *d; xres = gwy_data_field_get_xres(dfield); - d = gwy_data_field_get_data(dfield); + yres = gwy_data_field_get_yres(dfield); + col = CLAMP(col, 0, xres-1); + row = CLAMP(row, 0, yres-1); + width = CLAMP(width, 0, xres-col); + height = (height >= 0 ? CLAMP(height, 0, yres-row) : CLAMP(height, -row, 0)); + d = (is_const ? (gdouble*)gwy_data_field_get_data_const(dfield) : gwy_data_field_get_data(dfield)); + + j = 0; if (ABS(height) >= width) { q = width/2; if (height > 0) { - for (i = 0; i < height; i++) { - d[(row + i)*xres + col + q/height] = value; + for (i = 0; i < height-1; i++) { + mask_pixel_op(d, (row + i)*xres + col + q/height, data, &j, op); + if (is_4_connected && q/height != (q + width)/height) { + if (q % height >= height/2) + mask_pixel_op(d, (row + i)*xres + col + q/height+1, data, &j, op); + else + mask_pixel_op(d, (row + i+1)*xres + col + q/height, data, &j, op); + } q += width; } + mask_pixel_op(d, (row + i)*xres + col + q/height, data, &j, op); } else { height = ABS(height); - for (i = 0; i < height; i++) { - d[(row - i)*xres + col + q/height] = value; + for (i = 0; i < height-1; i++) { + mask_pixel_op(d, (row - i)*xres + col + q/height, data, &j, op); + if (is_4_connected && q/height != (q + width)/height) { + if (q % height >= height/2) + mask_pixel_op(d, (row - i)*xres + col + q/height+1, data, &j, op); + else + mask_pixel_op(d, (row - i-1)*xres + col + q/height, data, &j, op); + } q += width; } + mask_pixel_op(d, (row - i)*xres + col + q/height, data, &j, op); } } else { q = height/2; - for (i = 0; i < width; i++) { - d[(row + q/width)*xres + col + i] = value; + for (i = 0; i < width-1; i++) { + mask_pixel_op(d, (row + q/width)*xres + col + i, data, &j, op); + if (is_4_connected && q/width != (q + height)/width) { + if (q % width >= width/2) + mask_pixel_op(d, (row + q/width + 1)*xres + col + i, data, &j, op); + else + mask_pixel_op(d, (row + q/width)*xres + col + i+1, data, &j, op); + } q += height; } + mask_pixel_op(d, (row + q/width)*xres + col + i, data, &j, op); } - gwy_data_field_invalidate(dfield); + + if (!is_const) + gwy_data_field_invalidate(dfield); } +/* 8-continuous lines. */ static gint gwy_data_field_get_linear_area_size(gint width, gint height) { - return MAX(width, ABS(height)); + return MAX(ABS(width), ABS(height)); } -static gint +static void +gwy_data_field_linear_area_fill(GwyDataField *dfield, + gint col, gint row, + gint width, gint height, + gdouble value) +{ + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, &value, FALSE, MASK_FILL); +} + +static void gwy_data_field_linear_area_extract(GwyDataField *dfield, gint col, gint row, gint width, gint height, - gdouble *data) + gdouble *values) { - gint i, n, q, xres; - gdouble *d; - - /* FIXME: We do not handle lines sticking out, nor wide lines */ - xres = gwy_data_field_get_xres(dfield); - d = gwy_data_field_get_data(dfield); - n = 0; - if (ABS(height) >= width) { - q = width/2; - if (height > 0) { - for (i = 0; i < height; i++) { - data[n++] = d[(row + i)*xres + col + q/height]; - q += width; - } - } - else { - height = ABS(height); - for (i = 0; i < height; i++) { - data[n++] = d[(row - i)*xres + col + q/height]; - q += width; - } - } - } - else { - q = height/2; - for (i = 0; i < width; i++) { - data[n++] = d[(row + q/width)*xres + col + i]; - q += height; - } - } - - return n; + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, values, FALSE, MASK_EXTRACT); } static void gwy_data_field_linear_area_unextract(GwyDataField *dfield, gint col, gint row, gint width, gint height, - gdouble *data) + const gdouble *values) { - gint i, n, q, xres; - gdouble *d; + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, (gdouble*)values, + FALSE, MASK_UNEXTRACT); +} - /* FIXME: We do not handle lines sticking out, nor wide lines */ - xres = gwy_data_field_get_xres(dfield); - d = gwy_data_field_get_data(dfield); - n = 0; - if (ABS(height) >= width) { - q = width/2; - if (height > 0) { - for (i = 0; i < height; i++) { - d[(row + i)*xres + col + q/height] = data[n++]; - q += width; - } - } - else { - height = ABS(height); - for (i = 0; i < height; i++) { - d[(row - i)*xres + col + q/height] = data[n++]; - q += width; - } - } - } - else { - q = height/2; - for (i = 0; i < width; i++) { - d[(row + q/width)*xres + col + i] = data[n++]; - q += height; - } - } +/* 4-continuous lines. */ +static gint +gwy_data_field_get_clinear_area_size(gint width, gint height) +{ + return ABS(width) + ABS(height) - 1; } static void -gwy_tool_mask_editor_selection_finished(GwyPlainTool *plain_tool) +gwy_data_field_clinear_area_fill(GwyDataField *dfield, + gint col, gint row, + gint width, gint height, + gdouble value) { - static const FieldFillFunc fill_funcs[] = { - gwy_data_field_area_fill, - (FieldFillFunc)&gwy_data_field_elliptic_area_fill, - (FieldFillFunc)&gwy_data_field_linear_area_fill, - }; + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, &value, TRUE, MASK_FILL); +} +static void +gwy_data_field_clinear_area_extract(GwyDataField *dfield, + gint col, gint row, + gint width, gint height, + gdouble *values) +{ + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, values, TRUE, MASK_EXTRACT); +} + +static void +gwy_data_field_clinear_area_unextract(GwyDataField *dfield, + gint col, gint row, + gint width, gint height, + const gdouble *values) +{ + gwy_data_field_general_linear_area_operation(dfield, col, row, width, height, (gdouble*)values, + TRUE, MASK_UNEXTRACT); +} + +static void +gwy_tool_mask_editor_selection_finished(GwyPlainTool *plain_tool) +{ GwyToolMaskEditor *tool = GWY_TOOL_MASK_EDITOR(plain_tool); MaskEditStyle style = gwy_params_get_enum(tool->params, PARAM_STYLE); MaskEditTool drawtool = gwy_params_get_enum(tool->params, PARAM_TOOL); MaskEditShape shape = gwy_params_get_enum(tool->params, PARAM_SHAPE); MaskEditLogicalOp mode = gwy_params_get_enum(tool->params, PARAM_MODE); + gboolean lines_4_connected = gwy_params_get_boolean(tool->params, PARAM_LINES_4_CONNECTED); GwySelection *selection = plain_tool->selection; GwyDataField *mask = plain_tool->mask_field; - FieldFillFunc fill_func; + FieldFillFunc fill_func = NULL; + FieldExtractFunc extract_func = NULL; + FieldUnextractFunc unextract_func = NULL; + FieldSizeFunc size_func = NULL; gboolean log_it_anyway = FALSE; + gint col, row, width, height; GQuark quark; gdouble sel[4]; gint isel[4]; @@ -799,8 +846,31 @@ return; } - g_return_if_fail(shape < G_N_ELEMENTS(fill_funcs)); - fill_func = fill_funcs[shape]; + if (shape == MASK_SHAPE_RECTANGLE) + fill_func = gwy_data_field_area_fill; + else if (shape == MASK_SHAPE_ELLIPSE) { + fill_func = (FieldFillFunc)gwy_data_field_elliptic_area_fill; + extract_func = (FieldExtractFunc)gwy_data_field_elliptic_area_extract; + unextract_func = gwy_data_field_elliptic_area_unextract; + size_func = gwy_data_field_get_elliptic_area_size; + } + else if (shape == MASK_SHAPE_LINE) { + if (lines_4_connected) { + fill_func = gwy_data_field_clinear_area_fill; + extract_func = gwy_data_field_clinear_area_extract; + unextract_func = gwy_data_field_clinear_area_unextract; + size_func = gwy_data_field_get_clinear_area_size; + } + else { + fill_func = gwy_data_field_linear_area_fill; + extract_func = gwy_data_field_linear_area_extract; + unextract_func = gwy_data_field_linear_area_unextract; + size_func = gwy_data_field_get_linear_area_size; + } + } + else { + g_return_if_reached(); + } isel[2] = floor(gwy_data_field_rtoj(plain_tool->data_field, sel[2])); isel[3] = floor(gwy_data_field_rtoi(plain_tool->data_field, sel[3])); @@ -814,25 +884,27 @@ GWY_ORDER(gdouble, isel[0], isel[2]); GWY_ORDER(gdouble, isel[1], isel[3]); } - gwy_debug("(%d,%d) (%d,%d)", isel[0], isel[1], isel[2], isel[3]); - isel[2] -= isel[0] - 1; - isel[3] -= isel[1] - 1; + col = isel[0]; + row = isel[1]; + width = isel[2] - isel[0]; + height = isel[3] - isel[1]; /* This one can be negative for lines. */ + gwy_debug("(%d,%d) (%d,%d)", col, row, width, height); quark = gwy_app_get_mask_key_for_id(plain_tool->id); if (mode == MASK_EDIT_OP_SET) { gwy_app_undo_qcheckpointv(plain_tool->container, 1, &quark); mask = ensure_mask(plain_tool); gwy_data_field_clear(mask); - fill_func(mask, isel[0], isel[1], isel[2], isel[3], 1.0); + fill_func(mask, col, row, width, height, 1.0); } else if (mode == MASK_EDIT_OP_ADD && (!mask || gwy_data_field_get_min(mask) < 1.0)) { gwy_app_undo_qcheckpointv(plain_tool->container, 1, &quark); mask = ensure_mask(plain_tool); - fill_func(mask, isel[0], isel[1], isel[2], isel[3], 1.0); + fill_func(mask, col, row, width, height, 1.0); } else if (mode == MASK_EDIT_OP_REMOVE && mask && gwy_data_field_get_max(mask) > 0.0) { gwy_app_undo_qcheckpointv(plain_tool->container, 1, &quark); - fill_func(mask, isel[0], isel[1], isel[2], isel[3], 0.0); + fill_func(mask, col, row, width, height, 0.0); if (!(gwy_data_field_get_max(mask) > 0.0)) { gwy_container_remove(plain_tool->container, quark); mask = NULL; @@ -845,28 +917,16 @@ gwy_app_undo_qcheckpointv(plain_tool->container, 1, &quark); gwy_data_field_clamp(mask, 0.0, 1.0); if (shape == MASK_SHAPE_RECTANGLE) - gwy_data_field_area_add(mask, isel[0], isel[1], isel[2], isel[3], 1.0); - else if (shape == MASK_SHAPE_ELLIPSE) { - n = gwy_data_field_get_elliptic_area_size(isel[2], isel[3]); - data = g_new(gdouble, n); - gwy_data_field_elliptic_area_extract(mask, isel[0], isel[1], isel[2], isel[3], data); - while (n) - data[--n] += 1.0; - gwy_data_field_elliptic_area_unextract(mask, isel[0], isel[1], isel[2], isel[3], data); - g_free(data); - } - else if (shape == MASK_SHAPE_LINE) { - n = gwy_data_field_get_linear_area_size(isel[2], isel[3]); + gwy_data_field_area_add(mask, col, row, width, height, 1.0); + else { + n = size_func(width, height); data = g_new(gdouble, n); - gwy_data_field_linear_area_extract(mask, isel[0], isel[1], isel[2], isel[3], data); + extract_func(mask, col, row, width, height, data); while (n) data[--n] += 1.0; - gwy_data_field_linear_area_unextract(mask, isel[0], isel[1], isel[2], isel[3], data); + unextract_func(mask, col, row, width, height, data); g_free(data); } - else { - g_assert_not_reached(); - } gwy_data_field_add(mask, -1.0); gwy_data_field_clamp(mask, 0.0, 1.0); if (!(gwy_data_field_get_max(mask) > 0.0)) { diff -Nru gwyddion-2.62/modules/tools/profile.c gwyddion-2.63/modules/tools/profile.c --- gwyddion-2.62/modules/tools/profile.c 2022-08-29 14:22:53.000000000 +0000 +++ gwyddion-2.63/modules/tools/profile.c 2022-12-16 13:24:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: profile.c 24961 2022-08-29 14:22:53Z yeti-dn $ + * $Id: profile.c 25178 2022-12-16 13:24:16Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -48,6 +48,7 @@ PARAM_INTERPOLATION, PARAM_MASKING, PARAM_TARGET_GRAPH, + PARAM_HOLD_SELECTION, PARAM_OPTIONS_VISIBLE, PARAM_BOTH, @@ -157,7 +158,7 @@ &module_register, N_("Profile tool, creates profile graphs from selected lines."), "Petr Klapetek ", - "5.0", + "5.1", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -202,6 +203,7 @@ GWY_INTERPOLATION_LINEAR); gwy_param_def_add_enum(paramdef, PARAM_MASKING, "masking", NULL, GWY_TYPE_MASKING_TYPE, GWY_MASK_IGNORE); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, NULL, NULL); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); gwy_param_def_add_boolean(paramdef, PARAM_OPTIONS_VISIBLE, "options_visible", NULL, FALSE); gwy_param_def_add_boolean(paramdef, PARAM_BOTH, "both", _("_Show profile"), TRUE); @@ -279,6 +281,7 @@ tool->colorpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, height, height); gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_line, "line"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_profile_init_dialog(tool); } @@ -361,6 +364,7 @@ gwy_param_table_append_combo(table, PARAM_INTERPOLATION); gwy_param_table_append_combo(table, PARAM_MASKING); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, tool->gmodel); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gtk_box_pack_start(GTK_BOX(vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); @@ -397,7 +401,7 @@ GwyToolProfile *tool = GWY_TOOL_PROFILE(gwytool); gboolean ignore = (data_view == plain_tool->data_view); GtkWidget *unc_table_widget; - gchar xekey[24], yekey[24], zekey[24], xukey[24], yukey[24], zukey[24]; + gchar xekey[32], yekey[32], zekey[32], xukey[32], yukey[32], zukey[32]; GWY_TOOL_CLASS(gwy_tool_profile_parent_class)->data_switched(gwytool, data_view); @@ -422,21 +426,18 @@ g_snprintf(zukey, sizeof(zukey), "/%d/data/cal_zunc", plain_tool->id); unc_table_widget = gwy_param_table_widget(tool->table_unc); - if (gwy_container_gis_object_by_name(plain_tool->container, xekey, &tool->xerr) - && gwy_container_gis_object_by_name(plain_tool->container, yekey, &tool->yerr) - && gwy_container_gis_object_by_name(plain_tool->container, zekey, &tool->zerr) - && gwy_container_gis_object_by_name(plain_tool->container, xukey, &tool->xunc) - && gwy_container_gis_object_by_name(plain_tool->container, yukey, &tool->yunc) - && gwy_container_gis_object_by_name(plain_tool->container, zukey, &tool->zunc)) { - tool->has_calibration = TRUE; - gtk_widget_set_no_show_all(unc_table_widget, FALSE); + tool->has_calibration = (gwy_container_gis_object_by_name(plain_tool->container, xekey, &tool->xerr) + && gwy_container_gis_object_by_name(plain_tool->container, yekey, &tool->yerr) + && gwy_container_gis_object_by_name(plain_tool->container, zekey, &tool->zerr) + && gwy_container_gis_object_by_name(plain_tool->container, xukey, &tool->xunc) + && gwy_container_gis_object_by_name(plain_tool->container, yukey, &tool->yunc) + && gwy_container_gis_object_by_name(plain_tool->container, zukey, &tool->zunc)); + gtk_widget_set_no_show_all(unc_table_widget, !tool->has_calibration); + if (tool->has_calibration) gtk_widget_show_all(unc_table_widget); - } - else { - tool->has_calibration = FALSE; - gtk_widget_set_no_show_all(unc_table_widget, TRUE); + else gtk_widget_hide(unc_table_widget); - } + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } gwy_graph_model_remove_all_curves(tool->gmodel); diff -Nru gwyddion-2.62/modules/tools/readvalue.c gwyddion-2.63/modules/tools/readvalue.c --- gwyddion-2.62/modules/tools/readvalue.c 2022-08-22 13:29:34.000000000 +0000 +++ gwyddion-2.63/modules/tools/readvalue.c 2022-12-07 15:26:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: readvalue.c 24911 2022-08-22 13:29:34Z yeti-dn $ + * $Id: readvalue.c 25144 2022-11-21 15:49:59Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -38,6 +38,7 @@ enum { PARAM_RADIUS, PARAM_SHOW_SELECTION, + PARAM_ADAPT_COLOR_RANGE, BUTTON_SET_ZERO, WIDGET_RESULTS_Z, @@ -120,6 +121,8 @@ gint hint); static void palette_changed (GwyToolReadValue *tool); static void draw_zoom (GwyToolReadValue *tool); +static void adapt_colour_range (GwyToolReadValue *tool, + gboolean make_empty); static void pix_spinned (GwyToolReadValue *tool); static void calculate (GwyToolReadValue *tool, gint col, @@ -145,7 +148,7 @@ &module_register, N_("Pointer tool, reads value under pointer."), "Yeti ", - "4.0", + "4.1", "David Nečas (Yeti) & Petr Klapetek", "2003", }; @@ -174,6 +177,8 @@ gwy_param_def_set_function_name(paramdef, "readvalue"); gwy_param_def_add_int(paramdef, PARAM_RADIUS, "radius", _("_Averaging radius"), 1, RADIUS_MAX, 1); gwy_param_def_add_boolean(paramdef, PARAM_SHOW_SELECTION, "show-selection", _("Show _selection"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_ADAPT_COLOR_RANGE, "adapt-color-range", + _("Adapt color range to detail"), TRUE); return paramdef; } @@ -234,9 +239,7 @@ tool->data = gwy_container_new(); tool->detail = gwy_data_field_new(PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, TRUE); gwy_container_set_object(tool->data, gwy_app_get_data_key_for_id(0), tool->detail); - gwy_container_set_double(tool->data, gwy_app_get_data_range_min_key_for_id(0), 0.0); - gwy_container_set_double(tool->data, gwy_app_get_data_range_max_key_for_id(0), 0.0); - gwy_container_set_enum(tool->data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + adapt_colour_range(tool, TRUE); results = tool->results = gwy_results_new(); gwy_results_add_value_z(results, "z", "Z"); @@ -339,6 +342,7 @@ gwy_param_table_set_unitstr(tool->table, PARAM_RADIUS, _("px")); gwy_param_table_slider_set_mapping(tool->table, PARAM_RADIUS, GWY_SCALE_MAPPING_LINEAR); gwy_param_table_append_checkbox(tool->table, PARAM_SHOW_SELECTION); + gwy_param_table_append_checkbox(tool->table, PARAM_ADAPT_COLOR_RANGE); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), tool->table); gtk_box_pack_start(GTK_BOX(vbox), gwy_param_table_widget(tool->table), FALSE, FALSE, 0); @@ -392,16 +396,20 @@ g_return_if_fail(GWY_IS_LAYER_BASIC(layer)); key = gwy_layer_basic_get_gradient_key(GWY_LAYER_BASIC(layer)); if (key) { + /* FIXME: We may want to respond also to colour mapping keys in case something else than icolorange changes + * them (icolorange can't because it is another tool). */ sigdetail = g_strconcat("item-changed::", key, NULL); tool->palette_id = g_signal_connect_swapped(plain_tool->container, sigdetail, G_CALLBACK(palette_changed), tool); g_free(sigdetail); } + adapt_colour_range(tool, FALSE); palette_changed(tool); } else { gtk_entry_set_text(GTK_ENTRY(tool->xpix), ""); gtk_entry_set_text(GTK_ENTRY(tool->ypix), ""); + adapt_colour_range(tool, TRUE); } gtk_widget_set_sensitive(tool->xpix, !!data_view); @@ -479,11 +487,11 @@ { GwyToolReadValue *tool = GWY_TOOL_READ_VALUE(plain_tool); + tool->drawn = FALSE; resize_detail(tool); update_units(tool); - - tool->drawn = FALSE; gwy_tool_read_value_selection_changed(plain_tool, -1); + adapt_colour_range(tool, FALSE); if (!tool->drawn) draw_zoom(tool); } @@ -612,6 +620,8 @@ NULL); } } + if (id < 0 || id == PARAM_ADAPT_COLOR_RANGE) + adapt_colour_range(tool, FALSE); } static void @@ -638,8 +648,7 @@ if (tool->xr.from < 0 || tool->yr.from < 0) { gwy_data_field_clear(tool->detail); - gwy_container_set_double(tool->data, gwy_app_get_data_range_min_key_for_id(0), 0.0); - gwy_container_set_double(tool->data, gwy_app_get_data_range_max_key_for_id(0), 0.0); + adapt_colour_range(tool, TRUE); } else { plain_tool = GWY_PLAIN_TOOL(tool); @@ -660,6 +669,47 @@ } static void +adapt_colour_range(GwyToolReadValue *tool, gboolean make_empty) +{ + GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); + GwyContainer *data = tool->data; + GwyDataField *field = plain_tool->data_field; + gboolean do_adapt = gwy_params_get_boolean(tool->params, PARAM_ADAPT_COLOR_RANGE); + gint id = plain_tool->id; + GwyLayerBasicRangeType range_type = GWY_LAYER_BASIC_RANGE_FULL; + gdouble min = 0.0, max = 0.0; + + if (make_empty || !field || !plain_tool->container) { + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + gwy_container_set_double(data, gwy_app_get_data_range_min_key_for_id(0), 0.0); + gwy_container_set_double(data, gwy_app_get_data_range_max_key_for_id(0), 0.0); + return; + } + + if (do_adapt) { + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + gwy_container_remove(data, gwy_app_get_data_range_min_key_for_id(0)); + gwy_container_remove(data, gwy_app_get_data_range_max_key_for_id(0)); + return; + } + + gwy_container_gis_enum(plain_tool->container, gwy_app_get_data_range_type_key_for_id(id), &range_type); + if (range_type == GWY_LAYER_BASIC_RANGE_AUTO) + gwy_data_field_get_autorange(field, &min, &max); + else { + gwy_data_field_get_min_max(field, &min, &max); + if (range_type == GWY_LAYER_BASIC_RANGE_FIXED) { + gwy_container_gis_double(plain_tool->container, gwy_app_get_data_range_min_key_for_id(id), &min); + gwy_container_gis_double(plain_tool->container, gwy_app_get_data_range_max_key_for_id(id), &max); + } + /* FIXME: Adaptive mapping using the distribution of different data field is currently not possible. */ + } + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FIXED); + gwy_container_set_double(data, gwy_app_get_data_range_min_key_for_id(0), min); + gwy_container_set_double(data, gwy_app_get_data_range_max_key_for_id(0), max); +} + +static void pix_spinned(GwyToolReadValue *tool) { GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); diff -Nru gwyddion-2.62/modules/tools/roughness.c gwyddion-2.63/modules/tools/roughness.c --- gwyddion-2.62/modules/tools/roughness.c 2022-08-29 12:16:18.000000000 +0000 +++ gwyddion-2.63/modules/tools/roughness.c 2022-12-07 15:26:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: roughness.c 24957 2022-08-29 12:16:17Z yeti-dn $ + * $Id: roughness.c 25139 2022-11-07 09:46:06Z yeti-dn $ * Copyright (C) 2006-2022 Martin Hason, David Necas (Yeti), Petr Klapetek. * E-mail: hasonm@physics.muni.cz, yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -150,7 +150,7 @@ &module_register, N_("Calculate surface profile parameters."), "Martin Hasoň , Yeti ", - "3.0", + "3.1", "Martin Hasoň & David Nečas (Yeti)", "2006", }; @@ -302,6 +302,7 @@ table = tool->table = gwy_param_table_new(tool->params); gwy_param_table_append_report(table, PARAM_REPORT_STYLE); + gwy_param_table_report_set_results(table, PARAM_REPORT_STYLE, tool->results); gwy_param_table_append_separator(table); gwy_param_table_append_combo(table, PARAM_GRAPH); gwy_param_table_append_slider(table, PARAM_CUTOFF); diff -Nru gwyddion-2.62/modules/tools/rprofile.c gwyddion-2.63/modules/tools/rprofile.c --- gwyddion-2.62/modules/tools/rprofile.c 2022-08-29 14:22:53.000000000 +0000 +++ gwyddion-2.63/modules/tools/rprofile.c 2023-02-21 09:38:06.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rprofile.c 24961 2022-08-29 14:22:53Z yeti-dn $ + * $Id: rprofile.c 25221 2023-02-21 09:38:06Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -47,6 +47,7 @@ PARAM_SEPARATE, PARAM_MASKING, PARAM_TARGET_GRAPH, + PARAM_HOLD_SELECTION, PARAM_OPTIONS_VISIBLE, BUTTON_IMPROVE, @@ -131,7 +132,7 @@ &module_register, N_("Creates angularly averaged profile graphs."), "Yeti ", - "2.0", + "2.1", "David Nečas (Yeti) & Petr Klapetek", "2018", }; @@ -164,6 +165,7 @@ gwy_param_def_add_boolean(paramdef, PARAM_SEPARATE, "separate", _("_Separate profiles"), FALSE); gwy_param_def_add_enum(paramdef, PARAM_MASKING, "masking", NULL, GWY_TYPE_MASKING_TYPE, GWY_MASK_IGNORE); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, NULL, NULL); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); gwy_param_def_add_boolean(paramdef, PARAM_OPTIONS_VISIBLE, "options_visible", NULL, FALSE); return paramdef; @@ -231,6 +233,7 @@ tool->colorpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, height, height); gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_line, "line"); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_rprofile_init_dialog(tool); } @@ -308,6 +311,7 @@ gwy_param_table_append_checkbox(table, PARAM_SEPARATE); gwy_param_table_append_combo(table, PARAM_MASKING); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, tool->gmodel); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gtk_container_add(GTK_CONTAINER(options), gwy_param_table_widget(table)); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); @@ -351,6 +355,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1024); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); } gwy_graph_model_remove_all_curves(tool->gmodel); diff -Nru gwyddion-2.62/modules/tools/sfunctions.c gwyddion-2.63/modules/tools/sfunctions.c --- gwyddion-2.62/modules/tools/sfunctions.c 2022-08-29 14:22:53.000000000 +0000 +++ gwyddion-2.63/modules/tools/sfunctions.c 2023-04-24 18:36:49.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: sfunctions.c 24961 2022-08-29 14:22:53Z yeti-dn $ - * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. + * $Id: sfunctions.c 25307 2023-04-21 13:16:16Z yeti-dn $ + * Copyright (C) 2003-2023 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -40,6 +40,7 @@ PARAM_INSTANT_UPDATE, PARAM_SEPARATE, PARAM_TARGET_GRAPH, + PARAM_HOLD_SELECTION, PARAM_OPTIONS_VISIBLE, }; @@ -59,6 +60,8 @@ GWY_SF_RANGE = 12, GWY_SF_ASG = 13, GWY_SF_ANGSPEC = 14, + GWY_SF_IDF = 15, + GWY_SF_RIDF = 16, GWY_SF_NFUNCTIONS } GwySFOutputType; @@ -159,7 +162,7 @@ N_("Statistical function tool, calculates one-dimensional statistical functions (height distribution, " "correlations, PSDF, Minkowski functionals) of selected part of data."), "Petr Klapetek ", - "3.0", + "3.2", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -180,6 +183,8 @@ { N_("Minkowski connectivity"), GWY_SF_MINKOWSKI_CONNECTIVITY, }, { N_("Range"), GWY_SF_RANGE, }, { N_("Area scale graph"), GWY_SF_ASG, }, + { N_("IDF"), GWY_SF_IDF, }, + { N_("Radial IDF"), GWY_SF_RIDF, }, }; GWY_MODULE_QUERY2(module_info, sfunctions) @@ -218,6 +223,7 @@ gwy_param_def_add_instant_updates(paramdef, PARAM_INSTANT_UPDATE, "instant_update", NULL, TRUE); gwy_param_def_add_boolean(paramdef, PARAM_SEPARATE, "separate", _("_Separate uncertainty"), FALSE); gwy_param_def_add_target_graph(paramdef, PARAM_TARGET_GRAPH, NULL, NULL); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); gwy_param_def_add_boolean(paramdef, PARAM_OPTIONS_VISIBLE, "options_visible", NULL, FALSE); return paramdef; @@ -283,6 +289,7 @@ gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_rect, "rectangle"); memset(tool->isel_prev, 0xff, 4*sizeof(gint)); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_sfunctions_init_dialog(tool); } @@ -336,6 +343,7 @@ gwy_param_table_append_combo(table, PARAM_WINDOWING); gwy_param_table_append_target_graph(table, PARAM_TARGET_GRAPH, tool->gmodel); gwy_param_table_append_checkbox(table, PARAM_SEPARATE); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_container_add(GTK_CONTAINER(options), gwy_param_table_widget(table)); @@ -382,6 +390,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); update_unc_fields(plain_tool); } @@ -466,11 +475,11 @@ update_curve(GwyToolSFunctions *tool) { static const gchar* xlabels[GWY_SF_NFUNCTIONS] = { - "z", "z", "tan β", "tan β", "τ", "τ", "k", "z", "z", "z", "k", "τ", "τ", "τ", "α", + "z", "z", "tan β", "tan β", "τ", "τ", "k", "z", "z", "z", "k", "τ", "τ", "τ", "α", "τ", "τ", }; static const gchar* ylabels[GWY_SF_NFUNCTIONS] = { "ρ", "D", "ρ", "D", "G", "H", "W1", "V", "S", "χ", "Wr", "Gr", - "R", "Aexcess", "Wa", + "R", "Aexcess", "Wa", "I", "Ir", }; GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); @@ -617,6 +626,22 @@ g_object_unref(tool->line); tool->line = gwy_data_field_area_row_asg(field_to_use, mask_to_use, GWY_MASK_INCLUDE, col, row, w, h, 1); } + else if (output_type == GWY_SF_IDF) { + GwyDataLine *tmp = gwy_data_field_area_row_hhcf(field_to_use, mask_to_use, GWY_MASK_INCLUDE, + col, row, w, h, 1, NULL); + gwy_data_line_filter_slope(tmp, tool->line); + gwy_data_line_assign(tmp, tool->line); + gwy_data_line_filter_slope(tmp, tool->line); + g_object_unref(tmp); + } + else if (output_type == GWY_SF_RIDF) { + GwyDataLine *tmp = gwy_data_line_new(1, 1.0, FALSE); + gwy_data_field_area_racf(field_to_use, tmp, col, row, w, h, lineres); + gwy_data_line_filter_slope(tmp, tool->line); + gwy_data_line_assign(tmp, tool->line); + gwy_data_line_filter_slope(tmp, tool->line); + g_object_unref(tmp); + } else { g_return_if_reached(); } @@ -872,14 +897,14 @@ { return (type == GWY_SF_DH || type == GWY_SF_CDH || type == GWY_SF_DA || type == GWY_SF_CDA || type == GWY_SF_ACF || type == GWY_SF_HHCF || type == GWY_SF_ASG - || type == GWY_SF_PSDF || type == GWY_SF_ANGSPEC); + || type == GWY_SF_PSDF || type == GWY_SF_ANGSPEC || type == GWY_SF_IDF); } static gboolean sfunction_has_native_sampling(GwySFOutputType type) { return (type == GWY_SF_ACF || type == GWY_SF_HHCF || type == GWY_SF_ASG || type == GWY_SF_PSDF - || type == GWY_SF_RANGE); + || type == GWY_SF_RANGE || type == GWY_SF_IDF); } static gboolean @@ -894,13 +919,14 @@ sfunction_has_direction(GwySFOutputType type) { return (type == GWY_SF_DA || type == GWY_SF_CDA || type == GWY_SF_ACF || type == GWY_SF_HHCF || type == GWY_SF_ASG - || type == GWY_SF_PSDF); + || type == GWY_SF_PSDF || type == GWY_SF_IDF); } static gboolean sfunction_is_only_row_wise(GwySFOutputType type) { - return (type == GWY_SF_ACF || type == GWY_SF_HHCF || type == GWY_SF_ASG || type == GWY_SF_PSDF); + return (type == GWY_SF_ACF || type == GWY_SF_HHCF || type == GWY_SF_ASG || type == GWY_SF_PSDF + || type == GWY_SF_IDF); } static gboolean diff -Nru gwyddion-2.62/modules/tools/spotremove.c gwyddion-2.63/modules/tools/spotremove.c --- gwyddion-2.62/modules/tools/spotremove.c 2022-08-29 12:03:23.000000000 +0000 +++ gwyddion-2.63/modules/tools/spotremove.c 2022-12-07 15:26:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: spotremove.c 24956 2022-08-29 12:03:23Z yeti-dn $ + * $Id: spotremove.c 25141 2022-11-08 17:20:07Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -39,6 +39,7 @@ enum { PARAM_METHOD, PARAM_SHAPE, + PARAM_ADAPT_COLOR_RANGE, MESSAGE_MISSING, }; @@ -144,6 +145,8 @@ GwyToolSpotRemover *tool); static void update_selection_info_table (GwyToolSpotRemover *tool); static void draw_zoom (GwyToolSpotRemover *tool); +static void adapt_colour_range (GwyToolSpotRemover *tool, + gboolean make_empty); static void update_message (GwyToolSpotRemover *tool); static gboolean find_subrange (gint center, gint res, @@ -164,7 +167,7 @@ &module_register, N_("Spot removal tool, interpolates small parts of data (displayed on a zoomed view) using selected algorithm."), "Yeti ", - "4.0", + "4.1", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -207,6 +210,8 @@ methods, G_N_ELEMENTS(methods), GWY_SPOT_REMOVE_PSEUDO_LAPLACE); gwy_param_def_add_gwyenum(paramdef, PARAM_SHAPE, "shape", _("Shape"), shapes, G_N_ELEMENTS(shapes), GWY_SPOT_REMOVE_RECTANGLE); + gwy_param_def_add_boolean(paramdef, PARAM_ADAPT_COLOR_RANGE, "adapt-color-range", + _("Adapt color range to detail"), TRUE); return paramdef; } @@ -268,9 +273,7 @@ tool->data = gwy_container_new(); tool->detail = gwy_data_field_new(MAX_SIZE, MAX_SIZE, MAX_SIZE, MAX_SIZE, TRUE); gwy_container_set_object(tool->data, gwy_app_get_data_key_for_id(0), tool->detail); - gwy_container_set_double(tool->data, gwy_app_get_data_range_min_key_for_id(0), 0.0); - gwy_container_set_double(tool->data, gwy_app_get_data_range_max_key_for_id(0), 0.0); - gwy_container_set_enum(tool->data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + adapt_colour_range(tool, TRUE); gwy_tool_spot_remover_init_dialog(tool); } @@ -303,6 +306,7 @@ gwy_pixmap_layer_set_data_key(layer, "/0/data"); gwy_layer_basic_set_gradient_key(GWY_LAYER_BASIC(layer), "/0/base/palette"); gwy_layer_basic_set_range_type_key(GWY_LAYER_BASIC(layer), "/0/base/range-type"); + gwy_layer_basic_set_min_max_key(GWY_LAYER_BASIC(layer), "/0/base"); gwy_data_view_set_base_layer(GWY_DATA_VIEW(tool->zoomview), layer); setup_zoom_vector_layer(tool); @@ -317,6 +321,7 @@ gwy_param_table_append_header(table, -1, _("Options")); gwy_param_table_append_combo(table, PARAM_METHOD); gwy_param_table_append_radio_buttons(table, PARAM_SHAPE, shapes); + gwy_param_table_append_checkbox(table, PARAM_ADAPT_COLOR_RANGE); gwy_param_table_append_message(table, MESSAGE_MISSING, NULL); gwy_param_table_message_set_type(table, MESSAGE_MISSING, GTK_MESSAGE_WARNING); gtk_box_pack_start(GTK_BOX(vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -420,17 +425,21 @@ g_return_if_fail(GWY_IS_LAYER_BASIC(layer)); key = gwy_layer_basic_get_gradient_key(GWY_LAYER_BASIC(layer)); if (key) { + /* FIXME: We may want to respond also to colour mapping keys in case something else than icolorange changes + * them (icolorange can't because it is another tool). */ sigdetail = g_strconcat("item-changed::", key, NULL); tool->palette_id = g_signal_connect_swapped(plain_tool->container, sigdetail, G_CALLBACK(gwy_tool_spot_remover_palette_changed), tool); g_free(sigdetail); } + adapt_colour_range(tool, FALSE); gwy_tool_spot_remover_palette_changed(tool); gwy_tool_spot_remover_selection_changed(plain_tool, -1); } else { tool->has_selection = FALSE; tool->has_zselection = FALSE; + adapt_colour_range(tool, TRUE); update_selection_info_table(tool); } } @@ -443,6 +452,7 @@ tool->drawn = FALSE; resize_detail(tool); gwy_tool_spot_remover_selection_changed(plain_tool, -1); + adapt_colour_range(tool, FALSE); if (!tool->drawn) draw_zoom(tool); } @@ -677,8 +687,7 @@ if (tool->xr.from < 0 || tool->yr.from < 0) { gwy_data_field_clear(tool->detail); - gwy_container_set_double(tool->data, gwy_app_get_data_range_min_key_for_id(0), 0.0); - gwy_container_set_double(tool->data, gwy_app_get_data_range_max_key_for_id(0), 0.0); + adapt_colour_range(tool, TRUE); } else { if (!tool->complete) { @@ -696,6 +705,47 @@ } static void +adapt_colour_range(GwyToolSpotRemover *tool, gboolean make_empty) +{ + GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(tool); + GwyContainer *data = tool->data; + GwyDataField *field = plain_tool->data_field; + gboolean do_adapt = gwy_params_get_boolean(tool->params, PARAM_ADAPT_COLOR_RANGE); + gint id = plain_tool->id; + GwyLayerBasicRangeType range_type = GWY_LAYER_BASIC_RANGE_FULL; + gdouble min = 0.0, max = 0.0; + + if (make_empty || !field || !plain_tool->container) { + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + gwy_container_set_double(data, gwy_app_get_data_range_min_key_for_id(0), 0.0); + gwy_container_set_double(data, gwy_app_get_data_range_max_key_for_id(0), 0.0); + return; + } + + if (do_adapt) { + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FULL); + gwy_container_remove(data, gwy_app_get_data_range_min_key_for_id(0)); + gwy_container_remove(data, gwy_app_get_data_range_max_key_for_id(0)); + return; + } + + gwy_container_gis_enum(plain_tool->container, gwy_app_get_data_range_type_key_for_id(id), &range_type); + if (range_type == GWY_LAYER_BASIC_RANGE_AUTO) + gwy_data_field_get_autorange(field, &min, &max); + else { + gwy_data_field_get_min_max(field, &min, &max); + if (range_type == GWY_LAYER_BASIC_RANGE_FIXED) { + gwy_container_gis_double(plain_tool->container, gwy_app_get_data_range_min_key_for_id(id), &min); + gwy_container_gis_double(plain_tool->container, gwy_app_get_data_range_max_key_for_id(id), &max); + } + /* FIXME: Adaptive mapping using the distribution of different data field is currently not possible. */ + } + gwy_container_set_enum(data, gwy_app_get_data_range_type_key_for_id(0), GWY_LAYER_BASIC_RANGE_FIXED); + gwy_container_set_double(data, gwy_app_get_data_range_min_key_for_id(0), min); + gwy_container_set_double(data, gwy_app_get_data_range_max_key_for_id(0), max); +} + +static void update_message(GwyToolSpotRemover *tool) { const gchar *message_data = _("No point in the image selected."); @@ -756,6 +806,8 @@ if (restore_sel) gwy_selection_set_data(zselection, 1, sel); } + if (id < 0 || id == PARAM_ADAPT_COLOR_RANGE) + adapt_colour_range(tool, FALSE); } static void diff -Nru gwyddion-2.62/modules/tools/stats.c gwyddion-2.63/modules/tools/stats.c --- gwyddion-2.62/modules/tools/stats.c 2022-08-22 14:41:33.000000000 +0000 +++ gwyddion-2.63/modules/tools/stats.c 2022-12-16 13:24:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: stats.c 24912 2022-08-22 14:41:33Z yeti-dn $ + * $Id: stats.c 25178 2022-12-16 13:24:16Z yeti-dn $ * Copyright (C) 2003-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -35,6 +35,7 @@ PARAM_MASKING, PARAM_INSTANT_UPDATE, PARAM_REPORT_STYLE, + PARAM_HOLD_SELECTION, WIDGET_RESULTS_MOMENT, WIDGET_RESULTS_ORDER, @@ -128,7 +129,7 @@ &module_register, N_("Statistics tool."), "Petr Klapetek ", - "4.0", + "4.2", "David Nečas (Yeti) & Petr Klapetek", "2003", }; @@ -159,6 +160,7 @@ gwy_param_def_add_instant_updates(paramdef, PARAM_INSTANT_UPDATE, "instant_update", NULL, TRUE); gwy_param_def_add_report_type(paramdef, PARAM_REPORT_STYLE, "report_style", _("Save Statistical Quantities"), GWY_RESULTS_EXPORT_PARAMETERS, GWY_RESULTS_REPORT_COLON); + gwy_param_def_add_hold_selection(paramdef, PARAM_HOLD_SELECTION, "hold_selection", NULL); return paramdef; } @@ -213,6 +215,7 @@ gwy_plain_tool_connect_selection(plain_tool, tool->layer_type_rect, "rectangle"); memset(tool->isel_prev, 0xff, 4*sizeof(gint)); + gwy_plain_tool_enable_selection_holding(plain_tool); gwy_tool_stats_init_dialog(tool); } @@ -250,6 +253,7 @@ gwy_param_table_append_radio_item(table, PARAM_MASKING, GWY_MASK_IGNORE); gwy_param_table_append_header(table, -1, _("Options")); gwy_param_table_append_checkbox(table, PARAM_INSTANT_UPDATE); + gwy_param_table_append_hold_selection(table, PARAM_HOLD_SELECTION); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(vbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -273,6 +277,7 @@ NULL); gwy_param_table_append_separator(table); gwy_param_table_append_report(table, PARAM_REPORT_STYLE); + gwy_param_table_report_set_results(table, PARAM_REPORT_STYLE, tool->results); gwy_plain_tool_add_param_table(GWY_PLAIN_TOOL(tool), table); gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); @@ -298,7 +303,7 @@ GwyPlainTool *plain_tool = GWY_PLAIN_TOOL(gwytool); GwyToolStats *tool = GWY_TOOL_STATS(gwytool); gboolean ignore = (data_view == plain_tool->data_view); - gchar xukey[24], yukey[24], zukey[24]; + gchar xukey[32], yukey[32], zukey[32]; GwyContainer *container; GWY_TOOL_CLASS(gwy_tool_stats_parent_class)->data_switched(gwytool, data_view); @@ -319,12 +324,10 @@ g_snprintf(yukey, sizeof(yukey), "/%d/data/cal_yunc", plain_tool->id); g_snprintf(zukey, sizeof(zukey), "/%d/data/cal_zunc", plain_tool->id); - tool->has_calibration = FALSE; - if (gwy_container_gis_object_by_name(container, xukey, &tool->xunc) - && gwy_container_gis_object_by_name(container, yukey, &tool->yunc) - && gwy_container_gis_object_by_name(container, zukey, &tool->zunc)) - tool->has_calibration = TRUE; - + tool->has_calibration = (gwy_container_gis_object_by_name(container, xukey, &tool->xunc) + && gwy_container_gis_object_by_name(container, yukey, &tool->yunc) + && gwy_container_gis_object_by_name(container, zukey, &tool->zunc)); + gwy_plain_tool_hold_selection(plain_tool, gwy_params_get_flags(tool->params, PARAM_HOLD_SELECTION)); update_units(tool); } update_labels(tool); diff -Nru gwyddion-2.62/modules/volume/Makefile.am gwyddion-2.63/modules/volume/Makefile.am --- gwyddion-2.62/modules/volume/Makefile.am 2022-10-06 15:01:28.000000000 +0000 +++ gwyddion-2.63/modules/volume/Makefile.am 2023-06-13 13:18:30.000000000 +0000 @@ -1,9 +1,9 @@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25426 2023-06-13 13:18:30Z yeti-dn $ # Put sources that are for some reason disabled yet present in svn checkouts # here. This makes them distributed and translations of their messages are # kept. If we remove them completely, various bits can get lost. -disabled_sources = +disabled_sources = volume_localdetect.c volume_xystitch.c volumedir = $(pkglibdir)/modules/volume @@ -11,26 +11,34 @@ # any required libraries at run-time, it will at most break these individual # unbundled modules, not the bundle. bundlable_modules = \ + volume_addframe.la \ volume_arithmetic.la \ volume_asciiexport.la \ volume_calibrate.la \ + volume_drift.la \ volume_equiplane.la \ volume_extract.la \ + volume_facetlevel.la \ volume_fdfit.la \ volume_invert.la \ volume_kmeans.la \ volume_kmedians.la \ volume_lawnize.la \ + volume_linelevel.la \ volume_linestat.la \ volume_mfmrecalc.la \ volume_outliers.la \ volume_planelevel.la \ volume_planestat.la \ volume_psf.la \ + volume_removeframe.la \ volume_rephase.la \ + volume_scars.la \ volume_slice.la \ + volume_stepline.la \ volume_strayfield.la \ volume_swaxes.la \ + volume_xyarithmetics.la \ volume_zcal.la \ volume_zposlevel.la \ volumeops.la @@ -71,51 +79,67 @@ AM_CFLAGS = @COMMON_CFLAGS@ @OPENMP_CFLAGS@ AM_LDFLAGS = -avoid-version -module $(no_undefined) $(module_libadd) @OPENMP_CFLAGS@ -volume_arithmetic_la_SOURCES = volume_arithmetic.c -volume_asciiexport_la_SOURCES = volume_asciiexport.c -volume_calibrate_la_SOURCES = volume_calibrate.c -volume_equiplane_la_SOURCES = volume_equiplane.c -volume_extract_la_SOURCES = volume_extract.c -volume_fdfit_la_SOURCES = volume_fdfit.c -volume_invert_la_SOURCES = volume_invert.c -volume_kmeans_la_SOURCES = volume_kmeans.c -volume_kmedians_la_SOURCES = volume_kmedians.c -volume_lawnize_la_SOURCES = volume_lawnize.c -volume_linestat_la_SOURCES = volume_linestat.c -volume_mfmrecalc_la_SOURCES = volume_mfmrecalc.c -volume_outliers_la_SOURCES = volume_outliers.c -volume_planelevel_la_SOURCES = volume_planelevel.c -volume_planestat_la_SOURCES = volume_planestat.c -volume_psf_la_SOURCES = volume_psf.c -volume_rephase_la_SOURCES = volume_rephase.c -volume_slice_la_SOURCES = volume_slice.c -volume_strayfield_la_SOURCES = volume_strayfield.c -volume_swaxes_la_SOURCES = volume_swaxes.c -volume_zcal_la_SOURCES = volume_zcal.c -volume_zposlevel_la_SOURCES = volume_zposlevel.c -volumeops_la_SOURCES = volumeops.c +volume_addframe_la_SOURCES = volume_addframe.c +volume_arithmetic_la_SOURCES = volume_arithmetic.c +volume_asciiexport_la_SOURCES = volume_asciiexport.c +volume_calibrate_la_SOURCES = volume_calibrate.c +volume_drift_la_SOURCES = volume_drift.c +volume_equiplane_la_SOURCES = volume_equiplane.c +volume_extract_la_SOURCES = volume_extract.c +volume_facetlevel_la_SOURCES = volume_facetlevel.c +volume_fdfit_la_SOURCES = volume_fdfit.c +volume_invert_la_SOURCES = volume_invert.c +volume_kmeans_la_SOURCES = volume_kmeans.c +volume_kmedians_la_SOURCES = volume_kmedians.c +volume_lawnize_la_SOURCES = volume_lawnize.c +volume_linelevel_la_SOURCES = volume_linelevel.c +volume_linestat_la_SOURCES = volume_linestat.c +volume_mfmrecalc_la_SOURCES = volume_mfmrecalc.c +volume_outliers_la_SOURCES = volume_outliers.c +volume_planelevel_la_SOURCES = volume_planelevel.c +volume_planestat_la_SOURCES = volume_planestat.c +volume_psf_la_SOURCES = volume_psf.c +volume_removeframe_la_SOURCES = volume_removeframe.c +volume_rephase_la_SOURCES = volume_rephase.c +volume_scars_la_SOURCES = volume_scars.c +volume_slice_la_SOURCES = volume_slice.c +volume_stepline_la_SOURCES = volume_stepline.c +volume_strayfield_la_SOURCES = volume_strayfield.c +volume_swaxes_la_SOURCES = volume_swaxes.c +volume_xyarithmetics_la_SOURCES = volume_xyarithmetics.c +volume_zcal_la_SOURCES = volume_zcal.c +volume_zposlevel_la_SOURCES = volume_zposlevel.c +volumeops_la_SOURCES = volumeops.c volume_la_SOURCES = \ + $(volume_addframe_la_SOURCES) \ $(volume_arithmetic_la_SOURCES) \ $(volume_asciiexport_la_SOURCES) \ $(volume_calibrate_la_SOURCES) \ + $(volume_drift_la_SOURCES) \ $(volume_equiplane_la_SOURCES) \ $(volume_extract_la_SOURCES) \ + $(volume_facetlevel_la_SOURCES) \ $(volume_fdfit_la_SOURCES) \ $(volume_invert_la_SOURCES) \ $(volume_kmeans_la_SOURCES) \ $(volume_kmedians_la_SOURCES) \ $(volume_lawnize_la_SOURCES) \ + $(volume_linelevel_la_SOURCES) \ $(volume_linestat_la_SOURCES) \ $(volume_mfmrecalc_la_SOURCES) \ $(volume_outliers_la_SOURCES) \ $(volume_planelevel_la_SOURCES) \ $(volume_planestat_la_SOURCES) \ $(volume_psf_la_SOURCES) \ + $(volume_removeframe_la_SOURCES) \ $(volume_rephase_la_SOURCES) \ + $(volume_scars_la_SOURCES) \ $(volume_slice_la_SOURCES) \ + $(volume_stepline_la_SOURCES) \ $(volume_strayfield_la_SOURCES) \ $(volume_swaxes_la_SOURCES) \ + $(volume_xyarithmetics_la_SOURCES) \ $(volume_zcal_la_SOURCES) \ $(volume_zposlevel_la_SOURCES) \ $(volumeops_la_SOURCES) \ diff -Nru gwyddion-2.62/modules/volume/Makefile.in gwyddion-2.63/modules/volume/Makefile.in --- gwyddion-2.62/modules/volume/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/volume/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25426 2023-06-13 13:18:30Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -141,29 +141,37 @@ am__installdirs = "$(DESTDIR)$(volumedir)" LTLIBRARIES = $(volume_LTLIBRARIES) volume_la_LIBADD = -am__objects_1 = volume_la-volume_arithmetic.lo -am__objects_2 = volume_la-volume_asciiexport.lo -am__objects_3 = volume_la-volume_calibrate.lo -am__objects_4 = volume_la-volume_equiplane.lo -am__objects_5 = volume_la-volume_extract.lo -am__objects_6 = volume_la-volume_fdfit.lo -am__objects_7 = volume_la-volume_invert.lo -am__objects_8 = volume_la-volume_kmeans.lo -am__objects_9 = volume_la-volume_kmedians.lo -am__objects_10 = volume_la-volume_lawnize.lo -am__objects_11 = volume_la-volume_linestat.lo -am__objects_12 = volume_la-volume_mfmrecalc.lo -am__objects_13 = volume_la-volume_outliers.lo -am__objects_14 = volume_la-volume_planelevel.lo -am__objects_15 = volume_la-volume_planestat.lo -am__objects_16 = volume_la-volume_psf.lo -am__objects_17 = volume_la-volume_rephase.lo -am__objects_18 = volume_la-volume_slice.lo -am__objects_19 = volume_la-volume_strayfield.lo -am__objects_20 = volume_la-volume_swaxes.lo -am__objects_21 = volume_la-volume_zcal.lo -am__objects_22 = volume_la-volume_zposlevel.lo -am__objects_23 = volume_la-volumeops.lo +am__objects_1 = volume_la-volume_addframe.lo +am__objects_2 = volume_la-volume_arithmetic.lo +am__objects_3 = volume_la-volume_asciiexport.lo +am__objects_4 = volume_la-volume_calibrate.lo +am__objects_5 = volume_la-volume_drift.lo +am__objects_6 = volume_la-volume_equiplane.lo +am__objects_7 = volume_la-volume_extract.lo +am__objects_8 = volume_la-volume_facetlevel.lo +am__objects_9 = volume_la-volume_fdfit.lo +am__objects_10 = volume_la-volume_invert.lo +am__objects_11 = volume_la-volume_kmeans.lo +am__objects_12 = volume_la-volume_kmedians.lo +am__objects_13 = volume_la-volume_lawnize.lo +am__objects_14 = volume_la-volume_linelevel.lo +am__objects_15 = volume_la-volume_linestat.lo +am__objects_16 = volume_la-volume_mfmrecalc.lo +am__objects_17 = volume_la-volume_outliers.lo +am__objects_18 = volume_la-volume_planelevel.lo +am__objects_19 = volume_la-volume_planestat.lo +am__objects_20 = volume_la-volume_psf.lo +am__objects_21 = volume_la-volume_removeframe.lo +am__objects_22 = volume_la-volume_rephase.lo +am__objects_23 = volume_la-volume_scars.lo +am__objects_24 = volume_la-volume_slice.lo +am__objects_25 = volume_la-volume_stepline.lo +am__objects_26 = volume_la-volume_strayfield.lo +am__objects_27 = volume_la-volume_swaxes.lo +am__objects_28 = volume_la-volume_xyarithmetics.lo +am__objects_29 = volume_la-volume_zcal.lo +am__objects_30 = volume_la-volume_zposlevel.lo +am__objects_31 = volume_la-volumeops.lo am_volume_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ @@ -172,7 +180,9 @@ $(am__objects_15) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ - volume_la-volume.lo + $(am__objects_24) $(am__objects_25) $(am__objects_26) \ + $(am__objects_27) $(am__objects_28) $(am__objects_29) \ + $(am__objects_30) $(am__objects_31) volume_la-volume.lo volume_la_OBJECTS = $(am_volume_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -182,6 +192,11 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(volume_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @MODULE_BUNDLING_TRUE@am_volume_la_rpath = -rpath $(volumedir) +volume_addframe_la_LIBADD = +am_volume_addframe_la_OBJECTS = volume_addframe.lo +volume_addframe_la_OBJECTS = $(am_volume_addframe_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_addframe_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_arithmetic_la_LIBADD = am_volume_arithmetic_la_OBJECTS = volume_arithmetic.lo volume_arithmetic_la_OBJECTS = $(am_volume_arithmetic_la_OBJECTS) @@ -197,6 +212,10 @@ volume_calibrate_la_OBJECTS = $(am_volume_calibrate_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_calibrate_la_rpath = -rpath \ @MODULE_BUNDLING_FALSE@ $(volumedir) +volume_drift_la_LIBADD = +am_volume_drift_la_OBJECTS = volume_drift.lo +volume_drift_la_OBJECTS = $(am_volume_drift_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_drift_la_rpath = -rpath $(volumedir) volume_equiplane_la_LIBADD = am_volume_equiplane_la_OBJECTS = volume_equiplane.lo volume_equiplane_la_OBJECTS = $(am_volume_equiplane_la_OBJECTS) @@ -207,6 +226,11 @@ volume_extract_la_OBJECTS = $(am_volume_extract_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_extract_la_rpath = -rpath \ @MODULE_BUNDLING_FALSE@ $(volumedir) +volume_facetlevel_la_LIBADD = +am_volume_facetlevel_la_OBJECTS = volume_facetlevel.lo +volume_facetlevel_la_OBJECTS = $(am_volume_facetlevel_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_facetlevel_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_fdfit_la_LIBADD = am_volume_fdfit_la_OBJECTS = volume_fdfit.lo volume_fdfit_la_OBJECTS = $(am_volume_fdfit_la_OBJECTS) @@ -229,6 +253,11 @@ volume_lawnize_la_OBJECTS = $(am_volume_lawnize_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_lawnize_la_rpath = -rpath \ @MODULE_BUNDLING_FALSE@ $(volumedir) +volume_linelevel_la_LIBADD = +am_volume_linelevel_la_OBJECTS = volume_linelevel.lo +volume_linelevel_la_OBJECTS = $(am_volume_linelevel_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_linelevel_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_linestat_la_LIBADD = am_volume_linestat_la_OBJECTS = volume_linestat.lo volume_linestat_la_OBJECTS = $(am_volume_linestat_la_OBJECTS) @@ -258,15 +287,29 @@ am_volume_psf_la_OBJECTS = volume_psf.lo volume_psf_la_OBJECTS = $(am_volume_psf_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_psf_la_rpath = -rpath $(volumedir) +volume_removeframe_la_LIBADD = +am_volume_removeframe_la_OBJECTS = volume_removeframe.lo +volume_removeframe_la_OBJECTS = $(am_volume_removeframe_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_removeframe_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_rephase_la_LIBADD = am_volume_rephase_la_OBJECTS = volume_rephase.lo volume_rephase_la_OBJECTS = $(am_volume_rephase_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_rephase_la_rpath = -rpath \ @MODULE_BUNDLING_FALSE@ $(volumedir) +volume_scars_la_LIBADD = +am_volume_scars_la_OBJECTS = volume_scars.lo +volume_scars_la_OBJECTS = $(am_volume_scars_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_scars_la_rpath = -rpath $(volumedir) volume_slice_la_LIBADD = am_volume_slice_la_OBJECTS = volume_slice.lo volume_slice_la_OBJECTS = $(am_volume_slice_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_slice_la_rpath = -rpath $(volumedir) +volume_stepline_la_LIBADD = +am_volume_stepline_la_OBJECTS = volume_stepline.lo +volume_stepline_la_OBJECTS = $(am_volume_stepline_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_stepline_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_strayfield_la_LIBADD = am_volume_strayfield_la_OBJECTS = volume_strayfield.lo volume_strayfield_la_OBJECTS = $(am_volume_strayfield_la_OBJECTS) @@ -276,6 +319,12 @@ am_volume_swaxes_la_OBJECTS = volume_swaxes.lo volume_swaxes_la_OBJECTS = $(am_volume_swaxes_la_OBJECTS) @MODULE_BUNDLING_FALSE@am_volume_swaxes_la_rpath = -rpath $(volumedir) +volume_xyarithmetics_la_LIBADD = +am_volume_xyarithmetics_la_OBJECTS = volume_xyarithmetics.lo +volume_xyarithmetics_la_OBJECTS = \ + $(am_volume_xyarithmetics_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_volume_xyarithmetics_la_rpath = -rpath \ +@MODULE_BUNDLING_FALSE@ $(volumedir) volume_zcal_la_LIBADD = am_volume_zcal_la_OBJECTS = volume_zcal.lo volume_zcal_la_OBJECTS = $(am_volume_zcal_la_OBJECTS) @@ -304,46 +353,62 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/volume_arithmetic.Plo \ +am__depfiles_remade = ./$(DEPDIR)/volume_addframe.Plo \ + ./$(DEPDIR)/volume_arithmetic.Plo \ ./$(DEPDIR)/volume_asciiexport.Plo \ - ./$(DEPDIR)/volume_calibrate.Plo \ + ./$(DEPDIR)/volume_calibrate.Plo ./$(DEPDIR)/volume_drift.Plo \ ./$(DEPDIR)/volume_equiplane.Plo \ - ./$(DEPDIR)/volume_extract.Plo ./$(DEPDIR)/volume_fdfit.Plo \ + ./$(DEPDIR)/volume_extract.Plo \ + ./$(DEPDIR)/volume_facetlevel.Plo ./$(DEPDIR)/volume_fdfit.Plo \ ./$(DEPDIR)/volume_invert.Plo ./$(DEPDIR)/volume_kmeans.Plo \ ./$(DEPDIR)/volume_kmedians.Plo \ ./$(DEPDIR)/volume_la-volume.Plo \ + ./$(DEPDIR)/volume_la-volume_addframe.Plo \ ./$(DEPDIR)/volume_la-volume_arithmetic.Plo \ ./$(DEPDIR)/volume_la-volume_asciiexport.Plo \ ./$(DEPDIR)/volume_la-volume_calibrate.Plo \ + ./$(DEPDIR)/volume_la-volume_drift.Plo \ ./$(DEPDIR)/volume_la-volume_equiplane.Plo \ ./$(DEPDIR)/volume_la-volume_extract.Plo \ + ./$(DEPDIR)/volume_la-volume_facetlevel.Plo \ ./$(DEPDIR)/volume_la-volume_fdfit.Plo \ ./$(DEPDIR)/volume_la-volume_invert.Plo \ ./$(DEPDIR)/volume_la-volume_kmeans.Plo \ ./$(DEPDIR)/volume_la-volume_kmedians.Plo \ ./$(DEPDIR)/volume_la-volume_lawnize.Plo \ + ./$(DEPDIR)/volume_la-volume_linelevel.Plo \ ./$(DEPDIR)/volume_la-volume_linestat.Plo \ ./$(DEPDIR)/volume_la-volume_mfmrecalc.Plo \ ./$(DEPDIR)/volume_la-volume_outliers.Plo \ ./$(DEPDIR)/volume_la-volume_planelevel.Plo \ ./$(DEPDIR)/volume_la-volume_planestat.Plo \ ./$(DEPDIR)/volume_la-volume_psf.Plo \ + ./$(DEPDIR)/volume_la-volume_removeframe.Plo \ ./$(DEPDIR)/volume_la-volume_rephase.Plo \ + ./$(DEPDIR)/volume_la-volume_scars.Plo \ ./$(DEPDIR)/volume_la-volume_slice.Plo \ + ./$(DEPDIR)/volume_la-volume_stepline.Plo \ ./$(DEPDIR)/volume_la-volume_strayfield.Plo \ ./$(DEPDIR)/volume_la-volume_swaxes.Plo \ + ./$(DEPDIR)/volume_la-volume_xyarithmetics.Plo \ ./$(DEPDIR)/volume_la-volume_zcal.Plo \ ./$(DEPDIR)/volume_la-volume_zposlevel.Plo \ ./$(DEPDIR)/volume_la-volumeops.Plo \ - ./$(DEPDIR)/volume_lawnize.Plo ./$(DEPDIR)/volume_linestat.Plo \ + ./$(DEPDIR)/volume_lawnize.Plo \ + ./$(DEPDIR)/volume_linelevel.Plo \ + ./$(DEPDIR)/volume_linestat.Plo \ ./$(DEPDIR)/volume_mfmrecalc.Plo \ ./$(DEPDIR)/volume_outliers.Plo \ ./$(DEPDIR)/volume_planelevel.Plo \ ./$(DEPDIR)/volume_planestat.Plo ./$(DEPDIR)/volume_psf.Plo \ - ./$(DEPDIR)/volume_rephase.Plo ./$(DEPDIR)/volume_slice.Plo \ + ./$(DEPDIR)/volume_removeframe.Plo \ + ./$(DEPDIR)/volume_rephase.Plo ./$(DEPDIR)/volume_scars.Plo \ + ./$(DEPDIR)/volume_slice.Plo ./$(DEPDIR)/volume_stepline.Plo \ ./$(DEPDIR)/volume_strayfield.Plo \ - ./$(DEPDIR)/volume_swaxes.Plo ./$(DEPDIR)/volume_zcal.Plo \ - ./$(DEPDIR)/volume_zposlevel.Plo ./$(DEPDIR)/volumeops.Plo + ./$(DEPDIR)/volume_swaxes.Plo \ + ./$(DEPDIR)/volume_xyarithmetics.Plo \ + ./$(DEPDIR)/volume_zcal.Plo ./$(DEPDIR)/volume_zposlevel.Plo \ + ./$(DEPDIR)/volumeops.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -363,32 +428,40 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(volume_la_SOURCES) $(volume_arithmetic_la_SOURCES) \ +SOURCES = $(volume_la_SOURCES) $(volume_addframe_la_SOURCES) \ + $(volume_arithmetic_la_SOURCES) \ $(volume_asciiexport_la_SOURCES) \ - $(volume_calibrate_la_SOURCES) $(volume_equiplane_la_SOURCES) \ - $(volume_extract_la_SOURCES) $(volume_fdfit_la_SOURCES) \ + $(volume_calibrate_la_SOURCES) $(volume_drift_la_SOURCES) \ + $(volume_equiplane_la_SOURCES) $(volume_extract_la_SOURCES) \ + $(volume_facetlevel_la_SOURCES) $(volume_fdfit_la_SOURCES) \ $(volume_invert_la_SOURCES) $(volume_kmeans_la_SOURCES) \ $(volume_kmedians_la_SOURCES) $(volume_lawnize_la_SOURCES) \ - $(volume_linestat_la_SOURCES) $(volume_mfmrecalc_la_SOURCES) \ - $(volume_outliers_la_SOURCES) $(volume_planelevel_la_SOURCES) \ - $(volume_planestat_la_SOURCES) $(volume_psf_la_SOURCES) \ - $(volume_rephase_la_SOURCES) $(volume_slice_la_SOURCES) \ + $(volume_linelevel_la_SOURCES) $(volume_linestat_la_SOURCES) \ + $(volume_mfmrecalc_la_SOURCES) $(volume_outliers_la_SOURCES) \ + $(volume_planelevel_la_SOURCES) $(volume_planestat_la_SOURCES) \ + $(volume_psf_la_SOURCES) $(volume_removeframe_la_SOURCES) \ + $(volume_rephase_la_SOURCES) $(volume_scars_la_SOURCES) \ + $(volume_slice_la_SOURCES) $(volume_stepline_la_SOURCES) \ $(volume_strayfield_la_SOURCES) $(volume_swaxes_la_SOURCES) \ - $(volume_zcal_la_SOURCES) $(volume_zposlevel_la_SOURCES) \ - $(volumeops_la_SOURCES) -DIST_SOURCES = $(volume_la_SOURCES) $(volume_arithmetic_la_SOURCES) \ + $(volume_xyarithmetics_la_SOURCES) $(volume_zcal_la_SOURCES) \ + $(volume_zposlevel_la_SOURCES) $(volumeops_la_SOURCES) +DIST_SOURCES = $(volume_la_SOURCES) $(volume_addframe_la_SOURCES) \ + $(volume_arithmetic_la_SOURCES) \ $(volume_asciiexport_la_SOURCES) \ - $(volume_calibrate_la_SOURCES) $(volume_equiplane_la_SOURCES) \ - $(volume_extract_la_SOURCES) $(volume_fdfit_la_SOURCES) \ + $(volume_calibrate_la_SOURCES) $(volume_drift_la_SOURCES) \ + $(volume_equiplane_la_SOURCES) $(volume_extract_la_SOURCES) \ + $(volume_facetlevel_la_SOURCES) $(volume_fdfit_la_SOURCES) \ $(volume_invert_la_SOURCES) $(volume_kmeans_la_SOURCES) \ $(volume_kmedians_la_SOURCES) $(volume_lawnize_la_SOURCES) \ - $(volume_linestat_la_SOURCES) $(volume_mfmrecalc_la_SOURCES) \ - $(volume_outliers_la_SOURCES) $(volume_planelevel_la_SOURCES) \ - $(volume_planestat_la_SOURCES) $(volume_psf_la_SOURCES) \ - $(volume_rephase_la_SOURCES) $(volume_slice_la_SOURCES) \ + $(volume_linelevel_la_SOURCES) $(volume_linestat_la_SOURCES) \ + $(volume_mfmrecalc_la_SOURCES) $(volume_outliers_la_SOURCES) \ + $(volume_planelevel_la_SOURCES) $(volume_planestat_la_SOURCES) \ + $(volume_psf_la_SOURCES) $(volume_removeframe_la_SOURCES) \ + $(volume_rephase_la_SOURCES) $(volume_scars_la_SOURCES) \ + $(volume_slice_la_SOURCES) $(volume_stepline_la_SOURCES) \ $(volume_strayfield_la_SOURCES) $(volume_swaxes_la_SOURCES) \ - $(volume_zcal_la_SOURCES) $(volume_zposlevel_la_SOURCES) \ - $(volumeops_la_SOURCES) + $(volume_xyarithmetics_la_SOURCES) $(volume_zcal_la_SOURCES) \ + $(volume_zposlevel_la_SOURCES) $(volumeops_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -608,6 +681,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -670,33 +745,41 @@ # Put sources that are for some reason disabled yet present in svn checkouts # here. This makes them distributed and translations of their messages are # kept. If we remove them completely, various bits can get lost. -disabled_sources = +disabled_sources = volume_localdetect.c volume_xystitch.c volumedir = $(pkglibdir)/modules/volume # Only bundle modules without own dependencies. If something goes wrong with # any required libraries at run-time, it will at most break these individual # unbundled modules, not the bundle. bundlable_modules = \ + volume_addframe.la \ volume_arithmetic.la \ volume_asciiexport.la \ volume_calibrate.la \ + volume_drift.la \ volume_equiplane.la \ volume_extract.la \ + volume_facetlevel.la \ volume_fdfit.la \ volume_invert.la \ volume_kmeans.la \ volume_kmedians.la \ volume_lawnize.la \ + volume_linelevel.la \ volume_linestat.la \ volume_mfmrecalc.la \ volume_outliers.la \ volume_planelevel.la \ volume_planestat.la \ volume_psf.la \ + volume_removeframe.la \ volume_rephase.la \ + volume_scars.la \ volume_slice.la \ + volume_stepline.la \ volume_strayfield.la \ volume_swaxes.la \ + volume_xyarithmetics.la \ volume_zcal.la \ volume_zposlevel.la \ volumeops.la @@ -727,50 +810,66 @@ AM_CPPFLAGS = -I$(top_srcdir) -DG_LOG_DOMAIN=\"Module\" AM_CFLAGS = @COMMON_CFLAGS@ @OPENMP_CFLAGS@ AM_LDFLAGS = -avoid-version -module $(no_undefined) $(module_libadd) @OPENMP_CFLAGS@ +volume_addframe_la_SOURCES = volume_addframe.c volume_arithmetic_la_SOURCES = volume_arithmetic.c volume_asciiexport_la_SOURCES = volume_asciiexport.c volume_calibrate_la_SOURCES = volume_calibrate.c +volume_drift_la_SOURCES = volume_drift.c volume_equiplane_la_SOURCES = volume_equiplane.c volume_extract_la_SOURCES = volume_extract.c +volume_facetlevel_la_SOURCES = volume_facetlevel.c volume_fdfit_la_SOURCES = volume_fdfit.c volume_invert_la_SOURCES = volume_invert.c volume_kmeans_la_SOURCES = volume_kmeans.c volume_kmedians_la_SOURCES = volume_kmedians.c volume_lawnize_la_SOURCES = volume_lawnize.c +volume_linelevel_la_SOURCES = volume_linelevel.c volume_linestat_la_SOURCES = volume_linestat.c volume_mfmrecalc_la_SOURCES = volume_mfmrecalc.c volume_outliers_la_SOURCES = volume_outliers.c volume_planelevel_la_SOURCES = volume_planelevel.c volume_planestat_la_SOURCES = volume_planestat.c volume_psf_la_SOURCES = volume_psf.c +volume_removeframe_la_SOURCES = volume_removeframe.c volume_rephase_la_SOURCES = volume_rephase.c +volume_scars_la_SOURCES = volume_scars.c volume_slice_la_SOURCES = volume_slice.c +volume_stepline_la_SOURCES = volume_stepline.c volume_strayfield_la_SOURCES = volume_strayfield.c volume_swaxes_la_SOURCES = volume_swaxes.c +volume_xyarithmetics_la_SOURCES = volume_xyarithmetics.c volume_zcal_la_SOURCES = volume_zcal.c volume_zposlevel_la_SOURCES = volume_zposlevel.c volumeops_la_SOURCES = volumeops.c volume_la_SOURCES = \ + $(volume_addframe_la_SOURCES) \ $(volume_arithmetic_la_SOURCES) \ $(volume_asciiexport_la_SOURCES) \ $(volume_calibrate_la_SOURCES) \ + $(volume_drift_la_SOURCES) \ $(volume_equiplane_la_SOURCES) \ $(volume_extract_la_SOURCES) \ + $(volume_facetlevel_la_SOURCES) \ $(volume_fdfit_la_SOURCES) \ $(volume_invert_la_SOURCES) \ $(volume_kmeans_la_SOURCES) \ $(volume_kmedians_la_SOURCES) \ $(volume_lawnize_la_SOURCES) \ + $(volume_linelevel_la_SOURCES) \ $(volume_linestat_la_SOURCES) \ $(volume_mfmrecalc_la_SOURCES) \ $(volume_outliers_la_SOURCES) \ $(volume_planelevel_la_SOURCES) \ $(volume_planestat_la_SOURCES) \ $(volume_psf_la_SOURCES) \ + $(volume_removeframe_la_SOURCES) \ $(volume_rephase_la_SOURCES) \ + $(volume_scars_la_SOURCES) \ $(volume_slice_la_SOURCES) \ + $(volume_stepline_la_SOURCES) \ $(volume_strayfield_la_SOURCES) \ $(volume_swaxes_la_SOURCES) \ + $(volume_xyarithmetics_la_SOURCES) \ $(volume_zcal_la_SOURCES) \ $(volume_zposlevel_la_SOURCES) \ $(volumeops_la_SOURCES) \ @@ -850,6 +949,9 @@ volume.la: $(volume_la_OBJECTS) $(volume_la_DEPENDENCIES) $(EXTRA_volume_la_DEPENDENCIES) $(AM_V_CCLD)$(volume_la_LINK) $(am_volume_la_rpath) $(volume_la_OBJECTS) $(volume_la_LIBADD) $(LIBS) +volume_addframe.la: $(volume_addframe_la_OBJECTS) $(volume_addframe_la_DEPENDENCIES) $(EXTRA_volume_addframe_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_addframe_la_rpath) $(volume_addframe_la_OBJECTS) $(volume_addframe_la_LIBADD) $(LIBS) + volume_arithmetic.la: $(volume_arithmetic_la_OBJECTS) $(volume_arithmetic_la_DEPENDENCIES) $(EXTRA_volume_arithmetic_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_arithmetic_la_rpath) $(volume_arithmetic_la_OBJECTS) $(volume_arithmetic_la_LIBADD) $(LIBS) @@ -859,12 +961,18 @@ volume_calibrate.la: $(volume_calibrate_la_OBJECTS) $(volume_calibrate_la_DEPENDENCIES) $(EXTRA_volume_calibrate_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_calibrate_la_rpath) $(volume_calibrate_la_OBJECTS) $(volume_calibrate_la_LIBADD) $(LIBS) +volume_drift.la: $(volume_drift_la_OBJECTS) $(volume_drift_la_DEPENDENCIES) $(EXTRA_volume_drift_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_drift_la_rpath) $(volume_drift_la_OBJECTS) $(volume_drift_la_LIBADD) $(LIBS) + volume_equiplane.la: $(volume_equiplane_la_OBJECTS) $(volume_equiplane_la_DEPENDENCIES) $(EXTRA_volume_equiplane_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_equiplane_la_rpath) $(volume_equiplane_la_OBJECTS) $(volume_equiplane_la_LIBADD) $(LIBS) volume_extract.la: $(volume_extract_la_OBJECTS) $(volume_extract_la_DEPENDENCIES) $(EXTRA_volume_extract_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_extract_la_rpath) $(volume_extract_la_OBJECTS) $(volume_extract_la_LIBADD) $(LIBS) +volume_facetlevel.la: $(volume_facetlevel_la_OBJECTS) $(volume_facetlevel_la_DEPENDENCIES) $(EXTRA_volume_facetlevel_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_facetlevel_la_rpath) $(volume_facetlevel_la_OBJECTS) $(volume_facetlevel_la_LIBADD) $(LIBS) + volume_fdfit.la: $(volume_fdfit_la_OBJECTS) $(volume_fdfit_la_DEPENDENCIES) $(EXTRA_volume_fdfit_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_fdfit_la_rpath) $(volume_fdfit_la_OBJECTS) $(volume_fdfit_la_LIBADD) $(LIBS) @@ -880,6 +988,9 @@ volume_lawnize.la: $(volume_lawnize_la_OBJECTS) $(volume_lawnize_la_DEPENDENCIES) $(EXTRA_volume_lawnize_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_lawnize_la_rpath) $(volume_lawnize_la_OBJECTS) $(volume_lawnize_la_LIBADD) $(LIBS) +volume_linelevel.la: $(volume_linelevel_la_OBJECTS) $(volume_linelevel_la_DEPENDENCIES) $(EXTRA_volume_linelevel_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_linelevel_la_rpath) $(volume_linelevel_la_OBJECTS) $(volume_linelevel_la_LIBADD) $(LIBS) + volume_linestat.la: $(volume_linestat_la_OBJECTS) $(volume_linestat_la_DEPENDENCIES) $(EXTRA_volume_linestat_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_linestat_la_rpath) $(volume_linestat_la_OBJECTS) $(volume_linestat_la_LIBADD) $(LIBS) @@ -898,18 +1009,30 @@ volume_psf.la: $(volume_psf_la_OBJECTS) $(volume_psf_la_DEPENDENCIES) $(EXTRA_volume_psf_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_psf_la_rpath) $(volume_psf_la_OBJECTS) $(volume_psf_la_LIBADD) $(LIBS) +volume_removeframe.la: $(volume_removeframe_la_OBJECTS) $(volume_removeframe_la_DEPENDENCIES) $(EXTRA_volume_removeframe_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_removeframe_la_rpath) $(volume_removeframe_la_OBJECTS) $(volume_removeframe_la_LIBADD) $(LIBS) + volume_rephase.la: $(volume_rephase_la_OBJECTS) $(volume_rephase_la_DEPENDENCIES) $(EXTRA_volume_rephase_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_rephase_la_rpath) $(volume_rephase_la_OBJECTS) $(volume_rephase_la_LIBADD) $(LIBS) +volume_scars.la: $(volume_scars_la_OBJECTS) $(volume_scars_la_DEPENDENCIES) $(EXTRA_volume_scars_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_scars_la_rpath) $(volume_scars_la_OBJECTS) $(volume_scars_la_LIBADD) $(LIBS) + volume_slice.la: $(volume_slice_la_OBJECTS) $(volume_slice_la_DEPENDENCIES) $(EXTRA_volume_slice_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_slice_la_rpath) $(volume_slice_la_OBJECTS) $(volume_slice_la_LIBADD) $(LIBS) +volume_stepline.la: $(volume_stepline_la_OBJECTS) $(volume_stepline_la_DEPENDENCIES) $(EXTRA_volume_stepline_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_stepline_la_rpath) $(volume_stepline_la_OBJECTS) $(volume_stepline_la_LIBADD) $(LIBS) + volume_strayfield.la: $(volume_strayfield_la_OBJECTS) $(volume_strayfield_la_DEPENDENCIES) $(EXTRA_volume_strayfield_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_strayfield_la_rpath) $(volume_strayfield_la_OBJECTS) $(volume_strayfield_la_LIBADD) $(LIBS) volume_swaxes.la: $(volume_swaxes_la_OBJECTS) $(volume_swaxes_la_DEPENDENCIES) $(EXTRA_volume_swaxes_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_swaxes_la_rpath) $(volume_swaxes_la_OBJECTS) $(volume_swaxes_la_LIBADD) $(LIBS) +volume_xyarithmetics.la: $(volume_xyarithmetics_la_OBJECTS) $(volume_xyarithmetics_la_DEPENDENCIES) $(EXTRA_volume_xyarithmetics_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_volume_xyarithmetics_la_rpath) $(volume_xyarithmetics_la_OBJECTS) $(volume_xyarithmetics_la_LIBADD) $(LIBS) + volume_zcal.la: $(volume_zcal_la_OBJECTS) $(volume_zcal_la_DEPENDENCIES) $(EXTRA_volume_zcal_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_volume_zcal_la_rpath) $(volume_zcal_la_OBJECTS) $(volume_zcal_la_LIBADD) $(LIBS) @@ -925,50 +1048,66 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_addframe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_arithmetic.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_asciiexport.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_calibrate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_drift.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_equiplane.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_extract.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_facetlevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_fdfit.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_invert.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_kmeans.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_kmedians.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_addframe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_arithmetic.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_asciiexport.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_calibrate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_drift.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_equiplane.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_extract.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_facetlevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_fdfit.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_invert.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_kmeans.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_kmedians.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_lawnize.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_linelevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_linestat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_mfmrecalc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_outliers.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_planelevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_planestat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_psf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_removeframe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_rephase.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_scars.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_slice.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_stepline.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_strayfield.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_swaxes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_xyarithmetics.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_zcal.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volume_zposlevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_la-volumeops.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_lawnize.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_linelevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_linestat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_mfmrecalc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_outliers.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_planelevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_planestat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_psf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_removeframe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_rephase.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_scars.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_slice.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_stepline.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_strayfield.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_swaxes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_xyarithmetics.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_zcal.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume_zposlevel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volumeops.Plo@am__quote@ # am--include-marker @@ -1000,6 +1139,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +volume_la-volume_addframe.lo: volume_addframe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_addframe.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_addframe.Tpo -c -o volume_la-volume_addframe.lo `test -f 'volume_addframe.c' || echo '$(srcdir)/'`volume_addframe.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_addframe.Tpo $(DEPDIR)/volume_la-volume_addframe.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_addframe.c' object='volume_la-volume_addframe.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_addframe.lo `test -f 'volume_addframe.c' || echo '$(srcdir)/'`volume_addframe.c + volume_la-volume_arithmetic.lo: volume_arithmetic.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_arithmetic.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_arithmetic.Tpo -c -o volume_la-volume_arithmetic.lo `test -f 'volume_arithmetic.c' || echo '$(srcdir)/'`volume_arithmetic.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_arithmetic.Tpo $(DEPDIR)/volume_la-volume_arithmetic.Plo @@ -1021,6 +1167,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_calibrate.lo `test -f 'volume_calibrate.c' || echo '$(srcdir)/'`volume_calibrate.c +volume_la-volume_drift.lo: volume_drift.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_drift.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_drift.Tpo -c -o volume_la-volume_drift.lo `test -f 'volume_drift.c' || echo '$(srcdir)/'`volume_drift.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_drift.Tpo $(DEPDIR)/volume_la-volume_drift.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_drift.c' object='volume_la-volume_drift.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_drift.lo `test -f 'volume_drift.c' || echo '$(srcdir)/'`volume_drift.c + volume_la-volume_equiplane.lo: volume_equiplane.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_equiplane.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_equiplane.Tpo -c -o volume_la-volume_equiplane.lo `test -f 'volume_equiplane.c' || echo '$(srcdir)/'`volume_equiplane.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_equiplane.Tpo $(DEPDIR)/volume_la-volume_equiplane.Plo @@ -1035,6 +1188,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_extract.lo `test -f 'volume_extract.c' || echo '$(srcdir)/'`volume_extract.c +volume_la-volume_facetlevel.lo: volume_facetlevel.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_facetlevel.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_facetlevel.Tpo -c -o volume_la-volume_facetlevel.lo `test -f 'volume_facetlevel.c' || echo '$(srcdir)/'`volume_facetlevel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_facetlevel.Tpo $(DEPDIR)/volume_la-volume_facetlevel.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_facetlevel.c' object='volume_la-volume_facetlevel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_facetlevel.lo `test -f 'volume_facetlevel.c' || echo '$(srcdir)/'`volume_facetlevel.c + volume_la-volume_fdfit.lo: volume_fdfit.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_fdfit.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_fdfit.Tpo -c -o volume_la-volume_fdfit.lo `test -f 'volume_fdfit.c' || echo '$(srcdir)/'`volume_fdfit.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_fdfit.Tpo $(DEPDIR)/volume_la-volume_fdfit.Plo @@ -1070,6 +1230,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_lawnize.lo `test -f 'volume_lawnize.c' || echo '$(srcdir)/'`volume_lawnize.c +volume_la-volume_linelevel.lo: volume_linelevel.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_linelevel.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_linelevel.Tpo -c -o volume_la-volume_linelevel.lo `test -f 'volume_linelevel.c' || echo '$(srcdir)/'`volume_linelevel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_linelevel.Tpo $(DEPDIR)/volume_la-volume_linelevel.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_linelevel.c' object='volume_la-volume_linelevel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_linelevel.lo `test -f 'volume_linelevel.c' || echo '$(srcdir)/'`volume_linelevel.c + volume_la-volume_linestat.lo: volume_linestat.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_linestat.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_linestat.Tpo -c -o volume_la-volume_linestat.lo `test -f 'volume_linestat.c' || echo '$(srcdir)/'`volume_linestat.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_linestat.Tpo $(DEPDIR)/volume_la-volume_linestat.Plo @@ -1112,6 +1279,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_psf.lo `test -f 'volume_psf.c' || echo '$(srcdir)/'`volume_psf.c +volume_la-volume_removeframe.lo: volume_removeframe.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_removeframe.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_removeframe.Tpo -c -o volume_la-volume_removeframe.lo `test -f 'volume_removeframe.c' || echo '$(srcdir)/'`volume_removeframe.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_removeframe.Tpo $(DEPDIR)/volume_la-volume_removeframe.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_removeframe.c' object='volume_la-volume_removeframe.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_removeframe.lo `test -f 'volume_removeframe.c' || echo '$(srcdir)/'`volume_removeframe.c + volume_la-volume_rephase.lo: volume_rephase.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_rephase.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_rephase.Tpo -c -o volume_la-volume_rephase.lo `test -f 'volume_rephase.c' || echo '$(srcdir)/'`volume_rephase.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_rephase.Tpo $(DEPDIR)/volume_la-volume_rephase.Plo @@ -1119,6 +1293,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_rephase.lo `test -f 'volume_rephase.c' || echo '$(srcdir)/'`volume_rephase.c +volume_la-volume_scars.lo: volume_scars.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_scars.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_scars.Tpo -c -o volume_la-volume_scars.lo `test -f 'volume_scars.c' || echo '$(srcdir)/'`volume_scars.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_scars.Tpo $(DEPDIR)/volume_la-volume_scars.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_scars.c' object='volume_la-volume_scars.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_scars.lo `test -f 'volume_scars.c' || echo '$(srcdir)/'`volume_scars.c + volume_la-volume_slice.lo: volume_slice.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_slice.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_slice.Tpo -c -o volume_la-volume_slice.lo `test -f 'volume_slice.c' || echo '$(srcdir)/'`volume_slice.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_slice.Tpo $(DEPDIR)/volume_la-volume_slice.Plo @@ -1126,6 +1307,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_slice.lo `test -f 'volume_slice.c' || echo '$(srcdir)/'`volume_slice.c +volume_la-volume_stepline.lo: volume_stepline.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_stepline.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_stepline.Tpo -c -o volume_la-volume_stepline.lo `test -f 'volume_stepline.c' || echo '$(srcdir)/'`volume_stepline.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_stepline.Tpo $(DEPDIR)/volume_la-volume_stepline.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_stepline.c' object='volume_la-volume_stepline.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_stepline.lo `test -f 'volume_stepline.c' || echo '$(srcdir)/'`volume_stepline.c + volume_la-volume_strayfield.lo: volume_strayfield.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_strayfield.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_strayfield.Tpo -c -o volume_la-volume_strayfield.lo `test -f 'volume_strayfield.c' || echo '$(srcdir)/'`volume_strayfield.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_strayfield.Tpo $(DEPDIR)/volume_la-volume_strayfield.Plo @@ -1140,6 +1328,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_swaxes.lo `test -f 'volume_swaxes.c' || echo '$(srcdir)/'`volume_swaxes.c +volume_la-volume_xyarithmetics.lo: volume_xyarithmetics.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_xyarithmetics.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_xyarithmetics.Tpo -c -o volume_la-volume_xyarithmetics.lo `test -f 'volume_xyarithmetics.c' || echo '$(srcdir)/'`volume_xyarithmetics.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_xyarithmetics.Tpo $(DEPDIR)/volume_la-volume_xyarithmetics.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='volume_xyarithmetics.c' object='volume_la-volume_xyarithmetics.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -c -o volume_la-volume_xyarithmetics.lo `test -f 'volume_xyarithmetics.c' || echo '$(srcdir)/'`volume_xyarithmetics.c + volume_la-volume_zcal.lo: volume_zcal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(volume_la_CFLAGS) $(CFLAGS) -MT volume_la-volume_zcal.lo -MD -MP -MF $(DEPDIR)/volume_la-volume_zcal.Tpo -c -o volume_la-volume_zcal.lo `test -f 'volume_zcal.c' || echo '$(srcdir)/'`volume_zcal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/volume_la-volume_zcal.Tpo $(DEPDIR)/volume_la-volume_zcal.Plo @@ -1305,50 +1500,66 @@ clean-volumeLTLIBRARIES mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/volume_arithmetic.Plo + -rm -f ./$(DEPDIR)/volume_addframe.Plo + -rm -f ./$(DEPDIR)/volume_arithmetic.Plo -rm -f ./$(DEPDIR)/volume_asciiexport.Plo -rm -f ./$(DEPDIR)/volume_calibrate.Plo + -rm -f ./$(DEPDIR)/volume_drift.Plo -rm -f ./$(DEPDIR)/volume_equiplane.Plo -rm -f ./$(DEPDIR)/volume_extract.Plo + -rm -f ./$(DEPDIR)/volume_facetlevel.Plo -rm -f ./$(DEPDIR)/volume_fdfit.Plo -rm -f ./$(DEPDIR)/volume_invert.Plo -rm -f ./$(DEPDIR)/volume_kmeans.Plo -rm -f ./$(DEPDIR)/volume_kmedians.Plo -rm -f ./$(DEPDIR)/volume_la-volume.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_addframe.Plo -rm -f ./$(DEPDIR)/volume_la-volume_arithmetic.Plo -rm -f ./$(DEPDIR)/volume_la-volume_asciiexport.Plo -rm -f ./$(DEPDIR)/volume_la-volume_calibrate.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_drift.Plo -rm -f ./$(DEPDIR)/volume_la-volume_equiplane.Plo -rm -f ./$(DEPDIR)/volume_la-volume_extract.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_facetlevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_fdfit.Plo -rm -f ./$(DEPDIR)/volume_la-volume_invert.Plo -rm -f ./$(DEPDIR)/volume_la-volume_kmeans.Plo -rm -f ./$(DEPDIR)/volume_la-volume_kmedians.Plo -rm -f ./$(DEPDIR)/volume_la-volume_lawnize.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_linelevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_linestat.Plo -rm -f ./$(DEPDIR)/volume_la-volume_mfmrecalc.Plo -rm -f ./$(DEPDIR)/volume_la-volume_outliers.Plo -rm -f ./$(DEPDIR)/volume_la-volume_planelevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_planestat.Plo -rm -f ./$(DEPDIR)/volume_la-volume_psf.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_removeframe.Plo -rm -f ./$(DEPDIR)/volume_la-volume_rephase.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_scars.Plo -rm -f ./$(DEPDIR)/volume_la-volume_slice.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_stepline.Plo -rm -f ./$(DEPDIR)/volume_la-volume_strayfield.Plo -rm -f ./$(DEPDIR)/volume_la-volume_swaxes.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_xyarithmetics.Plo -rm -f ./$(DEPDIR)/volume_la-volume_zcal.Plo -rm -f ./$(DEPDIR)/volume_la-volume_zposlevel.Plo -rm -f ./$(DEPDIR)/volume_la-volumeops.Plo -rm -f ./$(DEPDIR)/volume_lawnize.Plo + -rm -f ./$(DEPDIR)/volume_linelevel.Plo -rm -f ./$(DEPDIR)/volume_linestat.Plo -rm -f ./$(DEPDIR)/volume_mfmrecalc.Plo -rm -f ./$(DEPDIR)/volume_outliers.Plo -rm -f ./$(DEPDIR)/volume_planelevel.Plo -rm -f ./$(DEPDIR)/volume_planestat.Plo -rm -f ./$(DEPDIR)/volume_psf.Plo + -rm -f ./$(DEPDIR)/volume_removeframe.Plo -rm -f ./$(DEPDIR)/volume_rephase.Plo + -rm -f ./$(DEPDIR)/volume_scars.Plo -rm -f ./$(DEPDIR)/volume_slice.Plo + -rm -f ./$(DEPDIR)/volume_stepline.Plo -rm -f ./$(DEPDIR)/volume_strayfield.Plo -rm -f ./$(DEPDIR)/volume_swaxes.Plo + -rm -f ./$(DEPDIR)/volume_xyarithmetics.Plo -rm -f ./$(DEPDIR)/volume_zcal.Plo -rm -f ./$(DEPDIR)/volume_zposlevel.Plo -rm -f ./$(DEPDIR)/volumeops.Plo @@ -1397,50 +1608,66 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/volume_arithmetic.Plo + -rm -f ./$(DEPDIR)/volume_addframe.Plo + -rm -f ./$(DEPDIR)/volume_arithmetic.Plo -rm -f ./$(DEPDIR)/volume_asciiexport.Plo -rm -f ./$(DEPDIR)/volume_calibrate.Plo + -rm -f ./$(DEPDIR)/volume_drift.Plo -rm -f ./$(DEPDIR)/volume_equiplane.Plo -rm -f ./$(DEPDIR)/volume_extract.Plo + -rm -f ./$(DEPDIR)/volume_facetlevel.Plo -rm -f ./$(DEPDIR)/volume_fdfit.Plo -rm -f ./$(DEPDIR)/volume_invert.Plo -rm -f ./$(DEPDIR)/volume_kmeans.Plo -rm -f ./$(DEPDIR)/volume_kmedians.Plo -rm -f ./$(DEPDIR)/volume_la-volume.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_addframe.Plo -rm -f ./$(DEPDIR)/volume_la-volume_arithmetic.Plo -rm -f ./$(DEPDIR)/volume_la-volume_asciiexport.Plo -rm -f ./$(DEPDIR)/volume_la-volume_calibrate.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_drift.Plo -rm -f ./$(DEPDIR)/volume_la-volume_equiplane.Plo -rm -f ./$(DEPDIR)/volume_la-volume_extract.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_facetlevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_fdfit.Plo -rm -f ./$(DEPDIR)/volume_la-volume_invert.Plo -rm -f ./$(DEPDIR)/volume_la-volume_kmeans.Plo -rm -f ./$(DEPDIR)/volume_la-volume_kmedians.Plo -rm -f ./$(DEPDIR)/volume_la-volume_lawnize.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_linelevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_linestat.Plo -rm -f ./$(DEPDIR)/volume_la-volume_mfmrecalc.Plo -rm -f ./$(DEPDIR)/volume_la-volume_outliers.Plo -rm -f ./$(DEPDIR)/volume_la-volume_planelevel.Plo -rm -f ./$(DEPDIR)/volume_la-volume_planestat.Plo -rm -f ./$(DEPDIR)/volume_la-volume_psf.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_removeframe.Plo -rm -f ./$(DEPDIR)/volume_la-volume_rephase.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_scars.Plo -rm -f ./$(DEPDIR)/volume_la-volume_slice.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_stepline.Plo -rm -f ./$(DEPDIR)/volume_la-volume_strayfield.Plo -rm -f ./$(DEPDIR)/volume_la-volume_swaxes.Plo + -rm -f ./$(DEPDIR)/volume_la-volume_xyarithmetics.Plo -rm -f ./$(DEPDIR)/volume_la-volume_zcal.Plo -rm -f ./$(DEPDIR)/volume_la-volume_zposlevel.Plo -rm -f ./$(DEPDIR)/volume_la-volumeops.Plo -rm -f ./$(DEPDIR)/volume_lawnize.Plo + -rm -f ./$(DEPDIR)/volume_linelevel.Plo -rm -f ./$(DEPDIR)/volume_linestat.Plo -rm -f ./$(DEPDIR)/volume_mfmrecalc.Plo -rm -f ./$(DEPDIR)/volume_outliers.Plo -rm -f ./$(DEPDIR)/volume_planelevel.Plo -rm -f ./$(DEPDIR)/volume_planestat.Plo -rm -f ./$(DEPDIR)/volume_psf.Plo + -rm -f ./$(DEPDIR)/volume_removeframe.Plo -rm -f ./$(DEPDIR)/volume_rephase.Plo + -rm -f ./$(DEPDIR)/volume_scars.Plo -rm -f ./$(DEPDIR)/volume_slice.Plo + -rm -f ./$(DEPDIR)/volume_stepline.Plo -rm -f ./$(DEPDIR)/volume_strayfield.Plo -rm -f ./$(DEPDIR)/volume_swaxes.Plo + -rm -f ./$(DEPDIR)/volume_xyarithmetics.Plo -rm -f ./$(DEPDIR)/volume_zcal.Plo -rm -f ./$(DEPDIR)/volume_zposlevel.Plo -rm -f ./$(DEPDIR)/volumeops.Plo diff -Nru gwyddion-2.62/modules/volume/volume_addframe.c gwyddion-2.63/modules/volume/volume_addframe.c --- gwyddion-2.62/modules/volume/volume_addframe.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_addframe.c 2023-05-31 10:54:11.000000000 +0000 @@ -0,0 +1,389 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +enum { + PREVIEW_SIZE = 360, + RESPONSE_BEFORE = 101, + RESPONSE_REPLACE = 102, + RESPONSE_AFTER = 103, +}; + +enum { + PARAM_ADD_IMAGE, + PARAM_Z, + BUTTON_BEFORE, + BUTTON_REPLACE, + BUTTON_AFTER +}; + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyBrick *result; + gboolean after; + gboolean replace; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void add_frame (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void addit (gpointer user_data); +static void update_image (ModuleGUI *gui, + gint z); +static gboolean add_image_filter (GwyContainer *data, + gint id, + gpointer user_data); + +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Add one frame to volume data stack"), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_addframe) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_addframe", + (GwyVolumeFunc)&add_frame, + N_("/_Basic Operations/I_nsert XY Plane..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Insert single XY plane to some level.")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_image_id(paramdef, PARAM_ADD_IMAGE, "add_image", _("Data to insert")); + gwy_param_def_add_int(paramdef, PARAM_Z, "z", "Preview level", 0, G_MAXINT, 0); + return paramdef; +} + +static void +add_frame(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.after = FALSE; + args.replace = FALSE; + args.params = gwy_params_new_from_settings(define_module_params()); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + newid = gwy_app_data_browser_add_brick(args.result, NULL, data, TRUE); + + gwy_app_set_brick_title(data, newid, _("Frame added")); + gwy_app_sync_volume_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + args->result = gwy_brick_duplicate(brick); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("Add XY Plane")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_slider(table, PARAM_Z); + gwy_param_table_slider_restrict_range(table, PARAM_Z, 0, gwy_brick_get_zres(brick)-1); + gwy_param_table_append_image_id(table, PARAM_ADD_IMAGE); + gwy_param_table_data_id_set_filter(table, PARAM_ADD_IMAGE, add_image_filter, args->brick, NULL); + + gwy_param_table_append_button(table, BUTTON_BEFORE, -1, RESPONSE_BEFORE, + _("Insert _Before Current Level")); + gwy_param_table_append_button(table, BUTTON_REPLACE, -1, RESPONSE_REPLACE, + _("_Replace Current Level")); + gwy_param_table_append_button(table, BUTTON_AFTER, -1, RESPONSE_AFTER, + _("Insert _After Current Level")); + + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, G_GNUC_UNUSED gint id) +{ + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + update_image(gui, z); + } + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + + if (response == GWY_RESPONSE_RESET) { + g_object_unref(gui->args->result); + gui->args->result = gwy_brick_duplicate(gui->args->brick); + gwy_param_table_slider_restrict_range(gui->table_options, PARAM_Z, 0, + gwy_brick_get_zres(gui->args->result) - 1); + update_image(gui, z); + } + else if (response == RESPONSE_BEFORE) { + gui->args->after = FALSE; + gui->args->replace = FALSE; + addit(gui); + } + else if (response == RESPONSE_REPLACE) { + gui->args->after = FALSE; + gui->args->replace = TRUE; + addit(gui); + } + else if (response == RESPONSE_AFTER) { + gui->args->after = TRUE; + gui->args->replace = FALSE; + addit(gui); + } +} + +static void +update_image(ModuleGUI *gui, gint z) +{ + GwyDataField *dfield; + GwyBrick *brick = gui->args->result; + dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + + gwy_brick_extract_xy_plane(brick, dfield, CLAMP(z, 0, brick->zres - 1)); + + gwy_data_field_data_changed(dfield); +} + + +static void +addit(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + GwyBrick *brick; + gint z; + + execute(gui->args); + brick = gui->args->result; + gwy_param_table_slider_restrict_range(gui->table_options, PARAM_Z, 0, gwy_brick_get_zres(brick) - 1); + z = CLAMP(gwy_params_get_int(gui->args->params, PARAM_Z), 0, gwy_brick_get_zres(brick) - 1); + update_image(gui, z); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k, m; + GwyBrick *original = args->result; + GwyBrick *newbrick; + GwyDataField *dfield, *addfield = gwy_params_get_image(args->params, PARAM_ADD_IMAGE); + gint level = gwy_params_get_int(params, PARAM_Z); + gint xres = gwy_brick_get_xres(original); + gint yres = gwy_brick_get_yres(original); + gint zres = gwy_brick_get_zres(original); + gdouble xreal = gwy_brick_get_xreal(original); + gdouble yreal = gwy_brick_get_yreal(original); + gdouble zreal = gwy_brick_get_zreal(original); + gint newzres; + + if (args->replace) { + gwy_brick_set_xy_plane(args->result, addfield, level); + } + else { + newzres = zres + 1; + newbrick = gwy_brick_new(xres, yres, newzres, + xreal, yreal, newzres*zreal/zres, + FALSE); + + gwy_brick_copy_units(original, newbrick); + + dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); + if (args->after) level++; + + m = 0; + for (k = 0; k < newzres; k++) { + if (k == level) gwy_brick_set_xy_plane(newbrick, addfield, k); + else { + gwy_brick_extract_xy_plane(original, dfield, m++); + gwy_brick_set_xy_plane(newbrick, dfield, k); + } + } + g_object_unref(original); + args->result = newbrick; + g_object_unref(dfield); + } +} + +static gboolean +add_image_filter(GwyContainer *data, gint id, gpointer user_data) +{ + GwyDataField *otherfield; + GwyBrick *brick = (GwyBrick*)user_data; + + if (!gwy_container_gis_object(data, gwy_app_get_data_key_for_id(id), &otherfield)) + return FALSE; + return !gwy_data_field_check_compatibility_with_brick_xy(otherfield, brick, + GWY_DATA_COMPATIBILITY_RES + | GWY_DATA_COMPATIBILITY_REAL + | GWY_DATA_COMPATIBILITY_LATERAL + | GWY_DATA_COMPATIBILITY_VALUE); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + sanitise_one_param(params, PARAM_Z, 0, gwy_brick_get_zres(args->brick), 0); +} + + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_arithmetic.c gwyddion-2.63/modules/volume/volume_arithmetic.c --- gwyddion-2.62/modules/volume/volume_arithmetic.c 2022-03-21 17:14:47.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_arithmetic.c 2023-04-11 11:53:25.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: volume_arithmetic.c 24708 2022-03-21 17:14:46Z yeti-dn $ - * Copyright (C) 2018-2019 David Necas (Yeti). + * $Id: volume_arithmetic.c 25296 2023-04-09 08:40:11Z klapetek $ + * Copyright (C) 2018-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -28,11 +24,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include "../process/preview.h" #define ARITH_RUN_MODES GWY_RUN_INTERACTIVE @@ -40,7 +38,7 @@ enum { NARGS = 8, HISTSIZE = 96, - USER_UNITS_ID = G_MAXINT, + USER_UNITS_ID = -1, }; enum { @@ -49,9 +47,9 @@ }; enum { - COMMON_COORD_X = 0, - COMMON_COORD_Y = 1, - COMMON_COORD_Z = 2, + COMMON_COORD_X = 0, + COMMON_COORD_Y = 1, + COMMON_COORD_Z = 2, COMMON_COORD_ZCAL = 3, COMMON_COORD_NCOORDS }; @@ -67,75 +65,86 @@ ARITHMETIC_NUMERIC = 4 }; +enum { + PARAM_EXPRESSION, + PARAM_DATAUNITS, + PARAM_USERUNITS, + PARAM_FIXED_FILLER, + PARAM_FILLER_VALUE, + PARAM_VOLUME, +}; + +typedef struct { + GwyParams *params; + GtkListStore *history; + GwyBrick *result; + GwyDataField *preview; +} ModuleArgs; + typedef struct { GwyExpr *expr; - gchar *expression; - gint dataunits; - gchar *userunits; - GtkTreeModel *history; guint err; - GwyAppDataId objects[NARGS]; gchar *name[ARITHMETIC_NARGS]; guint pos[ARITHMETIC_NARGS]; - GPtrArray *ok_masks; -} ArithmeticArgs; + GwyAppDataId first; +} EvaluationData; typedef struct { - ArithmeticArgs *args; + ModuleArgs *args; + EvaluationData *evdata; GtkWidget *dialog; GtkWidget *view; GtkWidget *expression; GtkWidget *userunits; GtkWidget *userunits_label; + GwyParamTable *table; GtkWidget *result; - GtkWidget *data[NARGS]; GSList *dataunits; - GwyContainer *mydata; -} ArithmeticControls; - -static gboolean module_register (void); -static void arithmetic (GwyContainer *data, - GwyRunType run); -static void arithmetic_load_args (GwyContainer *settings, - ArithmeticArgs *args); -static void arithmetic_save_args (GwyContainer *settings, - ArithmeticArgs *args); -static gboolean arithmetic_dialog (GwyContainer *data, - gint id, - ArithmeticArgs *args); -static void arithmetic_data_chosen (GwyDataChooser *chooser, - ArithmeticControls *controls); -static void arithmetic_expr_changed (GtkWidget *entry, - ArithmeticControls *controls); -static void arithmetic_userunits_changed (GtkEntry *entry, - ArithmeticControls *controls); -static void arithmetic_dataunits_selected(ArithmeticControls *controls); -static void arithmetic_show_state (ArithmeticControls *controls, - const gchar *message); -static const gchar* arithmetic_check_bricks (ArithmeticArgs *args); -static void arithmetic_preview (ArithmeticControls *controls); -static GwyBrick* arithmetic_do (ArithmeticArgs *args, - gint *id); -static void arithmetic_need_data (const ArithmeticArgs *args, - gboolean *need_data); -static void arithmetic_update_history (ArithmeticArgs *args); -static GwyBrick* make_x (GwyBrick *brick); -static GwyBrick* make_y (GwyBrick *brick); -static GwyBrick* make_z (GwyBrick *brick); -static GwyBrick* make_zcal (GwyBrick *brick, - GwyDataLine *zcal); - -static const gchar default_units[] = ""; -static const gchar default_expression[] = "d1 - d2"; + GwyContainer *data; +} ModuleGUI; -static GwyAppDataId object_ids[NARGS]; +static gboolean module_register (void); +static void arithmetic (GwyContainer *data, + GwyRunType run); +static GwyDialogOutcome run_gui (GwyContainer *data, + gint id, + ModuleArgs *args, + EvaluationData *evdata); +static void param_changed (ModuleGUI *gui, + gint id); +static void data_chosen (ModuleGUI *gui, + GwyDataChooser *chooser); +static void expr_changed (ModuleGUI *gui, + GtkWidget *entry); +static void userunits_changed (ModuleGUI *gui, + GtkEntry *entry); +static void dataunits_selected(ModuleGUI *gui); +static void show_state (ModuleGUI *gui, + const gchar *message); +static const gchar* check_bricks (ModuleArgs *args, + EvaluationData *evdata); +static void preview (gpointer user_data); +static void execute (ModuleArgs *args, + EvaluationData *evdata); +static void need_data (const EvaluationData *evdata, + gboolean *need_data); +static void fix_nans (ModuleArgs *args); +static void update_history (ModuleArgs *args); +static GwyBrick* make_x (GwyBrick *brick); +static GwyBrick* make_y (GwyBrick *brick); +static GwyBrick* make_z (GwyBrick *brick); +static GwyBrick* make_zcal (GwyBrick *brick, + GwyDataLine *zcal); +static void sanitise_params (ModuleArgs *args); +static GtkListStore* load_history (void); +static void save_history (GtkListStore *history); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Simple arithmetic operations with volume data."), "Yeti ", - "1.0", + "2.0", "David Nečas (Yeti)", "2018", }; @@ -145,15 +154,9 @@ static gboolean module_register(void) { - guint i; - - for (i = 0; i < NARGS; i++) { - object_ids[i].datano = 0; - object_ids[i].id = -1; - } gwy_volume_func_register("volume_arithmetic", (GwyVolumeFunc)&arithmetic, - N_("/_Arithmetic..."), + N_("/_Basic Operations/_Arithmetic..."), GWY_STOCK_VOLUME_ARITHMETIC, ARITH_RUN_MODES, GWY_MENU_FLAG_VOLUME, @@ -162,106 +165,121 @@ return TRUE; } +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + guint i; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_string(paramdef, PARAM_EXPRESSION, "expression", _("_Expression"), + GWY_PARAM_STRING_NULL_IS_EMPTY, NULL, "d1-d2"); + gwy_param_def_add_int(paramdef, PARAM_DATAUNITS, "dataunits", NULL, -1, NARGS-1, 0); + gwy_param_def_add_unit(paramdef, PARAM_USERUNITS, "userunits", _("Specify un_its"), NULL); + gwy_param_def_add_boolean(paramdef, PARAM_FIXED_FILLER, "fixed_filler", _("_Fixed filler value"), FALSE); + gwy_param_def_add_double(paramdef, PARAM_FILLER_VALUE, "filler_value", _("_Fixed filler value"), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + for (i = 0; i < NARGS; i++) { + gchar *s = g_strdup_printf("volume%u", i); + gwy_param_def_add_volume_id(paramdef, PARAM_VOLUME + i, s, NULL); + } + return paramdef; +} + void arithmetic(GwyContainer *data, GwyRunType run) { - ArithmeticArgs args; + ModuleArgs args; + EvaluationData evdata; + GwyAppDataId dataid; + GwyDialogOutcome outcome; + gint newid; guint i; - GwyContainer *settings; - gboolean dorun; - gint datano, id, newid; g_return_if_fail(run & ARITH_RUN_MODES); - - gwy_app_data_browser_get_current(GWY_APP_BRICK_ID, &id, - GWY_APP_CONTAINER_ID, &datano, + gwy_clear(&args, 1); + gwy_app_data_browser_get_current(GWY_APP_BRICK_ID, &dataid.id, + GWY_APP_CONTAINER_ID, &dataid.datano, 0); - args.objects[0].datano = datano; - args.objects[0].id = id; + g_return_if_fail(gwy_app_data_id_verify_volume(&dataid)); + args.params = gwy_params_new_from_settings(define_module_params()); + gwy_params_set_volume_id(args.params, PARAM_VOLUME, dataid); + args.history = load_history(); + args.result = gwy_brick_new(PREVIEW_SIZE, PREVIEW_SIZE, 1, 1.0, 1.0, 1.0, TRUE); + args.preview = gwy_data_field_new(PREVIEW_SIZE, PREVIEW_SIZE, 1.0, 1.0, TRUE); + sanitise_params(&args); + + evdata.expr = gwy_expr_new(); + gwy_expr_define_constant(evdata.expr, "pi", G_PI, NULL); + gwy_expr_define_constant(evdata.expr, "π", G_PI, NULL); - settings = gwy_app_settings_get(); - arithmetic_load_args(settings, &args); - args.ok_masks = g_ptr_array_new(); - args.expr = gwy_expr_new(); - - gwy_expr_define_constant(args.expr, "pi", G_PI, NULL); - gwy_expr_define_constant(args.expr, "π", G_PI, NULL); - - dorun = arithmetic_dialog(data, id, &args); - arithmetic_save_args(settings, &args); - if (dorun) { - GwyBrick *result = arithmetic_do(&args, &id); - - newid = gwy_app_data_browser_add_brick(result, NULL, data, TRUE); - g_object_unref(result); - gwy_app_set_brick_title(data, newid, _("Calculated")); - gwy_app_sync_data_items(data, data, id, newid, FALSE, - GWY_DATA_ITEM_GRADIENT, - 0); - gwy_app_volume_log_add_volume(data, -1, newid); + for (i = 0; i < NARGS; i++) { + evdata.name[i] = g_strdup_printf("d%d", i+1); } - g_ptr_array_free(args.ok_masks, TRUE); - gwy_expr_free(args.expr); + evdata.name[NARGS + 0] = g_strdup("x"); + evdata.name[NARGS + 1] = g_strdup("y"); + evdata.name[NARGS + 2] = g_strdup("z"); + evdata.name[NARGS + 3] = g_strdup("zcal"); + + outcome = run_gui(data, dataid.id, &args, &evdata); + gwy_params_save_to_settings(args.params); + save_history(args.history); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args, &evdata); + + newid = gwy_app_data_browser_add_brick(args.result, args.preview, data, TRUE); + gwy_app_set_data_field_title(data, newid, _("Calculated")); + gwy_app_sync_volume_items(gwy_app_data_browser_get(evdata.first.datano), data, evdata.first.id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + GWY_OBJECT_UNREF(args.result); + GWY_OBJECT_UNREF(args.preview); + g_object_unref(args.params); + g_object_unref(args.history); + gwy_expr_free(evdata.expr); for (i = 0; i < ARITHMETIC_NARGS; i++) - g_free(args.name[i]); + g_free(evdata.name[i]); } -static gboolean -arithmetic_dialog(GwyContainer *data, - gint id, - ArithmeticArgs *args) -{ - GtkWidget *dialog, *hbox, *hbox2, *vbox, *table, *chooser, *entry, - *label, *button; - ArithmeticControls controls; - GwyDataField *dfield; - GQuark quark; - guint i, row, response; - const guchar *gradient; +static GwyDialogOutcome +run_gui(GwyContainer *data, gint id, + ModuleArgs *args, EvaluationData *evdata) +{ + gint dataunits = gwy_params_get_int(args->params, PARAM_DATAUNITS); + const gchar *userunits = gwy_params_get_string(args->params, PARAM_USERUNITS); + GtkWidget *hbox, *hbox2, *table, *chooser, *entry, *label, *button; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyDialog *dialog; + guint i, row; gchar *s; - controls.args = args; - - dialog = gtk_dialog_new_with_buttons(_("Arithmetic"), NULL, 0, NULL); - controls.dialog = dialog; - gtk_dialog_add_action_widget(GTK_DIALOG(dialog), - gwy_stock_like_button_new(_("_Update"), - GTK_STOCK_EXECUTE), - RESPONSE_PREVIEW); - gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button(GTK_DIALOG(dialog), - GTK_STOCK_OK, GTK_RESPONSE_OK); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - gwy_help_add_to_volume_dialog(GTK_DIALOG(dialog), GWY_HELP_DEFAULT); - - hbox = gtk_hbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, - FALSE, FALSE, 4); - - vbox = gtk_vbox_new(FALSE, 4); - /* Ensure no wild changes of the dialog size due to non-square data. */ - gtk_widget_set_size_request(vbox, PREVIEW_SIZE, PREVIEW_SIZE); - gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4); - - quark = gwy_app_get_brick_preview_key_for_id(id); - dfield = gwy_container_get_object(data, quark); - dfield = gwy_data_field_new_alike(dfield, TRUE); - controls.mydata = gwy_container_new(); - gwy_container_set_object_by_name(controls.mydata, "/0/data", dfield); - g_object_unref(dfield); - - quark = gwy_app_get_brick_palette_key_for_id(id); - if (gwy_container_gis_string(data, quark, &gradient)) { - gwy_container_set_const_string_by_name(controls.mydata, - "/0/base/palette", gradient); - } + gui.args = args; + gui.evdata = evdata; + gui.data = gwy_container_new(); + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), args->preview); + gwy_app_sync_volume_items(data, gui.data, id, 0, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gui.dialog = gwy_dialog_new(_("Arithmetic")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); - controls.view = gwy_create_preview(controls.mydata, 0, PREVIEW_SIZE, FALSE); - gtk_box_pack_start(GTK_BOX(vbox), controls.view, FALSE, FALSE, 0); + gui.view = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, TRUE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(gui.view), FALSE); - table = gtk_table_new(5 + NARGS, 3, FALSE); + table = gtk_table_new(6 + NARGS, 3, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 2); gtk_table_set_col_spacings(GTK_TABLE(table), 6); gtk_container_set_border_width(GTK_CONTAINER(table), 4); @@ -270,302 +288,270 @@ label = gtk_label_new_with_mnemonic(_("_Expression:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); row++; - entry = gtk_combo_box_entry_new_with_model(args->history, 0); - controls.expression = entry; - gtk_combo_box_set_active(GTK_COMBO_BOX(controls.expression), 0); - gtk_table_attach(GTK_TABLE(table), entry, 0, 3, row, row+1, - GTK_EXPAND | GTK_FILL, 0, 0, 0); - g_signal_connect(entry, "changed", - G_CALLBACK(arithmetic_expr_changed), &controls); - g_signal_connect_swapped(gtk_bin_get_child(GTK_BIN(entry)), "activate", - G_CALLBACK(arithmetic_preview), &controls); + entry = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(args->history), 0); + gui.expression = entry; + gtk_combo_box_set_active(GTK_COMBO_BOX(gui.expression), 0); + gtk_table_attach(GTK_TABLE(table), entry, 0, 3, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_signal_connect_swapped(entry, "changed", G_CALLBACK(expr_changed), &gui); + g_signal_connect_swapped(gtk_bin_get_child(GTK_BIN(entry)), "activate", G_CALLBACK(preview), &gui); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); row++; - controls.result = label = gtk_label_new(NULL); + gui.result = label = gtk_label_new(NULL); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); row++; gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); label = gtk_label_new(_("Operands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Units")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 2, 3, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), label, 2, 3, row, row+1, GTK_FILL, 0, 0, 0); row++; - controls.dataunits = NULL; + gui.dataunits = NULL; for (i = 0; i < NARGS; i++) { + GwyAppDataId dataid; + /* VALUE is 0 */ - args->name[i] = g_strdup_printf("d_%d", i+1); - label = gtk_label_new_with_mnemonic(args->name[i]); - gwy_strkill(args->name[i], "_"); + s = g_strdup_printf("d_%d", i+1); + label = gtk_label_new_with_mnemonic(evdata->name[i]); + g_free(s); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); chooser = gwy_data_chooser_new_volumes(); - gwy_data_chooser_set_active_id(GWY_DATA_CHOOSER(chooser), - args->objects + i); - g_signal_connect(chooser, "changed", - G_CALLBACK(arithmetic_data_chosen), &controls); + dataid = gwy_params_get_data_id(args->params, PARAM_VOLUME + i); + gwy_data_chooser_set_active_id(GWY_DATA_CHOOSER(chooser), &dataid); + g_signal_connect_swapped(chooser, "changed", G_CALLBACK(data_chosen), &gui); g_object_set_data(G_OBJECT(chooser), "index", GUINT_TO_POINTER(i)); - gtk_table_attach(GTK_TABLE(table), chooser, 1, 2, row, row+1, - GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), chooser, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); gtk_label_set_mnemonic_widget(GTK_LABEL(label), chooser); - controls.data[i] = chooser; - button = gtk_radio_button_new(controls.dataunits); - controls.dataunits - = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); + button = gtk_radio_button_new(gui.dataunits); + gui.dataunits = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); gwy_radio_button_set_value(button, i); s = g_strdup_printf(_("Take result units from data d%d"), i+1); gtk_widget_set_tooltip_text(button, s); g_free(s); - gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, - 0, 0, 0, 0); - g_signal_connect_swapped(button, "clicked", - G_CALLBACK(arithmetic_dataunits_selected), - &controls); + gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, 0, 0, 0, 0); + g_signal_connect_swapped(button, "clicked", G_CALLBACK(dataunits_selected), &gui); row++; } - args->name[NARGS + 0] = g_strdup("x"); - args->name[NARGS + 1] = g_strdup("y"); - args->name[NARGS + 2] = g_strdup("z"); - args->name[NARGS + 3] = g_strdup("zcal"); hbox2 = gtk_hbox_new(FALSE, 6); - gtk_table_attach(GTK_TABLE(table), hbox2, 0, 2, row, row+1, - GTK_FILL, 0, 0, 0); + gtk_table_attach(GTK_TABLE(table), hbox2, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); label = gtk_label_new_with_mnemonic(_("Specify un_its:")); gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0); - controls.userunits_label = label; - gtk_widget_set_sensitive(controls.userunits_label, - args->dataunits == USER_UNITS_ID); - - controls.userunits = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(controls.userunits), args->userunits); - gtk_box_pack_start(GTK_BOX(hbox2), controls.userunits, TRUE, TRUE, 0); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), controls.userunits); - gtk_widget_set_sensitive(controls.userunits, - args->dataunits == USER_UNITS_ID); - g_signal_connect(controls.userunits, "changed", - G_CALLBACK(arithmetic_userunits_changed), &controls); + gui.userunits_label = label; + gtk_widget_set_sensitive(gui.userunits_label, dataunits == USER_UNITS_ID); + + gui.userunits = entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), userunits ? userunits : ""); + gtk_box_pack_start(GTK_BOX(hbox2), entry, TRUE, TRUE, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); + gtk_widget_set_sensitive(entry, dataunits == USER_UNITS_ID); + g_signal_connect_swapped(entry, "changed", G_CALLBACK(userunits_changed), &gui); - button = gtk_radio_button_new(controls.dataunits); - controls.dataunits = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); + button = gtk_radio_button_new(gui.dataunits); + gui.dataunits = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); gwy_radio_button_set_value(button, USER_UNITS_ID); gtk_widget_set_tooltip_text(button, _("Specify result units explicitly")); - gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, - 0, 0, 0, 0); - g_signal_connect_swapped(button, "clicked", - G_CALLBACK(arithmetic_dataunits_selected), - &controls); + gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, 0, 0, 0, 0); + g_signal_connect_swapped(button, "clicked", G_CALLBACK(dataunits_selected), &gui); row++; - gtk_widget_grab_focus(controls.expression); - gtk_widget_show_all(dialog); - gwy_radio_buttons_set_current(controls.dataunits, args->dataunits); - arithmetic_expr_changed(entry, &controls); - do { - response = gtk_dialog_run(GTK_DIALOG(dialog)); - switch (response) { - case GTK_RESPONSE_CANCEL: - case GTK_RESPONSE_DELETE_EVENT: - gtk_widget_destroy(dialog); - case GTK_RESPONSE_NONE: - return FALSE; - break; + gui.table = gwy_param_table_new(args->params); + gwy_param_table_append_entry(gui.table, PARAM_FILLER_VALUE); + gwy_param_table_add_enabler(gui.table, PARAM_FIXED_FILLER, PARAM_FILLER_VALUE); + gwy_param_table_entry_set_width(gui.table, PARAM_FILLER_VALUE, 12); + gtk_table_attach(GTK_TABLE(table), gwy_param_table_widget(gui.table), 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + gwy_dialog_add_param_table(dialog, gui.table); + row++; - case RESPONSE_PREVIEW: - arithmetic_preview(&controls); - break; + g_signal_connect_swapped(gui.table, "param-changed", G_CALLBACK(param_changed), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_UPON_REQUEST, preview, &gui, NULL); + gtk_widget_grab_focus(gui.expression); + gwy_radio_buttons_set_current(gui.dataunits, dataunits); + expr_changed(&gui, gui.expression); /* resolves variables */ + outcome = gwy_dialog_run(dialog); - case GTK_RESPONSE_OK: - break; + g_object_unref(gui.data); - default: - g_assert_not_reached(); - break; - } - } while (response != GTK_RESPONSE_OK); + return outcome; +} - gtk_widget_destroy(dialog); +static void +param_changed(ModuleGUI *gui, gint id) +{ + GwyParams *params = gui->args->params; - return TRUE; + if (id < 0 || id == PARAM_FILLER_VALUE) { + gdouble filler_value = gwy_params_get_double(params, PARAM_FILLER_VALUE); + if (gwy_isinf(filler_value) || gwy_isnan(filler_value)) + gwy_param_table_set_double(gui->table, PARAM_FILLER_VALUE, 0.0); + } + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void -arithmetic_data_chosen(GwyDataChooser *chooser, - ArithmeticControls *controls) +data_chosen(ModuleGUI *gui, GwyDataChooser *chooser) { - ArithmeticArgs *args; - guint i; - - args = controls->args; - i = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(chooser), "index")); - gwy_data_chooser_get_active_id(chooser, args->objects + i); - if (!(args->err & ARITHMETIC_EXPR)) - arithmetic_show_state(controls, NULL); + ModuleArgs *args = gui->args; + guint i = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(chooser), "index")); + GwyAppDataId dataid; + + gwy_data_chooser_get_active_id(chooser, &dataid); + gwy_params_set_volume_id(args->params, PARAM_VOLUME + i, dataid); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); + if (!(gui->evdata->err & ARITHMETIC_EXPR)) + show_state(gui, NULL); } static void -arithmetic_expr_changed(GtkWidget *entry, - ArithmeticControls *controls) +expr_changed(ModuleGUI *gui, GtkWidget *entry) { - ArithmeticArgs *args; - GtkComboBox *combo; + ModuleArgs *args = gui->args; + EvaluationData *evdata = gui->evdata; + GtkComboBox *combo = GTK_COMBO_BOX(entry); + const gchar *expr = gtk_combo_box_get_active_text(combo); GError *error = NULL; const gchar *message = NULL; gchar *s = NULL; - combo = GTK_COMBO_BOX(entry); - args = controls->args; - g_free(args->expression); - args->expression = g_strdup(gtk_combo_box_get_active_text(combo)); - args->err = ARITHMETIC_OK; + gwy_params_set_string(args->params, PARAM_EXPRESSION, expr); + evdata->err = ARITHMETIC_OK; - if (gwy_expr_compile(args->expr, args->expression, &error)) { - guint nvars = gwy_expr_get_variables(args->expr, NULL); + if (gwy_expr_compile(evdata->expr, expr, &error)) { + guint nvars = gwy_expr_get_variables(evdata->expr, NULL); g_return_if_fail(nvars); if (nvars == 1) { - gdouble v = gwy_expr_execute(args->expr, NULL); + gdouble v = gwy_expr_execute(evdata->expr, NULL); message = s = g_strdup_printf("%g", v); - args->err = ARITHMETIC_NUMERIC; + evdata->err = ARITHMETIC_NUMERIC; } else { - if (gwy_expr_resolve_variables(args->expr, ARITHMETIC_NARGS, - (const gchar*const*)args->name, - args->pos)) { - args->err = ARITHMETIC_EXPR; + if (gwy_expr_resolve_variables(evdata->expr, + ARITHMETIC_NARGS, (const gchar*const*)evdata->name, evdata->pos)) { + evdata->err = ARITHMETIC_EXPR; message = _("Expression contains unknown identifiers"); } +#ifdef DEBUG + { + gint i; + for (i = 0; i < ARITHMETIC_NARGS; i++) + gwy_debug("pos[%u] = %d", i, evdata->pos[i]); + } +#endif } } else { - args->err = ARITHMETIC_EXPR; + evdata->err = ARITHMETIC_EXPR; message = error->message; } - arithmetic_show_state(controls, message); + show_state(gui, message); g_clear_error(&error); g_free(s); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void -arithmetic_userunits_changed(GtkEntry *entry, - ArithmeticControls *controls) +userunits_changed(ModuleGUI *gui, GtkEntry *entry) { - g_free(controls->args->userunits); - controls->args->userunits = g_strdup(gtk_entry_get_text(entry)); + gwy_params_set_string(gui->args->params, PARAM_USERUNITS, gtk_entry_get_text(entry)); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void -arithmetic_dataunits_selected(ArithmeticControls *controls) +dataunits_selected(ModuleGUI *gui) { - ArithmeticArgs *args = controls->args; - args->dataunits = gwy_radio_buttons_get_current(controls->dataunits); - gtk_widget_set_sensitive(controls->userunits, - args->dataunits == USER_UNITS_ID); - gtk_widget_set_sensitive(controls->userunits_label, - args->dataunits == USER_UNITS_ID); + ModuleArgs *args = gui->args; + gint dataunits = gwy_radio_buttons_get_current(gui->dataunits); + + gwy_params_set_int(args->params, PARAM_DATAUNITS, dataunits); + gtk_widget_set_sensitive(gui->userunits, dataunits == USER_UNITS_ID); + gtk_widget_set_sensitive(gui->userunits_label, dataunits == USER_UNITS_ID); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); } static void -arithmetic_show_state(ArithmeticControls *controls, - const gchar *message) +show_state(ModuleGUI *gui, const gchar *message) { - ArithmeticArgs *args = controls->args; - GtkDialog *dialog = GTK_DIALOG(controls->dialog); + GtkDialog *dialog = GTK_DIALOG(gui->dialog); + ModuleArgs *args = gui->args; + EvaluationData *evdata = gui->evdata; gboolean ok; - if (!message && args->err != ARITHMETIC_NUMERIC) { - message = arithmetic_check_bricks(args); - if (args->err) - gtk_label_set_text(GTK_LABEL(controls->result), message); - else - gtk_label_set_text(GTK_LABEL(controls->result), ""); + if (!message && evdata->err != ARITHMETIC_NUMERIC) { + message = check_bricks(args, evdata); + gtk_label_set_text(GTK_LABEL(gui->result), evdata->err ? message : NULL); } else { if (message) - gtk_label_set_text(GTK_LABEL(controls->result), message); + gtk_label_set_text(GTK_LABEL(gui->result), message); } - ok = (args->err == ARITHMETIC_OK); + ok = (evdata->err == ARITHMETIC_OK); gtk_dialog_set_response_sensitive(dialog, GTK_RESPONSE_OK, ok); gtk_dialog_set_response_sensitive(dialog, RESPONSE_PREVIEW, ok); if (ok) - set_widget_as_ok_message(controls->result); + set_widget_as_ok_message(gui->result); else - set_widget_as_error_message(controls->result); + set_widget_as_error_message(gui->result); } static const gchar* -arithmetic_check_bricks(ArithmeticArgs *args) +check_bricks(ModuleArgs *args, EvaluationData *evdata) { guint first = 0, i; - GwyContainer *data; - GQuark quark; GwyBrick *bfirst, *brick; GwyDataCompatibilityFlags diff; - gboolean need_data[NARGS]; + gboolean nd[NARGS]; - if (args->err & (ARITHMETIC_EXPR | ARITHMETIC_NUMERIC)) + if (evdata->err & (ARITHMETIC_EXPR | ARITHMETIC_NUMERIC)) return NULL; - arithmetic_need_data(args, need_data); - + need_data(evdata, nd); for (i = 0; i < NARGS; i++) { - if (need_data[i]) { + if (nd[i]) { first = i; break; } } if (i == NARGS) { /* no variables */ - args->err &= ~ARITHMETIC_DATA; + evdata->err &= ~ARITHMETIC_DATA; return NULL; } /* each window must match with first, this is transitive */ - data = gwy_app_data_browser_get(args->objects[first].datano); - g_return_val_if_fail(data, NULL); - quark = gwy_app_get_brick_key_for_id(args->objects[first].id); - bfirst = GWY_BRICK(gwy_container_get_object(data, quark)); + bfirst = gwy_params_get_volume(args->params, PARAM_VOLUME + first); for (i = first+1; i < NARGS; i++) { - if (!need_data[i]) + if (!nd[i]) continue; - data = gwy_app_data_browser_get(args->objects[i].datano); - g_return_val_if_fail(data, NULL); - quark = gwy_app_get_brick_key_for_id(args->objects[i].id); - brick = GWY_BRICK(gwy_container_get_object(data, quark)); - + brick = gwy_params_get_volume(args->params, PARAM_VOLUME + i); diff = gwy_brick_check_compatibility(bfirst, brick, GWY_DATA_COMPATIBILITY_RES | GWY_DATA_COMPATIBILITY_REAL | GWY_DATA_COMPATIBILITY_LATERAL | GWY_DATA_COMPATIBILITY_AXISCAL); if (diff) { - args->err |= ARITHMETIC_DATA; + evdata->err |= ARITHMETIC_DATA; if (diff & GWY_DATA_COMPATIBILITY_RES) return _("Pixel dimensions differ"); if (diff & GWY_DATA_COMPATIBILITY_LATERAL) - return _("Lateral dimensions are different physical " - "quantities"); + return _("Lateral dimensions are different physical quantities"); if (diff & GWY_DATA_COMPATIBILITY_REAL) return _("Physical dimensions differ"); if (diff & GWY_DATA_COMPATIBILITY_AXISCAL) @@ -573,133 +559,122 @@ } } - args->err &= ~ARITHMETIC_DATA; + evdata->err &= ~ARITHMETIC_DATA; return NULL; } static void -arithmetic_preview(ArithmeticControls *controls) +preview(gpointer user_data) { - GwyBrick *result; - GwyDataField *dfield; - gint id = -1; + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; /* We can also get here by activation of the entry so check again. */ - if (controls->args->err != ARITHMETIC_OK) + if (gui->evdata->err != ARITHMETIC_OK) return; - result = arithmetic_do(controls->args, &id); - g_return_if_fail(result); + execute(args, gui->evdata); + g_return_if_fail(args->preview); - dfield = gwy_container_get_object_by_name(controls->mydata, "/0/data"); - gwy_brick_mean_xy_plane(result, dfield); - /* FIXME: This is a bit wasteful. We should keep the result and use it - * if the user does not change the expression. */ - g_object_unref(result); - gwy_data_field_data_changed(dfield); - gwy_set_data_preview_size(GWY_DATA_VIEW(controls->view), PREVIEW_SIZE); + gwy_data_field_data_changed(args->preview); + gwy_set_data_preview_size(GWY_DATA_VIEW(gui->view), PREVIEW_SIZE); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); } -static GwyBrick* -arithmetic_do(ArithmeticArgs *args, gint *id) +static void +update_brick(GwyBrick *src, GwyBrick *target, gint *n, gdouble **tdata) { - GwyContainer *data; - GwySIUnit *unit, *unit2; - GQuark quark; - GwyBrick **data_bricks, *brick, *result = NULL; + gint xres = gwy_brick_get_xres(src), yres = gwy_brick_get_yres(src), zres = gwy_brick_get_zres(src); + + gwy_brick_resample(target, xres, yres, zres, GWY_INTERPOLATION_NONE); + gwy_brick_copy_units(src, target); + gwy_brick_set_xreal(target, gwy_brick_get_xreal(src)); + gwy_brick_set_yreal(target, gwy_brick_get_yreal(src)); + gwy_brick_set_zreal(target, gwy_brick_get_zreal(src)); + gwy_brick_set_xoffset(target, gwy_brick_get_xoffset(src)); + gwy_brick_set_yoffset(target, gwy_brick_get_yoffset(src)); + gwy_brick_set_zoffset(target, gwy_brick_get_zoffset(src)); + *n = xres*yres*zres; + *tdata = gwy_brick_get_data(target); +} + +static void +execute(ModuleArgs *args, EvaluationData *evdata) +{ + GwyBrick **data_bricks, *brick; GwyDataLine *zcal = NULL; const gdouble **d; - gboolean need_data[NARGS]; + gboolean nd[NARGS]; gdouble *r = NULL; gboolean first = TRUE; - guint n = 0, i; + guint n = 0, i, dataunits; - g_return_val_if_fail(args->err == ARITHMETIC_OK, NULL); + g_return_if_fail(evdata->err == ARITHMETIC_OK); - arithmetic_need_data(args, need_data); + need_data(evdata, nd); /* We know the expression can't contain more variables */ data_bricks = g_new0(GwyBrick*, ARITHMETIC_NARGS); d = g_new0(const gdouble*, ARITHMETIC_NARGS + 1); - d[0] = NULL; /* First get all the data bricks we directly have */ for (i = 0; i < NARGS; i++) { - gwy_debug("brick[%u]: %s", i, need_data[i] ? "NEEDED" : "not needed"); - if (!need_data[i]) + gwy_debug("brick[%u]: %s", i, nd[i] ? "NEEDED" : "not needed"); + if (!nd[i]) continue; - data = gwy_app_data_browser_get(args->objects[i].datano); - g_return_val_if_fail(data, NULL); - quark = gwy_app_get_brick_key_for_id(args->objects[i].id); - brick = GWY_BRICK(gwy_container_get_object(data, quark)); + brick = data_bricks[i] = gwy_params_get_volume(args->params, PARAM_VOLUME + i); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); if (!i) zcal = gwy_brick_get_zcalibration(brick); - - data_bricks[i] = brick; - d[args->pos[i]] = gwy_brick_get_data_const(brick); - gwy_debug("d[%u] set to PRIMARY %u", args->pos[i], i); + gwy_debug("d[%u] set to PRIMARY %u", evdata->pos[i], i); if (first) { first = FALSE; - n = (gwy_brick_get_xres(brick) - * gwy_brick_get_yres(brick) - * gwy_brick_get_zres(brick)); - result = gwy_brick_new_alike(brick, FALSE); - r = gwy_brick_get_data(result); - *id = args->objects[i].id; + update_brick(brick, args->result, &n, &r); + evdata->first = gwy_params_get_data_id(args->params, PARAM_VOLUME + i); } } /* Then create the common coordinate bricks if we have to. */ i = NARGS + COMMON_COORD_X; - if (args->pos[i]) { + if (evdata->pos[i]) { brick = make_x(data_bricks[0]); data_bricks[i] = brick; - d[args->pos[i]] = gwy_brick_get_data_const(brick); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); } i = NARGS + COMMON_COORD_Y; - if (args->pos[i]) { + if (evdata->pos[i]) { brick = make_y(data_bricks[0]); data_bricks[i] = brick; - d[args->pos[i]] = gwy_brick_get_data_const(brick); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); } i = NARGS + COMMON_COORD_Z; - if (args->pos[i]) { + if (evdata->pos[i]) { brick = make_z(data_bricks[0]); data_bricks[i] = brick; - d[args->pos[i]] = gwy_brick_get_data_const(brick); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); } i = NARGS + COMMON_COORD_ZCAL; - if (args->pos[i]) { - if (zcal) - brick = make_zcal(data_bricks[0], zcal); - else - brick = make_z(data_bricks[0]); - - data_bricks[i] = brick; - d[args->pos[i]] = gwy_brick_get_data_const(brick); + if (evdata->pos[i]) { + brick = zcal ? make_zcal(data_bricks[0], zcal) : make_z(data_bricks[0]); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); } /* Execute */ - gwy_expr_vector_execute(args->expr, n, d, r); + gwy_expr_vector_execute(evdata->expr, n, d, r); + fix_nans(args); + gwy_brick_mean_xy_plane(args->result, args->preview); /* Set units. */ - unit = gwy_brick_get_si_unit_w(result); - if (args->dataunits == USER_UNITS_ID) - gwy_si_unit_set_from_string(unit, args->userunits); - else { - i = args->dataunits; - if (!(brick = data_bricks[i])) { - data = gwy_app_data_browser_get(args->objects[i].datano); - g_return_val_if_fail(data, NULL); - quark = gwy_app_get_brick_key_for_id(args->objects[i].id); - brick = GWY_BRICK(gwy_container_get_object(data, quark)); - } - unit2 = gwy_brick_get_si_unit_w(brick); - gwy_si_unit_assign(unit, unit2); + dataunits = gwy_params_get_int(args->params, PARAM_DATAUNITS); + if (dataunits == USER_UNITS_ID) { + gwy_si_unit_set_from_string(gwy_brick_get_si_unit_w(args->result), + gwy_params_get_string(args->params, PARAM_USERUNITS)); } + else + gwy_brick_copy_units(gwy_params_get_volume(args->params, PARAM_VOLUME + dataunits), args->result); /* Free stuff */ for (i = NARGS; i < ARITHMETIC_NARGS; i++) { @@ -708,48 +683,67 @@ } g_free(data_bricks); g_free(d); - - return result; } /* Find which data we need. */ static void -arithmetic_need_data(const ArithmeticArgs *args, - gboolean *need_data) +need_data(const EvaluationData *evdata, gboolean *nd) { guint i; - gwy_clear(need_data, NARGS); + gwy_clear(nd, NARGS); for (i = 0; i < NARGS; i++) { - if (args->pos[i]) - need_data[i] = TRUE; + if (evdata->pos[i]) + nd[i] = TRUE; } - // When x and y are needed, always take them from field 1. This also - // ensures the expression is considered to be a field expression. + // When x and y are needed, always take them from field 1. This also ensures the expression is considered to be + // a field expression. for (i = 0; i < COMMON_COORD_NCOORDS; i++) { - if (args->pos[NARGS + i]) { - need_data[0] = TRUE; + if (evdata->pos[NARGS + i]) { + nd[0] = TRUE; break; } } } +/* Must be run before creating the preview field, so we can reuse args->preview as a buffer. */ +static void +fix_nans(ModuleArgs *args) +{ + GwyParams *params = args->params; + gboolean fixed_filler = gwy_params_get_boolean(params, PARAM_FIXED_FILLER); + gdouble filler_value = gwy_params_get_double(params, PARAM_FILLER_VALUE); + GwyBrick *result = args->result; + gint xres = gwy_brick_get_xres(result), yres = gwy_brick_get_yres(result), zres = gwy_brick_get_zres(result); + GwyDataField *plane = args->preview, *mask; + gint i; + + plane = gwy_data_field_new(xres, yres, 1.0, 1.0, FALSE); + for (i = 0; i < zres; i++) { + gwy_brick_extract_xy_plane(result, plane, i); + mask = gwy_app_channel_mask_of_nans(plane, FALSE); + if (!mask) + continue; + + if (fixed_filler) + gwy_data_field_area_fill_mask(plane, mask, GWY_MASK_INCLUDE, 0, 0, xres, yres, filler_value); + else + gwy_data_field_laplace_solve(plane, mask, -1, 0.25); + gwy_brick_set_xy_plane(result, plane, i); + g_object_unref(mask); + } +} + static GwyBrick* make_x(GwyBrick *brick) { - GwyBrick *result; - gdouble dx, xoff; - guint xres, yres, zres, i, j; - gdouble *data; - - result = gwy_brick_new_alike(brick, FALSE); - xres = gwy_brick_get_xres(brick); - yres = gwy_brick_get_yres(brick); - zres = gwy_brick_get_zres(brick); - dx = gwy_brick_get_xreal(brick)/xres; - xoff = gwy_brick_get_xoffset(brick); - data = gwy_brick_get_data(result); + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dx = gwy_brick_get_dx(brick); + gdouble xoff = gwy_brick_get_xoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j; for (j = 0; j < xres; j++) data[j] = (j + 0.5)*dx + xoff; @@ -763,18 +757,12 @@ static GwyBrick* make_y(GwyBrick *brick) { - GwyBrick *result; - gdouble dy, yoff; - guint xres, yres, zres, i, j, k; - gdouble *data; - - result = gwy_brick_new_alike(brick, FALSE); - xres = gwy_brick_get_xres(brick); - yres = gwy_brick_get_yres(brick); - zres = gwy_brick_get_zres(brick); - dy = gwy_brick_get_yreal(brick)/yres; - yoff = gwy_brick_get_yoffset(brick); - data = gwy_brick_get_data(result); + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dy = gwy_brick_get_dy(brick); + gdouble yoff = gwy_brick_get_yoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j, k; for (k = 0; k < zres; k++) { for (i = 0; i < yres; i++) { @@ -791,18 +779,12 @@ static GwyBrick* make_z(GwyBrick *brick) { - GwyBrick *result; - gdouble dz, zoff; - guint xres, yres, zres, i, j; - gdouble *data; - - result = gwy_brick_new_alike(brick, FALSE); - xres = gwy_brick_get_xres(brick); - yres = gwy_brick_get_yres(brick); - zres = gwy_brick_get_zres(brick); - dz = gwy_brick_get_zreal(brick)/zres; - zoff = gwy_brick_get_yoffset(brick); - data = gwy_brick_get_data(result); + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dz = gwy_brick_get_dx(brick); + gdouble zoff = gwy_brick_get_xoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j; for (i = 0; i < zres; i++) { gdouble *rrow = data + i*xres*yres; @@ -817,21 +799,13 @@ static GwyBrick* make_zcal(GwyBrick *brick, GwyDataLine *zcal) { - GwyBrick *result; - guint xres, yres, zres, i, j; - gdouble *data; - const gdouble *zd; - - result = gwy_brick_new_alike(brick, FALSE); - xres = gwy_brick_get_xres(brick); - yres = gwy_brick_get_yres(brick); - zres = gwy_brick_get_zres(brick); - data = gwy_brick_get_data(result); + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble *data = gwy_brick_get_data(result); + const gdouble *zd = gwy_data_line_get_data_const(zcal); + gint i, j; - g_return_val_if_fail(GWY_IS_DATA_LINE(zcal), brick); g_return_val_if_fail(gwy_data_line_get_res(zcal) == xres, brick); - zd = gwy_data_line_get_data_const(zcal); - for (i = 0; i < zres; i++) { gdouble *rrow = data + i*xres*yres; gdouble z = zd[i]; @@ -843,112 +817,92 @@ } static void -arithmetic_update_history(ArithmeticArgs *args) +update_history(ModuleArgs *args) { - GtkListStore *store; + const gchar *expr = gwy_params_get_string(args->params, PARAM_EXPRESSION); + GtkListStore *store = args->history; + GtkTreeModel *model = GTK_TREE_MODEL(store); GtkTreeIter iter; gchar *s; - if (!*args->expression) + if (!expr) return; - store = GTK_LIST_STORE(args->history); gtk_list_store_prepend(store, &iter); - gtk_list_store_set(store, &iter, 0, args->expression, -1); + gtk_list_store_set(store, &iter, 0, expr, -1); - while (gtk_tree_model_iter_next(args->history, &iter)) { - gtk_tree_model_get(args->history, &iter, 0, &s, -1); - if (gwy_strequal(s, args->expression)) { + while (gtk_tree_model_iter_next(model, &iter)) { + gtk_tree_model_get(model, &iter, 0, &s, -1); + if (gwy_strequal(s, expr)) { gtk_list_store_remove(store, &iter); + g_free(s); break; } + g_free(s); } } -static const gchar expression_key[] = "/module/volume_arithmetic/expression"; -static const gchar dataunits_key[] = "/module/volume_arithmetic/dataunits"; -static const gchar userunits_key[] = "/module/volume_arithmetic/userunits"; - -static void -arithmetic_load_args(GwyContainer *settings, - ArithmeticArgs *args) +static GtkListStore* +load_history(void) { GtkListStore *store; - const guchar *str; gchar *buffer, *line, *p; gsize size; - guint i; - - str = default_expression; - gwy_container_gis_string_by_name(settings, expression_key, &str); - args->expression = g_strdup(str); - - str = default_units; - gwy_container_gis_string_by_name(settings, userunits_key, &str); - args->userunits = g_strdup(str); - - args->dataunits = 0; - gwy_container_gis_int32_by_name(settings, dataunits_key, &args->dataunits); store = gtk_list_store_new(1, G_TYPE_STRING); - args->history = GTK_TREE_MODEL(store); + if (!gwy_module_data_load("volume_arithmetic", "history", &buffer, &size, NULL)) + return store; - if (gwy_module_data_load("volume_arithmetic", "history", &buffer, &size, - NULL)) { - p = buffer; - for (line = gwy_str_next_line(&p); line; line = gwy_str_next_line(&p)) { + p = buffer; + for (line = gwy_str_next_line(&p); line; line = gwy_str_next_line(&p)) { + if (*g_strstrip(line)) { GtkTreeIter iter; - - g_strstrip(line); - if (*line) { - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, line, -1); - } + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, 0, line, -1); } - g_free(buffer); } + g_free(buffer); + return store; +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + GwyAppDataId dataid; + guint i; + dataid = gwy_params_get_data_id(params, PARAM_VOLUME); for (i = 1; i < NARGS; i++) { - args->objects[i] = object_ids[i]; - /* Init to d1 instead of ‘none’ when we lose the bricks. */ - if (!gwy_app_data_id_verify_channel(args->objects + i)) - args->objects[i] = args->objects[0]; + /* Replace lost volumes with d1. */ + if (!gwy_params_get_volume(params, PARAM_VOLUME + i)) + gwy_params_set_volume_id(params, PARAM_VOLUME + i, dataid); } - /* Ensures args->expression comes first */ - arithmetic_update_history(args); + update_history(args); } static void -arithmetic_save_args(GwyContainer *settings, - ArithmeticArgs *args) +save_history(GtkListStore *history) { - GtkTreeIter iter; - guint i = 0; - gchar *s; + GtkTreeModel *model = GTK_TREE_MODEL(history); + GtkTreeIter iter; + gchar *s; FILE *fh; + gint i = 0; - gwy_assign(object_ids, args->objects, NARGS); - - gwy_container_set_string_by_name(settings, expression_key, - args->expression); - gwy_container_set_string_by_name(settings, userunits_key, args->userunits); - gwy_container_set_int32_by_name(settings, dataunits_key, args->dataunits); - - if (!(fh = gwy_module_data_fopen("volume_arithmetic", "history", "w", - NULL))) + if (!(fh = gwy_module_data_fopen("volume_arithmetic", "history", "w", NULL))) return; - if (gtk_tree_model_get_iter_first(args->history, &iter)) { + if (gtk_tree_model_get_iter_first(model, &iter)) { do { - gtk_tree_model_get(args->history, &iter, 0, &s, -1); + gtk_tree_model_get(model, &iter, 0, &s, -1); fputs(s, fh); fputc('\n', fh); g_free(s); - } while (++i < HISTSIZE - && gtk_tree_model_iter_next(args->history, &iter)); + } while (++i < HISTSIZE && gtk_tree_model_iter_next(model, &iter)); } fclose(fh); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_asciiexport.c gwyddion-2.63/modules/volume/volume_asciiexport.c --- gwyddion-2.62/modules/volume/volume_asciiexport.c 2022-06-22 08:49:13.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_asciiexport.c 2023-02-24 17:05:18.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: volume_asciiexport.c 24842 2022-06-10 09:24:30Z klapetek $ - * Copyright (C) 2018 David Necas (Yeti). + * $Id: volume_asciiexport.c 25254 2023-02-24 17:05:18Z yeti-dn $ + * Copyright (C) 2018-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -36,7 +32,13 @@ #include #include -#define VOLASCEXP_RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) +#define RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) + +enum { + PARAM_STYLE, + PARAM_DECIMAL_DOT, + PARAM_PRECISION, +}; typedef enum { VOLUME_EXPORT_VTK = 0, @@ -47,53 +49,29 @@ } VolumeExportStyle; typedef struct { - VolumeExportStyle style; - gboolean decimal_dot; - guint precision; -} VolumeASCIIExportArgs; - -typedef struct { - gboolean needs_decimal_dot; - guint decimal_dot_len; - gchar *decimal_dot; -} DecimalDotInfo; - -typedef struct { - VolumeASCIIExportArgs *args; - DecimalDotInfo *decinfo; + GwyParams *params; + gboolean need_decimal_dot_option; GwyBrick *brick; - gchar *title; -} VolumeASCIIExportData; - -static gboolean module_register (void); -static void volume_ascii_export (GwyContainer *data, - GwyRunType run); -static gboolean volascexp_export_dialog(VolumeASCIIExportArgs *args, - const DecimalDotInfo *decinfo); -static void decimal_dot_changed (GtkToggleButton *toggle, - VolumeASCIIExportArgs *args); -static void precision_changed (GtkAdjustment *adj, - VolumeASCIIExportArgs *args); -static gchar* export_brick (gpointer user_data, - gssize *data_len); -static void destroy_brick (gchar *data, - gpointer user_data); -static void fill_decimal_dot_info (DecimalDotInfo *info); -static void volascexp_load_args (GwyContainer *settings, - VolumeASCIIExportArgs *args); -static void volascexp_save_args (GwyContainer *settings, - VolumeASCIIExportArgs *args); + /* Cached input data properties. */ + const guchar *title; +} ModuleArgs; -static const VolumeASCIIExportArgs volascexp_defaults = { - VOLUME_EXPORT_MATRICES, TRUE, 5, -}; +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void volume_ascii_export (GwyContainer *data, + GwyRunType mode); +static GwyDialogOutcome run_gui (ModuleArgs *args); +static gchar* export_brick (gpointer user_data, + gssize *data_len); +static void destroy_brick (gchar *data, + gpointer user_data); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Exports volume data in simple ASCII formats."), "Yeti ", - "1.0", + "2.0", "David Nečas (Yeti)", "2018", }; @@ -105,174 +83,93 @@ { gwy_volume_func_register("volume_asciiexport", (GwyVolumeFunc)&volume_ascii_export, - N_("/Export _Text..."), + N_("/_Basic Operations/Export _Text..."), NULL, - VOLASCEXP_RUN_MODES, + RUN_MODES, GWY_MENU_FLAG_VOLUME, N_("Export volume data to a text file")); return TRUE; } -static void -volume_ascii_export(GwyContainer *data, GwyRunType run) -{ - VolumeASCIIExportData expdata; - VolumeASCIIExportArgs args; - DecimalDotInfo decinfo; - GwyBrick *brick; - GQuark quark; - const guchar *title; - gint id; - - g_return_if_fail(run & VOLASCEXP_RUN_MODES); - - gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, - GWY_APP_BRICK_ID, &id, - 0); - g_return_if_fail(GWY_IS_BRICK(brick)); - - volascexp_load_args(gwy_app_settings_get(), &args); - fill_decimal_dot_info(&decinfo); - - if (run == GWY_RUN_INTERACTIVE) { - if (!volascexp_export_dialog(&args, &decinfo)) - goto finish; - } - - expdata.args = &args; - expdata.decinfo = &decinfo; - expdata.brick = brick; - - quark = gwy_app_get_brick_title_key_for_id(id); - if (gwy_container_gis_string(data, quark, &title)) - expdata.title = g_strdup(title); - else - expdata.title = g_strdup("Volume data"); - - gwy_save_auxiliary_with_callback(_("Export to Text File"), NULL, - export_brick, destroy_brick, &expdata); - g_free(expdata.title); - -finish: - g_free(decinfo.decimal_dot); -} - -static gboolean -volascexp_export_dialog(VolumeASCIIExportArgs *args, - const DecimalDotInfo *decinfo) +static GwyParamDef* +define_module_params(void) { - static const GwyEnum style_types[] = { + static const GwyEnum styles[] = { { N_("VTK structured grid"), VOLUME_EXPORT_VTK, }, { N_("One Z-profile per line"), VOLUME_EXPORT_ZLINES, }, { N_("One XY-layer per line"), VOLUME_EXPORT_LAYERS, }, { N_("Blank-line separated matrices"), VOLUME_EXPORT_MATRICES, }, }; + static GwyParamDef *paramdef = NULL; - GtkWidget *dialog, *vbox, *hbox, *label, *decimal_dot, *combo, - *precision; - gint response; - - dialog = gtk_dialog_new_with_buttons(_("Export Text"), NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - gwy_help_add_to_volume_dialog(GTK_DIALOG(dialog), GWY_HELP_DEFAULT); - - vbox = gtk_vbox_new(FALSE, 2); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, TRUE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); - - gtk_box_pack_start(GTK_BOX(vbox), gwy_label_new_header(_("Options")), - FALSE, FALSE, 0); - - combo = gwy_enum_combo_box_new(style_types, G_N_ELEMENTS(style_types), - G_CALLBACK(gwy_enum_combo_box_update_int), - &args->style, args->style, TRUE); - gtk_box_pack_start(GTK_BOX(vbox), combo, FALSE, FALSE, 0); - - decimal_dot = gtk_check_button_new_with_mnemonic(_("Use _dot " - "as decimal separator")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decimal_dot), - args->decimal_dot - || !decinfo->needs_decimal_dot); - gtk_widget_set_sensitive(decimal_dot, decinfo->needs_decimal_dot); - gtk_box_pack_start(GTK_BOX(vbox), decimal_dot, FALSE, FALSE, 0); - g_signal_connect(decimal_dot, "toggled", - G_CALLBACK(decimal_dot_changed), args); - - hbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - label = gtk_label_new_with_mnemonic(_("_Precision:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - precision = gtk_spin_button_new_with_range(0, 16, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(precision), args->precision); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), precision); - gtk_box_pack_start(GTK_BOX(hbox), precision, FALSE, FALSE, 0); - g_signal_connect(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(precision)), - "value-changed", G_CALLBACK(precision_changed), args); - - gtk_widget_show_all(dialog); - response = gtk_dialog_run(GTK_DIALOG(dialog)); - if (response != GTK_RESPONSE_NONE) { - if (decinfo->needs_decimal_dot) - args->decimal_dot - = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(decimal_dot)); - args->precision - = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(precision)); - volascexp_save_args(gwy_app_settings_get(), args); - gtk_widget_destroy(dialog); - } + if (paramdef) + return paramdef; - return response == GTK_RESPONSE_OK; + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_gwyenum(paramdef, PARAM_STYLE, "style", _("Style"), + styles, G_N_ELEMENTS(styles), VOLUME_EXPORT_MATRICES); + gwy_param_def_add_boolean(paramdef, PARAM_DECIMAL_DOT, "decimal-dot", _("Use _dot as decimal separator"), TRUE); + gwy_param_def_add_int(paramdef, PARAM_PRECISION, "precision", _("_Precision"), 0, 16, 5); + return paramdef; } static void -decimal_dot_changed(GtkToggleButton *toggle, VolumeASCIIExportArgs *args) +volume_ascii_export(GwyContainer *data, GwyRunType mode) { - args->decimal_dot = gtk_toggle_button_get_active(toggle); -} + ModuleArgs args; + GwyDialogOutcome outcome; + gint id; -static void -precision_changed(GtkAdjustment *adj, VolumeASCIIExportArgs *args) -{ - args->precision = gwy_adjustment_get_int(adj); + g_return_if_fail(mode & RUN_MODES); + + gwy_clear(&args, 1); + gwy_app_data_browser_get_current(GWY_APP_BRICK, &args.brick, + GWY_APP_BRICK_ID, &id, + 0); + g_return_if_fail(GWY_IS_BRICK(args.brick)); + + args.params = gwy_params_new_from_settings(define_module_params()); + if (mode == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto finish; + } + + if (!gwy_container_gis_string(data, gwy_app_get_brick_title_key_for_id(id), &args.title)) + args.title = _("Volume data"); + + gwy_save_auxiliary_with_callback(_("Export to Text File"), NULL, export_brick, destroy_brick, &args); + +finish: + g_object_unref(args.params); } -static inline void -append_formatted_number(GString *str, - gdouble v, - gint precision, - gboolean must_fix_decimal_dot, - const gchar *decimal_dot, - guint decimal_dot_len) +static GwyDialogOutcome +run_gui(ModuleArgs *args) { - gchar *pos; - gchar buf[40]; + gboolean needs_decimal_dot_option; + GwyDialog *dialog; + GwyParamTable *table; - g_snprintf(buf, sizeof(buf), "%.*g", precision, v); - if (!must_fix_decimal_dot) { - g_string_append(str, buf); - return; - } + needs_decimal_dot_option = !gwy_strequal(gwy_get_decimal_separator(), "."); - pos = strstr(buf, decimal_dot); - if (!pos) { - g_string_append(str, buf); - return; - } + dialog = GWY_DIALOG(gwy_dialog_new(_("Export Text"))); + gwy_dialog_add_buttons(dialog, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); - pos[0] = '.'; - if (decimal_dot_len == 1) { - g_string_append(str, buf); - return; - } + table = gwy_param_table_new(args->params); + gwy_param_table_append_header(table, -1, _("Options")); + gwy_param_table_append_combo(table, PARAM_STYLE); + if (needs_decimal_dot_option) + gwy_param_table_append_checkbox(table, PARAM_DECIMAL_DOT); + gwy_param_table_append_slider(table, PARAM_PRECISION); + gwy_param_table_slider_set_mapping(table, PARAM_PRECISION, GWY_SCALE_MAPPING_LINEAR); + gwy_dialog_add_content(dialog, gwy_param_table_widget(table), FALSE, FALSE, 0); + gwy_dialog_add_param_table(dialog, table); - pos[1] = '\0'; - g_string_append(str, buf); - g_string_append(str, pos + decimal_dot_len); + return gwy_dialog_run(dialog); } static gchar* @@ -292,77 +189,56 @@ "LOOKUP_TABLE default\n" ; - VolumeASCIIExportData *expdata = (VolumeASCIIExportData*)user_data; - GwyBrick *brick = expdata->brick; - guint xres, yres, zres, i, j, k, n; - const gchar *decimal_dot; - guint decimal_dot_len; + ModuleArgs *args = (ModuleArgs*)user_data; + GwyParams *params = args->params; + gint precision = gwy_params_get_int(params, PARAM_PRECISION); + VolumeExportStyle style = gwy_params_get_enum(params, PARAM_STYLE); + gboolean decimal_dot = gwy_params_get_boolean(params, PARAM_DECIMAL_DOT); + GwyBrick *brick = args->brick; + guint xres, yres, zres, i, j, n; GString *str; const gdouble *d, *dd; - gboolean must_fix_decimal_dot; - gint precision; xres = gwy_brick_get_xres(brick); yres = gwy_brick_get_yres(brick); zres = gwy_brick_get_zres(brick); d = gwy_brick_get_data_const(brick); - must_fix_decimal_dot = (expdata->decinfo->needs_decimal_dot - && expdata->args->decimal_dot); - decimal_dot = expdata->decinfo->decimal_dot; - decimal_dot_len = expdata->decinfo->decimal_dot_len; - precision = expdata->args->precision; str = g_string_new(NULL); - if (expdata->args->style == VOLUME_EXPORT_VTK) { + if (style == VOLUME_EXPORT_VTK) { n = xres*yres*zres; - g_string_append_printf(str, vtk_header, - expdata->title, xres, yres, zres, - gwy_brick_get_xreal(brick)/xres, - gwy_brick_get_yreal(brick)/yres, - gwy_brick_get_zreal(brick)/zres, + g_string_append_printf(str, vtk_header, args->title, xres, yres, zres, + gwy_brick_get_dx(brick), gwy_brick_get_dy(brick), gwy_brick_get_dz(brick), n); - for (i = 0; i < n; i++) { - append_formatted_number(str, d[i], precision, must_fix_decimal_dot, - decimal_dot, decimal_dot_len); - g_string_append_c(str, '\n'); - } + gwy_append_doubles_to_gstring(str, d, n, precision, "\n", decimal_dot); + g_string_append_c(str, '\n'); } - else if (expdata->args->style == VOLUME_EXPORT_ZLINES) { + else if (style == VOLUME_EXPORT_ZLINES) { n = xres*yres; for (i = 0; i < n; i++) { dd = d + i; for (j = 0; j < zres; j++) { - append_formatted_number(str, *dd, precision, - must_fix_decimal_dot, - decimal_dot, decimal_dot_len); + gwy_append_doubles_to_gstring(str, dd, 1, precision, "", decimal_dot); g_string_append_c(str, j == zres-1 ? '\n' : '\t'); dd += n; } } } - else if (expdata->args->style == VOLUME_EXPORT_LAYERS) { + else if (style == VOLUME_EXPORT_LAYERS) { n = xres*yres; for (i = 0; i < zres; i++) { dd = d + i*n; - for (j = 0; j < n; j++) { - append_formatted_number(str, dd[j], precision, - must_fix_decimal_dot, - decimal_dot, decimal_dot_len); - g_string_append_c(str, j == n-1 ? '\n' : '\t'); - } + gwy_append_doubles_to_gstring(str, dd, n, precision, "\t", decimal_dot); + g_string_append_c(str, '\n'); } } - else if (expdata->args->style == VOLUME_EXPORT_MATRICES) { + else if (style == VOLUME_EXPORT_MATRICES) { n = xres*yres; for (i = 0; i < zres; i++) { for (j = 0; j < yres; j++) { dd = d + i*n + j*xres; - for (k = 0; k < xres; k++) { - append_formatted_number(str, dd[k], precision, - must_fix_decimal_dot, - decimal_dot, decimal_dot_len); - g_string_append_c(str, k == xres-1 ? '\n' : '\t'); - } + gwy_append_doubles_to_gstring(str, dd, xres, precision, "\t", decimal_dot); + g_string_append_c(str, '\n'); } g_string_append_c(str, '\n'); } @@ -381,50 +257,4 @@ g_free(data); } -static void -fill_decimal_dot_info(DecimalDotInfo *info) -{ - struct lconv *locale_data; - guint len; - - locale_data = localeconv(); - info->decimal_dot = g_strdup(locale_data->decimal_point); - if (!info->decimal_dot || !(len = strlen(info->decimal_dot))) { - g_warning("Cannot get decimal dot information from localeconv()."); - g_free(info->decimal_dot); - info->decimal_dot = g_strdup("."); - len = 1; - } - info->decimal_dot_len = len; - info->needs_decimal_dot = !gwy_strequal(info->decimal_dot, "."); -} - -static const gchar decimal_dot_key[] = "/module/volume_asciiexport/decimal-dot"; -static const gchar precision_key[] = "/module/volume_asciiexport/precision"; -static const gchar style_key[] = "/module/volume_asciiexport/style"; - -static void -volascexp_load_args(GwyContainer *settings, - VolumeASCIIExportArgs *args) -{ - *args = volascexp_defaults; - - gwy_container_gis_boolean_by_name(settings, decimal_dot_key, - &args->decimal_dot); - gwy_container_gis_int32_by_name(settings, precision_key, &args->precision); - gwy_container_gis_enum_by_name(settings, style_key, &args->style); - - args->precision = MIN(args->precision, 16); -} - -static void -volascexp_save_args(GwyContainer *settings, - VolumeASCIIExportArgs *args) -{ - gwy_container_set_boolean_by_name(settings, decimal_dot_key, - args->decimal_dot); - gwy_container_set_int32_by_name(settings, precision_key, args->precision); - gwy_container_set_enum_by_name(settings, style_key, args->style); -} - -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume.c gwyddion-2.63/modules/volume/volume.c --- gwyddion-2.62/modules/volume/volume.c 2022-10-13 15:13:53.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume.c 2023-06-13 13:18:47.000000000 +0000 @@ -12,51 +12,67 @@ GWY_MODULE_QUERY(module_info) +GwyModuleInfo* _gwy_module_query__volume_addframe(void); GwyModuleInfo* _gwy_module_query__volume_arithmetic(void); GwyModuleInfo* _gwy_module_query__volume_asciiexport(void); GwyModuleInfo* _gwy_module_query__volume_calibrate(void); +GwyModuleInfo* _gwy_module_query__volume_drift(void); GwyModuleInfo* _gwy_module_query__volume_equiplane(void); GwyModuleInfo* _gwy_module_query__volume_extract(void); +GwyModuleInfo* _gwy_module_query__volume_facetlevel(void); GwyModuleInfo* _gwy_module_query__volume_fdfit(void); GwyModuleInfo* _gwy_module_query__volume_invert(void); GwyModuleInfo* _gwy_module_query__volume_kmeans(void); GwyModuleInfo* _gwy_module_query__volume_kmedians(void); GwyModuleInfo* _gwy_module_query__volume_lawnize(void); +GwyModuleInfo* _gwy_module_query__volume_linelevel(void); GwyModuleInfo* _gwy_module_query__volume_linestat(void); GwyModuleInfo* _gwy_module_query__volume_mfmrecalc(void); GwyModuleInfo* _gwy_module_query__volume_outliers(void); GwyModuleInfo* _gwy_module_query__volume_planelevel(void); GwyModuleInfo* _gwy_module_query__volume_planestat(void); GwyModuleInfo* _gwy_module_query__volume_psf(void); +GwyModuleInfo* _gwy_module_query__volume_removeframe(void); GwyModuleInfo* _gwy_module_query__volume_rephase(void); +GwyModuleInfo* _gwy_module_query__volume_scars(void); GwyModuleInfo* _gwy_module_query__volume_slice(void); +GwyModuleInfo* _gwy_module_query__volume_stepline(void); GwyModuleInfo* _gwy_module_query__volume_strayfield(void); GwyModuleInfo* _gwy_module_query__volume_swaxes(void); +GwyModuleInfo* _gwy_module_query__volume_xyarithmetics(void); GwyModuleInfo* _gwy_module_query__volume_zcal(void); GwyModuleInfo* _gwy_module_query__volume_zposlevel(void); GwyModuleInfo* _gwy_module_query__volumeops(void); static const GwyModuleRecord modules[] = { + { _gwy_module_query__volume_addframe, "volume_addframe", }, { _gwy_module_query__volume_arithmetic, "volume_arithmetic", }, { _gwy_module_query__volume_asciiexport, "volume_asciiexport", }, { _gwy_module_query__volume_calibrate, "volume_calibrate", }, + { _gwy_module_query__volume_drift, "volume_drift", }, { _gwy_module_query__volume_equiplane, "volume_equiplane", }, { _gwy_module_query__volume_extract, "volume_extract", }, + { _gwy_module_query__volume_facetlevel, "volume_facetlevel", }, { _gwy_module_query__volume_fdfit, "volume_fdfit", }, { _gwy_module_query__volume_invert, "volume_invert", }, { _gwy_module_query__volume_kmeans, "volume_kmeans", }, { _gwy_module_query__volume_kmedians, "volume_kmedians", }, { _gwy_module_query__volume_lawnize, "volume_lawnize", }, + { _gwy_module_query__volume_linelevel, "volume_linelevel", }, { _gwy_module_query__volume_linestat, "volume_linestat", }, { _gwy_module_query__volume_mfmrecalc, "volume_mfmrecalc", }, { _gwy_module_query__volume_outliers, "volume_outliers", }, { _gwy_module_query__volume_planelevel, "volume_planelevel", }, { _gwy_module_query__volume_planestat, "volume_planestat", }, { _gwy_module_query__volume_psf, "volume_psf", }, + { _gwy_module_query__volume_removeframe, "volume_removeframe", }, { _gwy_module_query__volume_rephase, "volume_rephase", }, + { _gwy_module_query__volume_scars, "volume_scars", }, { _gwy_module_query__volume_slice, "volume_slice", }, + { _gwy_module_query__volume_stepline, "volume_stepline", }, { _gwy_module_query__volume_strayfield, "volume_strayfield", }, { _gwy_module_query__volume_swaxes, "volume_swaxes", }, + { _gwy_module_query__volume_xyarithmetics, "volume_xyarithmetics", }, { _gwy_module_query__volume_zcal, "volume_zcal", }, { _gwy_module_query__volume_zposlevel, "volume_zposlevel", }, { _gwy_module_query__volumeops, "volumeops", }, diff -Nru gwyddion-2.62/modules/volume/volume_calibrate.c gwyddion-2.63/modules/volume/volume_calibrate.c --- gwyddion-2.62/modules/volume/volume_calibrate.c 2022-08-19 14:52:53.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_calibrate.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_calibrate.c 24904 2022-08-19 14:52:53Z yeti-dn $ + * $Id: volume_calibrate.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2013-2022 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -153,7 +153,7 @@ { gwy_volume_func_register("volcal", (GwyVolumeFunc)&volcal, - N_("/_Dimensions and Units..."), + N_("/_Basic Operations/_Dimensions and Units..."), GWY_STOCK_VOLUME_DIMENSIONS, RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_drift.c gwyddion-2.63/modules/volume/volume_drift.c --- gwyddion-2.62/modules/volume/volume_drift.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_drift.c 2023-06-12 08:56:15.000000000 +0000 @@ -0,0 +1,791 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +enum { + PREVIEW_SIZE = 360, + /* 16 is good for current processors; increasing it to 32 might not hurt in the future. */ + BLOCK_SIZE = 16, + MAX_PARAMS = 3, + MAX_PLOT_DATA = 16384, + PLOT_FUNC_SAMPLES = 241, +}; + +enum { + PARAM_OUTPUT_TYPE, + PARAM_DIR, + PARAM_XDO, + PARAM_YDO, + PARAM_ZDO, + PARAM_XRAW, + PARAM_YRAW, + PARAM_ZRAW, + PARAM_XORDER, + PARAM_YORDER, + PARAM_ZORDER, +}; + +typedef enum { + OUTPUT_DRIFT = 0, + OUTPUT_CROP = 1, + NOUTPUTS +} DriftOutput; + +typedef enum { + DIR_X = 0, + DIR_Y = 1, + DIR_Z = 2, + NDIRS +} DriftDir; + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyBrick *result; + gboolean xydata_done; + gboolean zdata_done; + gint xdrift_n; + gdouble *xdrift_z; + gdouble *xdrift_drift; + gdouble *xdrift_fit; + gint ydrift_n; + gdouble *ydrift_z; + gdouble *ydrift_drift; + gdouble *ydrift_fit; + gint zdrift_n; + gdouble *zdrift_z; + gdouble *zdrift_drift; + gdouble *zdrift_fit; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_quantity; + GwyParamTable *table_options; + GwyParamTable *table_x; + GwyParamTable *table_y; + GwyParamTable *table_z; + GwyContainer *data; + GwyGraphModel *gmodel; + GwySelection *graph_selection; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void drift (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void preview (gpointer user_data); +static void update_image (ModuleGUI *gui, + gint z); +static void calculate_xydrift_data (ModuleArgs *args, + GtkWindow *wait_window); +static void calculate_zdrift_data (ModuleArgs *args, + GtkWindow *wait_window); +static void graph_selection_changed(ModuleGUI *gui, + gint id, + GwySelection *selection); +static void update_graph_curve (ModuleGUI *gui); +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Estimates drift across stacked high-speed SPM frames."), + "Petr Klapetek ", + "1.0", + "Petr Klapetek", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_drift) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_drift", + (GwyVolumeFunc)&drift, + N_("/_Correct Data/Estimate _Drift..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Estimates drift")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static const GwyEnum output_types[] = { + { N_("_Extract drift"), OUTPUT_DRIFT, }, + { N_("_Crop data"), OUTPUT_CROP, }, + }; + static const GwyEnum dirs[] = { + { N_("_X"), DIR_X, }, + { N_("_Y"), DIR_Y, }, + { N_("_Z"), DIR_Z, }, + }; + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_gwyenum(paramdef, PARAM_DIR, "dir", _("Show direction"), + dirs, G_N_ELEMENTS(dirs), DIR_Z); + gwy_param_def_add_gwyenum(paramdef, PARAM_OUTPUT_TYPE, "output_type", _("Output type"), + output_types, G_N_ELEMENTS(output_types), OUTPUT_CROP); + gwy_param_def_add_boolean(paramdef, PARAM_XDO, "xdo", "apply", FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_YDO, "ydo", "apply", FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_ZDO, "zdo", "apply", FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_XRAW, "xraw", "use raw data", FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_YRAW, "yraw", "use raw data", FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_ZRAW, "zraw", "use raw data", FALSE); + gwy_param_def_add_int(paramdef, PARAM_XORDER, "xorder", "polynom order", 0, 10, 1); + gwy_param_def_add_int(paramdef, PARAM_YORDER, "yorder", "polynom order", 0, 10, 1); + gwy_param_def_add_int(paramdef, PARAM_ZORDER, "zorder", "polynom order", 0, 10, 1); + return paramdef; +} + +static void +drift(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + DriftOutput output_type; + gint oldid, newid; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + output_type = gwy_params_get_enum(args.params, PARAM_OUTPUT_TYPE); + + if (output_type == OUTPUT_DRIFT) { + GwyGraphModel *gmodel; + GwyGraphCurveModel *gcmodel; + + if (!args.xydata_done) + calculate_xydrift_data(&args, gwy_app_find_window_for_volume(data, oldid)); + if (!args.zdata_done) + calculate_zdrift_data(&args, gwy_app_find_window_for_volume(data, oldid)); + + gmodel = gwy_graph_model_new(); + g_object_set(gmodel, + "title", _("Lateral drift"), + "axis-label-left", _("Lateral drift"), + "axis-label-bottom", "slice level", + NULL); + + gcmodel = gwy_graph_curve_model_new(); + g_object_set(gcmodel, "description", _("x-axis drift"), NULL); + gwy_graph_curve_model_set_data(gcmodel, args.xdrift_z, args.xdrift_drift, args.xdrift_n); + gwy_graph_model_add_curve(gmodel, gcmodel); + g_object_unref(gcmodel); + gcmodel = gwy_graph_curve_model_new(); + g_object_set(gcmodel, "description", _("y-axis drift"), NULL); + gwy_graph_curve_model_set_data(gcmodel, args.ydrift_z, args.ydrift_drift, args.ydrift_n); + gwy_graph_model_add_curve(gmodel, gcmodel); + g_object_unref(gcmodel); + gwy_app_data_browser_add_graph_model(gmodel, data, TRUE); + g_object_unref(gmodel); + + gmodel = gwy_graph_model_new(); + g_object_set(gmodel, + "title", _("Z drift"), + "axis-label-left", _("Z drift"), + "axis-label-bottom", "slice level", + NULL); + + gcmodel = gwy_graph_curve_model_new(); + g_object_set(gcmodel, "description", _("z-axis drift"), NULL); + gwy_graph_curve_model_set_data(gcmodel, args.zdrift_z, args.zdrift_drift, args.zdrift_n); + gwy_graph_model_add_curve(gmodel, gcmodel); + g_object_unref(gcmodel); + gwy_app_data_browser_add_graph_model(gmodel, data, TRUE); + g_object_unref(gmodel); + } else { + newid = gwy_app_data_browser_add_brick(args.result, NULL, data, TRUE); + + gwy_app_set_brick_title(data, newid, _("Drift corrected")); + gwy_app_sync_volume_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, -1, newid); + } + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *graph, *area, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyGraphCurveModel *gcmodel; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + args->xydata_done = FALSE; + args->zdata_done = FALSE; + args->xdrift_z = NULL; + args->xdrift_drift = NULL; + args->xdrift_fit = NULL; + args->ydrift_z = NULL; + args->ydrift_drift = NULL; + args->ydrift_fit = NULL; + args->zdrift_z = NULL; + args->zdrift_drift = NULL; + args->zdrift_fit = NULL; + args->result = gwy_brick_duplicate(brick); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("Estimate drift")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + gui.gmodel = gwy_graph_model_new(); + g_object_set(gui.gmodel, + "label-visible", TRUE, + NULL); + + gcmodel = gwy_graph_curve_model_new(); + g_object_set(gcmodel, "mode", GWY_GRAPH_CURVE_POINTS, "description", "drift", NULL); + gwy_graph_model_add_curve(gui.gmodel, gcmodel); + g_object_unref(gcmodel); + gcmodel = gwy_graph_curve_model_new(); + g_object_set(gcmodel, "mode", GWY_GRAPH_CURVE_LINE, "description", "fit", NULL); + gwy_graph_model_add_curve(gui.gmodel, gcmodel); + g_object_unref(gcmodel); + + + graph = gwy_graph_new(gui.gmodel); + gwy_graph_enable_user_input(GWY_GRAPH(graph), FALSE); + gtk_widget_set_size_request(graph, PREVIEW_SIZE, PREVIEW_SIZE); + gtk_box_pack_start(GTK_BOX(hbox), graph, TRUE, TRUE, 0); + + area = gwy_graph_get_area(GWY_GRAPH(graph)); + gwy_graph_area_set_status(GWY_GRAPH_AREA(area), GWY_GRAPH_STATUS_XLINES); + gui.graph_selection = gwy_graph_area_get_selection(GWY_GRAPH_AREA(area), GWY_GRAPH_STATUS_XLINES); + gwy_selection_set_max_objects(gui.graph_selection, 1); + + hbox = gwy_hbox_new(20); + gwy_dialog_add_content(dialog, hbox, TRUE, TRUE, 4); + + table = gui.table_quantity = gwy_param_table_new(args->params); + gwy_param_table_append_combo(table, PARAM_DIR); + + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + table = gui.table_x = gwy_param_table_new(args->params); + gwy_param_table_append_header(table, -1, _("X correction")); + gwy_param_table_append_checkbox(table, PARAM_XDO); + gwy_param_table_append_checkbox(table, PARAM_XRAW); + gwy_param_table_append_slider(table, PARAM_XORDER); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + table = gui.table_y = gwy_param_table_new(args->params); + gwy_param_table_append_header(table, -1, _("Y correction")); + gwy_param_table_append_checkbox(table, PARAM_YDO); + gwy_param_table_append_checkbox(table, PARAM_YRAW); + gwy_param_table_append_slider(table, PARAM_YORDER); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + table = gui.table_z = gwy_param_table_new(args->params); + gwy_param_table_append_header(table, -1, _("Z correction")); + gwy_param_table_append_checkbox(table, PARAM_ZDO); + gwy_param_table_append_checkbox(table, PARAM_ZRAW); + gwy_param_table_append_slider(table, PARAM_ZORDER); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_radio(table, PARAM_OUTPUT_TYPE); + gwy_param_table_append_separator(table); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_quantity, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_x, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_y, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.table_z, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_swapped(gui.graph_selection, "changed", G_CALLBACK(graph_selection_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_UPON_REQUEST, preview, &gui, NULL); + + update_graph_curve(&gui); + update_image(&gui, 0); + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + g_object_unref(gui.gmodel); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, gint id) +{ + if (id != PARAM_OUTPUT_TYPE) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); + + update_graph_curve(gui); +} + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + if (response == GWY_RESPONSE_RESET) + gwy_selection_clear(gui->graph_selection); +} + +static void +calculate_zdrift_data(ModuleArgs *args, GtkWindow *wait_window) +{ + gint k; + GwyBrick *brick = args->brick; + gint xres = brick->xres; + gint yres = brick->yres; + gint zres = brick->zres; + GwyDataField *dfield; + gdouble zerodrift; + + gwy_app_wait_start(wait_window, _("Updating z drift data...")); + + if (args->zdrift_z) + g_free(args->zdrift_z); + if (args->zdrift_drift) + g_free(args->zdrift_drift); + if (args->zdrift_fit) + g_free(args->zdrift_fit); + + args->zdrift_n = zres; + args->zdrift_z = g_new(gdouble, zres); + args->zdrift_drift = g_new(gdouble, zres); + args->zdrift_fit = g_new(gdouble, zres); + + dfield = gwy_data_field_new(xres, yres, brick->xreal, brick->yreal, FALSE); + + for (k = 0; k < zres; k++) { + gwy_brick_extract_plane(brick, dfield, + 0, 0, k, + xres, yres, -1, + FALSE); + args->zdrift_z[k] = k; + if (k == 0) { + args->zdrift_drift[k] = 0; + zerodrift = gwy_data_field_get_avg(dfield); + } + else + args->zdrift_drift[k] = gwy_data_field_get_avg(dfield) - zerodrift; + + if (!gwy_app_wait_set_fraction((gdouble)k/zres)) + break; + } + gwy_app_wait_finish(); + + args->zdata_done = TRUE; + + g_object_unref(dfield); +} + +static gdouble +polynom(gint order, gdouble *coeffs, gdouble x) +{ + int i; + double sum, xpow; + + sum = coeffs[0]; + xpow = 1; + for (i = 1; i <= order; i++) { + xpow *= x; + sum += coeffs[i]*xpow; + } + return sum; +} + +static void +calculate_xydrift_data(ModuleArgs *args, GtkWindow *wait_window) +{ + gint i, j, k, n, xborder, yborder; + gdouble xoffset, yoffset, xoff, yoff, maxscore, xsum, ysum, zvals[9]; + GwyBrick *brick = args->brick; + gint xres = brick->xres; + gint yres = brick->yres; + gint zres = brick->zres; + GwyDataField *dfield, *dfieldp, *score, *kernel; + gwy_app_wait_start(wait_window, _("Updating lateral drift data...")); + + args->xdrift_n = zres; + args->ydrift_n = zres; + if (args->xdrift_z) + g_free(args->xdrift_z); + if (args->ydrift_z) + g_free(args->ydrift_z); + if (args->xdrift_drift) + g_free(args->xdrift_drift); + if (args->ydrift_drift) + g_free(args->ydrift_drift); + if (args->xdrift_fit) + g_free(args->xdrift_fit); + if (args->ydrift_fit) + g_free(args->ydrift_fit); + + args->xdrift_z = g_new0(gdouble, zres); + args->ydrift_z = g_new0(gdouble, zres); + args->xdrift_drift = g_new0(gdouble, zres); + args->ydrift_drift = g_new0(gdouble, zres); + args->xdrift_fit = g_new0(gdouble, zres); + args->ydrift_fit = g_new0(gdouble, zres); + + dfield = gwy_data_field_new(xres, yres, brick->xreal, brick->yreal, FALSE); + dfieldp = gwy_data_field_new(xres, yres, brick->xreal, brick->yreal, FALSE); + score = gwy_data_field_new_alike(dfieldp, FALSE); + xborder = xres/10; + yborder = yres/10; + kernel = gwy_data_field_area_extract(dfield, xborder, yborder, xres - 2*xborder, yres - 2*yborder); + + xsum = 0; + ysum = 0; + args->xdrift_z[0] = 0; + args->ydrift_z[0] = 0; + + args->xdrift_drift[0] = 0; + args->ydrift_drift[0] = 0; + + for (k = 1; k < zres; k++) { + gwy_brick_extract_plane(brick, dfieldp, + 0, 0, k-1, + xres, yres, -1, + FALSE); + gwy_brick_extract_plane(brick, dfield, + 0, 0, k, + xres, yres, -1, + FALSE); + + gwy_data_field_area_copy(dfield, kernel, xborder, yborder, xres - 2*xborder, yres - 2*yborder, 0, 0); + gwy_data_field_correlation_search (dfieldp, kernel, NULL, score, GWY_CORRELATION_POC, + 0.1, GWY_EXTERIOR_MIRROR_EXTEND, 0); + + //remove all the far values + //gwy_data_field_area_clear(score, 0, 0, xres/2 - xborder + 1, yres); + //gwy_data_field_area_clear(score, 0, 0, xres, yres/2 - yborder + 1); + //gwy_data_field_area_clear(score, xres/2 + xborder - 1, 0, xres/2 - xborder + 1, yres); + //gwy_data_field_area_clear(score, 0, yres/2 + yborder - 1, xres, yres/2 - yborder + 1); + +// for (si=0; si 0 && xoff < (xres - 1) && yoff > 0 && yoff < (yres - 1)) { + n = 0; + for (i = -1; i <= 1; i++) { + for (j = -1; j <= 1; j++) { + zvals[n++] = gwy_data_field_get_val(score, xoff+i, yoff+j); + } + } + gwy_math_refine_maximum_2d(zvals, &xoffset, &yoffset); + xoffset += xoff - xres/2; + yoffset += yoff - yres/2; + } else { + xoffset = GWY_ROUND(xoff) - xres/2; + yoffset = GWY_ROUND(yoff) - yres/2; + } + } + else + xoffset = yoffset = 0; + + xsum += xoffset; + ysum += yoffset; + args->xdrift_z[k] = k; + args->ydrift_z[k] = k; + args->xdrift_drift[k] = xsum; + args->ydrift_drift[k] = ysum; + + if (!gwy_app_wait_set_fraction((gdouble)k/zres)) + break; + } + gwy_app_wait_finish(); + args->xydata_done = TRUE; + + g_object_unref(dfield); + g_object_unref(dfieldp); + g_object_unref(score); + g_object_unref(kernel); +} + +static void +fit_polynom(gint order, gboolean raw, gdouble *z, gdouble *drift, gdouble *fit, gint n) +{ + gint k; + gdouble *coeffs; + + if (raw) { + for (k = 0; k < n; k++) + fit[k] = drift[k]; + } else { + coeffs = gwy_math_fit_polynom(n, z, drift, order, NULL); + for (k = 0; k < n; k++) + fit[k] = polynom(order, coeffs, k); + + g_free(coeffs); + } +} + +static void +update_graph_curve(ModuleGUI *gui) +{ + ModuleArgs *args = gui->args; + GwyParams *params = args->params; + gint dir = gwy_params_get_enum(params, PARAM_DIR); + GwyGraphCurveModel *gcmodel = gwy_graph_model_get_curve(gui->gmodel, 0); + GwyGraphCurveModel *fitmodel = gwy_graph_model_get_curve(gui->gmodel, 1); + gboolean xraw = gwy_params_get_boolean(args->params, PARAM_XRAW); + gboolean yraw = gwy_params_get_boolean(args->params, PARAM_YRAW); + gboolean zraw = gwy_params_get_boolean(args->params, PARAM_ZRAW); + gint xorder = gwy_params_get_int(args->params, PARAM_XORDER); + gint yorder = gwy_params_get_int(args->params, PARAM_YORDER); + gint zorder = gwy_params_get_int(args->params, PARAM_ZORDER); + gint zres = gwy_brick_get_zres(args->brick); + + if (dir == DIR_X || dir == DIR_Y) { + if (!args->xydata_done) + calculate_xydrift_data(args, GTK_WINDOW(gui->dialog)); + + fit_polynom(xorder, xraw, args->xdrift_z, args->xdrift_drift, args->xdrift_fit, zres); + fit_polynom(yorder, yraw, args->ydrift_z, args->ydrift_drift, args->ydrift_fit, zres); + + if (dir == DIR_X) { + gwy_graph_curve_model_set_data(gcmodel, args->xdrift_z, args->xdrift_drift, args->xdrift_n); + gwy_graph_curve_model_set_data(fitmodel, args->xdrift_z, args->xdrift_fit, args->xdrift_n); + } + else { + gwy_graph_curve_model_set_data(gcmodel, args->ydrift_z, args->ydrift_drift, args->ydrift_n); + gwy_graph_curve_model_set_data(fitmodel, args->ydrift_z, args->ydrift_fit, args->ydrift_n); + } + } + else + { + if (!args->zdata_done) + calculate_zdrift_data(args, GTK_WINDOW(gui->dialog)); + + fit_polynom(zorder, zraw, args->zdrift_z, args->zdrift_drift, args->zdrift_fit, zres); + + gwy_graph_curve_model_set_data(gcmodel, args->zdrift_z, args->zdrift_drift, args->zdrift_n); + gwy_graph_curve_model_set_data(fitmodel, args->zdrift_z, args->zdrift_fit, args->zdrift_n); + } +} + +static void +update_image(ModuleGUI *gui, gint z) +{ + GwyDataField *dfield; + GwyBrick *brick = gui->args->result; + dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + + gwy_brick_extract_xy_plane(brick, dfield, CLAMP(z, 0, brick->zres-1)); + + gwy_data_field_data_changed(dfield); +} + +static void +graph_selection_changed(ModuleGUI *gui, G_GNUC_UNUSED gint id, GwySelection *selection) +{ + gdouble z; + + if (!gwy_selection_get_object(selection, 0, &z)) + z = 0; + update_image(gui, z); +} + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + + if (!gui->args->xydata_done) + calculate_xydrift_data(gui->args, GTK_WINDOW(gui->dialog)); + if (!gui->args->zdata_done) + calculate_zdrift_data(gui->args, GTK_WINDOW(gui->dialog)); + + execute(gui->args); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k; + gboolean xdo = gwy_params_get_boolean(params, PARAM_XDO); + gboolean ydo = gwy_params_get_boolean(params, PARAM_YDO); + gboolean zdo = gwy_params_get_boolean(params, PARAM_ZDO); + gint xc, yc, xs, ys; + GwyBrick *original = args->brick; + GwyBrick *brick = args->result; + GwyDataField *dfield; + GwyDataField *cropfield; + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + + xc = args->xdrift_fit[zres/2]; + yc = args->ydrift_fit[zres/2]; + + dfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + cropfield = gwy_data_field_new_alike(dfield, FALSE); + + for (k = 0; k < zres; k++) { + gwy_brick_extract_xy_plane(original, dfield, k); + gwy_data_field_fill(cropfield, gwy_data_field_get_avg(dfield)); + + if (xdo) + xs = args->xdrift_fit[k] - xc; + else + xs = 0; + if (ydo) + ys = args->ydrift_fit[k] - yc; + else + ys = 0; + + gwy_data_field_area_copy(dfield, cropfield, 0, 0, xres, yres, xs, ys); + + if (zdo) + gwy_data_field_add(cropfield, -args->zdrift_fit[k]); + + gwy_brick_set_xy_plane(brick, cropfield, k); + } + + g_object_unref(dfield); + g_object_unref(cropfield); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + + sanitise_one_param(params, PARAM_XORDER, 0, 10, 0); + sanitise_one_param(params, PARAM_YORDER, 0, 10, 0); + sanitise_one_param(params, PARAM_ZORDER, 0, 10, 0); +} + + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_equiplane.c gwyddion-2.63/modules/volume/volume_equiplane.c --- gwyddion-2.62/modules/volume/volume_equiplane.c 2019-10-29 16:47:59.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_equiplane.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_equiplane.c 22619 2019-10-29 16:47:55Z yeti-dn $ + * $Id: volume_equiplane.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -151,7 +151,7 @@ { gwy_volume_func_register("volume_equiplane", (GwyVolumeFunc)&equiplane, - N_("/_Isosurface Image..."), + N_("/SPM M_odes/_Isosurface Image..."), NULL, EQUIPLANE_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_extract.c gwyddion-2.63/modules/volume/volume_extract.c --- gwyddion-2.62/modules/volume/volume_extract.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_extract.c 2023-04-28 14:19:53.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: volume_extract.c 21135 2018-06-12 13:58:33Z yeti-dn $ + * $Id: volume_extract.c 25312 2023-04-28 14:19:53Z yeti-dn $ * Copyright (C) 2013 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -96,7 +92,8 @@ gdouble bdepth; gdouble brick_min; gdouble brick_max; - gint nps; + guint nps; + guint allocated_nps; gboolean in_move; gboolean render_now; gboolean opdata_valid; @@ -185,7 +182,7 @@ &module_register, N_("Shows 3D representations of volume data"), "Petr Klapetek ", - "2.0", + "2.1", "David Nečas (Yeti) & Petr Klapetek", "2013", }; @@ -197,7 +194,7 @@ { gwy_volume_func_register("extract", (GwyVolumeFunc)&extract, - N_("/3D View..."), + N_("/_Basic Operations/3D View..."), NULL, EXTRACT_RUN_MODES, GWY_MENU_FLAG_VOLUME, @@ -248,23 +245,8 @@ controls.data = data; controls.brick = brick; controls.rm[0][0] = controls.rm[1][1] = controls.rm[2][2] = 1; - controls.rm[1][0] = controls.rm[2][0] = controls.rm[0][1] = controls.rm[0][2] = 0; - controls.rm[1][2] = controls.rm[2][1] = 0; - controls.px = NULL; - controls.py = NULL; - controls.pz = NULL; - controls.ps = NULL; - controls.wpx = NULL; - controls.wpy = NULL; - controls.wpz = NULL; - controls.xangle = controls.yangle = controls.zangle = 0; - controls.nps = 0; - controls.in_move = FALSE; - controls.image = NULL; - controls.render_now = FALSE; controls.opdata = g_new(gdouble, PREVIEW_SIZE*PREVIEW_SIZE); - controls.image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, - PREVIEW_SIZE, PREVIEW_SIZE); + controls.image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, PREVIEW_SIZE, PREVIEW_SIZE); controls.brick_min = gwy_brick_get_min(controls.brick); controls.brick_max = gwy_brick_get_max(controls.brick); @@ -509,6 +491,13 @@ finalize: extract_save_args(gwy_app_settings_get(), args); + g_free(controls.px); + g_free(controls.py); + g_free(controls.pz); + g_free(controls.ps); + g_free(controls.wpx); + g_free(controls.wpy); + g_free(controls.wpz); g_free(controls.opdata); cairo_surface_destroy(controls.image); g_object_unref(controls.mydata); @@ -721,22 +710,15 @@ { gint i, j, k; - for(i = 0; i < 3; i++) - { - for(j = 0; j < 3; j++) - { + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) result[i][j] = 0; - } } - for(i = 0; i < 3; i++) - { - for(j = 0; j < 3; j++) - { - for(k = 0; k < 3; k++) - { - result[i][j] += a[i][k]*b[k][j]; - } + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + for (k = 0; k < 3; k++) + result[i][j] += a[i][k] * b[k][j]; } } } @@ -865,9 +847,7 @@ size = args->size; perspective = args->perspective; - if (!controls->opdata_valid - && !controls->render_now - && (!args->update || controls->in_move)) { + if (!controls->opdata_valid && !controls->render_now && (!args->update || controls->in_move)) { cairo_rectangle(cr, 0.0, 0.0, PREVIEW_SIZE, PREVIEW_SIZE); cairo_set_source_rgb(cr, 0, 0, 0); cairo_fill(cr); @@ -875,13 +855,11 @@ cairo_set_source_rgb(cr, 1, 1, 1); cairo_set_line_width(cr, 0.5); - convert_3d2d(controls->wpx[3], controls->wpy[3], controls->wpz[3], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[3], controls->wpy[3], controls->wpz[3], &sx, &sy, perspective, size); cairo_move_to(cr, sx, sy); for (i = 4; i < controls->nps; i++) { - convert_3d2d(controls->wpx[i], controls->wpy[i], controls->wpz[i], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[i], controls->wpy[i], controls->wpz[i], &sx, &sy, perspective, size); if (controls->ps[i]) cairo_line_to(cr, sx, sy); else @@ -889,12 +867,10 @@ } /*axes description*/ - cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, - CAIRO_FONT_WEIGHT_BOLD); + cairo_select_font_face(cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); cairo_set_font_size(cr, 12.0); - convert_3d2d(controls->wpx[3], controls->wpy[3], controls->wpz[3], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[3], controls->wpy[3], controls->wpz[3], &sx, &sy, perspective, size); if (sx <= 200) sx -= 12; else @@ -902,8 +878,7 @@ cairo_move_to(cr, sx, sy); cairo_show_text(cr, "0"); - convert_3d2d(controls->wpx[4], controls->wpy[4], controls->wpz[4], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[4], controls->wpy[4], controls->wpz[4], &sx, &sy, perspective, size); if (sx <= 200) sx -= 12; else @@ -911,8 +886,7 @@ cairo_move_to(cr, sx, sy); cairo_show_text(cr, "x"); - convert_3d2d(controls->wpx[14], controls->wpy[14], controls->wpz[14], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[14], controls->wpy[14], controls->wpz[14], &sx, &sy, perspective, size); if (sx <= 200) sx -= 12; else @@ -920,8 +894,7 @@ cairo_move_to(cr, sx, sy); cairo_show_text(cr, "y"); - convert_3d2d(controls->wpx[8], controls->wpy[8], controls->wpz[8], - &sx, &sy, perspective, size); + convert_3d2d(controls->wpx[8], controls->wpy[8], controls->wpz[8], &sx, &sy, perspective, size); if (sx <= 200) sx -= 12; else @@ -929,7 +902,6 @@ cairo_move_to(cr, sx, sy); cairo_show_text(cr, "z"); - cairo_stroke(cr); } else { @@ -942,9 +914,9 @@ xoff = PREVIEW_SIZE/2; yoff = PREVIEW_SIZE/2; -// printf("rotation matrix: --------------\n"); -// printm(controls->rm); -// printf("-------------------------------\n"); + // printf("rotation matrix: --------------\n"); + // printm(controls->rm); + // printf("-------------------------------\n"); minv(controls->rm, inv); //inverse of the rotation matrix cdir[0] = 0; @@ -1026,22 +998,28 @@ return TRUE; } -static void rotatem(ExtractControls *controls) +static void +rotatem(ExtractControls *controls) { gdouble px, py, pz, im[3][3]; gint i; - im[0][0] = controls->rm[0][0]; im[0][1] = controls->rm[1][0]; im[0][2] = controls->rm[2][0]; - im[1][0] = controls->rm[0][1]; im[1][1] = controls->rm[1][1]; im[1][2] = controls->rm[2][1]; - im[2][0] = controls->rm[0][2]; im[2][1] = controls->rm[1][2]; im[2][2] = controls->rm[2][2]; + im[0][0] = controls->rm[0][0]; + im[0][1] = controls->rm[1][0]; + im[0][2] = controls->rm[2][0]; + im[1][0] = controls->rm[0][1]; + im[1][1] = controls->rm[1][1]; + im[1][2] = controls->rm[2][1]; + im[2][0] = controls->rm[0][2]; + im[2][1] = controls->rm[1][2]; + im[2][2] = controls->rm[2][2]; /*printf("rotation matrix:\n%g %g %g\n%g %g %g\n%g %g %g\n--------------\n", controls->rm[0][0], controls->rm[0][1], controls->rm[0][2], controls->rm[1][0], controls->rm[1][1], controls->rm[1][2], controls->rm[2][0], controls->rm[2][1], controls->rm[2][2]); -*/ - for (i=0; inps; i++) - { + */ + for (i = 0; i < controls->nps; i++) { mmultv(im, controls->wpx[i], controls->wpy[i], controls->wpz[i], &px, &py, &pz); controls->wpx[i] = px; controls->wpy[i] = py; @@ -1062,16 +1040,13 @@ mmultm(rotx, roty, rotbuf); mmultm(rotbuf, rotz, controls->rm); - for (i=0; inps; i++) - { + for (i = 0; i < controls->nps; i++) { mmultv(controls->rm, controls->wpx[i], controls->wpy[i], controls->wpz[i], &px, &py, &pz); controls->wpx[i] = px; controls->wpy[i] = py; controls->wpz[i] = pz; } - - controls->rm[0][0] = controls->wpx[0]; controls->rm[0][1] = controls->wpy[0]; controls->rm[0][2] = controls->wpz[0]; @@ -1084,12 +1059,10 @@ controls->rm[2][1] = controls->wpy[2]; controls->rm[2][2] = controls->wpz[2]; - -// printf("total rotation by angle %g %g %g (%g %g %g), rotating by %g %g %g\n", controls->xangle, -// controls->yangle, -// controls->zangle, -// controls->wpx[0], controls->wpy[1], controls->wpz[2], x, y, z); - + // printf("total rotation by angle %g %g %g (%g %g %g), rotating by %g %g %g\n", controls->xangle, + // controls->yangle, + // controls->zangle, + // controls->wpx[0], controls->wpy[1], controls->wpz[2], x, y, z); } static void @@ -1147,7 +1120,7 @@ rotate(controls, -0.02*diffy, 0.02*diffx, 0); -// printf("on move\n"); + // printf("on move\n"); invalidate_opdata(controls); gtk_widget_queue_draw(widget); @@ -1269,23 +1242,22 @@ p3d_set_axes(ExtractControls *controls) { gint i = 0; - gint max; + gdouble max; - if (!controls->px || controls->nps < 21) - controls->px = g_new(gdouble, 21); - if (!controls->py || controls->nps < 21) - controls->py = g_new(gdouble, 21); - if (!controls->pz || controls->nps < 21) - controls->pz = g_new(gdouble, 21); - if (!controls->ps || controls->nps < 21) - controls->ps = g_new(gdouble, 21); + if (controls->allocated_nps < 21) { + controls->px = g_renew(gdouble, controls->px, 21); + controls->py = g_renew(gdouble, controls->py, 21); + controls->pz = g_renew(gdouble, controls->pz, 21); + controls->ps = g_renew(gdouble, controls->ps, 21); + controls->allocated_nps = 21; + } controls->bwidth = controls->bheight = controls->bdepth = 1; if (controls->brick) { - max = MAX(MAX(gwy_brick_get_xres(controls->brick), - gwy_brick_get_yres(controls->brick)), - gwy_brick_get_zres(controls->brick)); + max = MAX(MAX(gwy_brick_get_xres(controls->brick), + gwy_brick_get_yres(controls->brick)), + gwy_brick_get_zres(controls->brick)); controls->bwidth = gwy_brick_get_xres(controls->brick)/max; controls->bheight = gwy_brick_get_yres(controls->brick)/max; @@ -1400,7 +1372,6 @@ } controls->nps = 20; - } static gint @@ -1421,9 +1392,9 @@ gwy_assign(ns, ps, newn); for (i = 6; i < nps; i++) { - if (ps[i] == 0 || !((px[i]-px[i-1]) == (px[i-1]-px[i-2]) - && (py[i]-py[i-1]) == (py[i-1]-py[i-2]) - && (pz[i]-pz[i-1]) == (pz[i-1]-pz[i-2]))) { + if (ps[i] == 0 || !((px[i] - px[i-1]) == (px[i-1] - px[i-2]) + && (py[i] - py[i-1]) == (py[i-1] - py[i-2]) + && (pz[i] - pz[i-1]) == (pz[i-1] - pz[i-2]))) { nx[newn] = px[i]; ny[newn] = py[i]; nz[newn] = pz[i]; @@ -1450,14 +1421,12 @@ return; } - gwy_app_wait_start(GTK_WINDOW(controls->dialog), - _("Building wireframe model...")); + gwy_app_wait_start(GTK_WINDOW(controls->dialog), _("Building wireframe model...")); p3d_set_axes(controls); p3d_add_wireframe(controls); gwy_app_wait_finish(); } - static void p3d_prepare_wdata(ExtractControls *controls, ExtractArgs *args) { @@ -1482,7 +1451,7 @@ } static gboolean -gothere(gdouble *data, gdouble *vdata, gint xres, gint yres, gint col, gint row, gdouble threshold) +gothere(const gdouble *data, gdouble *vdata, gint xres, gint yres, gint col, gint row, gdouble threshold) { guint k = col + xres*row; @@ -1493,11 +1462,10 @@ if (col < 1 || col >= xres-1) return FALSE; - if ((data[k] > threshold) && - ((data[k-1] < threshold) || (data[k-xres] < threshold) - || (data[k+1] < threshold) || (data[k+xres] < threshold) - || (data[k+xres+1] < threshold) || (data[k-xres-1] < threshold) - || (data[k-xres+1] < threshold) || (data[k+xres-1] < threshold))) + if ((data[k] > threshold) && ((data[k-1] < threshold) || (data[k-xres] < threshold) + || (data[k+1] < threshold) || (data[k+xres] < threshold) + || (data[k+xres+1] < threshold) || (data[k-xres-1] < threshold) + || (data[k-xres+1] < threshold) || (data[k+xres-1] < threshold))) return TRUE; vdata[k] = 1; @@ -1505,19 +1473,20 @@ } static void -visitme(ExtractControls *controls, gint *actual_nps, gdouble *data, gdouble *vdata, gint xres, gint yres, gint zres, gint col, gint row, gint dir, gint tval, gboolean *move, gdouble threshold) +visitme(ExtractControls *controls, + const gdouble *data, gdouble *vdata, gint xres, gint yres, gint zres, gint col, gint row, + gint dir, gint tval, gboolean *move, gdouble threshold) { gint first_res, second_res; /*detect ad add a segment of necessary*/ //printf("pos %d %d ", col, row); - /*increase allocation if necessary*/ - if (((*actual_nps)-controls->nps)<1000) { - *actual_nps += 1000; - controls->px = g_renew(gdouble, controls->px, *actual_nps); - controls->py = g_renew(gdouble, controls->py, *actual_nps); - controls->pz = g_renew(gdouble, controls->pz, *actual_nps); - controls->ps = g_renew(gdouble, controls->ps, *actual_nps); + if (controls->nps == controls->allocated_nps) { + controls->allocated_nps *= 2; + controls->px = g_renew(gdouble, controls->px, controls->allocated_nps); + controls->py = g_renew(gdouble, controls->py, controls->allocated_nps); + controls->pz = g_renew(gdouble, controls->pz, controls->allocated_nps); + controls->ps = g_renew(gdouble, controls->ps, controls->allocated_nps); } if (dir == 0) /*y const*/ { @@ -1539,10 +1508,11 @@ controls->ps[controls->nps] = 0; *move = 0; } - else controls->ps[controls->nps] = 1; + else + controls->ps[controls->nps] = 1; controls->nps += 1; - vdata[col+xres*row] = 1; + vdata[col + xres*row] = 1; if (dir == 0) { first_res = yres; @@ -1559,37 +1529,36 @@ /*go to neighbor positions*/ if (gothere(data, vdata, first_res, second_res, col+1, row, threshold)) - visitme(controls, actual_nps,data, vdata, xres, yres, zres, col+1, row, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col+1, row, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col-1, row, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col-1, row, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col-1, row, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col, row+1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col, row+1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col, row+1, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col, row-1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col, row-1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col, row-1, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col+1, row+1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col+1, row+1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col+1, row+1, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col-1, row-1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col-1, row-1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col-1, row-1, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col+1, row-1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col+1, row-1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col+1, row-1, dir, tval, move, threshold); else if (gothere(data, vdata, first_res, second_res, col-1, row+1, threshold)) - visitme(controls, actual_nps, data, vdata, xres, yres, zres, col-1, row+1, dir, tval, move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col-1, row+1, dir, tval, move, threshold); } static void p3d_add_wireframe(ExtractControls *controls) { - gint actual_nps = controls->nps; GwyDataField *cut, *visited; - gdouble threshold, *data, *vdata; + gdouble threshold; + const gdouble *data; + gdouble *vdata; gint col, row, i, spacing = 40; gint xres, yres, zres; gboolean move; - if (controls->brick == NULL) { - //printf("No brick\n"); + if (!controls->brick) return; - } xres = gwy_brick_get_xres(controls->brick); yres = gwy_brick_get_yres(controls->brick); @@ -1597,10 +1566,12 @@ cut = gwy_data_field_new(1, 1, 1, 1, FALSE); visited = gwy_data_field_new(yres, zres, gwy_brick_get_yreal(controls->brick), gwy_brick_get_zreal(controls-> brick), FALSE); //printf("brick min %g, max %g\n", gwy_brick_get_min(controls->brick), gwy_brick_get_max(controls->brick)); - threshold = gwy_brick_get_min(controls->brick) - + (gwy_brick_get_max(controls->brick) - gwy_brick_get_min(controls->brick))/100.0*controls->args->threshold; + threshold = (gwy_brick_get_min(controls->brick) + + (gwy_brick_get_max(controls->brick) + - gwy_brick_get_min(controls->brick))/100.0*controls->args->threshold); - for (i = 0; i < xres; i += spacing) { // why use 40 as a magic number - choose xres / 15 or something like that? + // why use 40 as a magic number - choose xres / 15 or something like that? + for (i = 0; i < xres; i += spacing) { /* Extract yz plane. */ gwy_brick_extract_plane(controls->brick, cut, i, 0, 0, -1, yres, zres, FALSE); data = gwy_data_field_get_data(cut); @@ -1609,13 +1580,11 @@ gwy_data_field_threshold(cut, threshold, 0, 1); move = 1; /*here comes the algorithm*/ - for (col = 1; col < zres-1; col++) { - for (row = 1; row < yres-1; row++) { + for (col = 1; col < yres-1; col++) { + for (row = 1; row < zres-1; row++) { move = 1; - if (gothere(data, vdata, yres, zres, col, row, threshold)) { - visitme(controls, &actual_nps, data, vdata, - xres, yres, zres, col, row, 0, i, &move, threshold); - } + if (gothere(data, vdata, yres, zres, col, row, threshold)) + visitme(controls, data, vdata, xres, yres, zres, col, row, 0, i, &move, threshold); } } } @@ -1625,21 +1594,20 @@ for (i = 0; i < yres; i += spacing) { /* Extract xz plane. */ gwy_brick_extract_plane(controls->brick, cut, 0, i, 0, xres, -1, zres, FALSE); + gwy_data_field_threshold(cut, threshold, 0, 1); data = gwy_data_field_get_data(cut); gwy_data_field_clear(visited); vdata = gwy_data_field_get_data(visited); - gwy_data_field_threshold(cut, threshold, 0, 1); - move = 1; /*here comes the algorithm*/ - for (col = 1; col < xres; col++) { - for (row = 1; row < zres; row++) { + for (col = 1; col < xres-1; col++) { + for (row = 1; row < zres-1; row++) { move = 1; if (gothere(data, vdata, xres, zres, col, row, threshold)) - visitme(controls, &actual_nps, data, vdata, xres, yres, zres, col, row, 1, i, &move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col, row, 1, i, &move, threshold); } } } @@ -1659,25 +1627,24 @@ move = 1; /*here comes the algorithm*/ - for (col = 1; col < xres; col++) { - for (row = 1; row < yres; row++) { + for (col = 1; col < xres-1; col++) { + for (row = 1; row < yres-1; row++) { move = 1; if (gothere(data, vdata, xres, yres, col, row, threshold)) - visitme(controls, &actual_nps, data, vdata, xres, yres, zres, col, row, 2, i, &move, threshold); + visitme(controls, data, vdata, xres, yres, zres, col, row, 2, i, &move, threshold); } } } -// printf("we have %d segments at the end\nRunning simplification:\n", controls->nps); - controls->nps = simplify(controls->px, controls->py, controls->pz, - controls->ps, controls->nps); + // printf("we have %d segments at the end\nRunning simplification:\n", controls->nps); + controls->nps = simplify(controls->px, controls->py, controls->pz, controls->ps, controls->nps); + /* FIXME FIXME FIXME: Leak. */ controls->wpx = g_renew(gdouble, controls->wpx, controls->nps); controls->wpy = g_renew(gdouble, controls->wpy, controls->nps); controls->wpz = g_renew(gdouble, controls->wpz, controls->nps); -// printf("we have %d segments after simplification\n", controls->nps); + // printf("we have %d segments after simplification\n", controls->nps); } - static const gchar gradient_key[] = "/module/volume_extract/gradient"; static const gchar opacity_key[] = "/module/volume_extract/opacity"; static const gchar perspective_key[] = "/module/volume_extract/perspective"; @@ -1727,4 +1694,4 @@ g_strdup(args->gradient)); } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_facetlevel.c gwyddion-2.63/modules/volume/volume_facetlevel.c --- gwyddion-2.62/modules/volume/volume_facetlevel.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_facetlevel.c 2023-05-23 15:07:21.000000000 +0000 @@ -0,0 +1,138 @@ +/* + * $Id: volume_facetlevel.c 25241 2023-02-23 16:00:42Z klapetek $ + * Copyright (C) 2018 David Necas (Yeti), Petr Klapetek. + * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define VOLUME_FACETLEVEL_RUN_MODES (GWY_RUN_IMMEDIATE) + +static gboolean module_register (void); +static void volume_facetlevel(GwyContainer *data, + GwyRunType run); +static void brick_level (GwyBrick *brick); + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Performs facet leveling on all XY planes"), + "Petr Klapetek ", + "1.0", + "David Nečas (Yeti) & Petr Klapetek", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_facetlevel) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_facetlevel", + (GwyVolumeFunc)&volume_facetlevel, + N_("/_Correct Data/_XY Facet Level"), + NULL, + VOLUME_FACETLEVEL_RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Facet leveling of all XY planes")); + + return TRUE; +} + +static void +volume_facetlevel(GwyContainer *data, GwyRunType run) +{ + GwyBrick *brick = NULL; + gint id, newid; + + g_return_if_fail(run & VOLUME_FACETLEVEL_RUN_MODES); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &id, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + + brick = gwy_brick_duplicate(brick); + gwy_app_wait_start(gwy_app_find_window_for_volume(data, id), _("Facet-leveling...")); + brick_level(brick); + gwy_app_wait_finish(); + newid = gwy_app_data_browser_add_brick(brick, NULL, data, TRUE); + gwy_app_set_brick_title(data, newid, _("Facet leveled")); + g_object_unref(brick); + + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, id, newid); +} + +static void +brick_level(GwyBrick *brick) +{ + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + +#ifdef _OPENMP +#pragma omp parallel if(gwy_threads_are_enabled()) default(none) \ + shared(brick,xres,yres,zres) +#endif + { + GwyDataField *dfield = gwy_data_field_new(xres, yres, xres, yres, + FALSE); + gint kfrom = gwy_omp_chunk_start(zres), kto = gwy_omp_chunk_end(zres); + gdouble c, bx, by, b2, eps = 1e-9; + gint i, k; + + for (k = kfrom; k < kto; k++) { + gwy_brick_extract_xy_plane(brick, dfield, k); + i = 0; + while (i < 100) + { + if (!gwy_data_field_fit_facet_plane(dfield, NULL, GWY_MASK_IGNORE, &c, &bx, &by)) + break; + + gwy_data_field_plane_level(dfield, c, bx, by); + bx /= gwy_data_field_get_dx(dfield); + by /= gwy_data_field_get_dy(dfield); + b2 = bx*bx + by*by; + if (b2 < eps) { + i = 100; + break; + } + i++; + } + gwy_brick_set_xy_plane(brick, dfield, k); + } + + g_object_unref(dfield); + } +} + +/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_fdfit.c gwyddion-2.63/modules/volume/volume_fdfit.c --- gwyddion-2.62/modules/volume/volume_fdfit.c 2021-10-25 08:47:19.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_fdfit.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_fdfit.c 24423 2021-10-24 14:55:31Z klapetek $ + * $Id: volume_fdfit.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2003-2007,2013 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -210,7 +210,7 @@ { gwy_volume_func_register("volume_fdfit", (GwyVolumeFunc)&volfit, - N_("/_Evaluate FD Data..."), + N_("/SPM M_odes/_Evaluate FD Data..."), GWY_STOCK_VOLUME_FD, VOLFIT_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_invert.c gwyddion-2.63/modules/volume/volume_invert.c --- gwyddion-2.62/modules/volume/volume_invert.c 2021-03-15 14:54:42.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_invert.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_invert.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: volume_invert.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2013 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -50,7 +50,7 @@ { gwy_volume_func_register("volume_invert", (GwyVolumeFunc)&volume_invert, - N_("/_Invert Value"), + N_("/_Basic Operations/_Invert Value"), GWY_STOCK_VOLUME_INVERT, VOLUME_INVERT_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_kmeans.c gwyddion-2.63/modules/volume/volume_kmeans.c --- gwyddion-2.62/modules/volume/volume_kmeans.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_kmeans.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_kmeans.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: volume_kmeans.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek, * Daniil Bratashov, Evgeniy Ryabov. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, dn2010@gmail.com. @@ -106,7 +106,7 @@ { gwy_volume_func_register("kmeans", (GwyVolumeFunc)&volume_kmeans, - N_("/_K-Means Clustering..."), + N_("/_Statistics/_K-Means Clustering..."), GWY_STOCK_VOLUME_KMEANS, KMEANS_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_kmedians.c gwyddion-2.63/modules/volume/volume_kmedians.c --- gwyddion-2.62/modules/volume/volume_kmedians.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_kmedians.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_kmedians.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: volume_kmedians.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek, * Daniil Bratashov, Evgeniy Ryabov. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, @@ -99,7 +99,7 @@ { gwy_volume_func_register("kmedians", (GwyVolumeFunc)&volume_kmedians, - N_("/_K-Medians Clustering..."), + N_("/_Statistics/_K-Medians Clustering..."), GWY_STOCK_VOLUME_KMEDIANS, KMEDIANS_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_lawnize.c gwyddion-2.63/modules/volume/volume_lawnize.c --- gwyddion-2.62/modules/volume/volume_lawnize.c 2021-10-07 15:12:30.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_lawnize.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_lawnize.c 24290 2021-10-07 15:12:30Z yeti-dn $ + * $Id: volume_lawnize.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -96,7 +96,7 @@ { gwy_volume_func_register("volume_lawnize", (GwyVolumeFunc)&lawnize, - N_("/Convert to _Curve Map..."), + N_("/_Basic Operations/Convert to _Curve Map..."), NULL, RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_linelevel.c gwyddion-2.63/modules/volume/volume_linelevel.c --- gwyddion-2.62/modules/volume/volume_linelevel.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_linelevel.c 2023-05-22 11:00:57.000000000 +0000 @@ -0,0 +1,838 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +/* Lower symmetric part indexing; i MUST be greater or equal than j */ +#define SLi(a, i, j) a[(i)*((i) + 1)/2 + (j)] + + +enum { + PREVIEW_SIZE = 360, + MAX_DEGREE = 5, +}; + +enum { + PARAM_METHOD, + PARAM_TRIM_FRACTION, + PARAM_MAX_DEGREE, + PARAM_DIRECTION, + PARAM_Z, + PARAM_ORDER, + PARAM_UPDATE +}; + +typedef enum { + LINE_MATCH_POLY = 0, + LINE_MATCH_MEDIAN = 1, + LINE_MATCH_MEDIAN_DIFF = 2, + LINE_MATCH_MODUS = 3, + LINE_MATCH_MATCH = 4, + LINE_MATCH_TRIMMED_MEAN = 5, + LINE_MATCH_TMEAN_DIFF = 6, + LINE_MATCH_FACET_TILT = 7, +} LineMatchMethod; + + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyBrick *result; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void line_level (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void preview (gpointer user_data); +static void update_image (ModuleGUI *gui, + gint z); +static void sanitise_params (ModuleArgs *args); +static void linematch_do_poly (GwyDataField *field, + GwyDataField *mask, + GwyDataLine *means, + GwyMaskingType masking, + gint degree); +static void linematch_do_trimmed_mean(GwyDataField *field, + GwyDataField *mask, + GwyDataLine *shifts, + GwyMaskingType masking, + gdouble trim_fraction); +static void linematch_do_trimmed_diff(GwyDataField *field, + GwyDataField *mask, + GwyDataLine *shifts, + GwyMaskingType masking, + gdouble trim_fraction); +static void linematch_do_modus (GwyDataField *field, + GwyDataField *mask, + GwyDataLine *shifts, + GwyMaskingType masking); +static void linematch_do_match (GwyDataField *field, + GwyDataField *mask, + GwyDataLine *shifts, + GwyMaskingType masking); +static void linematch_do_facet_tilt (GwyDataField *field, + GwyDataField *mask, + GwyDataLine *shifts, + GwyMaskingType masking); +static void zero_level_row_shifts (GwyDataLine *shifts); + +static const GwyEnum methods[] = { + { N_("linematch|Polynomial"), LINE_MATCH_POLY, }, + { N_("Median"), LINE_MATCH_MEDIAN, }, + { N_("Median of differences"), LINE_MATCH_MEDIAN_DIFF, }, + { N_("Modus"), LINE_MATCH_MODUS, }, + { N_("linematch|Matching"), LINE_MATCH_MATCH, }, + { N_("Trimmed mean"), LINE_MATCH_TRIMMED_MEAN, }, + { N_("Trimmed mean of differences"), LINE_MATCH_TMEAN_DIFF, }, + { N_("Facet-level tilt"), LINE_MATCH_FACET_TILT, }, +}; + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Performe line leveling for all the volume data levels."), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_linelevel) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_linelevel", + (GwyVolumeFunc)&line_level, + N_("/_Correct Data/_Align Rows..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Performs line leveling of all levels")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ +// static const GwyEnum output_types[] = { +// { N_("_Extract drift"), OUTPUT_DRIFT, }, +// { N_("_Crop data"), OUTPUT_CROP, }, +// }; + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_gwyenum(paramdef, PARAM_METHOD, "method", _("Method"), + methods, G_N_ELEMENTS(methods), LINE_MATCH_MEDIAN); + gwy_param_def_add_int(paramdef, PARAM_MAX_DEGREE, "max_degree", _("_Polynomial degree"), 0, MAX_DEGREE, 1); + gwy_param_def_add_double(paramdef, PARAM_TRIM_FRACTION, "trim_fraction", _("_Trim fraction"), 0.0, 0.5, 0.05); + gwy_param_def_add_enum(paramdef, PARAM_DIRECTION, "direction", NULL, GWY_TYPE_ORIENTATION, + GWY_ORIENTATION_HORIZONTAL); + gwy_param_def_add_instant_updates(paramdef, PARAM_UPDATE, "update", NULL, TRUE); + gwy_param_def_add_int(paramdef, PARAM_Z, "z", "Preview level", 0, G_MAXINT, 0); + return paramdef; +} + +static void +line_level(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + newid = gwy_app_data_browser_add_brick(args.result, NULL, data, TRUE); + + gwy_app_set_brick_title(data, newid, _("Line leveled")); + gwy_app_sync_volume_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + args->result = gwy_brick_duplicate(brick); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("Line level")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_slider(table, PARAM_Z); + gwy_param_table_slider_restrict_range(table, PARAM_Z, 0, gwy_brick_get_zres(brick)-1); + + gwy_param_table_append_radio_header(table, PARAM_METHOD); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_MEDIAN); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_MEDIAN_DIFF); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_MODUS); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_MATCH); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_FACET_TILT); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_POLY); + gwy_param_table_append_slider(table, PARAM_MAX_DEGREE); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_TRIMMED_MEAN); + gwy_param_table_append_radio_item(table, PARAM_METHOD, LINE_MATCH_TMEAN_DIFF); + gwy_param_table_append_slider(table, PARAM_TRIM_FRACTION); + gwy_param_table_slider_set_steps(table, PARAM_TRIM_FRACTION, 0.01, 0.1); + gwy_param_table_slider_set_factor(table, PARAM_TRIM_FRACTION, 100.0); + gwy_param_table_set_unitstr(table, PARAM_TRIM_FRACTION, "%"); + gwy_param_table_append_combo(table, PARAM_DIRECTION); + gwy_param_table_append_checkbox(table, PARAM_UPDATE); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, gint id) +{ + if (id != PARAM_UPDATE) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + if (response == GWY_RESPONSE_RESET) + gwy_brick_copy(gui->args->brick, gui->args->result, FALSE); + + preview(gui); +} + +static void +update_image(ModuleGUI *gui, gint z) +{ + GwyDataField *dfield; + GwyBrick *brick = gui->args->result; + dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + + gwy_brick_extract_xy_plane(brick, dfield, CLAMP(z, 0, brick->zres-1)); + + gwy_data_field_data_changed(dfield); +} + + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + + execute(gui->args); + update_image(gui, z); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k; + GwyBrick *original = args->brick; + GwyBrick *brick = args->result; + GwyDataField *dfield, *myfield; + GwyDataLine *shifts; + LineMatchMethod method = gwy_params_get_enum(params, PARAM_METHOD); + gdouble trim_fraction = gwy_params_get_double(params, PARAM_TRIM_FRACTION); + gint max_degree = gwy_params_get_int(params, PARAM_MAX_DEGREE); + GwyOrientation direction = gwy_params_get_enum(params, PARAM_DIRECTION); + + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + + dfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + shifts = gwy_data_line_new(gwy_data_field_get_yres(dfield), gwy_data_field_get_yreal(dfield), FALSE); + + for (k = 0; k < zres; k++) { + gwy_brick_extract_xy_plane(original, dfield, k); + + /* Transpose the fields if necessary. */ + myfield = dfield; + if (direction == GWY_ORIENTATION_VERTICAL) { + myfield = gwy_data_field_new_alike(dfield, FALSE); + gwy_data_field_flip_xy(dfield, myfield, FALSE); + } + + /* Perform the correction. */ + if (method == LINE_MATCH_POLY) { + if (max_degree == 0) + linematch_do_trimmed_mean(myfield, NULL, shifts, GWY_MASK_IGNORE, 0.0); + else + linematch_do_poly(myfield, NULL, shifts, GWY_MASK_IGNORE, max_degree); + } + else if (method == LINE_MATCH_MEDIAN) + linematch_do_trimmed_mean(myfield, NULL, shifts, GWY_MASK_IGNORE, 0.5); + else if (method == LINE_MATCH_MEDIAN_DIFF) + linematch_do_trimmed_diff(myfield, NULL, shifts, GWY_MASK_IGNORE, 0.5); + else if (method == LINE_MATCH_MODUS) + linematch_do_modus(myfield, NULL, shifts, GWY_MASK_IGNORE); + else if (method == LINE_MATCH_MATCH) + linematch_do_match(myfield, NULL, shifts, GWY_MASK_IGNORE); + else if (method == LINE_MATCH_FACET_TILT) + linematch_do_facet_tilt(myfield, NULL, shifts, GWY_MASK_IGNORE); + else if (method == LINE_MATCH_TRIMMED_MEAN) + linematch_do_trimmed_mean(myfield, NULL, shifts, GWY_MASK_IGNORE, trim_fraction); + else if (method == LINE_MATCH_TMEAN_DIFF) + linematch_do_trimmed_diff(myfield, NULL, shifts, GWY_MASK_IGNORE, trim_fraction); + else { + g_assert_not_reached(); + } + + /* Transpose back if necessary. */ + if (direction == GWY_ORIENTATION_VERTICAL) { + gwy_data_field_flip_xy(myfield, dfield, FALSE); + g_object_unref(myfield); + } + + gwy_brick_set_xy_plane(brick, dfield, k); + } + + g_object_unref(dfield); + g_object_unref(shifts); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + sanitise_one_param(params, PARAM_MAX_DEGREE, 0, MAX_DEGREE, 2); +} + + +static void +linematch_do_poly(GwyDataField *field, GwyDataField *mask, GwyDataLine *means, + GwyMaskingType masking, gint degree) +{ + gint xres, yres; + gdouble xc, avg; + const gdouble *m; + gdouble *d; + + xres = gwy_data_field_get_xres(field); + yres = gwy_data_field_get_yres(field); + xc = 0.5*(xres - 1); + avg = gwy_data_field_get_avg(field); + d = gwy_data_field_get_data(field); + + m = mask ? gwy_data_field_get_data_const(mask) : NULL; + +#ifdef _OPENMP +#pragma omp parallel if(gwy_threads_are_enabled()) default(none) \ + shared(d,m,xres,yres,masking,avg,degree,xc,means) +#endif + { + gdouble *xpowers = g_new(gdouble, 2*degree+1); + gdouble *zxpowers = g_new(gdouble, degree+1); + gdouble *matrix = g_new(gdouble, (degree+1)*(degree+2)/2); + gint ifrom = gwy_omp_chunk_start(yres), ito = gwy_omp_chunk_end(yres); + gint i, j, k; + + for (i = ifrom; i < ito; i++) { + const gdouble *mrow = m ? m + i*xres : NULL; + gdouble *drow = d + i*xres; + + gwy_clear(xpowers, 2*degree+1); + gwy_clear(zxpowers, degree+1); + + for (j = 0; j < xres; j++) { + gdouble p = 1.0, x = j - xc; + + if ((masking == GWY_MASK_INCLUDE && mrow[j] <= 0.0) + || (masking == GWY_MASK_EXCLUDE && mrow[j] >= 1.0)) + continue; + + for (k = 0; k <= degree; k++) { + xpowers[k] += p; + zxpowers[k] += p*drow[j]; + p *= x; + } + for (k = degree+1; k <= 2*degree; k++) { + xpowers[k] += p; + p *= x; + } + } + + /* Solve polynomial coefficients. */ + if (xpowers[0] > degree) { + for (j = 0; j <= degree; j++) { + for (k = 0; k <= j; k++) + SLi(matrix, j, k) = xpowers[j + k]; + } + gwy_math_choleski_decompose(degree+1, matrix); + gwy_math_choleski_solve(degree+1, matrix, zxpowers); + } + else + gwy_clear(zxpowers, degree+1); + + /* Subtract. */ + zxpowers[0] -= avg; + gwy_data_line_set_val(means, i, zxpowers[0]); + for (j = 0; j < xres; j++) { + gdouble p = 1.0, x = j - xc, z = 0.0; + + for (k = 0; k <= degree; k++) { + z += p*zxpowers[k]; + p *= x; + } + + drow[j] -= z; + } + } + + g_free(matrix); + g_free(zxpowers); + g_free(xpowers); + } +} + +static void +linematch_do_trimmed_mean(GwyDataField *field, GwyDataField *mask, GwyDataLine *shifts, + GwyMaskingType masking, gdouble trimfrac) +{ + GwyDataLine *myshifts; + + myshifts = gwy_data_field_find_row_shifts_trimmed_mean(field, mask, masking, trimfrac, 0); + gwy_data_field_subtract_row_shifts(field, myshifts); + gwy_data_line_assign(shifts, myshifts); + g_object_unref(myshifts); +} +static void +linematch_do_trimmed_diff(GwyDataField *field, GwyDataField *mask, GwyDataLine *shifts, + GwyMaskingType masking, gdouble trimfrac) +{ + GwyDataLine *myshifts; + + myshifts = gwy_data_field_find_row_shifts_trimmed_diff(field, mask, masking, trimfrac, 0); + gwy_data_field_subtract_row_shifts(field, myshifts); + gwy_data_line_assign(shifts, myshifts); + g_object_unref(myshifts); +} + +static void +linematch_do_modus(GwyDataField *field, GwyDataField *mask, GwyDataLine *modi, + GwyMaskingType masking) +{ + gint xres, yres; + const gdouble *d, *m; + gdouble total_median; + + xres = gwy_data_field_get_xres(field); + yres = gwy_data_field_get_yres(field); + total_median = gwy_data_field_area_get_median_mask(field, mask, masking, 0, 0, xres, yres); + + d = gwy_data_field_get_data(field); + m = mask ? gwy_data_field_get_data_const(mask) : NULL; +#ifdef _OPENMP +#pragma omp parallel if(gwy_threads_are_enabled()) default(none) \ + shared(d,m,modi,xres,yres,masking,total_median) +#endif + { + GwyDataLine *line = gwy_data_line_new(xres, 1.0, FALSE); + gdouble *buf = gwy_data_line_get_data(line); + gint ifrom = gwy_omp_chunk_start(yres), ito = gwy_omp_chunk_end(yres); + gint i; + + for (i = ifrom; i < ito; i++) { + const gdouble *row = d + i*xres; + const gdouble *mrow = m ? m + i*xres : NULL; + gdouble modus; + gint count = 0, j; + + for (j = 0; j < xres; j++) { + if ((masking == GWY_MASK_INCLUDE && mrow[j] <= 0.0) + || (masking == GWY_MASK_EXCLUDE && mrow[j] >= 1.0)) + continue; + + buf[count++] = row[j]; + } + + if (!count) + modus = total_median; + else if (count < 9) + modus = gwy_math_median(count, buf); + else { + gint seglen = GWY_ROUND(sqrt(count)), bestj = 0; + gdouble diff, bestdiff = G_MAXDOUBLE; + + gwy_math_sort(count, buf); + for (j = 0; j + seglen-1 < count; j++) { + diff = buf[j + seglen-1] - buf[j]; + if (diff < bestdiff) { + bestdiff = diff; + bestj = j; + } + } + modus = 0.0; + count = 0; + for (j = seglen/3; j < seglen - seglen/3; j++, count++) + modus += buf[bestj + j]; + modus /= count; + } + + gwy_data_line_set_val(modi, i, modus); + } + + g_object_unref(line); + } + + zero_level_row_shifts(modi); + gwy_data_field_subtract_row_shifts(field, modi); +} +static void +linematch_do_match(GwyDataField *field, GwyDataField *mask, GwyDataLine *shifts, + GwyMaskingType masking) +{ + gint xres, yres, k; + const gdouble *d, *m; + gdouble *s; + + xres = gwy_data_field_get_xres(field); + yres = gwy_data_field_get_yres(field); + d = gwy_data_field_get_data(field); + m = mask ? gwy_data_field_get_data_const(mask) : NULL; + s = gwy_data_line_get_data(shifts); + +#ifdef _OPENMP +#pragma omp parallel if(gwy_threads_are_enabled()) default(none) \ + shared(d,m,s,xres,yres,masking) +#endif + { + gint ifrom = gwy_omp_chunk_start(yres-1) + 1; + gint ito = gwy_omp_chunk_end(yres-1) + 1; + gdouble *w = g_new(gdouble, xres-1); + const gdouble *a, *b, *ma, *mb; + gdouble q, wsum, lambda, x; + gint i, j; + + for (i = ifrom; i < ito; i++) { + a = d + xres*(i - 1); + b = d + xres*i; + ma = m + xres*(i - 1); + mb = m + xres*i; + + /* Diffnorm */ + wsum = 0.0; + for (j = 0; j < xres-1; j++) { + if ((masking == GWY_MASK_INCLUDE && (ma[j] <= 0.0 || mb[j] <= 0.0)) + || (masking == GWY_MASK_EXCLUDE && (ma[j] >= 1.0 || mb[j] >= 1.0))) + continue; + + x = a[j+1] - a[j] - b[j+1] + b[j]; + wsum += fabs(x); + } + if (wsum == 0) { + s[i] = 0.0; + continue; + } + q = wsum/(xres-1); + + /* Weights */ + wsum = 0.0; + for (j = 0; j < xres-1; j++) { + if ((masking == GWY_MASK_INCLUDE && (ma[j] <= 0.0 || mb[j] <= 0.0)) + || (masking == GWY_MASK_EXCLUDE && (ma[j] >= 1.0 || mb[j] >= 1.0))) { + w[j] = 0.0; + continue; + } + + x = a[j+1] - a[j] - b[j+1] + b[j]; + w[j] = exp(-(x*x/(2.0*q))); + wsum += w[j]; + } + + /* Correction */ + lambda = (a[0] - b[0])*w[0]; + for (j = 1; j < xres-1; j++) { + if ((masking == GWY_MASK_INCLUDE && (ma[j] <= 0.0 || mb[j] <= 0.0)) + || (masking == GWY_MASK_EXCLUDE && (ma[j] >= 1.0 || mb[j] >= 1.0))) + continue; + + lambda += (a[j] - b[j])*(w[j-1] + w[j]); + } + lambda += (a[xres-1] - b[xres-1])*w[xres-2]; + lambda /= 2.0*wsum; + + gwy_debug("%g %g %g", q, wsum, lambda); + + s[i] = -lambda; + } + + g_free(w); + } + + s[0] = 0.0; + for (k = 1; k < yres; k++) + s[k] += s[k-1]; + + zero_level_row_shifts(shifts); + gwy_data_field_subtract_row_shifts(field, shifts); +} +static gdouble +row_fit_facet_tilt(const gdouble *drow, + const gdouble *mrow, + GwyMaskingType masking, + guint res, gdouble dx, + guint mincount) +{ + const gdouble c = 1.0/200.0; + + gdouble vx, q, sumvx, sumvz, sigma2; + guint i, n; + + sigma2 = 0.0; + n = 0; + if (mrow && masking == GWY_MASK_INCLUDE) { + for (i = 0; i < res-1; i++) { + if (mrow[i] >= 1.0 && mrow[i+1] >= 1.0) { + vx = (drow[i+1] - drow[i])/dx; + sigma2 += vx*vx; + n++; + } + } + } + else if (mrow && masking == GWY_MASK_EXCLUDE) { + for (i = 0; i < res-1; i++) { + if (mrow[i] <= 0.0 && mrow[i+1] <= 0.0) { + vx = (drow[i+1] - drow[i])/dx; + sigma2 += vx*vx; + n++; + } + } + } + else { + for (i = 0; i < res-1; i++) { + vx = (drow[i+1] - drow[i])/dx; + sigma2 += vx*vx; + } + n = res-1; + } + /* Do not try to level from some random pixel */ + gwy_debug("n=%d", n); + if (n < mincount) + return 0.0; + + sigma2 = c*sigma2/n; + sumvx = sumvz = 0.0; + if (mrow && masking == GWY_MASK_INCLUDE) { + for (i = 0; i < res-1; i++) { + if (mrow[i] >= 1.0 && mrow[i+1] >= 1.0) { + vx = (drow[i+1] - drow[i])/dx; + q = exp(vx*vx/sigma2); + sumvx += vx/q; + sumvz += 1.0/q; + } + } + } + else if (mrow && masking == GWY_MASK_EXCLUDE) { + for (i = 0; i < res-1; i++) { + if (mrow[i] <= 0.0 && mrow[i+1] <= 0.0) { + vx = (drow[i+1] - drow[i])/dx; + q = exp(vx*vx/sigma2); + sumvx += vx/q; + sumvz += 1.0/q; + } + } + } + else { + for (i = 0; i < res-1; i++) { + vx = (drow[i+1] - drow[i])/dx; + q = exp(vx*vx/sigma2); + sumvx += vx/q; + sumvz += 1.0/q; + } + } + + return sumvx/sumvz * dx; +} + +static void +untilt_row(gdouble *drow, guint res, gdouble bx) +{ + gdouble x; + guint i; + + if (!bx) + return; + + for (i = 0; i < res; i++) { + x = i - 0.5*(res - 1); + drow[i] -= bx*x; + } +} +static void +linematch_do_facet_tilt(GwyDataField *field, GwyDataField *mask, GwyDataLine *shifts, + GwyMaskingType masking) +{ + guint xres, yres, i, j, mincount; + const gdouble *mdata, *mrow; + gdouble *data, *drow; + gdouble dx, tilt; + + xres = gwy_data_field_get_xres(field); + yres = gwy_data_field_get_yres(field); + dx = gwy_data_field_get_dx(field); + mincount = GWY_ROUND(log(xres) + 1); + + data = gwy_data_field_get_data(field); + mdata = mask ? gwy_data_field_get_data_const(mask) : NULL; + for (i = 0; i < yres; i++) { + drow = data + i*xres; + mrow = mdata ? mdata + i*xres : NULL; + for (j = 0; j < 30; j++) { + tilt = row_fit_facet_tilt(drow, mrow, masking, xres, dx, mincount); + untilt_row(drow, xres, tilt); + if (fabs(tilt/dx) < 1e-6) + break; + } + } + + /* FIXME: Should we put the tilts there to confuse the user? We need to + * make sure all functions set the units correctly in such case. */ + gwy_data_line_clear(shifts); +} + +static void +zero_level_row_shifts(GwyDataLine *shifts) +{ + gwy_data_line_add(shifts, -gwy_data_line_get_avg(shifts)); +} + + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_linestat.c gwyddion-2.63/modules/volume/volume_linestat.c --- gwyddion-2.62/modules/volume/volume_linestat.c 2022-08-31 12:05:41.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_linestat.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * $Id: volume_linestat.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2015-2021 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -174,7 +174,7 @@ { gwy_volume_func_register("volume_linestat", (GwyVolumeFunc)&line_stat, - N_("/Summarize _Profiles..."), + N_("/_Statistics/Summarize _Profiles..."), GWY_STOCK_VOLUME_LINE_STATS, RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_localdetect.c gwyddion-2.63/modules/volume/volume_localdetect.c --- gwyddion-2.62/modules/volume/volume_localdetect.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_localdetect.c 2023-05-30 14:14:17.000000000 +0000 @@ -0,0 +1,315 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +enum { + PREVIEW_SIZE = 360, + MAX_WIDTH = 50, +}; + +enum { + PARAM_WIDTH, + PARAM_UPDATE +}; + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyDataField *result; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void localdetect (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void preview (gpointer user_data); +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Perform localization merge"), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_localdetect) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_localdetect", + (GwyVolumeFunc)&localdetect, + N_("/SPM M_odes/_Localization Merge..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Performs localization merge of all the levels")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_double(paramdef, PARAM_WIDTH, "peak_width", _("_Peak width"), 0.0, MAX_WIDTH, 1.0); + gwy_param_def_add_instant_updates(paramdef, PARAM_UPDATE, "update", NULL, TRUE); + return paramdef; +} + +static void +localdetect(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + + newid = gwy_app_data_browser_add_data_field(args.result, data, TRUE); + + gwy_app_set_data_field_title(data, newid, _("Localization result")); + gwy_app_sync_data_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *result = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + args->result = result; + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), result); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("Localization Merge")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_slider(table, PARAM_WIDTH); + gwy_param_table_append_checkbox(table, PARAM_UPDATE); + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, gint id) +{ + if (id != PARAM_UPDATE) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ +// if (response == GWY_RESPONSE_RESET) +// gwy_brick_copy(gui->args->brick, gui->args->result, FALSE); + + preview(gui); +} + + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + + execute(gui->args); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +filter_field(GwyDataField *dfield, GwyDataField *maxs, gdouble threshold) +{ + int xres, yres, i; + gdouble thresh = threshold*(gwy_data_field_get_max(dfield) - gwy_data_field_get_min(dfield)); + gdouble *data = gwy_data_field_get_data(dfield); + gdouble *mdata = gwy_data_field_get_data(maxs); + xres = gwy_data_field_get_xres(dfield); + yres = gwy_data_field_get_yres(dfield); + + for (i=0; i<(xres*yres); i++) { + if (mdata[i]>0 && data[i]>thresh) { + mdata[i] = data[i]; + } + else mdata[i] = 0; + } +} + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k; + GwyBrick *brick = args->brick; + GwyDataField *result = args->result; + GwyDataField *dfield, *maxs, *sum; + gdouble width = gwy_params_get_double(params, PARAM_WIDTH); + + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + + dfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + maxs = gwy_data_field_new_alike(dfield, FALSE); + sum = gwy_data_field_new_alike(dfield, TRUE); + + for (k = 0; k < 1; k++) { + gwy_brick_extract_xy_plane(brick, dfield, k); + gwy_data_field_add(dfield, -gwy_data_field_get_min(dfield)); + gwy_data_field_mark_extrema(dfield, maxs, TRUE); //find maxima mask + filter_field(dfield, maxs, 0.2); + gwy_data_field_filter_gaussian(maxs, width); //broaden them + gwy_data_field_sum_fields(sum, sum, maxs); //add them to result + } + gwy_data_field_copy(sum, result, FALSE); + gwy_data_field_data_changed(result); + + g_object_unref(dfield); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; +// sanitise_one_param(params, PARAM_WIDTH, 0, MAX_WIDTH, 2); +} + + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_mfmrecalc.c gwyddion-2.63/modules/volume/volume_mfmrecalc.c --- gwyddion-2.62/modules/volume/volume_mfmrecalc.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_mfmrecalc.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_mfmrecalc.c 21471 2018-09-26 19:47:48Z klapetek $ + * $Id: volume_mfmrecalc.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2017-2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -113,7 +113,7 @@ { gwy_volume_func_register("volume_mfmrecalc", (GwyVolumeFunc)&volume_mfmrecalc, - N_("/_Magnetic Data to Force Gradient..."), + N_("/SPM M_odes/_Magnetic Data to Force Gradient..."), NULL, VMFM_RECALC_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volumeops.c gwyddion-2.63/modules/volume/volumeops.c --- gwyddion-2.62/modules/volume/volumeops.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volumeops.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volumeops.c 20677 2017-12-18 18:22:52Z yeti-dn $ + * $Id: volumeops.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -50,7 +50,7 @@ { gwy_volume_func_register("extract_preview", (GwyVolumeFunc)&extract_preview, - N_("/Extract _Preview"), + N_("/_Basic Operations/Extract _Preview"), NULL, VOLUMEOPS_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_outliers.c gwyddion-2.63/modules/volume/volume_outliers.c --- gwyddion-2.62/modules/volume/volume_outliers.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_outliers.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_outliers.c 22340 2019-07-25 10:23:59Z yeti-dn $ + * $Id: volume_outliers.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -55,7 +55,7 @@ { gwy_volume_func_register("volume_outliers", (GwyVolumeFunc)&volume_outliers, - N_("/_XY Plane Outliers"), + N_("/_Correct Data/_XY Plane Outliers"), NULL, VOLUME_OUTLIERS_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_planelevel.c gwyddion-2.63/modules/volume/volume_planelevel.c --- gwyddion-2.62/modules/volume/volume_planelevel.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_planelevel.c 2023-04-11 11:53:25.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_planelevel.c 22340 2019-07-25 10:23:59Z yeti-dn $ + * $Id: volume_planelevel.c 25287 2023-03-29 17:24:40Z klapetek $ * Copyright (C) 2018 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -55,7 +55,7 @@ { gwy_volume_func_register("volume_planelevel", (GwyVolumeFunc)&volume_planelevel, - N_("/_XY Plane Level"), + N_("/_Correct Data/_XY Plane Level"), NULL, VOLUME_PLANELEVEL_RUN_MODES, GWY_MENU_FLAG_VOLUME, @@ -81,6 +81,12 @@ brick_level(brick); newid = gwy_app_data_browser_add_brick(brick, NULL, data, TRUE); g_object_unref(brick); + + gwy_app_set_brick_title(data, newid, _("Leveled")); + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + gwy_app_volume_log_add_volume(data, id, newid); } diff -Nru gwyddion-2.62/modules/volume/volume_planestat.c gwyddion-2.63/modules/volume/volume_planestat.c --- gwyddion-2.62/modules/volume/volume_planestat.c 2022-10-14 15:42:40.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_planestat.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_planestat.c 25092 2022-10-14 15:42:40Z yeti-dn $ + * $Id: volume_planestat.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2015-2022 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -242,7 +242,7 @@ { gwy_volume_func_register("volume_planestat", (GwyVolumeFunc)&plane_stat, - N_("/Summarize P_lanes..."), + N_("/_Statistics/Summarize P_lanes..."), GWY_STOCK_VOLUME_PLANE_STATS, RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_psf.c gwyddion-2.63/modules/volume/volume_psf.c --- gwyddion-2.62/modules/volume/volume_psf.c 2022-05-19 13:45:20.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_psf.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_psf.c 24833 2022-05-19 13:45:20Z yeti-dn $ + * $Id: volume_psf.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2017-2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -264,7 +265,7 @@ { gwy_volume_func_register("volume_psf", (GwyVolumeFunc)&volume_psf, - N_("/_Transfer Function Guess..."), + N_("/_Statistics/_Transfer Function Guess..."), NULL, PSF_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_removeframe.c gwyddion-2.63/modules/volume/volume_removeframe.c --- gwyddion-2.62/modules/volume/volume_removeframe.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_removeframe.c 2023-05-31 10:54:11.000000000 +0000 @@ -0,0 +1,379 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +enum { + PREVIEW_SIZE = 360, + RESPONSE_REMOVE = 101, +}; + +enum { + PARAM_Z, + PARAM_EXTRACT, + BUTTON_REMOVE +}; + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyBrick *result; + GwyDataField *extracted; + gint extracted_level; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void remove_frame (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void removeit (gpointer user_data); +static void update_image (ModuleGUI *gui, + gint z); +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Remove one frame from volume data stack"), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_removeframe) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_removeframe", + (GwyVolumeFunc)&remove_frame, + N_("/_Basic Operations/_Remove XY Plane..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Remove single XY plane")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_int(paramdef, PARAM_Z, "z", "Preview level", 0, G_MAXINT, 0); + gwy_param_def_add_boolean(paramdef, PARAM_EXTRACT, "extract", _("_Extract the plane"), FALSE); + return paramdef; +} + +static void +remove_frame(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid, level; + gchar key[40]; + gchar title[40]; + const guchar *gradient; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + args.extracted = NULL; + args.extracted_level = 123; + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + newid = gwy_app_data_browser_add_brick(args.result, NULL, data, TRUE); + + gwy_app_set_brick_title(data, newid, _("Frame removed")); + gwy_app_sync_volume_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + if (gwy_params_get_boolean(args.params, PARAM_EXTRACT) && args.extracted) + { + newid = gwy_app_data_browser_add_data_field(args.extracted, data, TRUE); + gwy_app_sync_data_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + GWY_DATA_ITEM_MASK_COLOR, + GWY_DATA_ITEM_REAL_SQUARE, + 0); + g_snprintf(key, sizeof(key), "/brick/%d/preview/palette", oldid); + if (gwy_container_gis_string_by_name(data, key, &gradient)) { + g_snprintf(key, sizeof(key), "/%d/base/palette", newid); + gwy_container_set_const_string_by_name(data, key, gradient); + } + + g_object_unref(args.extracted); + level = args.extracted_level; + g_snprintf(title, sizeof(title), _("Extracted frame (%d)"), level); + gwy_app_set_data_field_title(data, newid, title); + } + + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + args->result = gwy_brick_duplicate(brick); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("Remove XY Plane")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_slider(table, PARAM_Z); + gwy_param_table_slider_restrict_range(table, PARAM_Z, 0, gwy_brick_get_zres(brick)-1); + gwy_param_table_append_checkbox(table, PARAM_EXTRACT); + + gwy_param_table_append_button(table, BUTTON_REMOVE, -1, RESPONSE_REMOVE, + _("_Remove Current Level")); + + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, G_GNUC_UNUSED gint id) +{ + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + update_image(gui, z); + } + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + + if (response == GWY_RESPONSE_RESET) { + g_object_unref(gui->args->result); + gui->args->result = gwy_brick_duplicate(gui->args->brick); + gwy_param_table_slider_restrict_range(gui->table_options, PARAM_Z, 0, + gwy_brick_get_zres(gui->args->result) - 1); + update_image(gui, z); + } + else if (response == RESPONSE_REMOVE) { + removeit(gui); + if (gwy_brick_get_zres(gui->args->result) < 2) + gtk_dialog_set_response_sensitive(GTK_DIALOG(gui->dialog), RESPONSE_REMOVE, FALSE); + } +} + +static void +update_image(ModuleGUI *gui, gint z) +{ + GwyDataField *dfield; + GwyBrick *brick = gui->args->result; + dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + + gwy_brick_extract_xy_plane(brick, dfield, CLAMP(z, 0, brick->zres-1)); + + gwy_data_field_data_changed(dfield); +} + + +static void +removeit(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + GwyBrick *brick; + gint z; + + execute(gui->args); + brick = gui->args->result; + gwy_param_table_slider_restrict_range(gui->table_options, PARAM_Z, 0, gwy_brick_get_zres(brick) - 1); + z = CLAMP(gwy_params_get_int(gui->args->params, PARAM_Z), 0, gwy_brick_get_zres(brick) - 1); + update_image(gui, z); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k, m; + GwyBrick *original = args->result; + GwyBrick *newbrick; + GwyDataField *dfield; + gint level = gwy_params_get_int(params, PARAM_Z); + gint xres = gwy_brick_get_xres(original); + gint yres = gwy_brick_get_yres(original); + gint zres = gwy_brick_get_zres(original); + gdouble xreal = gwy_brick_get_xreal(original); + gdouble yreal = gwy_brick_get_yreal(original); + gdouble zreal = gwy_brick_get_zreal(original); + gint newzres = zres - 1; + gboolean extract = gwy_params_get_boolean(params, PARAM_EXTRACT); + + newbrick = gwy_brick_new(xres, yres, newzres, + xreal, yreal, newzres*zreal/zres, + FALSE); + + gwy_brick_copy_units(original, newbrick); + + dfield = gwy_data_field_new(xres, yres, xreal, yreal, FALSE); + + //printf("extracting plane %d\n", level); + m = 0; + for (k = 0; k < zres; k++) { + if (k == level) { + if (extract) { + if (!args->extracted) + args->extracted = gwy_data_field_new_alike(dfield, FALSE); + gwy_brick_extract_xy_plane(original, args->extracted, k); + } + continue; + } + gwy_brick_extract_xy_plane(original, dfield, k); + gwy_brick_set_xy_plane(newbrick, dfield, m++); + } + + g_object_unref(original); + args->result = newbrick; + args->extracted_level = level; + + g_object_unref(dfield); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + sanitise_one_param(params, PARAM_Z, 0, gwy_brick_get_zres(args->brick), 0); +} + + + + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_rephase.c gwyddion-2.63/modules/volume/volume_rephase.c --- gwyddion-2.62/modules/volume/volume_rephase.c 2019-10-29 16:47:59.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_rephase.c 2023-05-30 09:42:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_rephase.c 22619 2019-10-29 16:47:55Z yeti-dn $ + * $Id: volume_rephase.c 25379 2023-05-29 14:00:16Z klapetek $ * Copyright (C) 2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -161,7 +161,7 @@ { gwy_volume_func_register("volume_rephase", (GwyVolumeFunc)&rephase, - N_("/_Adjust Phase..."), + N_("/SPM M_odes/_Adjust Phase..."), NULL, REPHASE_RUN_MODES, GWY_MENU_FLAG_VOLUME, @@ -780,7 +780,7 @@ gint xres = brick->xres, yres = brick->yres, zres = brick->zres; gint col, row, lev; gdouble *r1data, *r2data; - gdouble val1, val2, lastval1, lastval2; + gdouble val1 = 0, val2 = 0, lastval1, lastval2; result1 = gwy_brick_new_alike(args->brick, TRUE); result2 = gwy_brick_new_alike(args->brick, TRUE); @@ -814,18 +814,18 @@ newid = gwy_app_data_browser_add_brick(result1, NULL, data, TRUE); gwy_app_set_brick_title(data, newid, _("Phase adjusted result A")); - gwy_app_sync_data_items(data, data, id, newid, FALSE, - GWY_DATA_ITEM_GRADIENT, - 0); + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); gwy_app_volume_log_add_volume(data, -1, newid); newid = gwy_app_data_browser_add_brick(result2, NULL, data, TRUE); gwy_app_set_brick_title(data, newid, _("Phase adjusted result B")); - gwy_app_sync_data_items(data, data, id, newid, FALSE, - GWY_DATA_ITEM_GRADIENT, - 0); + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); gwy_app_volume_log_add_volume(data, -1, newid); diff -Nru gwyddion-2.62/modules/volume/volume_scars.c gwyddion-2.63/modules/volume/volume_scars.c --- gwyddion-2.62/modules/volume/volume_scars.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_scars.c 2023-05-23 15:11:46.000000000 +0000 @@ -0,0 +1,393 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + +enum { + PREVIEW_SIZE = 360, + MAX_LENGTH = 1024 +}; + +typedef enum { + FEATURES_POSITIVE = 1 << 0, + FEATURES_NEGATIVE = 1 << 2, + FEATURES_BOTH = (FEATURES_POSITIVE | FEATURES_NEGATIVE), +} FeatureType; + +enum { + PARAM_TYPE, + PARAM_THRESHOLD_HIGH, + PARAM_THRESHOLD_LOW, + PARAM_MIN_LENGTH, + PARAM_MAX_WIDTH, + PARAM_UPDATE, + PARAM_MASK_COLOR, + PARAM_Z, +}; + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwyBrick *result; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void scars (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args, + GtkWindow *wait_window); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void preview (gpointer user_data); +static void update_image (ModuleGUI *gui, + gint z); +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Performs scars removal for all the volume data levels."), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_scars) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_scars", + (GwyVolumeFunc)&scars, + N_("/_Correct Data/_Scars..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Remove scars in all levels")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static const GwyEnum feature_types[] = { + { N_("Positive"), FEATURES_POSITIVE, }, + { N_("Negative"), FEATURES_NEGATIVE, }, + { N_("Both"), FEATURES_BOTH, }, + }; + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, "scars"); + gwy_param_def_add_int(paramdef, PARAM_Z, "z", "Preview level", 0, G_MAXINT, 0); + gwy_param_def_add_gwyenum(paramdef, PARAM_TYPE, "type", _("Scars type"), + feature_types, G_N_ELEMENTS(feature_types), FEATURES_BOTH); + gwy_param_def_add_double(paramdef, PARAM_THRESHOLD_HIGH, "threshold_high", _("_Hard threshold"), 0.0, 2.0, 0.666); + gwy_param_def_add_double(paramdef, PARAM_THRESHOLD_LOW, "threshold_low", _("_Soft threshold"), 0.0, 2.0, 0.25); + gwy_param_def_add_int(paramdef, PARAM_MIN_LENGTH, "min_len", _("Minimum _length"), 1, MAX_LENGTH, 16); + gwy_param_def_add_int(paramdef, PARAM_MAX_WIDTH, "max_width", _("Maximum _width"), 1, 16, 4); + gwy_param_def_add_instant_updates(paramdef, PARAM_UPDATE, "update", NULL, TRUE); + gwy_param_def_add_mask_color(paramdef, PARAM_MASK_COLOR, NULL, NULL); + return paramdef; +} + +static void +scars(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + execute(&args, gwy_app_find_window_for_volume(data, oldid)); + + newid = gwy_app_data_browser_add_brick(args.result, NULL, data, TRUE); + + gwy_app_set_brick_title(data, newid, _("Scars corrected")); + gwy_app_sync_volume_items(data, data, oldid, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + g_object_unref(args.params); + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + GwyDataField *mask = gwy_data_field_new_alike(field, TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + args->result = gwy_brick_duplicate(brick); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + gwy_container_set_object(gui.data, gwy_app_get_mask_key_for_id(0), mask); + + gui.dialog = gwy_dialog_new(_("Scars")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_slider(table, PARAM_Z); + gwy_param_table_slider_restrict_range(table, PARAM_Z, 0, gwy_brick_get_zres(brick)-1); + gwy_param_table_append_slider(table, PARAM_MAX_WIDTH); + gwy_param_table_set_unitstr(table, PARAM_MAX_WIDTH, _("px")); + gwy_param_table_slider_set_mapping(table, PARAM_MAX_WIDTH, GWY_SCALE_MAPPING_LINEAR); + gwy_param_table_append_slider(table, PARAM_MIN_LENGTH); + gwy_param_table_set_unitstr(table, PARAM_MIN_LENGTH, _("px")); + + gwy_param_table_append_slider(table, PARAM_THRESHOLD_HIGH); + gwy_param_table_set_unitstr(table, PARAM_THRESHOLD_HIGH, _("RMS")); + gwy_param_table_append_slider(table, PARAM_THRESHOLD_LOW); + gwy_param_table_set_unitstr(table, PARAM_THRESHOLD_LOW, _("RMS")); + + gwy_param_table_append_separator(table); + gwy_param_table_append_radio(table, PARAM_TYPE); + + gwy_param_table_append_header(table, -1, _("Options")); + gwy_param_table_append_mask_color(table, PARAM_MASK_COLOR, gui.data, 0, data, id); + gwy_param_table_append_checkbox(table, PARAM_UPDATE); + + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_IMMEDIATE, preview, &gui, NULL); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, gint id) +{ + GwyParams *params = gui->args->params; + GwyParamTable *table = gui->table_options; + + if (id == PARAM_THRESHOLD_HIGH || id == PARAM_THRESHOLD_LOW) { + gdouble threshold_low = gwy_params_get_double(params, PARAM_THRESHOLD_LOW); + gdouble threshold_high = gwy_params_get_double(params, PARAM_THRESHOLD_HIGH); + if (threshold_high < threshold_low) { + if (id == PARAM_THRESHOLD_HIGH) + gwy_param_table_set_double(table, PARAM_THRESHOLD_LOW, threshold_high); + else + gwy_param_table_set_double(table, PARAM_THRESHOLD_HIGH, threshold_low); + } + } + if (id != PARAM_MASK_COLOR && id != PARAM_UPDATE) + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + if (response == GWY_RESPONSE_RESET) + gwy_brick_copy(gui->args->brick, gui->args->result, FALSE); + + preview(gui); +} + +static void +mark_scars(GwyDataField *dfield, GwyDataField *mask, gdouble threshold_high, gdouble threshold_low, + gint min_len, gint max_width, FeatureType type) +{ + GwyDataField *tmp; + + if (type == FEATURES_POSITIVE || type == FEATURES_NEGATIVE) { + gwy_data_field_mark_scars(dfield, mask, threshold_high, threshold_low, + min_len, max_width, type == FEATURES_NEGATIVE); + } else { + gwy_data_field_mark_scars(dfield, mask, threshold_high, threshold_low, min_len, max_width, FALSE); + tmp = gwy_data_field_new_alike(dfield, FALSE); + gwy_data_field_mark_scars(dfield, tmp, threshold_high, threshold_low, min_len, max_width, TRUE); + gwy_data_field_max_of_fields(mask, mask, tmp); + g_object_unref(tmp); + } +} + +static void +update_image(ModuleGUI *gui, gint z) +{ + GwyDataField *dfield, *mask; + GwyBrick *brick = gui->args->result; + GwyParams *params = gui->args->params; + FeatureType type = gwy_params_get_enum(params, PARAM_TYPE); + gdouble threshold_high = gwy_params_get_double(params, PARAM_THRESHOLD_HIGH); + gdouble threshold_low = gwy_params_get_double(params, PARAM_THRESHOLD_LOW); + gint min_len = gwy_params_get_int(params, PARAM_MIN_LENGTH); + gint max_width = gwy_params_get_int(params, PARAM_MAX_WIDTH); + + dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + mask = gwy_container_get_object(gui->data, gwy_app_get_mask_key_for_id(0)); + + gwy_brick_extract_xy_plane(brick, dfield, CLAMP(z, 0, brick->zres-1)); + gwy_data_field_data_changed(dfield); + + mark_scars(dfield, mask, threshold_high, threshold_low, min_len, max_width, type); + gwy_data_field_data_changed(mask); +} + + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + gint z = gwy_params_get_int(gui->args->params, PARAM_Z); + + update_image(gui, z); +} + +static void +execute(ModuleArgs *args, GtkWindow *wait_window) +{ + GwyParams *params = args->params; + gint k; + GwyBrick *original = args->brick; + GwyBrick *brick = args->result; + GwyDataField *dfield, *mask; + FeatureType type = gwy_params_get_enum(params, PARAM_TYPE); + gdouble threshold_high = gwy_params_get_double(params, PARAM_THRESHOLD_HIGH); + gdouble threshold_low = gwy_params_get_double(params, PARAM_THRESHOLD_LOW); + gint min_len = gwy_params_get_int(params, PARAM_MIN_LENGTH); + gint max_width = gwy_params_get_int(params, PARAM_MAX_WIDTH); + + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + + dfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + mask = gwy_data_field_new_alike(dfield, FALSE); + + gwy_app_wait_start(wait_window, _("Removing scars...")); + + for (k = 0; k < zres; k++) { + gwy_brick_extract_xy_plane(original, dfield, k); + mark_scars(dfield, mask, threshold_high, threshold_low, min_len, max_width, type); + gwy_data_field_laplace_solve(dfield, mask, -1, 1.0); + gwy_brick_set_xy_plane(brick, dfield, k); + + if (!gwy_app_wait_set_fraction((gdouble)k/zres)) + break; + } + gwy_app_wait_finish(); + + g_object_unref(dfield); + g_object_unref(mask); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + gdouble threshold_high = gwy_params_get_double(params, PARAM_THRESHOLD_HIGH); + gdouble threshold_low = gwy_params_get_double(params, PARAM_THRESHOLD_LOW); + + if (threshold_low > threshold_high) + gwy_params_set_double(params, PARAM_THRESHOLD_HIGH, threshold_low); +} + + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_slice.c gwyddion-2.63/modules/volume/volume_slice.c --- gwyddion-2.62/modules/volume/volume_slice.c 2021-09-21 13:45:29.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_slice.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_slice.c 24177 2021-09-21 13:45:29Z yeti-dn $ + * $Id: volume_slice.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2015-2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -210,7 +210,7 @@ { gwy_volume_func_register("volume_slice", (GwyVolumeFunc)&slice, - N_("/Cut and _Slice..."), + N_("/_Basic Operations/Cut and _Slice..."), GWY_STOCK_VOLUME_SLICE, SLICE_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_stepline.c gwyddion-2.63/modules/volume/volume_stepline.c --- gwyddion-2.62/modules/volume/volume_stepline.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_stepline.c 2023-05-30 14:17:04.000000000 +0000 @@ -0,0 +1,239 @@ +/* + * $Id: volume_stepline.c 25241 2023-02-23 16:00:42Z klapetek $ + * Copyright (C) 2018 David Necas (Yeti), Petr Klapetek. + * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define VOLUME_STEPLINE_RUN_MODES (GWY_RUN_IMMEDIATE) + +static gboolean module_register (void); +static void volume_stepline (GwyContainer *data, + GwyRunType run); +static void brick_level (GwyBrick *brick); +static void step_line_correct (GwyDataField *dfield); + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Performs step line correction"), + "Yeti , Luke Somers , Petr Klapetek ", + "1.0", + "David Nečas (Yeti) & Petr Klapetek & Luke Somers", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_stepline) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_stepline", + (GwyVolumeFunc)&volume_stepline, + N_("/_Correct Data/Ste_p Line Correction"), + NULL, + VOLUME_STEPLINE_RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Step line correction in all XY planes")); + + return TRUE; +} + +static void +volume_stepline(GwyContainer *data, GwyRunType run) +{ + GwyBrick *brick = NULL; + gint id, newid; + + g_return_if_fail(run & VOLUME_STEPLINE_RUN_MODES); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &id, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + + brick = gwy_brick_duplicate(brick); + gwy_app_wait_start(gwy_app_find_window_for_volume(data, id), _("Step line correction...")); + brick_level(brick); + gwy_app_wait_finish(); + newid = gwy_app_data_browser_add_brick(brick, NULL, data, TRUE); + gwy_app_set_brick_title(data, newid, _("Step line corrected")); + g_object_unref(brick); + + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gwy_app_volume_log_add_volume(data, id, newid); +} + +static void +brick_level(GwyBrick *brick) +{ + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + +#ifdef _OPENMP +#pragma omp parallel if(gwy_threads_are_enabled()) default(none) \ + shared(brick,xres,yres,zres) +#endif + { + GwyDataField *dfield = gwy_data_field_new(xres, yres, xres, yres, + FALSE); + gint k; + gint kfrom = gwy_omp_chunk_start(zres), kto = gwy_omp_chunk_end(zres); + for (k = kfrom; k < kto; k++) { + gwy_brick_extract_xy_plane(brick, dfield, k); + step_line_correct(dfield); + gwy_brick_set_xy_plane(brick, dfield, k); + } + + g_object_unref(dfield); + } +} + +static void +calcualte_segment_correction(const gdouble *drow, + gdouble *mrow, + gint xres, + gint len) +{ + const gint min_len = 4; + gdouble corr; + gint j; + + if (len >= min_len) { + corr = 0.0; + for (j = 0; j < len; j++) + corr += (drow[j] + drow[2*xres + j])/2.0 - drow[xres + j]; + corr /= len; + for (j = 0; j < len; j++) + mrow[j] = (3*corr + + (drow[j] + drow[2*xres + j])/2.0 - drow[xres + j])/4.0; + } + else { + for (j = 0; j < len; j++) + mrow[j] = 0.0; + } +} + +static void +line_correct_step_iter(GwyDataField *dfield, + GwyDataField *mask) +{ + const gdouble threshold = 3.0; + gint xres, yres, i, j, len; + gdouble u, v, w; + const gdouble *d, *drow; + gdouble *m, *mrow; + + yres = gwy_data_field_get_yres(dfield); + xres = gwy_data_field_get_xres(dfield); + d = gwy_data_field_get_data_const(dfield); + m = gwy_data_field_get_data(mask); + + w = 0.0; + for (i = 0; i < yres-1; i++) { + drow = d + i*xres; + for (j = 0; j < xres; j++) { + v = drow[j + xres] - drow[j]; + w += v*v; + } + } + w = w/(yres-1)/xres; + + for (i = 0; i < yres-2; i++) { + drow = d + i*xres; + mrow = m + (i + 1)*xres; + + for (j = 0; j < xres; j++) { + u = drow[xres + j]; + v = (u - drow[j])*(u - drow[j + 2*xres]); + if (G_UNLIKELY(v > threshold*w)) { + if (2*u - drow[j] - drow[j + 2*xres] > 0) + mrow[j] = 1.0; + else + mrow[j] = -1.0; + } + } + + len = 1; + for (j = 1; j < xres; j++) { + if (mrow[j] == mrow[j-1]) + len++; + else { + if (mrow[j-1]) + calcualte_segment_correction(drow + j-len, mrow + j-len, + xres, len); + len = 1; + } + } + if (mrow[j-1]) { + calcualte_segment_correction(drow + j-len, mrow + j-len, + xres, len); + } + } + + gwy_data_field_sum_fields(dfield, dfield, mask); +} + + +static void +step_line_correct(GwyDataField *dfield) +{ + GwyDataField *mask; + GwyDataLine *shifts; + gdouble avg; + + avg = gwy_data_field_get_avg(dfield); + shifts = gwy_data_field_find_row_shifts_trimmed_mean(dfield, + NULL, GWY_MASK_IGNORE, + 0.5, 0); + gwy_data_field_subtract_row_shifts(dfield, shifts); + g_object_unref(shifts); + + mask = gwy_data_field_new_alike(dfield, TRUE); + line_correct_step_iter(dfield, mask); + gwy_data_field_clear(mask); + line_correct_step_iter(dfield, mask); + g_object_unref(mask); + + gwy_data_field_filter_conservative(dfield, 5); + gwy_data_field_add(dfield, avg - gwy_data_field_get_avg(dfield)); + gwy_data_field_data_changed(dfield); +} + + +/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_strayfield.c gwyddion-2.63/modules/volume/volume_strayfield.c --- gwyddion-2.62/modules/volume/volume_strayfield.c 2022-08-26 15:24:57.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_strayfield.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_strayfield.c 24952 2022-08-26 15:24:56Z yeti-dn $ + * $Id: volume_strayfield.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2015-2018 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -158,7 +158,7 @@ { gwy_volume_func_register("volume_strayfield", (GwyVolumeFunc)&strayfield, - N_("/_Stray Field Consistency..."), + N_("/SPM M_odes/_Stray Field Consistency..."), NULL, STRAYFIELD_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_swaxes.c gwyddion-2.63/modules/volume/volume_swaxes.c --- gwyddion-2.62/modules/volume/volume_swaxes.c 2019-10-10 12:22:54.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_swaxes.c 2023-02-24 17:05:57.000000000 +0000 @@ -1,22 +1,18 @@ /* - * $Id: volume_swaxes.c 22242 2019-07-14 12:17:43Z yeti-dn $ - * Copyright (C) 2017-2018 David Necas (Yeti). + * $Id: volume_swaxes.c 25255 2023-02-24 17:05:57Z yeti-dn $ + * Copyright (C) 2017-2023 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -25,14 +21,21 @@ #include #include #include -#include #include -#include #include #include #include -#define SWAXES_RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) +#define RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) + +enum { + PARAM_X, + PARAM_Y, + PARAM_Z, + PARAM_NEW_CHANNEL, + + MESSAGE_CALIBRATION +}; typedef enum { AXIS_XPOS = 0, @@ -41,69 +44,44 @@ AXIS_YNEG = 3, AXIS_ZPOS = 4, AXIS_ZNEG = 5, - NAXES } AxisType; typedef struct { - AxisType x; - AxisType y; - AxisType z; - gboolean new_channel; -} SwapAxesArgs; - -typedef struct { - SwapAxesArgs *args; + GwyParams *params; GwyBrick *brick; + /* Cached input data properties. */ gboolean has_zcal; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table; gint last_changed; gint second_last_changed; - GtkWidget *dialog; - GtkWidget *x; - GtkWidget *y; - GtkWidget *z; - GtkWidget *new_channel; - GtkWidget *message; -} SwapAxesControls; - -static gboolean module_register (void); -static void volume_swaxes (GwyContainer *data, - GwyRunType run); -static gboolean swaxes_dialog (SwapAxesArgs *args, - GwyBrick *brick); -static void new_channel_changed (GtkToggleButton *toggle, - SwapAxesControls *controls); -static void xaxis_changed (GtkComboBox *combo, - SwapAxesControls *controls); -static void yaxis_changed (GtkComboBox *combo, - SwapAxesControls *controls); -static void zaxis_changed (GtkComboBox *combo, - SwapAxesControls *controls); -static void update_sensitivity (SwapAxesControls *controls); -static void update_third_axis (SwapAxesControls *controls, - gint changed_axis); -static void update_message (SwapAxesControls *controls); -static gboolean axes_are_consistent (const SwapAxesArgs *args); -static void swaxes_do (GwyContainer *data, - gint id, - GwyBrick *brick, - SwapAxesArgs *args); -static void swaxes_sanitize_args(SwapAxesArgs *args); -static void swaxes_load_args (GwyContainer *container, - SwapAxesArgs *args); -static void swaxes_save_args (GwyContainer *container, - SwapAxesArgs *args); - -static const SwapAxesArgs swaxes_defaults = { - AXIS_XPOS, AXIS_YPOS, AXIS_ZPOS, - FALSE, -}; +} ModuleGUI; + +static gboolean module_register (void); +static GwyParamDef* define_module_params(void); +static void volume_swaxes (GwyContainer *data, + GwyRunType mode); +static GwyDialogOutcome run_gui (ModuleArgs *args); +static void param_changed (ModuleGUI *gui, + gint id); +static void update_third_axis (ModuleGUI *gui, + gint changed_axis); +static gboolean axes_are_consistent (const AxisType *xyz); +static void execute (ModuleArgs *args, + GwyContainer *data, + gint id); +static void sanitize_params (ModuleArgs *args); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Swaps axes of volume data."), "Yeti ", - "1.1", + "2.0", "David Nečas (Yeti)", "2017", }; @@ -115,42 +93,17 @@ { gwy_volume_func_register("volume_swaxes", (GwyVolumeFunc)&volume_swaxes, - N_("/S_wap Axes..."), + N_("/_Basic Operations/S_wap Axes..."), GWY_STOCK_VOLUME_SWAP_AXES, - SWAXES_RUN_MODES, + RUN_MODES, GWY_MENU_FLAG_VOLUME, N_("Swap axes")); return TRUE; } -static void -volume_swaxes(GwyContainer *data, GwyRunType run) -{ - SwapAxesArgs args; - GwyBrick *brick = NULL; - gboolean ok = TRUE; - gint id; - - g_return_if_fail(run & SWAXES_RUN_MODES); - - swaxes_load_args(gwy_app_settings_get(), &args); - gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, - GWY_APP_BRICK_ID, &id, - 0); - g_return_if_fail(GWY_IS_BRICK(brick)); - - if (run == GWY_RUN_INTERACTIVE) { - ok = swaxes_dialog(&args, brick); - swaxes_save_args(gwy_app_settings_get(), &args); - } - - if (ok) - swaxes_do(data, id, brick, &args); -} - -static gboolean -swaxes_dialog(SwapAxesArgs *args, GwyBrick *brick) +static GwyParamDef* +define_module_params(void) { static const GwyEnum axes[] = { { N_("X"), AXIS_XPOS, }, @@ -160,236 +113,186 @@ { N_("Z"), AXIS_ZPOS, }, { N_("Z, reversed"), AXIS_ZNEG, }, }; + static GwyParamDef *paramdef = NULL; - GtkWidget *dialog, *table; - GtkSizeGroup *sizegroup; - SwapAxesControls controls; - gint response, row; - - gwy_clear(&controls, 1); - controls.args = args; - controls.last_changed = 1; - controls.second_last_changed = 0; - controls.has_zcal = !!gwy_brick_get_zcalibration(brick); - - dialog = gtk_dialog_new_with_buttons(_("Swap Volume Axes"), - NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - gwy_help_add_to_volume_dialog(GTK_DIALOG(dialog), GWY_HELP_DEFAULT); - controls.dialog = dialog; - - table = gtk_table_new(5, 2, FALSE); - gtk_container_set_border_width(GTK_CONTAINER(table), 4); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_table_set_row_spacings(GTK_TABLE(table), 2); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 4); - row = 0; - - sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - controls.x = gwy_enum_combo_box_new(axes, G_N_ELEMENTS(axes), - G_CALLBACK(xaxis_changed), &controls, - args->x, TRUE); - gwy_table_attach_adjbar(table, row, _("Current _X axis will become:"), NULL, - GTK_OBJECT(controls.x), GWY_HSCALE_WIDGET); - gtk_size_group_add_widget(sizegroup, controls.x); - row++; - - controls.y = gwy_enum_combo_box_new(axes, G_N_ELEMENTS(axes), - G_CALLBACK(yaxis_changed), &controls, - args->y, TRUE); - gwy_table_attach_adjbar(table, row, _("Current _Y axis will become:"), NULL, - GTK_OBJECT(controls.y), GWY_HSCALE_WIDGET); - gtk_size_group_add_widget(sizegroup, controls.y); - row++; - - controls.z = gwy_enum_combo_box_new(axes, G_N_ELEMENTS(axes), - G_CALLBACK(zaxis_changed), &controls, - args->z, TRUE); - gwy_table_attach_adjbar(table, row, _("Current _Z axis will become:"), NULL, - GTK_OBJECT(controls.z), GWY_HSCALE_WIDGET); - gtk_size_group_add_widget(sizegroup, controls.z); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - controls.new_channel - = gtk_check_button_new_with_mnemonic(_("Create new volume data")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls.new_channel), - args->new_channel); - gtk_table_attach(GTK_TABLE(table), controls.new_channel, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - g_signal_connect(controls.new_channel, "toggled", - G_CALLBACK(new_channel_changed), &controls); - row++; - - gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); - controls.message = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(controls.message), 0.0, 0.5); - gtk_table_attach(GTK_TABLE(table), controls.message, - 0, 2, row, row+1, GTK_FILL, 0, 0, 0); - row++; - - g_object_unref(sizegroup); - update_message(&controls); - update_sensitivity(&controls); + if (paramdef) + return paramdef; - gtk_widget_show_all(dialog); - - response = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - - return response == GTK_RESPONSE_OK; + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_gwyenum(paramdef, PARAM_X, "x", _("Current _X axis will become"), + axes, G_N_ELEMENTS(axes), AXIS_XPOS); + gwy_param_def_add_gwyenum(paramdef, PARAM_Y, "y", _("Current _Y axis will become"), + axes, G_N_ELEMENTS(axes), AXIS_YPOS); + gwy_param_def_add_gwyenum(paramdef, PARAM_Z, "z", _("Current _Z axis will become"), + axes, G_N_ELEMENTS(axes), AXIS_ZPOS); + gwy_param_def_add_boolean(paramdef, PARAM_NEW_CHANNEL, "new_channel", _("Create new volume data"), FALSE); + return paramdef; } static void -new_channel_changed(GtkToggleButton *toggle, SwapAxesControls *controls) +volume_swaxes(GwyContainer *data, GwyRunType mode) { - controls->args->new_channel = gtk_toggle_button_get_active(toggle); - update_sensitivity(controls); -} + ModuleArgs args; + GwyDialogOutcome outcome; + gint id; -static void -xaxis_changed(GtkComboBox *combo, SwapAxesControls *controls) -{ - controls->args->x = gwy_enum_combo_box_get_active(combo); - update_third_axis(controls, 0); -} + g_return_if_fail(mode & RUN_MODES); -static void -yaxis_changed(GtkComboBox *combo, SwapAxesControls *controls) -{ - controls->args->y = gwy_enum_combo_box_get_active(combo); - update_third_axis(controls, 1); -} + gwy_clear(&args, 1); + gwy_app_data_browser_get_current(GWY_APP_BRICK, &args.brick, + GWY_APP_BRICK_ID, &id, + 0); + g_return_if_fail(GWY_IS_BRICK(args.brick)); -static void -zaxis_changed(GtkComboBox *combo, SwapAxesControls *controls) -{ - controls->args->z = gwy_enum_combo_box_get_active(combo); - update_third_axis(controls, 2); - update_message(controls); + args.has_zcal = !!gwy_brick_get_zcalibration(args.brick); + args.params = gwy_params_new_from_settings(define_module_params()); + sanitize_params(&args); + if (mode == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto finish; + } + + execute(&args, data, id); + +finish: + g_object_unref(args.params); } -static void -update_message(SwapAxesControls *controls) +static GwyDialogOutcome +run_gui(ModuleArgs *args) { - if (!controls->has_zcal) - return; + GwyDialog *dialog; + GwyParamTable *table; + ModuleGUI gui; - if (controls->args->z == AXIS_ZPOS || controls->args->z == AXIS_ZNEG) - gtk_label_set_text(GTK_LABEL(controls->message), NULL); - else { - gtk_label_set_text(GTK_LABEL(controls->message), - _("Z axis calibration will be lost.")); + gwy_clear(&gui, 1); + gui.args = args; + gui.last_changed = 1; + gui.second_last_changed = 0; + + gui.dialog = gwy_dialog_new(_("Swap Volume Axes")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + table = gui.table = gwy_param_table_new(args->params); + gwy_param_table_append_combo(table, PARAM_X); + gwy_param_table_append_combo(table, PARAM_Y); + gwy_param_table_append_combo(table, PARAM_Z); + gwy_param_table_append_checkbox(table, PARAM_NEW_CHANNEL); + if (args->has_zcal) { + gwy_param_table_append_separator(table); + gwy_param_table_append_message(table, MESSAGE_CALIBRATION, NULL); } + gwy_dialog_add_content(dialog, gwy_param_table_widget(table), FALSE, FALSE, 0); + gwy_dialog_add_param_table(dialog, table); + + g_signal_connect_swapped(table, "param-changed", G_CALLBACK(param_changed), &gui); + + return gwy_dialog_run(dialog); } static void -update_sensitivity(SwapAxesControls *controls) +param_changed(ModuleGUI *gui, gint id) { - SwapAxesArgs *args = controls->args; - gboolean is_noop; + GwyParams *params = gui->args->params; + GwyParamTable *table = gui->table; - is_noop = (args->x == AXIS_XPOS - && args->y == AXIS_YPOS - && args->z == AXIS_ZPOS - && !args->new_channel); - gtk_dialog_set_response_sensitive(GTK_DIALOG(controls->dialog), - GTK_RESPONSE_OK, !is_noop); + if (id == PARAM_X) + update_third_axis(gui, 0); + else if (id == PARAM_Y) + update_third_axis(gui, 1); + else if (id == PARAM_Z) + update_third_axis(gui, 2); + + /* Must do this after possible cross-updates. */ + { + AxisType x = gwy_params_get_enum(params, PARAM_X); + AxisType y = gwy_params_get_enum(params, PARAM_Y); + AxisType z = gwy_params_get_enum(params, PARAM_Z); + gboolean new_channel = gwy_params_get_boolean(params, PARAM_NEW_CHANNEL); + gboolean is_noop = (x == AXIS_XPOS && y == AXIS_YPOS && z == AXIS_ZPOS && !new_channel); + + gtk_dialog_set_response_sensitive(GTK_DIALOG(gui->dialog), GTK_RESPONSE_OK, !is_noop); + + if (gui->args->has_zcal) { + gwy_param_table_set_label(table, MESSAGE_CALIBRATION, + (z == AXIS_ZPOS || z == AXIS_ZNEG) ? "" : _("Z axis calibration will be lost.")); + } + } } static void -update_third_axis(SwapAxesControls *controls, gint changed_axis) +update_third_axis(ModuleGUI *gui, gint changed_axis) { - SwapAxesArgs *args = controls->args; - AxisType xyz[3]; - gint third, axis_to_fix; + ModuleArgs *args = gui->args; + AxisType xyz[3], fixed; + gint i, third, axis_to_fix; - if (changed_axis == controls->last_changed) { + if (changed_axis == gui->last_changed) { /* Dd nothing. */ } - else if (changed_axis == controls->second_last_changed) - GWY_SWAP(gint, controls->last_changed, controls->second_last_changed); + else if (changed_axis == gui->second_last_changed) + GWY_SWAP(gint, gui->last_changed, gui->second_last_changed); else { - controls->second_last_changed = controls->last_changed; - controls->last_changed = changed_axis; + gui->second_last_changed = gui->last_changed; + gui->last_changed = changed_axis; } - if (axes_are_consistent(args)) { - update_sensitivity(controls); - return; - } + for (i = 0; i < 3; i++) + xyz[i] = gwy_params_get_enum(args->params, PARAM_X + i); - third = 3 - (controls->last_changed + controls->second_last_changed); - xyz[0] = args->x; - xyz[1] = args->y; - xyz[2] = args->z; + if (axes_are_consistent(xyz)) + return; - if (xyz[third]/2 == xyz[controls->last_changed]/2) + third = 3 - (gui->last_changed + gui->second_last_changed); + if (xyz[third]/2 == xyz[gui->last_changed]/2) axis_to_fix = third; else - axis_to_fix = controls->second_last_changed; + axis_to_fix = gui->second_last_changed; - if (axis_to_fix == 0) { - args->x = (2*(3 - args->y/2 - args->z/2)) | (args->x & 1); - g_assert(axes_are_consistent(args)); - gwy_enum_combo_box_set_active(GTK_COMBO_BOX(controls->x), args->x); - } - else if (axis_to_fix == 1) { - args->y = (2*(3 - args->z/2 - args->x/2)) | (args->y & 1); - g_assert(axes_are_consistent(args)); - gwy_enum_combo_box_set_active(GTK_COMBO_BOX(controls->y), args->y); - } - else if (axis_to_fix == 2) { - args->z = (2*(3 - args->x/2 - args->y/2)) | (args->z & 1); - g_assert(axes_are_consistent(args)); - gwy_enum_combo_box_set_active(GTK_COMBO_BOX(controls->z), args->z); - } - else { - g_assert_not_reached(); - } + fixed = (2*(3 - xyz[(axis_to_fix + 1) % 3]/2 - xyz[(axis_to_fix + 2) % 3]/2)) | (xyz[axis_to_fix] & 1); + gwy_param_table_set_enum(gui->table, PARAM_X + axis_to_fix, fixed); } static gboolean -axes_are_consistent(const SwapAxesArgs *args) +axes_are_consistent(const AxisType *xyz) { - if (args->y/2 == args->x/2) - return FALSE; - if (args->z/2 == args->y/2) - return FALSE; - if (args->x/2 == args->z/2) + if (xyz[0]/2 == xyz[1]/2 || xyz[1]/2 == xyz[2]/2 || xyz[2]/2 == xyz[0]/2) return FALSE; - return TRUE; } static void -swaxes_do(GwyContainer *data, gint id, GwyBrick *brick, SwapAxesArgs *args) +execute(ModuleArgs *args, GwyContainer *data, gint id) { - AxisType ax = args->x, ay = args->y, az = args->z; + GwyParams *params = args->params; + AxisType ax = gwy_params_get_enum(params, PARAM_X); + AxisType ay = gwy_params_get_enum(params, PARAM_Y); + AxisType az = gwy_params_get_enum(params, PARAM_Z); AxisType bx = 2*(ax/2), by = 2*(ay/2); + gboolean new_channel = gwy_params_get_boolean(params, PARAM_NEW_CHANNEL); GwyBrickTransposeType transtype; gboolean xinv = ax & 1, yinv = ay & 1, zinv = az & 1; - GwyBrick *result; - GwyDataField *preview = NULL; + GwyBrick *result, *brick = args->brick; + GwyDataField *tmp, *preview = NULL; gdouble xoff, yoff; gint xres, yres, newid; GQuark quarks[2]; - if (ax == AXIS_XPOS && ay == AXIS_YPOS) + if (bx == AXIS_XPOS && by == AXIS_YPOS) transtype = GWY_BRICK_TRANSPOSE_XYZ; - else if (ax == AXIS_XPOS && ay == AXIS_ZPOS) + else if (bx == AXIS_XPOS && by == AXIS_ZPOS) transtype = GWY_BRICK_TRANSPOSE_XZY; - else if (ax == AXIS_YPOS && ay == AXIS_XPOS) + else if (bx == AXIS_YPOS && by == AXIS_XPOS) transtype = GWY_BRICK_TRANSPOSE_YXZ; - else if (ax == AXIS_YPOS && ay == AXIS_ZPOS) + else if (bx == AXIS_YPOS && by == AXIS_ZPOS) transtype = GWY_BRICK_TRANSPOSE_YZX; - else if (ax == AXIS_ZPOS && ay == AXIS_XPOS) + else if (bx == AXIS_ZPOS && by == AXIS_XPOS) transtype = GWY_BRICK_TRANSPOSE_ZXY; - else if (ax == AXIS_ZPOS && ay == AXIS_YPOS) + else if (bx == AXIS_ZPOS && by == AXIS_YPOS) transtype = GWY_BRICK_TRANSPOSE_ZYX; else { g_return_if_reached(); @@ -399,12 +302,9 @@ gwy_brick_transpose(brick, result, transtype, xinv, yinv, zinv); /* Reuse the old preview if the XY plane is preserved. */ - if (gwy_container_gis_object(data, gwy_app_get_brick_preview_key_for_id(id), - &preview) + if (gwy_container_gis_object(data, gwy_app_get_brick_preview_key_for_id(id), &preview) && (bx == AXIS_XPOS || bx == AXIS_YPOS) && (by == AXIS_XPOS || by == AXIS_YPOS)) { - GwyDataField *tmp; - if (ax == AXIS_YPOS && ay == AXIS_XNEG) tmp = gwy_data_field_new_rotated_90(preview, TRUE); else if (ax == AXIS_YNEG && ay == AXIS_XPOS) @@ -443,13 +343,11 @@ } /* Create new channel or modify the current one. */ - if (args->new_channel) { + if (new_channel) { newid = gwy_app_data_browser_add_brick(result, preview, data, TRUE); gwy_app_set_brick_title(data, id, _("Rotated Data")); gwy_app_volume_log_add_volume(data, id, newid); - gwy_app_sync_volume_items(data, data, id, newid, - GWY_DATA_ITEM_GRADIENT, - 0); + gwy_app_sync_volume_items(data, data, id, newid, GWY_DATA_ITEM_GRADIENT, 0); } else { quarks[0] = gwy_app_get_brick_key_for_id(id); @@ -464,48 +362,20 @@ g_object_unref(preview); } -static const gchar x_key[] = "/module/volume_swaxes/x"; -static const gchar y_key[] = "/module/volume_swaxes/y"; -static const gchar z_key[] = "/module/volume_swaxes/z"; -static const gchar new_channel_key[] = "/module/volume_swaxes/new_channel"; - -static void -swaxes_sanitize_args(SwapAxesArgs *args) -{ - args->x = MIN(args->x, NAXES-1); - args->y = MIN(args->y, NAXES-1); - args->z = MIN(args->z, NAXES-1); - args->new_channel = !!args->new_channel; - - /* Do not bother fixing invalid configurations, reset to no-op. */ - if (!axes_are_consistent(args)) { - args->x = swaxes_defaults.x; - args->y = swaxes_defaults.y; - args->z = swaxes_defaults.z; - } -} - static void -swaxes_load_args(GwyContainer *container, SwapAxesArgs *args) +sanitize_params(ModuleArgs *args) { - *args = swaxes_defaults; + AxisType xyz[3]; + gint i; - gwy_container_gis_enum_by_name(container, x_key, &args->x); - gwy_container_gis_enum_by_name(container, y_key, &args->y); - gwy_container_gis_enum_by_name(container, z_key, &args->z); - gwy_container_gis_boolean_by_name(container, new_channel_key, - &args->new_channel); - swaxes_sanitize_args(args); -} + for (i = 0; i < 3; i++) + xyz[i] = gwy_params_get_enum(args->params, PARAM_X + i); -static void -swaxes_save_args(GwyContainer *container, SwapAxesArgs *args) -{ - gwy_container_set_enum_by_name(container, x_key, args->x); - gwy_container_set_enum_by_name(container, y_key, args->y); - gwy_container_set_enum_by_name(container, z_key, args->z); - gwy_container_set_boolean_by_name(container, new_channel_key, - args->new_channel); + /* Do not bother fixing invalid configurations, just reset to the default no-op. */ + if (!axes_are_consistent(xyz)) { + for (i = 0; i < 3; i++) + gwy_params_reset(args->params, PARAM_X + i); + } } -/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_xyarithmetics.c gwyddion-2.63/modules/volume/volume_xyarithmetics.c --- gwyddion-2.62/modules/volume/volume_xyarithmetics.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_xyarithmetics.c 2023-04-11 11:53:25.000000000 +0000 @@ -0,0 +1,953 @@ +/* + * $Id: volume_arithmetic.c 25277 2023-03-15 17:36:48Z yeti-dn $ + * Copyright (C) 2018-2023 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../process/preview.h" + +#define XYARITH_RUN_MODES GWY_RUN_INTERACTIVE + +enum { + NARGS = 8, + HISTSIZE = 96, + USER_UNITS_ID = -1, +}; + +enum { + SENS_EXPR_OK = 1 << 0, + SENS_USERUINTS = 1 << 1 +}; + +enum { + COMMON_COORD_X = 0, + COMMON_COORD_Y = 1, + COMMON_COORD_Z = 2, + COMMON_COORD_ZCAL = 3, + COMMON_COORD_NCOORDS +}; + +enum { + XYARITHMETIC_NARGS = NARGS + COMMON_COORD_NCOORDS +}; + +enum { + XYARITHMETIC_OK = 0, + XYARITHMETIC_DATA = 1, + XYARITHMETIC_EXPR = 2, + XYARITHMETIC_NUMERIC = 4 +}; + +enum { + PARAM_EXPRESSION, + PARAM_DATAUNITS, + PARAM_USERUNITS, + PARAM_FIXED_FILLER, + PARAM_FILLER_VALUE, + PARAM_VOLUME, + PARAM_IMAGE, +}; + +typedef struct { + GwyParams *params; + GtkListStore *history; + GwyBrick *result; + GwyDataField *preview; +} ModuleArgs; + +typedef struct { + GwyExpr *expr; + guint err; + gchar *name[XYARITHMETIC_NARGS]; + guint pos[XYARITHMETIC_NARGS]; + GwyAppDataId first; +} EvaluationData; + +typedef struct { + ModuleArgs *args; + EvaluationData *evdata; + GtkWidget *dialog; + GtkWidget *view; + GtkWidget *expression; + GtkWidget *userunits; + GtkWidget *userunits_label; + GwyParamTable *table; + GtkWidget *result; + GSList *dataunits; + GwyContainer *data; +} ModuleGUI; + +static gboolean module_register (void); +static void arithmetic (GwyContainer *data, + GwyRunType run); +static GwyDialogOutcome run_gui (GwyContainer *data, + gint id, + ModuleArgs *args, + EvaluationData *evdata); +static void param_changed (ModuleGUI *gui, + gint id); +static void data_chosen (ModuleGUI *gui, + GwyDataChooser *chooser); +static void expr_changed (ModuleGUI *gui, + GtkWidget *entry); +static void userunits_changed (ModuleGUI *gui, + GtkEntry *entry); +static void dataunits_selected(ModuleGUI *gui); +static void show_state (ModuleGUI *gui, + const gchar *message); +static const gchar* check_bricks (ModuleArgs *args, + EvaluationData *evdata); +static void preview (gpointer user_data); +static void execute (ModuleArgs *args, + EvaluationData *evdata); +static void need_data (const EvaluationData *evdata, + gboolean *need_data); +static void fix_nans (ModuleArgs *args); +static void update_history (ModuleArgs *args); +static GwyBrick* make_x (GwyBrick *brick); +static GwyBrick* make_y (GwyBrick *brick); +static GwyBrick* make_z (GwyBrick *brick); +static GwyBrick* make_zcal (GwyBrick *brick, + GwyDataLine *zcal); +static void sanitise_params (ModuleArgs *args); +static GtkListStore* load_history (void); +static void save_history (GtkListStore *history); + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Simple arithmetic operations with volume and plane data."), + "Petr Klapetek ,", + "1.0", + "David Nečas (Yeti) & Petr Klapetek", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_xyarithmetics) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_xyarithmetics", + (GwyVolumeFunc)&arithmetic, + N_("/_Basic Operations/_XY Arithmetic..."), + NULL, + XYARITH_RUN_MODES, + GWY_MENU_FLAG_VOLUME, + N_("Arithmetic operations on volume and plane data")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + guint i; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_string(paramdef, PARAM_EXPRESSION, "expression", _("_Expression"), + GWY_PARAM_STRING_NULL_IS_EMPTY, NULL, "d1-d2"); + gwy_param_def_add_int(paramdef, PARAM_DATAUNITS, "dataunits", NULL, -1, NARGS-1, 0); + gwy_param_def_add_unit(paramdef, PARAM_USERUNITS, "userunits", _("Specify un_its"), NULL); + gwy_param_def_add_boolean(paramdef, PARAM_FIXED_FILLER, "fixed_filler", _("_Fixed filler value"), FALSE); + gwy_param_def_add_double(paramdef, PARAM_FILLER_VALUE, "filler_value", _("_Fixed filler value"), + -G_MAXDOUBLE, G_MAXDOUBLE, 0.0); + gwy_param_def_add_volume_id(paramdef, PARAM_VOLUME, "volume", NULL); + + for (i = 1; i < NARGS; i++) { + gchar *s = g_strdup_printf("image%u", i); + gwy_param_def_add_image_id(paramdef, PARAM_IMAGE + i, s, NULL); + } + + return paramdef; +} + +void +arithmetic(GwyContainer *data, GwyRunType run) +{ + ModuleArgs args; + EvaluationData evdata; + GwyAppDataId dataid; + GwyDialogOutcome outcome; + gint newid; + guint i; + + g_return_if_fail(run & XYARITH_RUN_MODES); + gwy_clear(&args, 1); + gwy_app_data_browser_get_current(GWY_APP_BRICK_ID, &dataid.id, + GWY_APP_CONTAINER_ID, &dataid.datano, + 0); + + g_return_if_fail(gwy_app_data_id_verify_volume(&dataid)); + args.params = gwy_params_new_from_settings(define_module_params()); + gwy_params_set_volume_id(args.params, PARAM_VOLUME, dataid); + args.history = load_history(); + args.result = gwy_brick_new(PREVIEW_SIZE, PREVIEW_SIZE, 1, 1.0, 1.0, 1.0, TRUE); + args.preview = gwy_data_field_new(PREVIEW_SIZE, PREVIEW_SIZE, 1.0, 1.0, TRUE); + sanitise_params(&args); + + evdata.expr = gwy_expr_new(); + gwy_expr_define_constant(evdata.expr, "pi", G_PI, NULL); + gwy_expr_define_constant(evdata.expr, "π", G_PI, NULL); + + for (i = 0; i < NARGS; i++) { + evdata.name[i] = g_strdup_printf("d%d", i+1); + } + evdata.name[NARGS + 0] = g_strdup("x"); + evdata.name[NARGS + 1] = g_strdup("y"); + evdata.name[NARGS + 2] = g_strdup("z"); + evdata.name[NARGS + 3] = g_strdup("zcal"); + + outcome = run_gui(data, dataid.id, &args, &evdata); + gwy_params_save_to_settings(args.params); + save_history(args.history); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args, &evdata); + + newid = gwy_app_data_browser_add_brick(args.result, args.preview, data, TRUE); + gwy_app_set_data_field_title(data, newid, _("Calculated")); + gwy_app_sync_volume_items(gwy_app_data_browser_get(evdata.first.datano), data, evdata.first.id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + gwy_app_volume_log_add_volume(data, -1, newid); + +end: + GWY_OBJECT_UNREF(args.result); + GWY_OBJECT_UNREF(args.preview); + g_object_unref(args.params); + g_object_unref(args.history); + gwy_expr_free(evdata.expr); + for (i = 0; i < XYARITHMETIC_NARGS; i++) + g_free(evdata.name[i]); +} + +static GwyDialogOutcome +run_gui(GwyContainer *data, gint id, + ModuleArgs *args, EvaluationData *evdata) +{ + gint dataunits = gwy_params_get_int(args->params, PARAM_DATAUNITS); + const gchar *userunits = gwy_params_get_string(args->params, PARAM_USERUNITS); + GtkWidget *hbox, *hbox2, *table, *chooser, *entry, *label, *button; + GwyAppDataId dataid; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyDialog *dialog; + guint i, row; + gchar *s; + + gui.args = args; + gui.evdata = evdata; + gui.data = gwy_container_new(); + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), args->preview); + gwy_app_sync_volume_items(data, gui.data, id, 0, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + + gui.dialog = gwy_dialog_new(_("Volume - Plane Arithmetic")); + dialog = GWY_DIALOG(gui.dialog); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_UPDATE, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + gui.view = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, TRUE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(gui.view), FALSE); + + table = gtk_table_new(6 + NARGS, 3, FALSE); + gtk_table_set_row_spacings(GTK_TABLE(table), 2); + gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_container_set_border_width(GTK_CONTAINER(table), 4); + gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 4); + row = 0; + + label = gtk_label_new_with_mnemonic(_("_Expression:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + row++; + + entry = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(args->history), 0); + gui.expression = entry; + gtk_combo_box_set_active(GTK_COMBO_BOX(gui.expression), 0); + gtk_table_attach(GTK_TABLE(table), entry, 0, 3, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_signal_connect_swapped(entry, "changed", G_CALLBACK(expr_changed), &gui); + g_signal_connect_swapped(gtk_bin_get_child(GTK_BIN(entry)), "activate", G_CALLBACK(preview), &gui); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); + row++; + + gui.result = label = gtk_label_new(NULL); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + row++; + + gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); + label = gtk_label_new(_("Operands")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new(_("Units")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 2, 3, row, row+1, GTK_FILL, 0, 0, 0); + row++; + + label = gtk_label_new_with_mnemonic(_("Volume data:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + row++; + + + gui.dataunits = NULL; + for (i = 0; i < NARGS; i++) { + if (i == 1) { + label = gtk_label_new_with_mnemonic(_("Images:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + row++; + } + + s = g_strdup_printf("d_%d", i+1); + label = gtk_label_new_with_mnemonic(evdata->name[i]); + g_free(s); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + + if (i==0) { + chooser = gwy_data_chooser_new_volumes(); + dataid = gwy_params_get_data_id(args->params, PARAM_VOLUME); + } + else { + chooser = gwy_data_chooser_new_channels(); + dataid = gwy_params_get_data_id(args->params, PARAM_IMAGE + i); + } + + gwy_data_chooser_set_active_id(GWY_DATA_CHOOSER(chooser), &dataid); + g_signal_connect_swapped(chooser, "changed", G_CALLBACK(data_chosen), &gui); + g_object_set_data(G_OBJECT(chooser), "index", GUINT_TO_POINTER(i)); + gtk_table_attach(GTK_TABLE(table), chooser, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), chooser); + + button = gtk_radio_button_new(gui.dataunits); + gui.dataunits = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); + gwy_radio_button_set_value(button, i); + s = g_strdup_printf(_("Take result units from data d%d"), i+1); + gtk_widget_set_tooltip_text(button, s); + g_free(s); + gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, 0, 0, 0, 0); + g_signal_connect_swapped(button, "clicked", G_CALLBACK(dataunits_selected), &gui); + + row++; + } + + + hbox2 = gtk_hbox_new(FALSE, 6); + gtk_table_attach(GTK_TABLE(table), hbox2, 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + + label = gtk_label_new_with_mnemonic(_("Specify un_its:")); + gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0); + gui.userunits_label = label; + gtk_widget_set_sensitive(gui.userunits_label, dataunits == USER_UNITS_ID); + + gui.userunits = entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(entry), userunits ? userunits : ""); + gtk_box_pack_start(GTK_BOX(hbox2), entry, TRUE, TRUE, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); + gtk_widget_set_sensitive(entry, dataunits == USER_UNITS_ID); + g_signal_connect_swapped(entry, "changed", G_CALLBACK(userunits_changed), &gui); + + button = gtk_radio_button_new(gui.dataunits); + gui.dataunits = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); + gwy_radio_button_set_value(button, USER_UNITS_ID); + gtk_widget_set_tooltip_text(button, _("Specify result units explicitly")); + gtk_table_attach(GTK_TABLE(table), button, 2, 3, row, row+1, 0, 0, 0, 0); + g_signal_connect_swapped(button, "clicked", G_CALLBACK(dataunits_selected), &gui); + row++; + + gui.table = gwy_param_table_new(args->params); + gwy_param_table_append_entry(gui.table, PARAM_FILLER_VALUE); + gwy_param_table_add_enabler(gui.table, PARAM_FIXED_FILLER, PARAM_FILLER_VALUE); + gwy_param_table_entry_set_width(gui.table, PARAM_FILLER_VALUE, 12); + gtk_table_attach(GTK_TABLE(table), gwy_param_table_widget(gui.table), 0, 2, row, row+1, GTK_FILL, 0, 0, 0); + gwy_dialog_add_param_table(dialog, gui.table); + row++; + + g_signal_connect_swapped(gui.table, "param-changed", G_CALLBACK(param_changed), &gui); + gwy_dialog_set_preview_func(dialog, GWY_PREVIEW_UPON_REQUEST, preview, &gui, NULL); + gtk_widget_grab_focus(gui.expression); + gwy_radio_buttons_set_current(gui.dataunits, dataunits); + expr_changed(&gui, gui.expression); /* resolves variables */ + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + +static void +param_changed(ModuleGUI *gui, gint id) +{ + GwyParams *params = gui->args->params; + + if (id < 0 || id == PARAM_FILLER_VALUE) { + gdouble filler_value = gwy_params_get_double(params, PARAM_FILLER_VALUE); + if (gwy_isinf(filler_value) || gwy_isnan(filler_value)) + gwy_param_table_set_double(gui->table, PARAM_FILLER_VALUE, 0.0); + } + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +data_chosen(ModuleGUI *gui, GwyDataChooser *chooser) +{ + ModuleArgs *args = gui->args; + guint i = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(chooser), "index")); + GwyAppDataId dataid; + + gwy_data_chooser_get_active_id(chooser, &dataid); + if (i == 0) + gwy_params_set_volume_id(args->params, PARAM_VOLUME, dataid); + else + gwy_params_set_image_id(args->params, PARAM_IMAGE + i, dataid); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); + if (!(gui->evdata->err & XYARITHMETIC_EXPR)) + show_state(gui, NULL); +} + +static void +expr_changed(ModuleGUI *gui, GtkWidget *entry) +{ + ModuleArgs *args = gui->args; + EvaluationData *evdata = gui->evdata; + GtkComboBox *combo = GTK_COMBO_BOX(entry); + const gchar *expr = gtk_combo_box_get_active_text(combo); + GError *error = NULL; + const gchar *message = NULL; + gchar *s = NULL; + + gwy_params_set_string(args->params, PARAM_EXPRESSION, expr); + evdata->err = XYARITHMETIC_OK; + + if (gwy_expr_compile(evdata->expr, expr, &error)) { + guint nvars = gwy_expr_get_variables(evdata->expr, NULL); + g_return_if_fail(nvars); + if (nvars == 1) { + gdouble v = gwy_expr_execute(evdata->expr, NULL); + message = s = g_strdup_printf("%g", v); + evdata->err = XYARITHMETIC_NUMERIC; + } + else { + if (gwy_expr_resolve_variables(evdata->expr, + XYARITHMETIC_NARGS, (const gchar*const*)evdata->name, evdata->pos)) { + evdata->err = XYARITHMETIC_EXPR; + message = _("Expression contains unknown identifiers"); + } +#ifdef DEBUG + { + gint i; + for (i = 0; i < XYARITHMETIC_NARGS; i++) + gwy_debug("pos[%u] = %d", i, evdata->pos[i]); + } +#endif + } + } + else { + evdata->err = XYARITHMETIC_EXPR; + message = error->message; + } + + show_state(gui, message); + g_clear_error(&error); + g_free(s); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +userunits_changed(ModuleGUI *gui, GtkEntry *entry) +{ + gwy_params_set_string(gui->args->params, PARAM_USERUNITS, gtk_entry_get_text(entry)); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dataunits_selected(ModuleGUI *gui) +{ + ModuleArgs *args = gui->args; + gint dataunits = gwy_radio_buttons_get_current(gui->dataunits); + + gwy_params_set_int(args->params, PARAM_DATAUNITS, dataunits); + gtk_widget_set_sensitive(gui->userunits, dataunits == USER_UNITS_ID); + gtk_widget_set_sensitive(gui->userunits_label, dataunits == USER_UNITS_ID); + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +show_state(ModuleGUI *gui, const gchar *message) +{ + GtkDialog *dialog = GTK_DIALOG(gui->dialog); + ModuleArgs *args = gui->args; + EvaluationData *evdata = gui->evdata; + gboolean ok; + + if (!message && evdata->err != XYARITHMETIC_NUMERIC) { + message = check_bricks(args, evdata); + gtk_label_set_text(GTK_LABEL(gui->result), evdata->err ? message : NULL); + } + else { + if (message) + gtk_label_set_text(GTK_LABEL(gui->result), message); + } + + ok = (evdata->err == XYARITHMETIC_OK); + gtk_dialog_set_response_sensitive(dialog, GTK_RESPONSE_OK, ok); + gtk_dialog_set_response_sensitive(dialog, RESPONSE_PREVIEW, ok); + + if (ok) + set_widget_as_ok_message(gui->result); + else + set_widget_as_error_message(gui->result); +} + +static const gchar* +check_bricks(ModuleArgs *args, EvaluationData *evdata) +{ + guint i; + GwyBrick *brick; + GwyDataField *dfield; + GwyDataCompatibilityFlags diff; + gboolean nd[NARGS]; + + if (evdata->err & (XYARITHMETIC_EXPR | XYARITHMETIC_NUMERIC)) + return NULL; + + need_data(evdata, nd); + if (!nd[0]){ + /*no brick*/ + evdata->err |= XYARITHMETIC_DATA; + return _("No volume data in the expression"); + } + + for (i = 0; i < NARGS; i++) { + if (nd[i]) { + //first = i; //should we do and use this? + break; + } + } + if (i == NARGS) { + /* no variables */ + evdata->err &= ~XYARITHMETIC_DATA; + return NULL; + } + + /* each window must match with first, this is transitive */ + brick = gwy_params_get_volume(args->params, PARAM_VOLUME); + for (i = 1; i < NARGS; i++) { + if (!nd[i]) + continue; + + dfield = gwy_params_get_image(args->params, PARAM_IMAGE + i); + diff = gwy_data_field_check_compatibility_with_brick_xy(dfield, brick, + GWY_DATA_COMPATIBILITY_RES + | GWY_DATA_COMPATIBILITY_REAL + | GWY_DATA_COMPATIBILITY_LATERAL + | GWY_DATA_COMPATIBILITY_VALUE); + if (diff) { + evdata->err |= XYARITHMETIC_DATA; + if (diff & GWY_DATA_COMPATIBILITY_RES) + return _("Pixel dimensions differ"); + if (diff & GWY_DATA_COMPATIBILITY_LATERAL) + return _("Lateral dimensions are different physical quantities"); + if (diff & GWY_DATA_COMPATIBILITY_REAL) + return _("Physical dimensions differ"); + if (diff & GWY_DATA_COMPATIBILITY_AXISCAL) + return _("Z-axis calibrations differ"); + } + } + + evdata->err &= ~XYARITHMETIC_DATA; + return NULL; +} + +static void +preview(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + ModuleArgs *args = gui->args; + + /* We can also get here by activation of the entry so check again. */ + if (gui->evdata->err != XYARITHMETIC_OK) + return; + + execute(args, gui->evdata); + g_return_if_fail(args->preview); + + gwy_data_field_data_changed(args->preview); + gwy_set_data_preview_size(GWY_DATA_VIEW(gui->view), PREVIEW_SIZE); + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static void +update_brick(GwyBrick *src, GwyBrick *target, gint *n, gdouble **tdata) +{ + gint xres = gwy_brick_get_xres(src), yres = gwy_brick_get_yres(src), zres = gwy_brick_get_zres(src); + + gwy_brick_resample(target, xres, yres, zres, GWY_INTERPOLATION_NONE); + gwy_brick_copy_units(src, target); + gwy_brick_set_xreal(target, gwy_brick_get_xreal(src)); + gwy_brick_set_yreal(target, gwy_brick_get_yreal(src)); + gwy_brick_set_zreal(target, gwy_brick_get_zreal(src)); + gwy_brick_set_xoffset(target, gwy_brick_get_xoffset(src)); + gwy_brick_set_yoffset(target, gwy_brick_get_yoffset(src)); + gwy_brick_set_zoffset(target, gwy_brick_get_zoffset(src)); + *n = xres*yres*zres; + *tdata = gwy_brick_get_data(target); +} + +static void +execute(ModuleArgs *args, EvaluationData *evdata) +{ + GwyBrick **data_bricks, *brick, *modelbrick; + GwyDataField *dfield; + GwyDataLine *zcal = NULL; + const gdouble **d; + gboolean nd[NARGS]; + gdouble *r = NULL; + gboolean first = TRUE; + guint n = 0, i, dataunits; + + g_return_if_fail(evdata->err == XYARITHMETIC_OK); + + need_data(evdata, nd); + /* We know the expression can't contain more variables */ + data_bricks = g_new0(GwyBrick*, XYARITHMETIC_NARGS); + d = g_new0(const gdouble*, XYARITHMETIC_NARGS + 1); + + /*check if we have a primary brick and if not, do not evalue anything*/ + modelbrick = gwy_params_get_volume(args->params, PARAM_VOLUME); + + /* First get all the data bricks we directly have */ + for (i = 0; i < NARGS; i++) { + gwy_debug("brick[%u]: %s", i, nd[i] ? "NEEDED" : "not needed"); + if (!nd[i]) + continue; + + if (i==0) + brick = data_bricks[0] = gwy_params_get_volume(args->params, PARAM_VOLUME); + else { + brick = gwy_brick_new_alike(modelbrick, TRUE); + dfield = gwy_params_get_image(args->params, PARAM_IMAGE + i); + gwy_brick_add_to_xy_planes(brick, dfield); + data_bricks[i] = brick; + } + + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); + if (!i) + zcal = gwy_brick_get_zcalibration(brick); + gwy_debug("d[%u] set to PRIMARY %u", evdata->pos[i], i); + if (first) { + first = FALSE; + update_brick(brick, args->result, &n, &r); + evdata->first = gwy_params_get_data_id(args->params, PARAM_VOLUME + i); + } + } + + /* Then create the common coordinate bricks if we have to. */ + i = NARGS + COMMON_COORD_X; + if (evdata->pos[i]) { + brick = make_x(data_bricks[0]); + data_bricks[i] = brick; + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); + } + + i = NARGS + COMMON_COORD_Y; + if (evdata->pos[i]) { + brick = make_y(data_bricks[0]); + data_bricks[i] = brick; + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); + } + + i = NARGS + COMMON_COORD_Z; + if (evdata->pos[i]) { + brick = make_z(data_bricks[0]); + data_bricks[i] = brick; + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); + } + + i = NARGS + COMMON_COORD_ZCAL; + if (evdata->pos[i]) { + brick = zcal ? make_zcal(data_bricks[0], zcal) : make_z(data_bricks[0]); + d[evdata->pos[i]] = gwy_brick_get_data_const(brick); + } + + /* Execute */ + gwy_expr_vector_execute(evdata->expr, n, d, r); + fix_nans(args); + gwy_brick_mean_xy_plane(args->result, args->preview); + + /* Set units. */ + dataunits = gwy_params_get_int(args->params, PARAM_DATAUNITS); + if (dataunits == USER_UNITS_ID) { + gwy_si_unit_set_from_string(gwy_brick_get_si_unit_w(args->result), + gwy_params_get_string(args->params, PARAM_USERUNITS)); + } + else + gwy_brick_copy_units(gwy_params_get_volume(args->params, PARAM_VOLUME + dataunits), args->result); + + /* Free stuff */ + for (i = NARGS; i < XYARITHMETIC_NARGS; i++) { + if (data_bricks[i]) + g_object_unref(data_bricks[i]); + } + g_free(data_bricks); + g_free(d); +} + +/* Find which data we need. */ +static void +need_data(const EvaluationData *evdata, gboolean *nd) +{ + guint i; + + gwy_clear(nd, NARGS); + for (i = 0; i < NARGS; i++) { + if (evdata->pos[i]) + nd[i] = TRUE; + } + + // When x and y are needed, always take them from field 1. This also ensures the expression is considered to be + // a field expression. + for (i = 0; i < COMMON_COORD_NCOORDS; i++) { + if (evdata->pos[NARGS + i]) { + nd[0] = TRUE; + break; + } + } +} + +/* Must be run before creating the preview field, so we can reuse args->preview as a buffer. */ +static void +fix_nans(ModuleArgs *args) +{ + GwyParams *params = args->params; + gboolean fixed_filler = gwy_params_get_boolean(params, PARAM_FIXED_FILLER); + gdouble filler_value = gwy_params_get_double(params, PARAM_FILLER_VALUE); + GwyBrick *result = args->result; + gint xres = gwy_brick_get_xres(result), yres = gwy_brick_get_yres(result), zres = gwy_brick_get_zres(result); + GwyDataField *plane = args->preview, *mask; + gint i; + + plane = gwy_data_field_new(xres, yres, 1.0, 1.0, FALSE); + for (i = 0; i < zres; i++) { + gwy_brick_extract_xy_plane(result, plane, i); + mask = gwy_app_channel_mask_of_nans(plane, FALSE); + if (!mask) + continue; + + if (fixed_filler) + gwy_data_field_area_fill_mask(plane, mask, GWY_MASK_INCLUDE, 0, 0, xres, yres, filler_value); + else + gwy_data_field_laplace_solve(plane, mask, -1, 0.25); + gwy_brick_set_xy_plane(result, plane, i); + g_object_unref(mask); + } +} + +static GwyBrick* +make_x(GwyBrick *brick) +{ + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dx = gwy_brick_get_dx(brick); + gdouble xoff = gwy_brick_get_xoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j; + + for (j = 0; j < xres; j++) + data[j] = (j + 0.5)*dx + xoff; + + for (i = 1; i < yres*zres; i++) + gwy_assign(data + i*xres, data, xres); + + return result; +} + +static GwyBrick* +make_y(GwyBrick *brick) +{ + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dy = gwy_brick_get_dy(brick); + gdouble yoff = gwy_brick_get_yoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j, k; + + for (k = 0; k < zres; k++) { + for (i = 0; i < yres; i++) { + gdouble y = (i + 0.5)*dy + yoff; + gdouble *rrow = data + (k*yres + i)*xres; + for (j = 0; j < xres; j++, rrow++) + *rrow = y; + } + } + + return result; +} + +static GwyBrick* +make_z(GwyBrick *brick) +{ + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble dz = gwy_brick_get_dx(brick); + gdouble zoff = gwy_brick_get_xoffset(brick); + gdouble *data = gwy_brick_get_data(result); + gint i, j; + + for (i = 0; i < zres; i++) { + gdouble *rrow = data + i*xres*yres; + gdouble z = (i + 0.5)*dz + zoff; + for (j = 0; j < xres*yres; j++) + *rrow = z; + } + + return result; +} + +static GwyBrick* +make_zcal(GwyBrick *brick, GwyDataLine *zcal) +{ + gint xres = gwy_brick_get_xres(brick), yres = gwy_brick_get_yres(brick), zres = gwy_brick_get_zres(brick); + GwyBrick *result = gwy_brick_new_alike(brick, FALSE); + gdouble *data = gwy_brick_get_data(result); + const gdouble *zd = gwy_data_line_get_data_const(zcal); + gint i, j; + + g_return_val_if_fail(gwy_data_line_get_res(zcal) == xres, brick); + for (i = 0; i < zres; i++) { + gdouble *rrow = data + i*xres*yres; + gdouble z = zd[i]; + for (j = 0; j < xres*yres; j++) + *rrow = z; + } + + return result; +} + +static void +update_history(ModuleArgs *args) +{ + const gchar *expr = gwy_params_get_string(args->params, PARAM_EXPRESSION); + GtkListStore *store = args->history; + GtkTreeModel *model = GTK_TREE_MODEL(store); + GtkTreeIter iter; + gchar *s; + + if (!expr) + return; + + gtk_list_store_prepend(store, &iter); + gtk_list_store_set(store, &iter, 0, expr, -1); + + while (gtk_tree_model_iter_next(model, &iter)) { + gtk_tree_model_get(model, &iter, 0, &s, -1); + if (gwy_strequal(s, expr)) { + gtk_list_store_remove(store, &iter); + g_free(s); + break; + } + g_free(s); + } +} + +static GtkListStore* +load_history(void) +{ + GtkListStore *store; + gchar *buffer, *line, *p; + gsize size; + + store = gtk_list_store_new(1, G_TYPE_STRING); + if (!gwy_module_data_load("volume_arithmetic", "history", &buffer, &size, NULL)) + return store; + + p = buffer; + for (line = gwy_str_next_line(&p); line; line = gwy_str_next_line(&p)) { + if (*g_strstrip(line)) { + GtkTreeIter iter; + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, 0, line, -1); + } + } + g_free(buffer); + return store; +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + GwyAppDataId dataid; + guint i; + + dataid = gwy_params_get_data_id(params, PARAM_VOLUME); + for (i = 1; i < NARGS; i++) { + /* Replace lost images with d1, FIXME, if there is any */ + if (!gwy_params_get_image(params, PARAM_IMAGE + i)) + gwy_params_set_image_id(params, PARAM_IMAGE + i, dataid); + } + /* Ensures args->expression comes first */ + update_history(args); +} + +static void +save_history(GtkListStore *history) +{ + GtkTreeModel *model = GTK_TREE_MODEL(history); + GtkTreeIter iter; + gchar *s; + FILE *fh; + gint i = 0; + + if (!(fh = gwy_module_data_fopen("volume_arithmetic", "history", "w", NULL))) + return; + + if (gtk_tree_model_get_iter_first(model, &iter)) { + do { + gtk_tree_model_get(model, &iter, 0, &s, -1); + fputs(s, fh); + fputc('\n', fh); + g_free(s); + } while (++i < HISTSIZE && gtk_tree_model_iter_next(model, &iter)); + } + fclose(fh); +} + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_xystitch.c gwyddion-2.63/modules/volume/volume_xystitch.c --- gwyddion-2.62/modules/volume/volume_xystitch.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_xystitch.c 2023-05-24 09:36:14.000000000 +0000 @@ -0,0 +1,547 @@ +/* + * $Id: volume_linestat.c 24975 2022-08-31 12:05:41Z yeti-dn $ + * Copyright (C) 2015-2021 David Necas (Yeti). + * E-mail: yeti@gwyddion.net. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libgwyddion/gwyomp.h" + +#define RUN_MODES (GWY_RUN_INTERACTIVE) + + +enum { + PREVIEW_SIZE = 500, + RESPONSE_RECALC = 101, +}; + +enum { + PARAM_XOFFSETS, + PARAM_YOFFSETS, + PARAM_XOFFSETS_CURVE, + PARAM_YOFFSETS_CURVE, + PARAM_XOFFSETS_FLIP, + PARAM_YOFFSETS_FLIP, + PARAM_SHIFT, + PARAM_MAXSHIFT, + PARAM_ROTATE, + PARAM_MAXROTATE +}; + + +typedef struct { + GwyParams *params; + GwyBrick *brick; + GwySurface *result; +} ModuleArgs; + +typedef struct { + ModuleArgs *args; + GtkWidget *dialog; + GwyParamTable *table_options; + GwyContainer *data; +} ModuleGUI; + + +static gboolean module_register (void); +static GwyParamDef* define_module_params (void); +static void xystitch (GwyContainer *data, + GwyRunType runtype); +static void execute (ModuleArgs *args); +static GwyDialogOutcome run_gui (ModuleArgs *args, + GwyContainer *data, + gint id); +static void param_changed (ModuleGUI *gui, + gint id); +static void dialog_response (GwyDialog *dialog, + gint response, + ModuleGUI *gui); +static void recalc (gpointer user_data); +static void sanitise_params (ModuleArgs *args); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Merges all XY planes into XYZ data"), + "Petr Klapetek ", + "1.0", + "Petr Klapetek & David Nečas (Yeti)", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, volume_xystitch) + +static gboolean +module_register(void) +{ + gwy_volume_func_register("volume_xystitch", + (GwyVolumeFunc)&xystitch, + N_("/SPM M_odes/_XY Stitch..."), + NULL, + RUN_MODES, + GWY_MENU_FLAG_VOLUME | GWY_MENU_FLAG_GRAPH_CURVE, + N_("Merge all the XY planes to XYZ data")); + + return TRUE; +} + +static GwyParamDef* +define_module_params(void) +{ + static GwyParamDef *paramdef = NULL; + + if (paramdef) + return paramdef; + + paramdef = gwy_param_def_new(); + gwy_param_def_set_function_name(paramdef, gwy_volume_func_current()); + gwy_param_def_add_graph_id(paramdef, PARAM_XOFFSETS, "xoffsets", _("_X offsets graph")); + gwy_param_def_add_graph_curve(paramdef, PARAM_XOFFSETS_CURVE, "xcurve", _("X _offsets curve")); + gwy_param_def_add_graph_id(paramdef, PARAM_YOFFSETS, "yoffsets", _("_Y offsets graph")); + gwy_param_def_add_graph_curve(paramdef, PARAM_YOFFSETS_CURVE, "ycurve", _("Y o_ffsets curve")); + gwy_param_def_add_boolean(paramdef, PARAM_XOFFSETS_FLIP, "xflip", _("_Flip X axis"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_YOFFSETS_FLIP, "yflip", _("_Flip Y axis"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_SHIFT, "shift", _("_Adjust shifts"), FALSE); + gwy_param_def_add_boolean(paramdef, PARAM_ROTATE, "rotate", _("A_djust rotation"), FALSE); + gwy_param_def_add_double(paramdef, PARAM_MAXSHIFT, "max_shift", _("_Shift range"), 0.0, 50, 20); + gwy_param_def_add_double(paramdef, PARAM_MAXROTATE, "max_rotate", _("_Rotation range"), 0.0, 10, 1); + + return paramdef; +} + +static void +xystitch(GwyContainer *data, GwyRunType runtype) +{ + ModuleArgs args; + GwyBrick *brick = NULL; + GwyDialogOutcome outcome = GWY_DIALOG_PROCEED; + gint oldid, newid; + GwyAppDataId graph_id; + + g_return_if_fail(runtype & RUN_MODES); + g_return_if_fail(g_type_from_name("GwyLayerPoint")); + + gwy_app_data_browser_get_current(GWY_APP_BRICK, &brick, + GWY_APP_BRICK_ID, &oldid, + GWY_APP_CONTAINER_ID, &graph_id.datano, + GWY_APP_GRAPH_MODEL_ID, &graph_id.id, + 0); + g_return_if_fail(GWY_IS_BRICK(brick)); + args.result = NULL; + args.brick = brick; + args.params = gwy_params_new_from_settings(define_module_params()); + gwy_params_set_graph_id(args.params, PARAM_XOFFSETS, graph_id); + gwy_params_set_graph_id(args.params, PARAM_YOFFSETS, graph_id); + sanitise_params(&args); + + if (runtype == GWY_RUN_INTERACTIVE) { + outcome = run_gui(&args, data, oldid); + gwy_params_save_to_settings(args.params); + if (outcome == GWY_DIALOG_CANCEL) + goto end; + } + if (outcome != GWY_DIALOG_HAVE_RESULT) + execute(&args); + + if (args.result) { + newid = gwy_app_data_browser_add_surface(args.result, data, TRUE); + gwy_app_set_surface_title(data, newid, _("Stitched")); + } + +end: + g_object_unref(args.params); + if (args.result) + g_object_unref(args.result); +} + +static GwyDialogOutcome +run_gui(ModuleArgs *args, GwyContainer *data, gint id) +{ + GtkWidget *hbox, *dataview; + GwyParamTable *table; + GwyDialog *dialog; + ModuleGUI gui; + GwyDialogOutcome outcome; + GwyBrick *brick = args->brick; + GwyDataField *field = gwy_data_field_new(gwy_brick_get_xres(brick), + gwy_brick_get_yres(brick), + gwy_brick_get_xreal(brick), + gwy_brick_get_yreal(brick), + TRUE); + const guchar *gradient; + + gwy_clear(&gui, 1); + gui.args = args; + gui.data = gwy_container_new(); + + gwy_container_set_object(gui.data, gwy_app_get_data_key_for_id(0), field); + if (gwy_container_gis_string(data, gwy_app_get_brick_palette_key_for_id(id), &gradient)) + gwy_container_set_const_string(gui.data, gwy_app_get_data_palette_key_for_id(0), gradient); + + gui.dialog = gwy_dialog_new(_("XY Stitch")); + dialog = GWY_DIALOG(gui.dialog); + gtk_dialog_add_button(GTK_DIALOG(dialog), gwy_sgettext("verb|_Stitch"), RESPONSE_RECALC); + gwy_dialog_add_buttons(dialog, GWY_RESPONSE_RESET, GTK_RESPONSE_CANCEL, GTK_RESPONSE_OK, 0); + + dataview = gwy_create_preview(gui.data, 0, PREVIEW_SIZE, FALSE); + hbox = gwy_create_dialog_preview_hbox(GTK_DIALOG(dialog), GWY_DATA_VIEW(dataview), FALSE); + + table = gui.table_options = gwy_param_table_new(args->params); + gwy_param_table_append_graph_id(table, PARAM_XOFFSETS); + gwy_param_table_append_graph_curve(table, PARAM_XOFFSETS_CURVE, gwy_params_get_graph(args->params, + PARAM_XOFFSETS)); + gwy_param_table_append_checkbox(table, PARAM_XOFFSETS_FLIP); + + gwy_param_table_append_graph_id(table, PARAM_YOFFSETS); + gwy_param_table_append_graph_curve(table, PARAM_YOFFSETS_CURVE, gwy_params_get_graph(args->params, + PARAM_YOFFSETS)); + gwy_param_table_append_checkbox(table, PARAM_YOFFSETS_FLIP); + + gwy_param_table_append_checkbox(table, PARAM_SHIFT); + gwy_param_table_append_slider(table, PARAM_MAXSHIFT); + gwy_param_table_set_unitstr(table, PARAM_MAXSHIFT, "px"); + gwy_param_table_append_checkbox(table, PARAM_ROTATE); + gwy_param_table_append_slider(table, PARAM_MAXROTATE); + gwy_param_table_set_unitstr(table, PARAM_MAXROTATE, "deg"); + + gwy_dialog_add_param_table(dialog, table); + gtk_box_pack_start(GTK_BOX(hbox), gwy_param_table_widget(table), FALSE, FALSE, 0); + + g_signal_connect_swapped(gui.table_options, "param-changed", G_CALLBACK(param_changed), &gui); + g_signal_connect_after(dialog, "response", G_CALLBACK(dialog_response), &gui); + param_changed(&gui, PARAM_XOFFSETS); + + outcome = gwy_dialog_run(dialog); + + g_object_unref(gui.data); + + return outcome; +} + + +static void +param_changed(ModuleGUI *gui, gint id) +{ + if (id == PARAM_XOFFSETS || id == PARAM_YOFFSETS) { + gwy_param_table_graph_curve_set_model(gui->table_options, PARAM_XOFFSETS_CURVE, + gwy_params_get_graph(gui->args->params, PARAM_XOFFSETS)); + gwy_param_table_graph_curve_set_model(gui->table_options, PARAM_YOFFSETS_CURVE, + gwy_params_get_graph(gui->args->params, PARAM_YOFFSETS)); + } + + gwy_dialog_invalidate(GWY_DIALOG(gui->dialog)); +} + +static void +dialog_response(G_GNUC_UNUSED GwyDialog *dialog, gint response, ModuleGUI *gui) +{ + if (response == RESPONSE_RECALC) { + recalc(gui); + } +} + +static void +recalc(gpointer user_data) +{ + ModuleGUI *gui = (ModuleGUI*)user_data; + GwyDataField *dfield = gwy_container_get_object(gui->data, gwy_app_get_data_key_for_id(0)); + gdouble xmin, xmax, ymin, ymax, xrange, yrange; + gint newxres, newyres; + + execute(gui->args); + + gwy_surface_get_xrange(gui->args->result, &xmin, &xmax); + gwy_surface_get_yrange(gui->args->result, &ymin, &ymax); + xrange = xmax - xmin; + yrange = ymax - ymin; + + if (xrange>=yrange) { + newxres = PREVIEW_SIZE; + newyres = yrange*newxres/xrange; + } else { + newyres = PREVIEW_SIZE; + newxres = xrange*newyres/yrange; + } + + gwy_data_field_resample(dfield, newxres, newyres, GWY_INTERPOLATION_NONE); + gwy_data_field_set_xoffset(dfield, xmin); + gwy_data_field_set_yoffset(dfield, ymin); + gwy_data_field_set_xreal(dfield, xrange); + gwy_data_field_set_yreal(dfield, yrange); + + gwy_data_field_average_xyz(dfield, NULL, + gwy_surface_get_data_const(gui->args->result), + gwy_surface_get_npoints(gui->args->result)); + gwy_data_field_data_changed(dfield); + + gwy_dialog_have_result(GWY_DIALOG(gui->dialog)); +} + +static gdouble +get_curve_value_at(GwyGraphCurveModel *gc, gint level) +{ + const gdouble *ys = gwy_graph_curve_model_get_ydata(gc); + gint n = gwy_graph_curve_model_get_ndata(gc); + + if (level < 0 || level > (n-1)) return 0; + else return ys[level]; +} + +/* + z optimisation: + create a list of mutual average shifts and their projected areas + 1-2 + 1-3 + 1-5 + 4-5 + + create function that sets the offsets to minimize the area normalized mean shift + apply the offsets + + */ +static void +get_overlap(double moff, double noff, gint res, gint *start1, gint *start2, gint *size) +{ + int imoff = (int)moff; + int inoff = (int)noff; + + if (inoff == imoff) { + *start1 = 0; + *start2 = 0; + *size = res; + } + else if (inoff > imoff && (inoff-imoff)0) zshift[m] -= zs[m][n]; + } + } + */ + +} + + +static void +get_z_shifts(GwyBrick *brick, gdouble *xoff, gdouble *yoff, gdouble *zshift) +{ + gint k, m, n, col1, row1, col2, row2, width, height; + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + GwyDataField *mfield, *nfield; + gdouble **zs, mh, nh; + gint **rzs; + + zs = g_new(gdouble*, zres); + for (k = 0; k < zres; k++) zs[k] = g_new(gdouble, zres); + + rzs = g_new(gint*, zres); + for (k = 0; k < zres; k++) rzs[k] = g_new(gint, zres); + + mfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + nfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + + //find z shift between mth and nth plane + for (m = 0; m < zres; m++) { + gwy_brick_extract_xy_plane(brick, mfield, m); + for (n = m + 1; n < zres; n++) { + gwy_brick_extract_xy_plane(brick, nfield, n); + + get_overlap(gwy_brick_rtoi(brick, xoff[m]), gwy_brick_rtoi(brick, xoff[n]), xres, &col1, &col2, &width); + get_overlap(gwy_brick_rtoj(brick, yoff[m]), gwy_brick_rtoj(brick, yoff[n]), yres, &row1, &row2, &height); + + /*printf("%d %d shifts %d %d %d %d overlap start: %d %d %d %d size %d %d\n", m, n, + (gint)gwy_brick_rtoi(brick, xoff[m]), (gint)gwy_brick_rtoj(brick, yoff[m]), + (gint)gwy_brick_rtoi(brick, xoff[n]), (gint)gwy_brick_rtoj(brick, yoff[n]), + col1, row1, col2, row2, width, height);*/ + + if (width>0 && height>0) + { + mh = gwy_data_field_area_get_avg_mask(mfield, NULL, GWY_MASK_IGNORE, + col1, row1, width, height); + nh = gwy_data_field_area_get_avg_mask(nfield, NULL, GWY_MASK_IGNORE, + col2, row2, width, height); + + zs[m][n] = mh - nh; + rzs[m][n] = width*height; + } + else { + zs[m][n] = 0; + rzs[m][n] = 0; + } + } + } + + for (m = 0; m < zres; m++) { + for (n = m + 1; n < zres; n++) { + if (rzs[m][n]>0) printf("(%d %d : %d %g) ", m, n, rzs[m][n], zs[m][n]); + } + printf("\n"); + } + + //calculate optimum z shifts + optimize_zshifts(zs, rzs, zshift, zres); + for (k = 0; k < zres; k++) printf("zshift %d %g\n", k, zshift[k]); + + for (k = 0; k < zres; k++) { + g_free(zs[k]); + g_free(rzs[k]); + } + g_free(zs); + g_free(rzs); + g_object_unref(mfield); + g_object_unref(nfield); + + +} + + +static void +execute(ModuleArgs *args) +{ + GwyParams *params = args->params; + gint k, m, n; + GwyBrick *brick = args->brick; + GwySurface *frame; + GwyXYZ *xyz, *sxyz; + GwyDataField *dfield; + gdouble *xoffset, *yoffset, *zshift; + gboolean xflip = gwy_params_get_boolean(params, PARAM_XOFFSETS_FLIP); + gboolean yflip = gwy_params_get_boolean(params, PARAM_YOFFSETS_FLIP); + GwyGraphCurveModel* gcmx = gwy_graph_model_get_curve(gwy_params_get_graph(params, PARAM_XOFFSETS), + gwy_params_get_int(params, PARAM_XOFFSETS_CURVE)); + GwyGraphCurveModel* gcmy = gwy_graph_model_get_curve(gwy_params_get_graph(params, PARAM_YOFFSETS), + gwy_params_get_int(params, PARAM_YOFFSETS_CURVE)); + + gint xres = gwy_brick_get_xres(brick); + gint yres = gwy_brick_get_yres(brick); + gint zres = gwy_brick_get_zres(brick); + + xoffset = g_new(gdouble, zres); + yoffset = g_new(gdouble, zres); + zshift = g_new(gdouble, zres); + + if (args->result) g_object_unref(args->result); + args->result = gwy_surface_new_sized(xres*yres*zres); + xyz = gwy_surface_get_data(args->result); + + dfield = gwy_data_field_new(xres, yres, gwy_brick_get_xreal(brick), gwy_brick_get_yreal(brick), FALSE); + + + n = 0; + for (k = 0; k < zres; k++) { + if (xflip) { + xoffset[k] = get_curve_value_at(gcmx, zres-k-1) - get_curve_value_at(gcmx, zres-1); + } else { + xoffset[k] = get_curve_value_at(gcmx, k) - get_curve_value_at(gcmx, 0); + } + if (yflip) { + yoffset[k] = get_curve_value_at(gcmy, zres-k-1) - get_curve_value_at(gcmy, zres-1); + } else { + yoffset[k] = get_curve_value_at(gcmy, k) - get_curve_value_at(gcmy, 0); + } + } + + get_z_shifts(brick, xoffset, yoffset, zshift); + + for (k = 0; k < zres; k++) { + gwy_brick_extract_xy_plane(brick, dfield, k); + + frame = gwy_surface_new(); + gwy_surface_set_from_data_field(frame, dfield); + sxyz = gwy_surface_get_data(frame); + for (m=0; m<(xres*yres); m++) { + xyz[n].x = sxyz[m].x + xoffset[k]; + xyz[n].y = sxyz[m].y + yoffset[k]; + xyz[n].z = sxyz[m].z + zshift[k]; + n++; + } + g_object_unref(frame); + } + + g_object_unref(dfield); + g_free(xoffset); + g_free(yoffset); + g_free(zshift); +} + +static void +sanitise_one_param(GwyParams *params, gint id, gint min, gint max, gint defval) +{ + gint v; + + v = gwy_params_get_int(params, id); + if (v >= min && v <= max) { + gwy_debug("param #%d is %d, i.e. within range [%d..%d]", id, v, min, max); + return; + } + gwy_debug("param #%d is %d, setting it to the default %d", id, v, defval); + gwy_params_set_int(params, id, defval); +} + +static void +sanitise_params(ModuleArgs *args) +{ + GwyParams *params = args->params; + //sanitise_one_param(params, PARAM_MAX_DEGREE, 0, MAX_DEGREE, 2); +} + +/* vim: set cin columns=120 tw=118 et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/volume/volume_zcal.c gwyddion-2.63/modules/volume/volume_zcal.c --- gwyddion-2.62/modules/volume/volume_zcal.c 2022-02-04 15:06:44.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_zcal.c 2023-02-23 16:14:15.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_zcal.c 24580 2022-02-04 15:06:43Z yeti-dn $ + * $Id: volume_zcal.c 25241 2023-02-23 16:00:42Z klapetek $ * Copyright (C) 2015-2019 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -123,7 +123,7 @@ { gwy_volume_func_register("volume_zcal", (GwyVolumeFunc)&zcal, - N_("/_Z-Calibration..."), + N_("/_Basic Operations/_Z-Calibration..."), GWY_STOCK_VOLUME_CALIBRATE, ZCAL_RUN_MODES, GWY_MENU_FLAG_VOLUME, diff -Nru gwyddion-2.62/modules/volume/volume_zposlevel.c gwyddion-2.63/modules/volume/volume_zposlevel.c --- gwyddion-2.62/modules/volume/volume_zposlevel.c 2019-10-29 16:47:59.000000000 +0000 +++ gwyddion-2.63/modules/volume/volume_zposlevel.c 2023-03-09 08:36:17.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: volume_zposlevel.c 22619 2019-10-29 16:47:55Z yeti-dn $ + * $Id: volume_zposlevel.c 25267 2023-03-08 17:15:49Z klapetek $ * Copyright (C) 2019 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -159,7 +159,7 @@ { gwy_volume_func_register("volume_zposlevel", (GwyVolumeFunc)&zposlevel, - N_("/S_hift Value To Zero..."), + N_("/_Correct Data/S_hift Value To Zero..."), NULL, ZPOSLEVEL_RUN_MODES, GWY_MENU_FLAG_VOLUME, @@ -694,9 +694,9 @@ g_snprintf(title, sizeof(title), _("Shifted to zero for z level = %d"), args->z); gwy_app_set_brick_title(data, newid, title); - gwy_app_sync_data_items(data, data, id, newid, FALSE, - GWY_DATA_ITEM_GRADIENT, - 0); + gwy_app_sync_volume_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); gwy_app_volume_log_add_volume(data, id, newid); diff -Nru gwyddion-2.62/modules/xyz/Makefile.am gwyddion-2.63/modules/xyz/Makefile.am --- gwyddion-2.62/modules/xyz/Makefile.am 2022-10-06 15:01:28.000000000 +0000 +++ gwyddion-2.63/modules/xyz/Makefile.am 2023-03-09 08:36:17.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25258 2023-03-05 19:21:27Z klapetek $ # Put sources that are for some reason disabled yet present in svn checkouts # here. This makes them distributed and translations of their messages are @@ -12,6 +12,7 @@ # unbundled modules, not the bundle. bundlable_modules = \ xyzops.la \ + xyz_autocrop.la \ xyz_drift.la \ xyz_level.la \ xyz_raster.la \ @@ -54,14 +55,16 @@ AM_LDFLAGS = -avoid-version -module $(no_undefined) $(module_libadd) @OPENMP_CFLAGS@ # Bundlable modules, must be listed in xyz_la_SOURCES below. -xyzops_la_SOURCES = xyzops.c -xyz_drift_la_SOURCES = xyz_drift.c -xyz_level_la_SOURCES = xyz_level.c -xyz_raster_la_SOURCES = xyz_raster.c -xyz_split_la_SOURCES = xyz_split.c +xyzops_la_SOURCES = xyzops.c +xyz_autocrop_la_SOURCES = xyz_autocrop.c +xyz_drift_la_SOURCES = xyz_drift.c +xyz_level_la_SOURCES = xyz_level.c +xyz_raster_la_SOURCES = xyz_raster.c +xyz_split_la_SOURCES = xyz_split.c xyz_la_SOURCES = \ $(xyzops_la_SOURCES) \ + $(xyz_autocrop_la_SOURCES) \ $(xyz_drift_la_SOURCES) \ $(xyz_level_la_SOURCES) \ $(xyz_raster_la_SOURCES) \ diff -Nru gwyddion-2.62/modules/xyz/Makefile.in gwyddion-2.63/modules/xyz/Makefile.in --- gwyddion-2.62/modules/xyz/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/modules/xyz/Makefile.in 2023-06-13 13:22:36.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 25070 2022-10-06 15:01:28Z yeti-dn $ +# $Id: Makefile.am 25258 2023-03-05 19:21:27Z klapetek $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -142,12 +142,14 @@ LTLIBRARIES = $(xyz_LTLIBRARIES) xyz_la_LIBADD = am__objects_1 = xyz_la-xyzops.lo -am__objects_2 = xyz_la-xyz_drift.lo -am__objects_3 = xyz_la-xyz_level.lo -am__objects_4 = xyz_la-xyz_raster.lo -am__objects_5 = xyz_la-xyz_split.lo +am__objects_2 = xyz_la-xyz_autocrop.lo +am__objects_3 = xyz_la-xyz_drift.lo +am__objects_4 = xyz_la-xyz_level.lo +am__objects_5 = xyz_la-xyz_raster.lo +am__objects_6 = xyz_la-xyz_split.lo am_xyz_la_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) xyz_la-xyz.lo + $(am__objects_4) $(am__objects_5) $(am__objects_6) \ + xyz_la-xyz.lo xyz_la_OBJECTS = $(am_xyz_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -157,6 +159,10 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xyz_la_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @MODULE_BUNDLING_TRUE@am_xyz_la_rpath = -rpath $(xyzdir) +xyz_autocrop_la_LIBADD = +am_xyz_autocrop_la_OBJECTS = xyz_autocrop.lo +xyz_autocrop_la_OBJECTS = $(am_xyz_autocrop_la_OBJECTS) +@MODULE_BUNDLING_FALSE@am_xyz_autocrop_la_rpath = -rpath $(xyzdir) xyz_drift_la_LIBADD = am_xyz_drift_la_OBJECTS = xyz_drift.lo xyz_drift_la_OBJECTS = $(am_xyz_drift_la_OBJECTS) @@ -192,8 +198,10 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/xyz_drift.Plo \ - ./$(DEPDIR)/xyz_la-xyz.Plo ./$(DEPDIR)/xyz_la-xyz_drift.Plo \ +am__depfiles_remade = ./$(DEPDIR)/xyz_autocrop.Plo \ + ./$(DEPDIR)/xyz_drift.Plo ./$(DEPDIR)/xyz_la-xyz.Plo \ + ./$(DEPDIR)/xyz_la-xyz_autocrop.Plo \ + ./$(DEPDIR)/xyz_la-xyz_drift.Plo \ ./$(DEPDIR)/xyz_la-xyz_level.Plo \ ./$(DEPDIR)/xyz_la-xyz_raster.Plo \ ./$(DEPDIR)/xyz_la-xyz_split.Plo ./$(DEPDIR)/xyz_la-xyzops.Plo \ @@ -218,12 +226,14 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(xyz_la_SOURCES) $(xyz_drift_la_SOURCES) \ - $(xyz_level_la_SOURCES) $(xyz_raster_la_SOURCES) \ - $(xyz_split_la_SOURCES) $(xyzops_la_SOURCES) -DIST_SOURCES = $(xyz_la_SOURCES) $(xyz_drift_la_SOURCES) \ - $(xyz_level_la_SOURCES) $(xyz_raster_la_SOURCES) \ - $(xyz_split_la_SOURCES) $(xyzops_la_SOURCES) +SOURCES = $(xyz_la_SOURCES) $(xyz_autocrop_la_SOURCES) \ + $(xyz_drift_la_SOURCES) $(xyz_level_la_SOURCES) \ + $(xyz_raster_la_SOURCES) $(xyz_split_la_SOURCES) \ + $(xyzops_la_SOURCES) +DIST_SOURCES = $(xyz_la_SOURCES) $(xyz_autocrop_la_SOURCES) \ + $(xyz_drift_la_SOURCES) $(xyz_level_la_SOURCES) \ + $(xyz_raster_la_SOURCES) $(xyz_split_la_SOURCES) \ + $(xyzops_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -443,6 +453,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -513,6 +525,7 @@ # unbundled modules, not the bundle. bundlable_modules = \ xyzops.la \ + xyz_autocrop.la \ xyz_drift.la \ xyz_level.la \ xyz_raster.la \ @@ -547,12 +560,14 @@ # Bundlable modules, must be listed in xyz_la_SOURCES below. xyzops_la_SOURCES = xyzops.c +xyz_autocrop_la_SOURCES = xyz_autocrop.c xyz_drift_la_SOURCES = xyz_drift.c xyz_level_la_SOURCES = xyz_level.c xyz_raster_la_SOURCES = xyz_raster.c xyz_split_la_SOURCES = xyz_split.c xyz_la_SOURCES = \ $(xyzops_la_SOURCES) \ + $(xyz_autocrop_la_SOURCES) \ $(xyz_drift_la_SOURCES) \ $(xyz_level_la_SOURCES) \ $(xyz_raster_la_SOURCES) \ @@ -633,6 +648,9 @@ xyz.la: $(xyz_la_OBJECTS) $(xyz_la_DEPENDENCIES) $(EXTRA_xyz_la_DEPENDENCIES) $(AM_V_CCLD)$(xyz_la_LINK) $(am_xyz_la_rpath) $(xyz_la_OBJECTS) $(xyz_la_LIBADD) $(LIBS) +xyz_autocrop.la: $(xyz_autocrop_la_OBJECTS) $(xyz_autocrop_la_DEPENDENCIES) $(EXTRA_xyz_autocrop_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(am_xyz_autocrop_la_rpath) $(xyz_autocrop_la_OBJECTS) $(xyz_autocrop_la_LIBADD) $(LIBS) + xyz_drift.la: $(xyz_drift_la_OBJECTS) $(xyz_drift_la_DEPENDENCIES) $(EXTRA_xyz_drift_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(am_xyz_drift_la_rpath) $(xyz_drift_la_OBJECTS) $(xyz_drift_la_LIBADD) $(LIBS) @@ -654,8 +672,10 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_autocrop.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_drift.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_la-xyz.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_la-xyz_autocrop.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_la-xyz_drift.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_la-xyz_level.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyz_la-xyz_raster.Plo@am__quote@ # am--include-marker @@ -700,6 +720,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xyz_la_CFLAGS) $(CFLAGS) -c -o xyz_la-xyzops.lo `test -f 'xyzops.c' || echo '$(srcdir)/'`xyzops.c +xyz_la-xyz_autocrop.lo: xyz_autocrop.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xyz_la_CFLAGS) $(CFLAGS) -MT xyz_la-xyz_autocrop.lo -MD -MP -MF $(DEPDIR)/xyz_la-xyz_autocrop.Tpo -c -o xyz_la-xyz_autocrop.lo `test -f 'xyz_autocrop.c' || echo '$(srcdir)/'`xyz_autocrop.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xyz_la-xyz_autocrop.Tpo $(DEPDIR)/xyz_la-xyz_autocrop.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xyz_autocrop.c' object='xyz_la-xyz_autocrop.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xyz_la_CFLAGS) $(CFLAGS) -c -o xyz_la-xyz_autocrop.lo `test -f 'xyz_autocrop.c' || echo '$(srcdir)/'`xyz_autocrop.c + xyz_la-xyz_drift.lo: xyz_drift.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xyz_la_CFLAGS) $(CFLAGS) -MT xyz_la-xyz_drift.lo -MD -MP -MF $(DEPDIR)/xyz_la-xyz_drift.Tpo -c -o xyz_la-xyz_drift.lo `test -f 'xyz_drift.c' || echo '$(srcdir)/'`xyz_drift.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xyz_la-xyz_drift.Tpo $(DEPDIR)/xyz_la-xyz_drift.Plo @@ -872,8 +899,10 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/xyz_drift.Plo + -rm -f ./$(DEPDIR)/xyz_autocrop.Plo + -rm -f ./$(DEPDIR)/xyz_drift.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz.Plo + -rm -f ./$(DEPDIR)/xyz_la-xyz_autocrop.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_drift.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_level.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_raster.Plo @@ -928,8 +957,10 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/xyz_drift.Plo + -rm -f ./$(DEPDIR)/xyz_autocrop.Plo + -rm -f ./$(DEPDIR)/xyz_drift.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz.Plo + -rm -f ./$(DEPDIR)/xyz_la-xyz_autocrop.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_drift.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_level.Plo -rm -f ./$(DEPDIR)/xyz_la-xyz_raster.Plo diff -Nru gwyddion-2.62/modules/xyz/xyz_autocrop.c gwyddion-2.63/modules/xyz/xyz_autocrop.c --- gwyddion-2.62/modules/xyz/xyz_autocrop.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/modules/xyz/xyz_autocrop.c 2023-06-12 11:50:23.000000000 +0000 @@ -0,0 +1,236 @@ +/* + * $Id: xyz_level.c 21865 2019-01-29 16:24:47Z yeti-dn $ + * Copyright (C) 2016 David Necas (Yeti). + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define RUN_MODES (GWY_RUN_IMMEDIATE) + + +static gboolean module_register (void); +static void autocrop (GwyContainer *data, + GwyRunType run); +static GwyXYZ* pick_points (GwySurface *surface, + gint *newn); + + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Simple XYZ automated crop."), + "Petr Klapetek ", + "1.0", + "David Nečas (Yeti) & Petr Klapetek", + "2023", +}; + +GWY_MODULE_QUERY2(module_info, xyz_autocrop) + +static gboolean +module_register(void) +{ + gwy_xyz_func_register("autocrop", + (GwyXYZFunc)&autocrop, + N_("/Crop Automatically"), + GWY_STOCK_FIX_ZERO, + RUN_MODES, + GWY_MENU_FLAG_XYZ, + N_("Crop data automatically to cover scanned areas")); + + return TRUE; +} + +static void +autocrop(GwyContainer *data, G_GNUC_UNUSED GwyRunType run) +{ + GwySurface *surface = NULL, *newsurface; + GQuark quark; + gint id, newid; + GwyXYZ *newxyz; + guint n; + + gwy_app_data_browser_get_current(GWY_APP_SURFACE, &surface, + GWY_APP_SURFACE_ID, &id, + 0); + g_return_if_fail(GWY_IS_SURFACE(surface)); + + quark = gwy_app_get_surface_key_for_id(id); + gwy_app_undo_qcheckpointv(data, 1, &quark); + + newxyz = pick_points(surface, &n); + newsurface = gwy_surface_new_from_data(newxyz, n); + + newid = gwy_app_data_browser_add_surface(newsurface, data, TRUE); + gwy_app_set_surface_title(data, newid, _("Cropped")); + g_object_unref(newsurface); +} + +static void +extract_column_profile(GwyDataField *dfield, GwyDataLine *dline) +{ + gint xres, yres, i, j; + const gdouble *d, *drow; + gdouble *linedata = gwy_data_line_get_data(dline); + + xres = gwy_data_field_get_xres(dfield); + yres = gwy_data_field_get_yres(dfield); + d = gwy_data_field_get_data_const(dfield); + + for (i = 0; i < yres; i++) { + drow = d + i*xres; + linedata[i] = 0; + + for (j = 0; j < xres; j++) + linedata[i] += drow[j]; + } +} + +static void +extract_row_profile(GwyDataField *dfield, GwyDataLine *dline) +{ + gint xres, yres, i, j; + const gdouble *d, *drow; + gdouble *linedata = gwy_data_line_get_data(dline); + + xres = gwy_data_field_get_xres(dfield); + yres = gwy_data_field_get_yres(dfield); + d = gwy_data_field_get_data_const(dfield); + + for (i = 0; i < yres; i++) { + drow = d + i*xres; + linedata[i] = 0; + + for (j = 0; j < xres; j++) + linedata[j] += drow[j]; + } +} + +static gdouble +get_lpos(GwyDataLine *dline, gdouble value) +{ + gint i; + const gdouble *linedata = gwy_data_line_get_data(dline); + + for (i = 1; i < gwy_data_line_get_res(dline); i++) { + if (linedata[i] > value) { + return gwy_data_line_itor(dline, i-1) + gwy_data_line_get_offset(dline); + } + } + return gwy_data_line_itor(dline, gwy_data_line_get_res(dline)-1); +} + +static gdouble +get_rpos(GwyDataLine *dline, gdouble value) +{ + gint i; + const gdouble *linedata = gwy_data_line_get_data(dline); + + for (i = 0; i < (gwy_data_line_get_res(dline) - 1); i++) { + if (linedata[i] > value) + return gwy_data_line_itor(dline, i+1) + gwy_data_line_get_offset(dline); + } + return gwy_data_line_itor(dline, gwy_data_line_get_res(dline)-1); +} + + +static GwyXYZ* +pick_points(GwySurface *surface, int *newn) +{ + gint i, n, npoints, newnpoints; + gint xres = 500; + gint yres = 500; + gdouble xmin, xmax, ymin, ymax; + gdouble xfrom, xto, yfrom, yto; + GwyDataField *dfield, *mapfield; + GwyDataLine *xline, *yline; + GwyXYZ *xyz, *newxyz; + + gwy_surface_get_xrange(surface, &xmin, &xmax); + gwy_surface_get_yrange(surface, &ymin, &ymax); + + dfield = gwy_data_field_new(xres, yres, xmax - xmin, ymax - ymin, FALSE); + mapfield = gwy_data_field_new_alike(dfield, FALSE); + xline = gwy_data_line_new(xres, xmax - xmin, FALSE); + yline = gwy_data_line_new(yres, ymax - ymin, FALSE); + gwy_data_line_set_offset(xline, xmin); + gwy_data_line_set_offset(yline, ymin); + gwy_data_field_set_xoffset(dfield, xmin); + gwy_data_field_set_yoffset(dfield, ymin); + + gwy_data_field_average_xyz(dfield, mapfield, + gwy_surface_get_data_const(surface), + gwy_surface_get_npoints(surface)); + extract_row_profile(dfield, xline); + extract_column_profile(dfield, yline); + + gwy_data_line_cumulate(xline); + gwy_data_line_cumulate(yline); + gwy_data_line_multiply(xline, 1.0/gwy_data_line_get_val(xline, xres-1)); + gwy_data_line_multiply(yline, 1.0/gwy_data_line_get_val(yline, yres-1)); + + xfrom = get_lpos(xline, 0.05); + xto = get_rpos(xline, 0.95); + + yfrom = get_lpos(yline, 0.05); + yto = get_rpos(yline, 0.95); + + printf("Ranges: %g %g %g %g %g %g %g %g\n", xmin, xmax, ymin, ymax, xfrom, xto, yfrom, yto); + + xyz = gwy_surface_get_data(surface); + npoints = gwy_surface_get_npoints(surface); + newnpoints = 0; + for (i = 0; i < npoints; i++) { + if (xyz[i].x >= xfrom && xyz[i].y >= yfrom && xyz[i].x <= xto && xyz[i].y <= yto) + newnpoints++; + } + + printf("n %d %d\n", npoints, newnpoints); + + newxyz = g_new(GwyXYZ, newnpoints); + n = 0; + for (i = 0; i < npoints; i++) { + if (xyz[i].x >= xfrom && xyz[i].y >= yfrom && xyz[i].x <= xto && xyz[i].y <= yto) { + newxyz[n].x = xyz[i].x; + newxyz[n].y = xyz[i].y; + newxyz[n].z = xyz[i].z; + n++; + } + } + + g_object_unref(dfield); + g_object_unref(mapfield); + g_object_unref(xline); + g_object_unref(yline); + + *newn = newnpoints; + return newxyz; +} + + +/* vim: set cin et ts=4 sw=4 cino=>1s,e0,n0,f0,{0,}0,^0,\:1s,=0,g1s,h0,t0,+1s,c3,(0,u0 : */ diff -Nru gwyddion-2.62/modules/xyz/xyz.c gwyddion-2.63/modules/xyz/xyz.c --- gwyddion-2.62/modules/xyz/xyz.c 2022-10-17 12:24:12.000000000 +0000 +++ gwyddion-2.63/modules/xyz/xyz.c 2023-03-09 08:37:09.000000000 +0000 @@ -13,6 +13,7 @@ GWY_MODULE_QUERY(module_info) GwyModuleInfo* _gwy_module_query__xyzops(void); +GwyModuleInfo* _gwy_module_query__xyz_autocrop(void); GwyModuleInfo* _gwy_module_query__xyz_drift(void); GwyModuleInfo* _gwy_module_query__xyz_level(void); GwyModuleInfo* _gwy_module_query__xyz_raster(void); @@ -20,6 +21,7 @@ static const GwyModuleRecord modules[] = { { _gwy_module_query__xyzops, "xyzops", }, + { _gwy_module_query__xyz_autocrop, "xyz_autocrop", }, { _gwy_module_query__xyz_drift, "xyz_drift", }, { _gwy_module_query__xyz_level, "xyz_level", }, { _gwy_module_query__xyz_raster, "xyz_raster", }, diff -Nru gwyddion-2.62/NEWS gwyddion-2.63/NEWS --- gwyddion-2.62/NEWS 2022-11-03 09:41:06.000000000 +0000 +++ gwyddion-2.63/NEWS 2023-06-13 13:07:00.000000000 +0000 @@ -1,3 +1,81 @@ +2.63 (2023-06-13) +Application: +- Translations updated: Czech, French, Russian. +- Menus: Volume function menu was reorganised to hierarchical. + +Libraries: +- libgwyddion: Bug in rank and median function, sometimes giving incorrect + value/partial sorting, introduced in 2.62, was fixed. +- libgwyddion: New helper functions for locale floating point number formats. +- libgwyprocess: Fixed bug in gwy_data_line_zoom_fft() accessing an out of + bound array element. +- libgwyprocess: New GwyDataLine function to calculate slopes (derivatives). +- libgwyprocess: GwyResults floating point values can have minimum number of + significant digits set. +- libgwyprocess: Rank filter function for GwyDataLine was added. +- libgwyprocess: Wrong real size of gwy_data_field_area_row_psd() by factor of + 2 was corrected. +- libgwyprocess: gwy_data_field_correlation_search() can also compute + phase-only correlation score. +- libgwyapp: Selection holding support functions in the GwyParams framework and + GwyPlainTool. +- libgwyapp: New function for merging settings from a string. +- libgwyapp: New GwyParamTable control representing a range. Fixed possible + crash when trying to assing NULL to a GString. +- libgwyapp: Helper functions for keeping sync graph X-selections with numeric + range controls. +- libgwyapp: Message logging is OpenMP thread safe; gwy_debug() can be used + from OpenMP parallel code. + +Modules: +- Dunes (new): Sand dunes synthetic data generator. +- Graph Measure Period (new): Measurement of period of 1D periodic data. +- Volume add frame (new): Insertion of XY planes to volume data. +- Volume remove frame (new): Removal of XY planes from volume data. +- Volume plane level (new): Plane levelling of all XY planes of volume data. +- Volume facet level (new): Facet levelling of all XY planes of volume data. +- Volume line level (new): Line correction in all XY planes of volume data. +- Volume drift (new): Drift estimation from a stack of high-speed SPM frames. +- Volume step line correction (new): Step line correction in all XY planes + of volume data. +- Volume scars (new): Removal of scars in all XY planes of volume data. +- Volume outliers (new): Outlier removal in all XY planes of volume data. +- Statistical quantities, Correlation length and Roughness tools: Buttons + for copying results to clipboard and saving them to file work again. +- Tools: Most tools can optionally hold the selection and transfer it to the + other image upon switching, instead of using the selection present there. +- Spot remove tool: Detail can use colour mapping of the image instead + always adapting it to the zoomed area. +- Mask editor tool: Thin lines can be 4-connected (instead of 8-connected). +- Statistical functions tool: Interface distribution function was added. +- Mask operations: Function extracting grain numbers to an image was added. +- Colour Range tool: New button for shifting data zero to the minimum of + colour range mapping range. Range adjustment to selected rectangle can + be disabled. +- Volume 3D view: Occasional crashes and broken visualisations were fixed. +- Volume swap axes: Crash for reversed axes was fixed. +- Olympus OIR: Image properties are matched using UUIDs, fixing sometimes + mismatched Height/Intensity/Invalid channels. Support for files with an extra + XML chunk was added and UTF-8 encoded XML chunks are correctly recognised. +- NetCDF: Physical unit support for newer GXSM files was improved. +- OPD: Integer type checking is more lenient, loading some files which were + previously rejected as invalid. +- HDF5: Mismatched x and y resolutions and physical sizes in Ergo files were + corrected. String handling, which causes problems with some HDF5 versions, + was improved. Initial support for Shilps Sciences Lucent files was added. +- MI file: Loading curve maps was implemented and loading of binary single + curves fixed to actually work. +- Nanoscope: Some single force curve files are no longed misdetected as + images. +- Correlation search: A preview of the score image was added. + +Others: +- Gwyutils: The multidimensional numpy array creation helpers actually create + data with the correct shape now. +- Dependencies: If nothing else is available, the Zziplib ZIP file handling + library can be also used to read ZIP-based file formats. + + 2.62 (2022-11-03) Application: - Translations updated: Czech, French, Russian. diff -Nru gwyddion-2.62/perl/Makefile.in gwyddion-2.63/perl/Makefile.in --- gwyddion-2.62/perl/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/perl/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -357,6 +357,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_3d_base-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_3d_base-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_arithmetic-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_arithmetic-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_binning-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_binning-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_bold-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_bold-20.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_cantilever-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_cantilever-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_color_range-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_color_range-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_color_range_adaptive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_color_range_adaptive-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_color_range_auto-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_color_range_auto-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_color_range_fixed-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_color_range_fixed-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_color_range_full-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_color_range_full-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_convolution-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_convolution-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_convolve-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_convolve-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_correct_affine-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_correct_affine-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_correlation_length-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_correlation_length-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_correlation_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_correlation_mask-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_crop-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_crop-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_cross_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_cross_profile-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_curvature-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_curvature-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_cwt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_cwt-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_data_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_data_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_deconvolve-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_deconvolve-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_disconnected-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_disconnected-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_displacement_field-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_displacement_field-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_distance-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_distance-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_distance_transform-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_distance_transform-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_distribution_angle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_distribution_angle-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_distribution_slope-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_distribution_slope-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_dwt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_dwt-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_edge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_edge-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_enforce_distribution-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_enforce_distribution-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_entropy-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_entropy-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_extend-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_extend-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_extract_path-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_extract_path-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_facet_analysis-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_facet_analysis-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_facet_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_facet_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_facet_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_facet_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_favourite-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_favourite-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fft-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fft-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fft_2d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fft_2d-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fft_filter_1d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fft_filter_1d-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fft_filter_2d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fft_filter_2d-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_filter-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_find_peaks-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_find_peaks-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fit_shape-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fit_shape-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fix_zero-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fix_zero-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_flip_diagonally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_flip_diagonally-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_flip_horizontally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_flip_horizontally-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_flip_vertically-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_flip_vertically-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fractal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fractal-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fractal_correction-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fractal_correction-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_fractal_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_fractal_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_frequency_split-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_frequency_split-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_gl_material-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_gl_material-16.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_gradient_horizontal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_gradient_horizontal-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_gradient_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_gradient_vertical-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grain_bounding_box-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grain_bounding_box-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grain_correlation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grain_correlation-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grain_exscribed_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grain_exscribed_circle-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grain_inscribed_box-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grain_inscribed_box-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grain_inscribed_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grain_inscribed_circle-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_edge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_edge-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_edge_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_edge_remove-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_graph-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_graph-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_otsu-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_otsu-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_remove-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_statistics-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_statistics-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_grains_water-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_grains_water-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_align-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_align-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_cut-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_cut-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_dos-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_dos-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_export_ascii-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_export_ascii-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_export_png-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_export_png-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_export_vector-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_export_vector-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_fd-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_fd-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_filter-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_function-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_function-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_palette-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_palette-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_period_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_period_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_pointer-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_pointer-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_ruler-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_ruler-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_statistics-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_statistics-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_vertical-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_zoom_fit-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_zoom_fit-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_zoom_in-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_zoom_in-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_graph_zoom_out-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_graph_zoom_out-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_hold_selection_clear-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_hold_selection_clear-18.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_hold_selection_replace-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_hold_selection_replace-18.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_hough-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_hough-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_image_relation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_image_relation-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_immerse-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_immerse-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_iso_roughness-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_iso_roughness-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_italic-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_italic-20.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_less-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_less-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_level_flatten_base-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_level_flatten_base-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_level_median-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_level_median-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_level_triangle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_level_triangle-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_light_rotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_light_rotate-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_limit_range-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_limit_range-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_line_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_line_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_local_slope-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_local_slope-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_logscale_horizontal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_logscale_horizontal-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_logscale_vertical-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_logscale_vertical-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mark_outliers-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mark_outliers-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mark_scars-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mark_scars-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mark_with-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mark_with-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask-16.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_add-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_add-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_circle-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_circle-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_circle_inclusive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_circle_inclusive-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_distribute-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_distribute-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_editor-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_editor-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_extract-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_extract-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_fill_draw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_fill_draw-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_intersect-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_intersect-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_line-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_line-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_noisify-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_noisify-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_paint_draw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_paint_draw-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_rect_inclusive-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_rect_inclusive-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_remove-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_set-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_set-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_shift-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_subtract-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_subtract-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mask_thin-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mask_thin-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_measure_lattice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_measure_lattice-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_merge-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_merge-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_convert_to_force-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_convert_to_force-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_current_line-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_current_line-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_field_find_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_field_find_shift-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_field_shift-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_field_shift-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_parallel-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_parallel-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mfm_perpendicular-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mfm_perpendicular-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_more-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_more-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_mutual_crop-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_mutual_crop-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_neural_apply-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_neural_apply-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_neural_train-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_neural_train-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_next-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_next-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_null_offsets-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_null_offsets-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_palettes-16.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_palettes-16.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_palettes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_palettes-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_path_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_path_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_perspective_distort-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_perspective_distort-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_pointer_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_pointer_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_poly_distort-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_poly_distort-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_polynom-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_polynom-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_polynom_level-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_polynom_level-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_previous-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_previous-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_profile-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_profile_multiple-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_profile_multiple-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_psdf_log_phi-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_psdf_log_phi-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_pygwy-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_pygwy-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_radial_profile-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_radial_profile-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rank_filter-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rank_filter-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rasterize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rasterize-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_remove_under_mask-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_remove_under_mask-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_revolve_arc-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_revolve_arc-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_revolve_sphere-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_revolve_sphere-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rotate_180-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rotate_180-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rotate-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rotate_3d-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rotate_3d-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rotate_90_ccw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rotate_90_ccw-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_rotate_90_cw-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_rotate_90_cw-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_scale-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_scale-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_scale_horizontally-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_scale_horizontally-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_scale_vertically-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_scale_vertically-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_scars-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_scars-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_scientific_number_format-18.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_scientific_number_format-18.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_selections-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_selections-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_shader-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_shader-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_spectrum-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_spectrum-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_spot_remove-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_spot_remove-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_square_samples-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_square_samples-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_stat_quantities-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_stat_quantities-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_stitch-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_stitch-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_straighten_path-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_straighten_path-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_subscript-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_subscript-20.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_superscript-20.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_superscript-20.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_anneal-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_anneal-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_ballistic_deposition-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_ballistic_deposition-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_brownian_motion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_brownian_motion-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_columnar-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_columnar-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_diffusion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_diffusion-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_discs-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_discs-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_domains-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_domains-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_dunes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_dunes-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_fibres-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_fibres-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_lattice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_lattice-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_line_noise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_line_noise-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_noise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_noise-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_objects-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_objects-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_particles-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_particles-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_pattern-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_pattern-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_phases-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_phases-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_pileup-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_pileup-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_spectral-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_spectral-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_turing_pattern-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_turing_pattern-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_synthetic_waves-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_synthetic_waves-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_terrace_measure-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_terrace_measure-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tilt-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tilt-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_dilation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_dilation-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_erosion-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_erosion-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_estimation-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_estimation-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_indent_analyze-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_indent_analyze-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_lateral_force-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_lateral_force-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_map-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_map-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_model-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_model-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_tip_pid-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_tip_pid-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_unrotate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_unrotate-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_value_invert-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_value_invert-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_arithmetic-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_arithmetic-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_calibrate-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_calibrate-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_dimensions-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_dimensions-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_fd-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_fd-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_invert-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_invert-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_kmeans-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_kmeans-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_kmedians-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_kmedians-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_line_stats-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_line_stats-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_plane_stats-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_plane_stats-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_slice-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_slice-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volume_swap_axes-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volume_swap_axes-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volumize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volumize-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_volumize_layers-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_volumize_layers-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_wrap_value-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_wrap_value-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_xy_denoise-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_xy_denoise-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_xyzize-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_xyzize-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zero_maximum-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zero_maximum-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zero_mean-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zero_mean-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zoom_1_1-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zoom_1_1-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zoom_fit-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zoom_fit-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zoom_in-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zoom_in-24.png differ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/pixmaps/gwy_zoom_out-24.png and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/pixmaps/gwy_zoom_out-24.png differ diff -Nru gwyddion-2.62/pixmaps/Makefile.am gwyddion-2.63/pixmaps/Makefile.am --- gwyddion-2.62/pixmaps/Makefile.am 2022-04-28 15:20:37.000000000 +0000 +++ gwyddion-2.63/pixmaps/Makefile.am 2023-01-10 13:32:19.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 24795 2022-04-28 15:20:36Z yeti-dn $ +# $Id: Makefile.am 25198 2023-01-10 13:32:19Z yeti-dn $ SUBDIRS = src @@ -27,6 +27,7 @@ # Since 2.57: mask_shift profile_multiple # Since 2.59: zero_maximum # Since 2.61: displacement_field grain_bounding_box grain_inscribed_box mask_noisify perspective_distort zero_under_mask +# Since 2.63: graph_period_measure hold_selection_clear hold_selection_replace synthetic_dunes # # If you add new stock icons here # - Add them to a `Since' line above (one Gwyddion version = one line). @@ -144,12 +145,15 @@ gwy_graph_pointer-24.png \ gwy_graph_ruler-24.png \ gwy_graph_statistics-24.png \ + gwy_graph_period_measure-24.png \ gwy_graph_terrace_measure-24.png \ gwy_graph_vertical-24.png \ gwy_graph_zoom_fit-24.png \ gwy_graph_zoom_in-24.png \ gwy_graph_zoom_out-24.png \ gwy_hough-24.png \ + gwy_hold_selection_clear-18.png \ + gwy_hold_selection_replace-18.png \ gwy_immerse-24.png \ gwy_iso_roughness-24.png \ gwy_image_relation-24.png \ @@ -260,6 +264,7 @@ gwy_synthetic_diffusion-24.png \ gwy_synthetic_discs-24.png \ gwy_synthetic_domains-24.png \ + gwy_synthetic_dunes-24.png \ gwy_synthetic_fibres-24.png \ gwy_synthetic_lattice-24.png \ gwy_synthetic_line_noise-24.png \ @@ -771,6 +776,11 @@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_palette-24.png" "gwy_graph_palette-24.crush.png" if test -s "gwy_graph_palette-24.crush.png"; then mv -f "gwy_graph_palette-24.crush.png" "gwy_graph_palette-24.png"; fi +gwy_graph_period_measure-24.png: $(srcdir)/src/gwy_graph_period_measure-24.svg + DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_graph_period_measure-24.png" "$(srcdir)/src/gwy_graph_period_measure-24.svg" + $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_period_measure-24.png" "gwy_graph_period_measure-24.crush.png" + if test -s "gwy_graph_period_measure-24.crush.png"; then mv -f "gwy_graph_period_measure-24.crush.png" "gwy_graph_period_measure-24.png"; fi + gwy_graph_pointer-24.png: $(srcdir)/src/gwy_graph_pointer-24.svg DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_graph_pointer-24.png" "$(srcdir)/src/gwy_graph_pointer-24.svg" $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_pointer-24.png" "gwy_graph_pointer-24.crush.png" @@ -811,6 +821,16 @@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_zoom_out-24.png" "gwy_graph_zoom_out-24.crush.png" if test -s "gwy_graph_zoom_out-24.crush.png"; then mv -f "gwy_graph_zoom_out-24.crush.png" "gwy_graph_zoom_out-24.png"; fi +gwy_hold_selection_clear-18.png: $(srcdir)/src/gwy_hold_selection_clear-18.svg + DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=18 --export-height=18 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hold_selection_clear-18.png" "$(srcdir)/src/gwy_hold_selection_clear-18.svg" + $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hold_selection_clear-18.png" "gwy_hold_selection_clear-18.crush.png" + if test -s "gwy_hold_selection_clear-18.crush.png"; then mv -f "gwy_hold_selection_clear-18.crush.png" "gwy_hold_selection_clear-18.png"; fi + +gwy_hold_selection_replace-18.png: $(srcdir)/src/gwy_hold_selection_replace-18.svg + DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=18 --export-height=18 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hold_selection_replace-18.png" "$(srcdir)/src/gwy_hold_selection_replace-18.svg" + $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hold_selection_replace-18.png" "gwy_hold_selection_replace-18.crush.png" + if test -s "gwy_hold_selection_replace-18.crush.png"; then mv -f "gwy_hold_selection_replace-18.crush.png" "gwy_hold_selection_replace-18.png"; fi + gwy_hough-24.png: $(srcdir)/src/gwy_hough-24.svg DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hough-24.png" "$(srcdir)/src/gwy_hough-24.svg" $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hough-24.png" "gwy_hough-24.crush.png" @@ -1366,6 +1386,11 @@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_domains-24.png" "gwy_synthetic_domains-24.crush.png" if test -s "gwy_synthetic_domains-24.crush.png"; then mv -f "gwy_synthetic_domains-24.crush.png" "gwy_synthetic_domains-24.png"; fi +gwy_synthetic_dunes-24.png: $(srcdir)/src/gwy_synthetic_dunes-24.svg + DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_synthetic_dunes-24.png" "$(srcdir)/src/gwy_synthetic_dunes-24.svg" + $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_dunes-24.png" "gwy_synthetic_dunes-24.crush.png" + if test -s "gwy_synthetic_dunes-24.crush.png"; then mv -f "gwy_synthetic_dunes-24.crush.png" "gwy_synthetic_dunes-24.png"; fi + gwy_synthetic_fibres-24.png: $(srcdir)/src/gwy_synthetic_fibres-24.svg DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_synthetic_fibres-24.png" "$(srcdir)/src/gwy_synthetic_fibres-24.svg" $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_fibres-24.png" "gwy_synthetic_fibres-24.crush.png" diff -Nru gwyddion-2.62/pixmaps/Makefile.in gwyddion-2.63/pixmaps/Makefile.in --- gwyddion-2.62/pixmaps/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/pixmaps/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 24795 2022-04-28 15:20:36Z yeti-dn $ +# $Id: Makefile.am 25198 2023-01-10 13:32:19Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -416,6 +416,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -500,6 +502,7 @@ # Since 2.57: mask_shift profile_multiple # Since 2.59: zero_maximum # Since 2.61: displacement_field grain_bounding_box grain_inscribed_box mask_noisify perspective_distort zero_under_mask +# Since 2.63: graph_period_measure hold_selection_clear hold_selection_replace synthetic_dunes # # If you add new stock icons here # - Add them to a `Since' line above (one Gwyddion version = one line). @@ -617,12 +620,15 @@ gwy_graph_pointer-24.png \ gwy_graph_ruler-24.png \ gwy_graph_statistics-24.png \ + gwy_graph_period_measure-24.png \ gwy_graph_terrace_measure-24.png \ gwy_graph_vertical-24.png \ gwy_graph_zoom_fit-24.png \ gwy_graph_zoom_in-24.png \ gwy_graph_zoom_out-24.png \ gwy_hough-24.png \ + gwy_hold_selection_clear-18.png \ + gwy_hold_selection_replace-18.png \ gwy_immerse-24.png \ gwy_iso_roughness-24.png \ gwy_image_relation-24.png \ @@ -733,6 +739,7 @@ gwy_synthetic_diffusion-24.png \ gwy_synthetic_discs-24.png \ gwy_synthetic_domains-24.png \ + gwy_synthetic_dunes-24.png \ gwy_synthetic_fibres-24.png \ gwy_synthetic_lattice-24.png \ gwy_synthetic_line_noise-24.png \ @@ -1600,6 +1607,11 @@ @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_palette-24.png" "gwy_graph_palette-24.crush.png" @MAINTAINER_MODE_TRUE@ if test -s "gwy_graph_palette-24.crush.png"; then mv -f "gwy_graph_palette-24.crush.png" "gwy_graph_palette-24.png"; fi +@MAINTAINER_MODE_TRUE@gwy_graph_period_measure-24.png: $(srcdir)/src/gwy_graph_period_measure-24.svg +@MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_graph_period_measure-24.png" "$(srcdir)/src/gwy_graph_period_measure-24.svg" +@MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_period_measure-24.png" "gwy_graph_period_measure-24.crush.png" +@MAINTAINER_MODE_TRUE@ if test -s "gwy_graph_period_measure-24.crush.png"; then mv -f "gwy_graph_period_measure-24.crush.png" "gwy_graph_period_measure-24.png"; fi + @MAINTAINER_MODE_TRUE@gwy_graph_pointer-24.png: $(srcdir)/src/gwy_graph_pointer-24.svg @MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_graph_pointer-24.png" "$(srcdir)/src/gwy_graph_pointer-24.svg" @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_pointer-24.png" "gwy_graph_pointer-24.crush.png" @@ -1640,6 +1652,16 @@ @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_graph_zoom_out-24.png" "gwy_graph_zoom_out-24.crush.png" @MAINTAINER_MODE_TRUE@ if test -s "gwy_graph_zoom_out-24.crush.png"; then mv -f "gwy_graph_zoom_out-24.crush.png" "gwy_graph_zoom_out-24.png"; fi +@MAINTAINER_MODE_TRUE@gwy_hold_selection_clear-18.png: $(srcdir)/src/gwy_hold_selection_clear-18.svg +@MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=18 --export-height=18 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hold_selection_clear-18.png" "$(srcdir)/src/gwy_hold_selection_clear-18.svg" +@MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hold_selection_clear-18.png" "gwy_hold_selection_clear-18.crush.png" +@MAINTAINER_MODE_TRUE@ if test -s "gwy_hold_selection_clear-18.crush.png"; then mv -f "gwy_hold_selection_clear-18.crush.png" "gwy_hold_selection_clear-18.png"; fi + +@MAINTAINER_MODE_TRUE@gwy_hold_selection_replace-18.png: $(srcdir)/src/gwy_hold_selection_replace-18.svg +@MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=18 --export-height=18 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hold_selection_replace-18.png" "$(srcdir)/src/gwy_hold_selection_replace-18.svg" +@MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hold_selection_replace-18.png" "gwy_hold_selection_replace-18.crush.png" +@MAINTAINER_MODE_TRUE@ if test -s "gwy_hold_selection_replace-18.crush.png"; then mv -f "gwy_hold_selection_replace-18.crush.png" "gwy_hold_selection_replace-18.png"; fi + @MAINTAINER_MODE_TRUE@gwy_hough-24.png: $(srcdir)/src/gwy_hough-24.svg @MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_hough-24.png" "$(srcdir)/src/gwy_hough-24.svg" @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_hough-24.png" "gwy_hough-24.crush.png" @@ -2195,6 +2217,11 @@ @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_domains-24.png" "gwy_synthetic_domains-24.crush.png" @MAINTAINER_MODE_TRUE@ if test -s "gwy_synthetic_domains-24.crush.png"; then mv -f "gwy_synthetic_domains-24.crush.png" "gwy_synthetic_domains-24.png"; fi +@MAINTAINER_MODE_TRUE@gwy_synthetic_dunes-24.png: $(srcdir)/src/gwy_synthetic_dunes-24.svg +@MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_synthetic_dunes-24.png" "$(srcdir)/src/gwy_synthetic_dunes-24.svg" +@MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_dunes-24.png" "gwy_synthetic_dunes-24.crush.png" +@MAINTAINER_MODE_TRUE@ if test -s "gwy_synthetic_dunes-24.crush.png"; then mv -f "gwy_synthetic_dunes-24.crush.png" "gwy_synthetic_dunes-24.png"; fi + @MAINTAINER_MODE_TRUE@gwy_synthetic_fibres-24.png: $(srcdir)/src/gwy_synthetic_fibres-24.svg @MAINTAINER_MODE_TRUE@ DISPLAY=; unset DISPLAY; $(INKSCAPE_EXPORT) --export-width=24 --export-height=24 $(INKSCAPE_EXPORT_PNGFILE)="gwy_synthetic_fibres-24.png" "$(srcdir)/src/gwy_synthetic_fibres-24.svg" @MAINTAINER_MODE_TRUE@ $(PNGCRUSH) $(PNGCRUSH_SILENCE) -brute "gwy_synthetic_fibres-24.png" "gwy_synthetic_fibres-24.crush.png" diff -Nru gwyddion-2.62/pixmaps/src/gwy_graph_period_measure-24.svg gwyddion-2.63/pixmaps/src/gwy_graph_period_measure-24.svg --- gwyddion-2.62/pixmaps/src/gwy_graph_period_measure-24.svg 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/gwy_graph_period_measure-24.svg 2023-01-10 13:27:23.000000000 +0000 @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gwyddion-2.62/pixmaps/src/gwy_hold_selection_clear-18.svg gwyddion-2.63/pixmaps/src/gwy_hold_selection_clear-18.svg --- gwyddion-2.62/pixmaps/src/gwy_hold_selection_clear-18.svg 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/gwy_hold_selection_clear-18.svg 2022-12-16 13:23:33.000000000 +0000 @@ -0,0 +1,106 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -Nru gwyddion-2.62/pixmaps/src/gwy_hold_selection_replace-18.svg gwyddion-2.63/pixmaps/src/gwy_hold_selection_replace-18.svg --- gwyddion-2.62/pixmaps/src/gwy_hold_selection_replace-18.svg 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/gwy_hold_selection_replace-18.svg 2022-12-16 13:09:52.000000000 +0000 @@ -0,0 +1,124 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff -Nru gwyddion-2.62/pixmaps/src/gwy_synthetic_dunes-24.svg gwyddion-2.63/pixmaps/src/gwy_synthetic_dunes-24.svg --- gwyddion-2.62/pixmaps/src/gwy_synthetic_dunes-24.svg 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/gwy_synthetic_dunes-24.svg 2022-12-19 09:52:22.000000000 +0000 @@ -0,0 +1,100 @@ + + + +image/svg+xml diff -Nru gwyddion-2.62/pixmaps/src/Makefile.am gwyddion-2.63/pixmaps/src/Makefile.am --- gwyddion-2.62/pixmaps/src/Makefile.am 2022-04-28 15:20:37.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/Makefile.am 2023-01-10 13:32:19.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am 24795 2022-04-28 15:20:36Z yeti-dn $ +# $Id: Makefile.am 25198 2023-01-10 13:32:19Z yeti-dn $ svg_sources = \ cd_line.svg \ @@ -94,11 +94,14 @@ gwy_graph_pointer-24.svg \ gwy_graph_ruler-24.svg \ gwy_graph_statistics-24.svg \ + gwy_graph_period_measure-24.svg \ gwy_graph_terrace_measure-24.svg \ gwy_graph_vertical-24.svg \ gwy_graph_zoom_fit-24.svg \ gwy_graph_zoom_in-24.svg \ gwy_graph_zoom_out-24.svg \ + gwy_hold_selection_clear-18.svg \ + gwy_hold_selection_replace-18.svg \ gwy_hough-24.svg \ gwy_immerse-24.svg \ gwy_iso_roughness-24.svg \ @@ -209,6 +212,7 @@ gwy_synthetic_diffusion-24.svg \ gwy_synthetic_discs-24.svg \ gwy_synthetic_domains-24.svg \ + gwy_synthetic_dunes-24.svg \ gwy_synthetic_fibres-24.svg \ gwy_synthetic_lattice-24.svg \ gwy_synthetic_line_noise-24.svg \ diff -Nru gwyddion-2.62/pixmaps/src/Makefile.in gwyddion-2.63/pixmaps/src/Makefile.in --- gwyddion-2.62/pixmaps/src/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/pixmaps/src/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 24795 2022-04-28 15:20:36Z yeti-dn $ +# $Id: Makefile.am 25198 2023-01-10 13:32:19Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -329,6 +329,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -481,11 +483,14 @@ gwy_graph_pointer-24.svg \ gwy_graph_ruler-24.svg \ gwy_graph_statistics-24.svg \ + gwy_graph_period_measure-24.svg \ gwy_graph_terrace_measure-24.svg \ gwy_graph_vertical-24.svg \ gwy_graph_zoom_fit-24.svg \ gwy_graph_zoom_in-24.svg \ gwy_graph_zoom_out-24.svg \ + gwy_hold_selection_clear-18.svg \ + gwy_hold_selection_replace-18.svg \ gwy_hough-24.svg \ gwy_immerse-24.svg \ gwy_iso_roughness-24.svg \ @@ -596,6 +601,7 @@ gwy_synthetic_diffusion-24.svg \ gwy_synthetic_discs-24.svg \ gwy_synthetic_domains-24.svg \ + gwy_synthetic_dunes-24.svg \ gwy_synthetic_fibres-24.svg \ gwy_synthetic_lattice-24.svg \ gwy_synthetic_line_noise-24.svg \ diff -Nru gwyddion-2.62/plugins/Makefile.in gwyddion-2.63/plugins/Makefile.in --- gwyddion-2.62/plugins/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/plugins/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -357,6 +357,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/cs.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/cs.gmo differ diff -Nru gwyddion-2.62/po/cs.po gwyddion-2.63/po/cs.po --- gwyddion-2.62/po/cs.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/cs.po 2023-06-13 13:20:08.000000000 +0000 @@ -1,10 +1,10 @@ -# @(#) $Id: cs.po 25102 2022-10-19 08:43:48Z yeti-dn $ +# @(#) $Id: cs.po 25359 2023-05-24 09:39:33Z yeti-dn $ msgid "" msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" -"PO-Revision-Date: 2022-10-19 10:43+0200\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" +"PO-Revision-Date: 2023-05-24 11:39+0200\n" "Last-Translator: Yeti \n" "Language-Team: Czech\n" "Language: cs\n" @@ -145,9 +145,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -163,7 +163,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Nepojmenovaný" @@ -289,39 +289,39 @@ msgid "Resource directory cannot be created." msgstr "Nelze vytvořit adresář se zdroji." -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Ano" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "Ne" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(pevný)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "stupňů" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -391,8 +391,8 @@ msgid "Maximum value" msgstr "Největší hodnota" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Střední hodnota" @@ -417,11 +417,11 @@ msgid "Pixel area" msgstr "Plocha v pixelech" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Projektovaná plocha" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Plocha povrchu" @@ -523,13 +523,13 @@ msgid "Direction of maximum Martin diameter" msgstr "Směr největšího Martinova průměru" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "θ sklonu" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "φ sklonu" @@ -545,11 +545,11 @@ msgid "Curvature center z value" msgstr "Hodnota ve středu křivosti" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Křivost 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Křivost 2" @@ -582,14 +582,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Poloha" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Hodnota" @@ -599,7 +599,7 @@ msgstr "Plocha" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Objem" @@ -612,7 +612,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Sklon" @@ -669,12 +669,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Vodorovný" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Svislý" @@ -715,12 +715,12 @@ msgstr "Frekvenčně a lokálně adaptabilní" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Zaokrouhlení" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Lineární" @@ -1296,7 +1296,7 @@ msgid "Hide full controls" msgstr "Skryj kompletní ovládací prvky" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Základní" @@ -1347,12 +1347,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1361,7 +1361,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1371,20 +1371,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1436,11 +1437,11 @@ msgstr "θ s_větla:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1463,7 +1464,7 @@ msgid "Maximum z value" msgstr "Největší hodnota z" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "Pop_isek:" @@ -1553,7 +1554,7 @@ msgstr "Skrytý" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Body" @@ -1610,7 +1611,7 @@ msgid "_Line type:" msgstr "Typ čá_ry:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "T_loušťka čáry:" @@ -1631,7 +1632,7 @@ msgid "Diamond" msgstr "Kosočtverec" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Kříž" @@ -1705,7 +1706,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Mód" @@ -1741,8 +1742,8 @@ msgstr "Vodorovná osa" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Graf" @@ -1750,7 +1751,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Data" @@ -1789,12 +1790,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Délka" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1802,7 +1803,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Výška" @@ -1829,8 +1830,8 @@ msgstr "Upřednostňovaný" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Jméno" @@ -1867,12 +1868,12 @@ msgid "A_dd symbol" msgstr "_Přidat symbol" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Náhled" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Soubor nelze otevřít pro čtení: %s." @@ -2031,35 +2032,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Střední hodnota" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Minimum" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Maximum" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Min. poloha" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Max. poloha" @@ -2069,7 +2070,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2093,41 +2095,41 @@ msgid "Change Curve Map Preview" msgstr "Změnit náhled mapy křivek" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Neznámý kanál %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Neznámá objemová data %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "Neznámá XYZ data %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, c-format msgid "Unknown curve map %d" msgstr "Neznámá mapa křivek %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Z úrovně: %d, Z jednotky: %s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Počet bodů: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 msgid "Curves:" msgstr "Křivky:" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "Segmenty:" @@ -2192,11 +2194,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "_Aktualizovat" @@ -2253,7 +2255,7 @@ msgid "Open File" msgstr "Otevření souboru" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2403,64 +2405,64 @@ msgid "Cannot preview" msgstr "Náhled není možný" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "Sekce %s skončila na řádku %u, ale nikdy nezačala." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "Sekce %s skončila na řádku %u namísto %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "Sekce %s začala na řádku %u dříve, než %s skončila." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Prázdné jméno sekce v hlavičce na řádku %u." -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "Na řádku %u hlavičky chybí prefix %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "Na řádku %u hlavičky schází oddělovač klíče a hodnoty." -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "Klíč na řádku %u je prázdný." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" "Hlavička neočekávaně skončila na řádku %u; chybí značka konce hlavičky." #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Vodorovný rozměr" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Svislý rozměr" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "Č_tvercový obrázek" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2470,7 +2472,7 @@ msgstr "Šířk_a" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2487,20 +2489,20 @@ msgstr "_Výška" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 msgid "_Square pixels" msgstr "Č_tvercové pixely" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 msgid "_Dimensions unit" msgstr "Jednotky roz_měrů" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 msgid "_Value unit" msgstr "Jednotky _hodnot" @@ -2514,21 +2516,22 @@ msgstr "_Začít ze současného obrázku" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Rozlišení" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Fyzické rozměry" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Jednotky" @@ -2547,28 +2550,28 @@ msgid "Generated" msgstr "Generovaný" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Do souboru nelze zapisovat: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "%s: Rozměry a hodnota musejí být tatáž fyzikální veličina." -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: Data musejí být čtvercová." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Chybí modul vrstvy." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2577,31 +2580,31 @@ "Tento nástroj potřebuje vrstvu typu %s, které se nezdá být nainstalována. " "Prosím zkontroluj instalaci." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Smazat vybrané objekty." #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Počátek" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Velikost" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Šířka" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "Uložit výsledky do souboru" @@ -2661,7 +2664,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "cs" @@ -2682,7 +2685,7 @@ msgid "_Close" msgstr "_Zavřít" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Typ" @@ -2690,11 +2693,11 @@ msgid "Function" msgstr "Funkce" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parametry" @@ -2750,8 +2753,8 @@ msgid "_New" msgstr "_Nový" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Smazat" @@ -2769,92 +2772,115 @@ msgid "Save Metadata" msgstr "Uložit metadata" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "_Maskování" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "Typ _interpolace" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "S_měr" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "Zkombinovat s existující maskou" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "Typ _okénkové funkce" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "_Typ vzdálenosti" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "_Typ grafu" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "Okamžité _aktualizace" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Znáhodn_it" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "Barva _masky" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "Cílový _graf" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 msgid "C_urve" msgstr "_Křivka" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "_Segment" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +msgid "Hold selection" +msgstr "Držet výběr" + +#: app/param-def.c:1212 +msgid "Replace existing selection" +msgstr "Nahrazovat existující výběr" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "Nahrazovat existující i prázdným (mazat výběr)" + +#: app/param-def.c:1217 +msgid "_Hold selection" +msgstr "_Držet výběr" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "_Hnízdo náhodných čísel" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "Otevřené skupiny" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "Nový graf" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "až" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Změnit" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_Nové" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Změnit jednotky" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2880,40 +2906,40 @@ msgid "Set selected item as default" msgstr "Nastavit vybranou položku jako výchozí" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Soubor nelze otevřít pro zápis: %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Obsah souboru nelze přečíst: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "Soubor je prázdný." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "Soubor je poškozený, nesedí magická hlavička." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "Soubor je poškozený, selhala deserializace." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Nelze vytvořit adresář pro uživatelské nastavení %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Nelze vytvořit adresář pro uživatelské rozhraní %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Nelze vytvořit adresář pro uživatelské moduly %s: %s" @@ -3035,66 +3061,66 @@ "kterékoli pozdější verze. Plné znění licence najdeš v souboru COPYING v " "balíku se zdrojovým kódem." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "Nebo si přečti licenci na" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licence" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Vlastnosti" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Vývojáři" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Překladatelé" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "Vývoj programu podporuje Český metrologický institut: " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "OpenGL trojrozměrné zobrazení" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "Paralelizace pomocí OpenMP" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "X11 protokol\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Win32 protokol\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Dálkové ovládání" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Rozhraní pro skriptování v Pythonu" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "Vydán %s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "Vývojová verze, sestavena %s" @@ -3733,7 +3759,7 @@ msgstr "Úpr_avy" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Odstranit" @@ -3745,7 +3771,7 @@ msgid "Move _Down" msgstr "Posunout _dolů" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "Šířk_a:" @@ -3806,7 +3832,7 @@ msgid "XYZ Data" msgstr "XYZ data" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Nástroj" @@ -4042,7 +4068,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Metoda" @@ -4055,7 +4081,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "T_yp výstupu" @@ -4146,31 +4172,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/_Jednoduché operace/_Oříznutí" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Oříznout data" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "_Zachovat podélné posunutí" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Detail" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Ořez" @@ -4178,34 +4206,36 @@ msgid "New Dimensions" msgstr "Nové rozměry" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Volby" @@ -4268,7 +4298,7 @@ msgstr "Z-křivka" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Probíhá fitování..." @@ -4368,7 +4398,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "proložení" @@ -4439,49 +4469,54 @@ msgid "Convert FZ to FD Curve" msgstr "Konvertovat FZ křivky na FD" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Medián" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Rozsah" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Šikmost" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "Špičatost" @@ -4507,8 +4542,8 @@ msgstr "_Nastavit náhled" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Veličina" @@ -4516,7 +4551,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "Typ výstupu" @@ -4549,7 +4584,7 @@ msgstr "Reference" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "_Stupeň" @@ -4557,9 +4592,9 @@ msgid "_Show" msgstr "_Ukázat" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplituda" @@ -4584,7 +4619,7 @@ msgid "Remove polynomial background from all curves" msgstr "Odečíst polynomiální pozadí ze všech křivek" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Odstranění polynomiálního pozadí" @@ -4706,12 +4741,12 @@ msgid "Output images" msgstr "Výstupní obrázky" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Zobrazovat" @@ -4744,14 +4779,15 @@ msgid "DMT fit" msgstr "Proložení DMT" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "Výsledky proložení" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Výsledky" @@ -4767,19 +4803,19 @@ msgid "Remove sine background from all curves" msgstr "Odstranit sinusoidální pozadí ze všech křivek" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 msgid "Remove Sine Background" msgstr "Odstranění sinusoidálního pozadí" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Načítá textové soubory Accurex II." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Accurex II textové soubory (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "Hlavičku souboru nelze převést ze znakové sady ISO-8859-1: %s" @@ -4805,52 +4841,52 @@ msgid "AIST-NT files (.aist)" msgstr "AIST-NT soubory (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Načítá datové soubory AL3D Alicona Imaging." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "AL3D soubory Alicona Imaging (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Neplatné číslo roviny %u v tagu ‚%s‘." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "Klíč tagu v hlavičce není ukončen nulovým znakem." -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "Klíč tagu v hlavičce je prázdný." -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "Klíč tagu ‚%s‘ v hlavičce není doplněn nulami." -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "Klíči tagu ‚%s‘ v hlavičce schází ukončení CRLF." -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "Hodnota tagu ‚%s‘ v hlavičce není ukončena nulovým znakem." -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "Hodnota tagu ‚%s‘ v hlavičce není doplněna nulami." -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "Komentáři schází ukončení CRLF." -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "Komentář není ukončen nulovým znakem." @@ -4928,16 +4964,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "FileDescBegin nemá odpovídající FileDescEnd" -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "Špatný počet řádků nebo sloupců hlavičky." -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "Nelze přečíst datové hodnoty na řádku %d." -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "Souřadnice netvoří pravidelnou mřížku." @@ -4949,91 +4985,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "A.P.E. Research DAX soubory (.dax) a APDT soubory (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Načítá datové soubory APE (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "APE soubory (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Exportuje data jako jednoduchou textovou matici." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "Textová matice dat (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Přidat na začátek _informativní komentář" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Použít tečku namísto _desetinné čárky" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "_Zřetězit exporty všech obrázků" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Přesnost" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Export jako text" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Kanál:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Šířka:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Výška:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Jednotky hodnot:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Načítá datové soubory Assing AFM." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Assing AFM soubory (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Načítá ASC soubory Attocube Systems." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Attocube ASCII soubory (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Načítá datové soubory BCR Image Metrology." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "BCR soubory (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "Nepodařilo se převést řetězec z UTF-16." -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Neznámá hlavička souboru: ‚%s‘." @@ -5067,17 +5104,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Burleigh exportovaná data (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "V řádku hlavičky schází dvojtečka." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Načítá Code V soubory s interferogramy." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Soubory s Code V interferogramy (.int)" @@ -5094,18 +5131,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Nebyla nalezena hlavička ‚%s‘ ani ‚%s‘." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "Selhala inicializace zlib (s chybovým kódem %d), nelze rozbalit data." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "Rozbalení komprimovaných dat selhalo s chybovým kódem %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "Nelze rozbalit komprimovaná data. Podpora zlib není zakompilována." @@ -5239,22 +5276,22 @@ msgid "Scan size header field overlaps with data." msgstr "Hlavička velikosti skenu se překrývá s daty." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Soubor nelze číst: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "Nebyl nalezen datový soubor příslušící k `%s'." -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "Soubor je příliš krátký, aby mohl být daného typu." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5263,7 +5300,7 @@ "Soubor není typu %s, je vážně poškozen nebo je to nějaká neznámá verze " "formátu." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5273,21 +5310,21 @@ "skutečná velikost je %u bajtů." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "Komponenta/položka ‚%s‘ souboru je uříznutá." -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "Hlavička souboru je uříznutá." -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Neplatný rozměr pole: %d." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5296,39 +5333,43 @@ "Počet bitů na vzorek %d je neplatný nebo není pro tento formát souboru " "podporován." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Datový typ %d je neplatný či nepodporovaný." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Chybí položka hlavičky `%s'." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "Hodnota parametru `%s' je neplatná nebo nepodporovaná." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Parametr `%s' schází nebo je neplatný." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "Soubor neobsahuje importovatelná data." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "Nekonzistentní struktura jednotlivých spekter." + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "Soubor neobsahuje exportovatelný kanál." -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "Načtení souboru bylo zrušeno uživatelem." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "Chybějící hlavička." @@ -5352,7 +5393,7 @@ msgid "Garbage before first header section." msgstr "Nesmysly před začátkem hlavičky první sekce." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Vadný řádek hlavičky (chybí =)." @@ -5390,8 +5431,8 @@ msgid "FemtoScan SPM files" msgstr "FemtoScan SPM soubory" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Data obrázku jsou mimo soubor." @@ -5477,7 +5518,7 @@ msgid "Following features" msgstr "Sledující povrch" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Š_kála Z" @@ -5507,15 +5548,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Export %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5527,14 +5568,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Načtení %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Počet bodů" @@ -5551,24 +5593,24 @@ msgid "Z-range" msgstr "Z-ový rozsah" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Načítá datové soubory DME GDEF." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "DME GDEF soubory (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "Verze souboru %u.%u není podporována." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "Značka kontrolního bloku není CB, soubor je poškozen." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Neznámý typ proměnné %u." @@ -5600,75 +5642,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "Deserializace dat se podařila, ale výsledkem je neočekávaný objekt %s." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "Nebyl nalezen nezbytný tag %u." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "Adresář TIFFu č. %lu neočekávaně skončil." -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "Datový typ %u BigTIFFu byl nalezen v klasickém TIFFu" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Vyskytly se neplatné posice dat tagů." -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "Reservovaná pole BigTIFFu jsou %u a %u namísto 8 a 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Komprese typu %u není podporována." -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "Nestejné počty bitů na vzorek nejsou podporovány." -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "Planární konfigurace %u není podporována." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Nepodporovaný formát vzorku" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "%s nedokáže otevřít soubor coby soubor ZIP." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Chyba knihovny %s při načítání zip souboru: %s." - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "Konec seznamu souborů" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Nelze zjistit velikost nekomprimovaného souboru." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Obsah souboru nelze přečíst." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Neznámá chyba" @@ -5677,6 +5699,11 @@ msgid "End of file" msgstr "Konec souboru" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "Konec seznamu souborů" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Chyba parametru" @@ -5699,11 +5726,26 @@ msgstr "Chyba knihovny %s při načítání zip souboru: %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "V zip souboru schází soubor %s." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Chyba knihovny %s při načítání zip souboru: %s." + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Nelze zjistit velikost nekomprimovaného souboru." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Obsah souboru nelze přečíst." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Načítá surové datové soubory typu Gwyddion XYZ Field." @@ -5725,50 +5767,54 @@ msgid "Export GXYZF" msgstr "Export jako GXYZF" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Kanál" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "XYZ data" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Načítá soubory v hierarchickém datovém formátu (HDF) verze 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Psi HDF4 soubory (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "Binární hlavička PSI je příliš krátká." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "HDF data s ‚nativním‘ typem nejsou podporována." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "" "Načítá soubory založené na hierarchickém datovém formátu (HDF) verze 5." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "Asylum Research Ergo HDF5 soubory (.h5)" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." -msgstr "Chyba HDF5 knihovny %ld ve funkci %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" +msgstr "Shilps Sciences Lucent HDF5 soubory (.h5)" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "Datová sada %s má %d položek, což neodpovídá rozměrům obrázku %d×%d." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "Chyba HDF5 knihovny %ld ve funkci %s." + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5793,22 +5839,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "TIFF a BigTIFF obrázky s 16bitovou hloubkou (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "_Vodorovný rozměr" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "_Svislý rozměr" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "_Z-škála (na jednotku)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 msgid "Just use _pixels" msgstr "Prostě použít pixely" @@ -5864,12 +5910,12 @@ msgstr "OpenEXR datový typ %u je neplatný či nepodporovaný." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "Chyba při inicializaci knihovny libpng (v %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "Chyba při použití knihovny libpng" @@ -5877,7 +5923,7 @@ msgid "Failed to read image data." msgstr "Nepodařilo se načíst data obrázku" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Kanály" @@ -5886,11 +5932,11 @@ msgid "Pages" msgstr "Strany" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Informace o obrázku" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 msgid "Value Mapping" msgstr "Mapování hodnot" @@ -5920,7 +5966,7 @@ msgstr "Hitachi SEM soubory (.txt + obrázek)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "K hlavičkovému souboru nebyl nalezen odpovídající datový soubor." @@ -5961,105 +6007,105 @@ msgid "Cannot read channel labels." msgstr "Nelze přečíst popisky kanálů." -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "PNG obrázek (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG obrázek (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF obrázek (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Bitmapa Windows či OS2 (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA obrázek (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Vodorov./svis. čáry" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "Kříže" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Elipsy" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Čáry" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Obdélníky" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Mřížka" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Cesta" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "Žád_né" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "_Pravítka" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "_Vložené měřítko" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "Škála _falešných barev" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "Žádný" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "Nahoře" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Podél pravé hrany" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6069,283 +6115,283 @@ "WebP, PPM, TARGA, GIF) obrázků. Export do některých formátů se spoléhá na " "GDK a další knihovny, tudíž se může u různých instalací lišit." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Vybrat barvu" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "Bílá" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Černá" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Velikost pi_xelu:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "Pixelů na pa_lec:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zvětšení" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Výška:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "_Písmo:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "Ve_likost písma" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "Šířka okra_je:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "_Délka značek:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Svázat _velikosti s rozměrem pixelu" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "_Desetinný oddělovač je čárka" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Barvy" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "Barva čar a te_xtu:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "_Transparentní pozadí" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "Barva _pozadí:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Umístění" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "vlevo" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "uprostřed" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "vpravo" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "nahoře" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "dole" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" -msgstr "Příčná škála" +msgstr "Délková škála" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Délka:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "_Vodorovná mezera:" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "_Svislá mezera:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "_Barva:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "Barva obr_ysu:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "Tloušťka obr_ysu:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "O_pacita:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Kreslit čárk_y" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Kreslit _popisek" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "Kreslit text _nad měřítko" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Obraz" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "Typ _interpolace:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Kreslit orá_mování" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Nakreslit _masku" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Kreslit _legendu masky" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Škála hodnot" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Pe_vná přesnost:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Pevný práh pro _kilo:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Název" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Polo_ha:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "_Mezera:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Umístit _jednotky do názvu" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Nakreslit _výběr" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objekty" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" -msgstr "Podélné měřítko" +msgstr "Délkové měřítko" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "_Načíst" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "_Uložit" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Přejmenovat" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "_Jméno předvolby:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Exportovat s 16bitovou hloubkou" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" -msgstr "Příčná škála" +msgstr "Délková škála" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Hodnoty" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Výběr" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Předvolby" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Chyba při použití knihovny cairo: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Uložení pixbufu se nezdařilo: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "Obrázek je příliš velký, než aby šel uložit jako TARGA." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Kr_eslit čísla" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "Délka koncových _značek:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "_Poloměr značky:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Maska" @@ -6365,31 +6411,31 @@ "Neplatná data nalezena na adrese 0x%0x. Soubor je v nějaké neznámé verzi " "formátu." -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Načítá datové soubory SDF Intematixu." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Intematix SDF soubory (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "Množina parametrových tagů je neúplná." -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "hloubka obrázku" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "Načítá a exportuje soubory ISO 28600:2011 SPM data transfer format." -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "ISO 28600:2011 SPM data transfer soubory (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6398,57 +6444,57 @@ "Jsou implementována pouze pravidelná a nepravidelná mapování, ale soubor má " "mapování typu ‚%s‘." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "Seznam ‚%s‘ má %u položek, což se liší od počtu %u daného ‚%s‘." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Soubor skončil při čtení vzorku č. %u z %u." -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "Při čtení vzorku č. %u se narazilo na vadná data." -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Chybí značka konce dat." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "Soubor skončil při čtení vzorku č. %d z %d." -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "Při čtení vzorku č. %d z %d se narazilo na vadná data." -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "Řádek %u neobsahuje povinný popisek ‚%s‘." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Načítá datové soubory JEOL." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "JEOL datové soubory (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "Typ dat je neznámý. Nahlaš ho prosím vývojářům." @@ -6476,38 +6522,38 @@ msgid "File does not contain grid dimensions." msgstr "Soubor neobsahuje rozměry mřížky." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "Prohledávám soubor (%u křivek)..." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Načítám soubory..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "Vytvářím objemová data..." -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Neuniformní číslování bodů a/nebo segmentů není podporováno." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Neuniformní seznamy kanálů nejsou podporovány." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Datový soubor %s byl nalezen namísto očekávaného %s." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "Chybí hlavičkový soubor s nastaveními pro index %u." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Nemohu najít žádný výškový kanál." @@ -6525,11 +6571,11 @@ msgstr "Blok hlavičky %u má neplatnou posici nebo velikost." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Nelze najít blok hlavičky souboru." -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Nelze najít piezo blok hlavičky." @@ -6661,7 +6707,7 @@ msgid "MetroPro files (.dat)" msgstr "MetroPro soubory (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "Hlavička souboru je větší než soubor." @@ -6677,12 +6723,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "MicroProf FRT textové soubory (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "Blok %02x se opakuje." -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "Soubor obsahuje méně než XSize*YSize datových bodů." @@ -6719,32 +6765,32 @@ msgid "Unique id record is too short." msgstr "Záznam unikátního identifikátoru je příliš krátký." -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Načítá datové soubory MI Molecular Imaging." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "PicoView soubory (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Graf spektroskopie" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Načítá datové soubory Aarhus MUL." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Aarhus MUL soubory (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "Číslo obrázku v popisku %u nesouhlasí s číslem %u v indexu." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "Délka popisku %u je větší než 20." @@ -6770,21 +6816,21 @@ msgid "Spectra data starts past the end of file." msgstr "Data spekter začínají za koncem souboru." -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "Profil %u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "F-D spektra" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "I-V spektra" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "I-Z spektra" @@ -6804,7 +6850,7 @@ msgid "Nanonics files (.nan)" msgstr "Nanonics soubory (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6815,7 +6861,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "Hodnota HeaderLength %u se liší od skutečné délky hlavičky %u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "Namísto očekávané značky začátku hlavičky ‚%s‘ bylo nalezeno ‚%s‘." @@ -6836,7 +6882,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Nanonis SXM soubory (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "Hlavička souboru neočekávaně skončila." @@ -6850,12 +6896,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFO neobsahuje očekávané sloupce: %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "Řádek DATA_INFO obsahuje méně než %d položek." -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Schází značka začátku dat \\x1a\\x04." @@ -6887,11 +6933,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "NanoScanTech data (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Načítá datové soubory Digital Instruments Nanoscope II." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope II soubory." @@ -6925,20 +6971,20 @@ "komprimované složky‘ v některých verzích MS Windows, případně jiným přenosem " "souboru, který se pokouší ukládat textové soubory nezávisle na systému." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "Načítám kanály..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Nedaří se analyzovat položku ‚Scan size‘." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Po datovém vzorku č. %u následují nesmysly." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Předčasně ukončený řádek hlavičky." @@ -6958,56 +7004,56 @@ msgid "Nanotop files (.spm)" msgstr "Nanotop soubory (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "" "Načítá soubory network Common Data Form (netCDF) vytvářené programem GXSM." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "GXSM netCDF soubory (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "Proměnná ‚%s‘ ukazuje na neplatná či neexistující data." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "NetCDF záznamy nejsou podporovány." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "Hodnoty datové řady musejí být typu FLOAT." -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "Časové hodnoty musejí být typu DOUBLE." -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "Načítání souborů rychlých skenů není implementováno (zatím)." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "Pořadí časové řady je chybné." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "Soubor neočekávaně skončil uvnitř ‚%s‘." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "Čekal bych pole ‚%s‘ nebo ‚ABSENT‘." -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "Pole ‚%s‘ má nenulový počet prvků, ačkoli není přítomno." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "Více než jedna dimenze je ‚record‘." @@ -7024,7 +7070,7 @@ msgstr "Načítání dat Nano Measuring Machine musí být spuštěno interaktivně." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Vykresluji povrch..." @@ -7032,7 +7078,7 @@ msgid "Import NMM Profile Set" msgstr "Načtení sady NMM profilů" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Informace" @@ -7061,13 +7107,13 @@ msgstr "Zarovnat řádky skenu s osou X." #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "_Vodorovný rozměr:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "_Svislý rozměr:" @@ -7154,17 +7200,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "Položka hlavičky lineskip požaduje více bajtů, než je v souboru." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "Části položky hlavičky %s pro jednotlivé osy nejsou v uvozovkách." -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "Položka hlavičky %s pro jednotlivé osy má příliš mnoho částí." -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "Položka hlavičky %s pro jednotlivé osy má příliš málo částí." @@ -7225,7 +7271,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Pakované Olympus OIR datové soubory (.poir)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "Oddíl typu %u se vyskytl opakovaně." @@ -7297,7 +7344,7 @@ msgid "Header line starts with a colon." msgstr "Řádek hlavičky začíná dvojtečkou." -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "Informace o kanálu neočekávaně skončily." @@ -7331,46 +7378,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Načítá Wyko OPD a ASC soubory." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Wyko OPD soubory (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Wyko exportované ASCII soubory (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "Položka ‚%s‘ zasahuje za konec souboru." -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Struktura obsahuje vnořené adresáře" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Načítá datové soubory ISO 5436-2 OpenGPS .x3p." -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "ISO 5436-2 OpenGPS data (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "Příliš mnoho položek DataList pro dané rozměry matice." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "Soubor main.xml obsahuje několik elementů ‚data‘." #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "Pro osu %2$s je podporován pouze typ %1$s." @@ -7394,7 +7441,7 @@ msgstr "Neplatné zanoření objektů na řádku %u." #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "Blok dat je předčasně ukončený." @@ -7479,36 +7526,36 @@ "JPEG ...). Množina dostupných formátů závisí na dostupných GDK pixbuf " "loaderech." -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Použít" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "_Posun odstínu" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "Pixmap si nezaregistroval typ souboru ‚%s‘." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Nelze získat pixbuf loader: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "Pixbuf loader odmítl data: %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "jako data" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7560,7 +7607,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "Hlavička je příliš krátká (jen %lu bajtů)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "Hlavička spektroskopických dat je příliš krátká (jen %lu bajtů)." @@ -7587,20 +7634,16 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "Neočekávaná JSON struktura: %s by mělo být %s." -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "Nekonzistentní struktura jednotlivých spekter." - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "Parsování JSON selhalo: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 msgid "Reading frame table..." msgstr "Načítám tabulku rámců..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 msgid "Reading curve data..." msgstr "Načítám data křivek..." @@ -7670,59 +7713,59 @@ msgid "Quesant files (.afm)" msgstr "Quesant soubory (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "Předepsán uživatelem" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Bajt se znaménkem" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Bajt bez znaménka" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "16bitové slovo se znaménkem" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "16bitové slovo bez znaménka" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "32bitové slovo se znaménkem" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "32bitové slovo bez znaménka" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "64bitové slovo se znaménkem" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "64bitové slovo bez znaménka" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "Reálné číslo IEEE single" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "Reálné číslo IEEE double" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "Reálné číslo IEEE half" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Reálné číslo Pascalu" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7730,158 +7773,158 @@ "Načítá surové datové soubory, textové i binární, ve formátu specifikovaném " "uživatelem." -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "Surová data" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Libovolné bílé znaky" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "Tabelátor" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Jiný znak" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "_Oddělovač polí" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "Pro neznámé soubory _automaticky nabízet načtení surových dat" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "_Textová data" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "_Binární data" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "Chybějící hodnotu _zastupuje" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "Začít od řá_dku" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "Na každém řádku _přeskočit" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "_Oddělovač polí" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 msgid "Data t_ype" msgstr "T_yp dat" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "Vzor pře_házení bajtů" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "_Začít na pozici" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "_Velikost vzorku" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "Po každém vzorku přes_kočit" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "Po každém řádk_u přeskočit" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "Převrátit b_ity v bajtech" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Převrátit bity ve vzo_rcích" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Vzorky mají z_naménko" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "Načítání surových dat musí být spuštěno interaktivně." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Načtení surových dat" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Formát dat" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Soubor" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "polí" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "bajtů" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bitů" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binární" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Text" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Oddělovač: bílé znaky" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Oddělovač: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Oddělovač: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 msgid "Invalid preset name." msgstr "Neplatný název předvolby." -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -7892,7 +7935,7 @@ "Formát by vyžadoval soubor dlouhý alespoň %lu bajtů, ale délka ‚%s‘ je jen " "%u bajtů." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -7901,46 +7944,46 @@ "Čtení selhalo\n" "Obsah souboru `%s' neodpovídá formátu: %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Příliš málo řádků (%d), než aby šlo začít od pozice %d" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" "Čekal jsem bílé znaky, abych mohl přeskočit další pole v řádku %u, ale " "narazil jsem na ‚%.16s‘" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" "Čekal jsem ‚%c‘, abych mohl přeskočit další pole v řádku %u, ale narazil " "jsem na ‚%.16s‘" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" "Čekal jsem ‚%s‘, abych mohl přeskočit další pole v řádku %u, ale narazil " "jsem na ‚%.16s‘" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Nesmysly ‚%.16s‘ v řádku %u, sloupci %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" "Čekal bych oddělovač ‚%c‘ po datech v řádku %u, sloupci %u, ale narazil jsem " "na ‚%c‘" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -7959,8 +8002,8 @@ msgid "_Title" msgstr "_Název" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Křivka" @@ -8004,36 +8047,36 @@ msgid "Random points order unsupported" msgstr "Náhodné pořadí bodů není podporováno." -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Načítá datové soubory RHK Technology typu SM3." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "RHK SM3 soubory (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "Soubor skončil v hlavičce stránky." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "magická hlavička stránky" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "Soubor skončil v řetězci č. %u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "Soubor skončil v hlavičce dat barev." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "Soubor skončil v datech barev." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Neznámá čára %d" @@ -8046,17 +8089,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "RHK SM4 soubory (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "Seznam objektů v %s je uříznutý." -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "Objekt typu %s je uříznutý." -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Nelze nalézt objekt %s v %s." @@ -8091,7 +8134,7 @@ msgid "data ranges" msgstr "rozsahy dat" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "posun dat" @@ -8167,16 +8210,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Sensofar PLu soubory (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Profil" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Sensofar PLUx soubory (.plux)" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Sensofar PLUx soubory (.plux)" @@ -8188,15 +8231,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Sensolytics textové soubory (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Načítá SPM datové soubory Shimadzu." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Shimadzu soubory" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Nelze přečíst datové hodnoty po %d (z %d)." @@ -8217,31 +8260,31 @@ msgid "SIS files (.sis)" msgstr "SIS soubory (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Blok není blok dokumentu." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Informace o dokumentu jsou příliš krátké." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Informace o parametrech jsou příliš krátké." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Neočekávaný blok obrázku." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "Soubor skončil v bloku obrázku." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "Soubor skončil v bloku kanálu." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "Soubor skončil v místě, kde by měl být další kanál." @@ -8542,31 +8585,31 @@ msgid "Unknown data type `%s'." msgstr "Neznámý typ dat: ‚%s‘." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Exportuje data jako jednoduchý textový XYZ soubor." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "XYZ textová data (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "XYZ data:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Jednotky rozměrů:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Export jako XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Načítá SEM obrázky Carl Zeiss." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Carl Zeiss SEM obrázky (.tif)" @@ -8599,12 +8642,12 @@ msgid "Data line %u does not contain four items." msgstr "Řádek %u neobsahuje čtyři položky." -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Kód jednotek %d je neplatný či nepodporovaný." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "První řádek obsahuje příliš mnoho položek." @@ -8632,9 +8675,8 @@ msgid "Fit Graph" msgstr "Proložení funkce grafem" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "_Křivka grafu:" @@ -8643,28 +8685,18 @@ msgid "F_unction:" msgstr "_Funkce:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Rozsah:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "až" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "Kreslit _celou kružnici" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8716,26 +8748,26 @@ msgid "Results\n" msgstr "Výsledky\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Oříznutí grafu" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "/_Jednoduché operace/_Oříznout..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Extrahovat část grafu do nového" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Oříznutí grafu" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Oříznout _všechny křivky" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Oříznutí grafu" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "DOS spektra" @@ -8791,6 +8823,7 @@ msgstr "Textová vlna Igor Pro" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "Styl" @@ -8815,7 +8848,7 @@ msgstr "Jediná _sloučená vodorovná osa" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Export do textového souboru" @@ -9000,8 +9033,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/_Silové křivky/Převést _FZ křivku na FD..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "_Všechny křivky" @@ -9013,8 +9046,8 @@ msgid "Zero position" msgstr "Nulovat polohu" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 msgid "FD curve" msgstr "FD křivka" @@ -9106,6 +9139,86 @@ msgid "Logscale Transform" msgstr "Logaritmická transformace" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "Vyhodnocuje periodu jednodimenzionálních periodických struktur." + +#: modules/graph/graph_measure_period.c:105 +msgid "/Measure _Features/_Period..." +msgstr "/Měření ú_tvarů/_Perioda..." + +#: modules/graph/graph_measure_period.c:108 +msgid "Measure grating period" +msgstr "Měřit periodu mřížky" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "Uložit parametry" + +#: modules/graph/graph_measure_period.c:126 +msgid "_Subtract background" +msgstr "O_dečíst pozadí" + +#: modules/graph/graph_measure_period.c:127 +msgid "Show _leveled curve" +msgstr "Zobrazit _vyrovnanou křivku" + +#: modules/graph/graph_measure_period.c:166 +msgid "Measure Period" +msgstr "Měření Periody" + +#: modules/graph/graph_measure_period.c:187 +msgid "Fourier Transform" +msgstr "Fourierova transformace" + +#: modules/graph/graph_measure_period.c:189 +msgid "Autocorrelation" +msgstr "Autokorelace" + +#: modules/graph/graph_measure_period.c:191 +msgid "Direct Methods" +msgstr "Přímé metody" + +#: modules/graph/graph_measure_period.c:237 +msgid "Grating Period" +msgstr "Perioda mřížky" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "%{from}v do %{to}v" + +#: modules/graph/graph_measure_period.c:250 +msgid "Simple FFT" +msgstr "Jednoduchá FFT" + +#: modules/graph/graph_measure_period.c:251 +msgid "Refined FFT" +msgstr "Zjemněná FFT" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "Jednoduchá ACF" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "Vícepíková ACF" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Těžiště" + +#: modules/graph/graph_measure_period.c:255 +msgid "Zero crossings" +msgstr "Průsečíky s nulou" + +#: modules/graph/graph_measure_period.c:1050 +msgid "Leveled profile" +msgstr "Vyrovnaný profil" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "Hledá píky na křivkách grafu." @@ -9123,7 +9236,7 @@ msgstr "Význačnost" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Nula" @@ -9155,90 +9268,90 @@ msgid "Graph Peaks" msgstr "Píky na grafu" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "Data + proložení" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Vyrovnaná data" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Odečíst polynomiální pozadí" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/_Silové křivky/Odstranit _polynomiální pozadí..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 msgid "Remove polynomial background from FZ curve" msgstr "Odečítá polynomiální pozadí z FZ křivky" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "Proložit křivku" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 msgid "_Output" msgstr "_Výstup" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 msgid "Fit results" msgstr "Výsledky proložení" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "P0" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "P1" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "P2" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "P3" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "P4" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "P5" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Rozdělení výšek" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Kumul. rozdělení výšek" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Rozdělení úhlů" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Kumul. rozdělení úhlů" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9254,7 +9367,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/_Statistika/Statistické _funkce..." -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Výpočet jednorozměrných statistických funkcí" @@ -9265,14 +9378,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "Pevné ro_zlišení" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Statistické funkce" @@ -9292,110 +9405,99 @@ msgid "pick points" msgstr "význačné body" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 msgid "Remove sine background" msgstr "Odečíst sinusoidální pozadí" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "/_Silové křivky/Odstranit _sinusoidální pozadí..." -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "Odstranit inteferenční efekty z FZ křivky" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "Perioda" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "Posun v Y" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "Počítá jednoduché statistické charakteristiky křivek grafu." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 msgid "/_Statistics/_Statistical Quantities..." msgstr "/_Statistika/Statistické _veličiny..." -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "Spočítat statistiky křivek grafu" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "Uložit parametry" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Statistické veličiny" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "Jednoduché parametry" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "Integrály" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "Statistika grafu" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "%{from}v do %{to}v" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "Rms (Rq)" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "Projektovaná délka" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "Rozvinutá délka" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variace" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "Plocha pod křivkou" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "Kladná plocha" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "Záporná plocha" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "Střední kvadrát" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "Data + polynomy" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9404,202 +9506,194 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Rozdíl" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "Terasy (ideální)" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "Vyrovnaný povrch" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "Polynomiální pozadí" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "Prokládá terasy s polynomiálním pozadím." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "/Měření ú_tvarů/_Terasy..." -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "Proložit terasy s polynomiálním pozadím" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "Nafitovaná výška schodku" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" +msgstr "Detekce nespojitostí" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "Střední kvadratická odchylka" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" +msgstr "_Jádro detekce nespojitostí" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "Neshoda mezi terasami" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" +msgstr "_Práh detekce nespojitostí" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" -msgstr "Počet teras" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" +msgstr "_Rozšíření schodku" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "Proložit terasy" +#: modules/graph/graph_terraces.c:268 +msgid "Minimum terrace _length" +msgstr "Minimální _délka terasy" + +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "_Stupeň polynomu" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "Seznam teras" +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" +msgstr "_Nezávislé výšky" + +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" +msgstr "Vybrat oblas_ti ručně" + +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" +msgstr "Uložit tabulku teras" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 msgid "Output" msgstr "Výstup" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" -msgstr "Průzkum" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "_Jádro detekce nespojitostí:" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" +msgstr "M_inimální stupeň polynomu" -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" -msgstr "_Práh detekce nespojitostí" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" +msgstr "_Maximální stupeň polynomu" -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "_Rozšíření nespojitostí:" - -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "Minimální _délka terasy:" - -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "_Stupeň polynomu:" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" +msgstr "Minimální rozšíření" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" -msgstr "_Nezávislé výšky" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" +msgstr "Maximální rozšíření" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" -msgstr "Detekce nespojitostí" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "Proložit terasy" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "_Zobrazovat:" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "Seznam teras" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "Vybrat oblas_ti ručně" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" +msgstr "Průzkum" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "Výsledek" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "Uložit tabulku teras" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "_Spustit" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "_Stupeň polynomu" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "Nafitovaná výška schodku" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" -msgstr "M_inimální stupeň polynomu:" - -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" -msgstr "_Maximální stupeň polynomu:" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "Střední kvadratická odchylka" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" -msgstr "_Rozšíření schodku" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "Neshoda mezi terasami" -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" -msgstr "Minimální rozšíření:" - -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" -msgstr "Maximální rozšíření:" - -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." -msgstr "Průzkum nelze provést s nezávislými stupni polynomu." +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" +msgstr "Počet teras" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, c-format -msgid "Number of combinations: %u." -msgstr "Počet kombinací: %u." +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "Průzkum nelze provést s nezávislými výškami." -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 msgid "No free parameters are selected." msgstr "Není vybrán žádný volný parametr." -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, c-format +msgid "Number of combinations: %u." +msgstr "Počet kombinací: %u." + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "Segment %u" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "Úroveň %d" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "Prokládání se nezdařilo" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "Nebyly nalezeny žádné vhodné schodky" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "Nebyly nalezeny žádné terasy" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Uložit tabulku" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "Uložit průzkum fitování teras" @@ -9731,7 +9825,7 @@ msgstr "Vyrovnání rovinou" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Zvětšení" @@ -9749,8 +9843,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "_Tloušťka" @@ -9777,7 +9871,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "Používá se maska" @@ -9869,7 +9963,7 @@ msgstr "Generovat obrázek žíháním celulárního mřížkového plynu" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Počet iterací" @@ -9913,8 +10007,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Postupné náhledy" @@ -9926,13 +10020,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Rozměry" @@ -9941,18 +10036,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Generátor" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Parametry simulace" @@ -9963,15 +10060,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "_Jako současný obrázek" @@ -9980,10 +10078,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -9994,8 +10093,9 @@ msgstr "Inicializuje se..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "Běží výpočet..." @@ -10025,7 +10125,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Poloměr" @@ -10065,64 +10165,80 @@ msgid "Arithmetic operations on data" msgstr "Aritmetické operace s daty" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Výraz" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Zadat _jednotky" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "_Pevná náhradní hodnota" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Vypočtený" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Aritmetika" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Výraz:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Operandy" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Převzít jednotky výsledku z dat d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Zadat _jednotky:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Zadat jednotky výsledku explicitně" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "Výraz obsahuje neznámé identifikátory" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Nekompatibilní rozlišení" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" -msgstr "Příčné rozměry jsou nekompatibilní fyzikální veličiny" +msgstr "Rozměry jsou nekompatibilní fyzikální veličiny" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Nekompatibilní fyzické rozměry" @@ -10158,7 +10274,7 @@ "Základní operace, jako překlápěni, inverze hodnot a rotace o násobky 90 " "stupňů." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/_Jednoduché operace/_Inverze hodnoty" @@ -10188,35 +10304,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "_Pokrytí" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "Rozptyl" @@ -10618,27 +10735,30 @@ msgid "Building mesh..." msgstr "Vytváření sítě..." -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "X korekce" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Y korekce" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Z korekce" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "X nejistota" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Y nejistota" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Z nejistota" @@ -10671,6 +10791,7 @@ msgstr "Kalibruje podélné rozměry vzorku nebo rozsah hodnot." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/_Jednoduché operace/_Rozsah a jednotky..." @@ -10753,7 +10874,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "Vytvořit nový obrázek" @@ -10802,10 +10923,6 @@ msgid "Classify" msgstr "Klasifikace" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "_Spustit" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "Maska A" @@ -10970,6 +11087,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 msgid "_Height scale" msgstr "Škála _výšek" @@ -11119,14 +11237,14 @@ msgid "Convolution _kernel" msgstr "Jádro _konvoluce" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Normalizovat jako _integrál" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "Konvoluce" @@ -11160,13 +11278,13 @@ msgstr "Afinní pokřivení" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "_Zpřesnit" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Volby náhledu" @@ -11361,7 +11479,7 @@ msgstr "Přidat _masku s nízkým skóre" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "Prá_h" @@ -11445,13 +11563,13 @@ msgid "Curvature Sections" msgstr "Řezy křivosti" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Profil %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Typ výstupu:" @@ -11551,7 +11669,7 @@ msgid "Deconvolve" msgstr "Dekonvoluce" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "Sigma" @@ -11798,7 +11916,7 @@ #: modules/process/pat_synth.c:2133 modules/process/pat_synth.c:2258 #: modules/process/pat_synth.c:2448 modules/process/pat_synth.c:2593 msgid "_Lateral scale" -msgstr "_Příčná škála" +msgstr "_Délková škála" #: modules/process/displfield.c:168 msgid "_X displacement" @@ -11909,7 +12027,8 @@ msgid "drift" msgstr "drift" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "drift podél x" @@ -11925,6 +12044,42 @@ msgid "rows" msgstr "řádků" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "Generuje obrázky pomocí simulace tvorby písečných dun." + +#: modules/process/dune_synth.c:122 +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/S_yntetická/_Depozice/_Duny..." + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "Generovat obrázek transportem písku" + +#: modules/process/dune_synth.c:145 +msgid "_Minimum step" +msgstr "_Nejmenší krok" + +#: modules/process/dune_synth.c:146 +msgid "Step range" +msgstr "Rozsah kroků" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "Pravděpodobnost _ulpění na podkladu" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "_Pravděpodobnost ulpění na písku" + +#: modules/process/dune_synth.c:149 +msgid "Maximum s_lope" +msgstr "Největší možný sklon" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "Duny" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "Dvourozměrná DWT (diskrétní waveletová transformace)." @@ -12230,7 +12385,7 @@ msgstr "Není vybrána žádná cesta." #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Vzdálenosti" @@ -12255,10 +12410,11 @@ msgstr "Vyrovnání podle plošek" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Vyrovnávání podle plošek..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Zobrazuje, označuje a měří orientaci plošek." @@ -12279,11 +12435,11 @@ msgid "_Number points" msgstr "Číslovat _body" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "Vy_mazat" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "O_značit" @@ -12355,7 +12511,7 @@ msgid "Create _Points" msgstr "Vytvořit _body" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "Uložit vektory plošek" @@ -12364,43 +12520,43 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f deg, φ = %.2f deg" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." msgstr "/Měření ú_tvarů/_Měření plošek..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "Měření úhlů faset" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "Velikost _plošky fasety" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Tolerance" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "Vybrané φ" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "Vybraná ϑ" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "Okamžitě o_značovat fasety" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "Měření faset" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "_Změřit" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "body" @@ -12636,7 +12792,7 @@ msgid "Clear the entire filter mask" msgstr "Vymazat celou masku filtru" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "_Vyplnění" @@ -12656,7 +12812,7 @@ msgid "Zoom:" msgstr "Zvětšení:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Možnosti výstupu" @@ -12725,7 +12881,7 @@ msgid "Triangle" msgstr "Trojúhelník" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "Obdélník" @@ -12773,7 +12929,7 @@ msgstr "Náhodná vlákna" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Tvar" @@ -12804,7 +12960,7 @@ msgstr "Proložený tvar" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Oba" @@ -13062,6 +13218,7 @@ msgstr "Vytvořit _masku" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "_Useknout podíl" @@ -14042,7 +14199,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Opravuje řádkové defekty (převážně experimentální algoritmy)." -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/_Korekce dat/Srovnání s_chodů v řádcích" @@ -14058,31 +14215,31 @@ msgid "Mark lines with inverted sign" msgstr "Označit řádky s otočeným znaménkem" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Polynom" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Medián rozdílů" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Modus" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Lícování" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "Useknutý průměr" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "Useknutý průměr rozdílů" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "Vyrovnávání sklonu podle plošek" @@ -14090,7 +14247,7 @@ msgid "Aligns rows by various methods." msgstr "Vyrovnává řádky pomocí různých metod." -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/_Korekce dat/_Srovnat řádky..." @@ -14126,7 +14283,7 @@ msgid "Steps" msgstr "Schody" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Šrámy" @@ -14135,7 +14292,7 @@ msgstr "Hřebeny" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Naklonění" @@ -14279,7 +14436,7 @@ msgid "_Hessian" msgstr "Hessián" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "_Regularizační parametr" @@ -14304,10 +14461,12 @@ msgstr "Označit data oddělená od ostatních hodnot" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positivní" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negativní" @@ -14442,7 +14601,7 @@ msgid "Two-sided" msgstr "Oboustranná" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Zužovat i od _krajů" @@ -14566,115 +14725,132 @@ msgid "Shift Mask" msgstr "Posunout masku" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "Hledá detail v jiném obrázku pomocí korelace." -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidata/_Korelační hledání..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "Hledat detail pomocí korelace" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "Korelace, surová" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "Korelace, srovnaná" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Korelační skóre" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "Rozdíl hodnot, surový" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "Rozdíl hodnot, srovnaný" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "Rozdíl hodnot, skóre" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Jen fáze" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Vyznačené objekty" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Maxima korelace" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "Korelační _metoda" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Použít _masku" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "_Vykreslit masku" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "_Hledat detail" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "Korelační hledání" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Základní operace s maskou: inverze, odstranění, extrakce." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Maska/_Odstranit masku" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Odstranit masku z dat" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Maska/_Invertovat masku" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Invertovat masku" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Maska/_Extrahovat masku" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "Extrahovat masku do nového obrázku" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "/_Zrna/_Extrahovat čísla" + +#: modules/process/maskops.c:85 +msgid "Extract grain numbers to a new image" +msgstr "Extrahovat čísla zrn do nového obrázku" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Zrna/Odstranit dotýkající se _hran" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Odstranit zrna dotýkající se hran obrázku" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Maska/Z_tenčit" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Ztenčit masku" +#: modules/process/maskops.c:193 +msgid "Grain Numbers" +msgstr "Čísla zrn" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Ořízne neprotínající se oblasti dvou obrázků." @@ -14819,7 +14995,7 @@ msgid "Second image" msgstr "Druhý obrázek" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Průměr" @@ -15177,7 +15353,7 @@ msgid "Use _first mask for all images" msgstr "Použít _první masku pro všechny obrázky" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "_Mód" @@ -15270,8 +15446,8 @@ msgid "Re_initialize" msgstr "Re_inicializuj" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Maska" @@ -15792,6 +15968,65 @@ msgid "Pile Up Shapes" msgstr "Hromadit tvary" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Generovat povrch s oddělenými fázemi." + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/S_yntetická/_Vzory..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Generovat obrázek s doménami" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Maximální šířk_a" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Nejmenší krok" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Rozptyl velikostí" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "Podíl ši_kmé části" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Škálova_t s velikostí:" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "Škála _výšek" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Náhodné roviny" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Generuji vlákna..." + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Provede polynomiální deformaci ve vodorovné rovině." @@ -15852,10 +16087,6 @@ msgid "_Vertical polynomial degree" msgstr "Stupeň _svislého polynomu" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "_Maximální stupeň polynomu" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "S_tejné stupně" @@ -15872,6 +16103,10 @@ msgid "Copy table to clipboard" msgstr "Zkopírovat tabulku do schránky" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Uložit tabulku" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Základní operace s presentacemi: extrakce, odstranění." @@ -16013,8 +16248,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "Přenosová funkce" @@ -16034,7 +16269,7 @@ msgid "Transfer function estimation" msgstr "Odhad přenosové funkce" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Statistika/Odhadnout _přenosovou fukci..." @@ -16042,15 +16277,15 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "Odhadnout přenosovou funkci ze známých dat a ideálního obrazu" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "Regularizovaný filtr" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "Nejmenší čtverce" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "Wienerův filtr" @@ -16058,19 +16293,19 @@ msgid "_Border" msgstr "Okra_j" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "Obrázek je jsou příliš malý." -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "Odhadnout přenosovou funkci" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "_Fitovat sigmu" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "Velikost přenosové funkce" @@ -16086,23 +16321,23 @@ msgid "Transfer Function" msgstr "Přenosová funkce" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "Šířka přenosové funkce" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "Výška přenosové funkce" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "Norma přenosové funkce" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "Norma rozdílu" @@ -16226,7 +16461,7 @@ msgid "Proportion" msgstr "Přímá úměra" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "Posun" @@ -16444,7 +16679,7 @@ msgid "_Assume symmetry" msgstr "Uvažovat _asymetrii" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Otočená data" @@ -16520,23 +16755,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Opravit horizontální šrámy" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Typ šrámů" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "_Tvrdý práh" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "_Měkký práh" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Minimální _délka" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Maximální šířk_a" @@ -16788,14 +17023,6 @@ msgid "Marked terraces" msgstr "Označené terasy" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "_Jádro detekce nespojitostí" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "_Práh detekce nespojitostí" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "Nejmenší _plocha terasy" @@ -16804,22 +17031,6 @@ msgid "Do not _segment, use only mask" msgstr "Nesegmentovat, použít přímo masku" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "M_inimální stupeň polynomu" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "Minimální rozšíření" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "Maximální rozšíření" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "Průzkum nelze provést s nezávislými výškami." - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Omezuje rozsah dat pomocí horního/dolního prahu" @@ -16864,7 +17075,7 @@ msgid "Limit Range" msgstr "Omezit rozsah dat" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "Plný rozsah" @@ -17551,134 +17762,134 @@ msgid "Function written in Python" msgstr "Funkce napsaná v Pythonu" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "Nástroj odhadu autokorelační délky." -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "Žádné" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "Vyrovnání řádků" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Uložení statistických hodnot" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "Autokorelační délka" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "Autokorelační délka T" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "Vztah k velikosti obrázku" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "Vybraná plocha" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i na (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v na (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "Naivní pokles ACF na 1/e" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "Extrapolovaný pokles ACF na 1/e" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "Pokles ACF na nulu" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "Fit PSDF gaussovským modelem" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "Fit PSDF exponenciálním modelem" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "Poměr α = T/L" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "Velikost obrázku měřená v T" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "Nástroj pro odečítání profilů ve vodorovném a/nebo svislém směru." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "Překřížení je v _nule" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "Profily podél os" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "Odečítat vodorovné a/nebo svislé profily" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Profily" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Volby" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "Svislý profile %d" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "Vodorovný profil %d" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Nástroj ořez, ořezává data na menší velikost." -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Nástroj měření vzdálenosti, měří vzdálenosti a úhly." +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "Uložit tabulku vzdáleností" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "Čís_lovat čáry:" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Měření vzdáleností a směrů mezi body" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "Uložit tabulku vzdáleností" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -17737,7 +17948,7 @@ "Nástroj odstraňování zrn, odstraňuje souvislé části masky a/nebo data ležící " "pod ní." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Řešení Laplaceovy rovnice" @@ -17745,7 +17956,7 @@ msgid "Fractal correction" msgstr "Fraktální korekce" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "Směs Laplaceovy a fraktální" @@ -17753,7 +17964,7 @@ msgid "Remove" msgstr "Odstranit" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "Metoda _interpolace" @@ -17765,7 +17976,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Odstranění jednotlivých zrn (spojitých částí masky)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -17773,66 +17984,74 @@ "Nástroj interaktivní nastavení barevného rozsahu, umožňuje vybrat rozsah, na " "nějž se mapuje barevná škála, na datech či histogramu rozdělení výšky." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 msgid "_Start" msgstr "_Počátek" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "_Konec" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "_Přizpůsobovat rozsah barev výběru" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Barevný rozsah" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Natažení rozsahu barev na část dat" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Plný barevný rozsah od minima po maximum" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Explicitně nastavený barevný rozsah" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Automatický barevný rozsah s useknutými konci" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Adaptivní nelineární mapování barev" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "_výchozí" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Rozdělení výšek" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 msgid "Color Mapping" msgstr "Mapování barev" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Podle _maskovaných" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "Podle _nemaskovaných" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Invertovat mapu" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 msgid "Data Range" msgstr "Rozsah dat" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "Nasatavit nulu na minimum mapy barev" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -17841,7 +18060,7 @@ "Nástroj tříbodové vyrovnání, vyrovnává data odečtením roviny proložené třemi " "vybranými body." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "_Poloměr oblasti průměrování" @@ -17861,7 +18080,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Vyrovnání dat proložením roviny třemi zadanými body" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -17869,129 +18088,133 @@ "Nástroj řádkových/sloupcových statistických funkcí: počítá střední hodnoty, " "mediány, maxima, minima, RMS, ..., řádků čí sloupců." -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tg β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Řá_dky" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "S_loupce" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Řádková/sloupcová statistika" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Spočítat řádkové/sloupcové statistické funkce" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "Nástroj editor masky, umožňuje interaktivně přidávat či odstraňovat části " "masky." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "_Tvary" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "_Kreslicí nástroje" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Nastavení masky na výběr" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Přidávání výběru k masce" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Odebírání výběru od masky" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Průnik výběru s maskou" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Obdélníkové tvary" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Eliptické tvary" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Tenké čáry" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Volné kreslení masky" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Volné mazání masky" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Vyplnění souvislých prázdných oblastí maskou" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Odstranění souvislých částí masky" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "_Míra" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "Vyplnit nejen jednoduše souvislé" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "_Zabránit spojení zrn při rozšíření" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "Tenké čáry jsou čtyřčlenně souvislé" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Editor masky" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Upravit masku" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Editor" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Akce" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Rozšíření/zúžení" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Inverze" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "Vyplnit _Díry" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "Rozšíři_t" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "_Zúžit" @@ -18008,103 +18231,107 @@ msgid "Level rows using intersections with given lines" msgstr "Vyrovnat řádky podle průsečíků se zvolenými čárami" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Nástroj profil, vytváří grafy profilů z vybraných úseček." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "Žádná" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "_Oddělit profily" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "_Zobrazit profil" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "_Kalibrační data" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "Odečítat profily podél libovolných čar" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "Zlepšit směr" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "Zlepšit všechny" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "Chyba X %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Chyba Y %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Chyba Z %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "Nejistota X %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Nejistota Y %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Nejistota z %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Nejistota z do %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Nejistota z od %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Nástroj ukazatel, čte hodnotu pod ukazatelem myši." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Zobrazovat _výběr" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "Přizpůsobovat rozsah barev detailu" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Čtení hodnot" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Čtení hodnot pod kursorem myši" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Nastavit _nulu" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Ploška" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Křivosti" @@ -18112,16 +18339,16 @@ msgid "Calculate surface profile parameters." msgstr "Počítá parametry drsnosti profilu." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Textura" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Zvlnění" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Drsnost" @@ -18133,7 +18360,7 @@ msgid "BRC" msgstr "BRC" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Počet peaků" @@ -18145,179 +18372,179 @@ msgid "Calculate roughness parameters" msgstr "Spočítat parametry drsnosti" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Parametry drsnosti" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "Vybraná čára" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "(%{x1}i, %{y1}i) do (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "(%{x1}v, %{y1}v) do (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "Uříznutí" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Střední drsnost" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Střední kvadratická drsnost" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Největší výška drsnosti" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Největší hloubka drsnosti" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Největší výchylka drsnosti" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Střední největší výška drsnosti" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Střední největší hloubka drsnosti" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Střední největší výchylka drsnosti" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "Střední výška třetí největší výchylky oproti třetí největší hloubce" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Střední největší výška profilu" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "Největší hloubka plus výška drsnosti" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Šikmost" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Špičatost" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Střední zvlněnost" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Střední kvadratická zvlněnost" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Největší výška zvlněnosti" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Největší výška profilu" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Prostorové" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "Střední rozestup nerovností profilu" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Střední vlnová délka profilu" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Střední kvadratická vlnová délka profilu" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "Hybridní" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Střední absolutní sklon" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Střední kvadratický sklon" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Rozvinutá délka profilu" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Délkový poměr profilu" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 msgid "parameters|Functional" msgstr "Funkční" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 msgid "Swedish height" msgstr "Švédská výška" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "V obrázku není vybrán žádný profil." -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Funkce rozdělení amplitudy" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "Materiálová poměrná křivka" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Profily" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "Vytváří grafy úhlově zprůměrovaných profilů." -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "Radiální profily" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "Odečítat úhlově zprůměrované profily" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "Radiální profily" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "S_ymetrizovat" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Symetrizovat _vše" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "Radiální profil %d" @@ -18354,7 +18581,7 @@ msgid "_Copy" msgstr "_Kopírovat" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -18364,35 +18591,43 @@ "(rozdělení výšek, korelace, spektrální hustotu, Minkowského funkcionály) " "vybrané části dat." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "Radiální PSDF" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "Úhlové spektrum" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "Radiální ACF" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Minkovského objem" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Minkovského hranice" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Minkovského spojitost" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "Graf škálování plochy" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "IDF" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "Radiální IDF" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "_Oddělit nejistotu" @@ -18420,7 +18655,7 @@ msgid "Spectroscopy" msgstr "Spektroskopie" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -18428,154 +18663,187 @@ "Nástroj odstranění skvrn, interpoluje malé části dat (zobrazené na zvětšeném " "pohledu) vybraným algoritmem." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Hyperbolické zploštění" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Psudolaplaceova interpolace" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Fraktální interpolace" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "Elipsa" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Odstranění skvrn" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Interpoluje malé, ručně označené vady" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "Není vybrán žádný bod obrázku." -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "Není vybrána žádná oblast ve výřezu." -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Statistický nástroj." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Statistické veličiny" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "Momentové" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "Kvantilové" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Hybridní" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "Ostatní" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "Střední hodnota" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "Rms drsnost" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "Rms (po zrnech)" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "Průměrná drsnost" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "Největší výška drsnosti" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "Největší hloubka drsnosti" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "Největší výška plus hloubka" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "Sklon povrchu" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "Neshoda mezi řádky skenu" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "Vložit jednu rovinu do objemových dat" + +#: modules/volume/volume_addframe.c:113 +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/_Jednoduché operace/V_ložit XY rovinu..." + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "Vložit jednu XY rovinu na danou úroveň." + +#: modules/volume/volume_addframe.c:132 +msgid "Data to insert" +msgstr "Vložit data" + +#: modules/volume/volume_addframe.c:170 +msgid "Frame added" +msgstr "Přidána rovina" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "Přidat XY roviny" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "Přidat pře_d současnou rovinu" + +#: modules/volume/volume_addframe.c:224 +msgid "_Replace Current Level" +msgstr "Nahra_dit současnou rovinu" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "Vložit _po současné rovině" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "Jednoduché aritmetické operace s objemovými daty." -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/_Aritmetika..." +#: modules/volume/volume_arithmetic.c:159 +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/_Jednoduché operace/_Aritmetika..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "Aritmetické operace s objemovými daty" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "Kalibrace os Z se liší" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "Exportuje objemová do jednotuchých textových formátů." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Export jako _text..." +#: modules/volume/volume_asciiexport.c:86 +msgid "/_Basic Operations/Export _Text..." +msgstr "/_Jednoduché operace/Export jako _text..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "Export objemových dat do textového souboru" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "VTK strukturovaná mřížka" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "Jeden profil podél Z na řádek" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "Jedna XY vrstva na řádek" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "Matice oddělené prázdnými řádky" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Přesnost:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Objemová data" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "Překalibruje rozměry nebo rozsah hodnot objemových dat." -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Rozsah a jednotky..." - #: modules/volume/volume_calibrate.c:170 msgid "Match voxel size" msgstr "Přizpůsobit velikost voxelu" @@ -18605,7 +18873,7 @@ msgstr "Korekční faktor _hodnot" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "Vytvořit nová objemová data" @@ -18617,13 +18885,74 @@ msgid "Z Dimension" msgstr "Z rozměr" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Korekce dat/Odhad _driftu..." + +#: modules/volume/volume_drift.c:160 +msgid "Estimates drift" +msgstr "Odhadnutý drift" + +#: modules/volume/volume_drift.c:169 +msgid "_Extract drift" +msgstr "_Extrahovat drift" + +#: modules/volume/volume_drift.c:170 +msgid "_Crop data" +msgstr "_Oříznout data" + +#: modules/volume/volume_drift.c:175 +msgid "_Z" +msgstr "_Z" + +#: modules/volume/volume_drift.c:185 +msgid "Show direction" +msgstr "Zobrazit směr" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +msgid "Lateral drift" +msgstr "Vodorovný drift" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "drift podél y" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Z-ový drift" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "drift podél z" + +#: modules/volume/volume_drift.c:279 +msgid "Drift corrected" +msgstr "Drift opraven" + +#: modules/volume/volume_drift.c:330 +msgid "Estimate drift" +msgstr "Odhadnout drift" + +#: modules/volume/volume_drift.c:449 +msgid "Updating z drift data..." +msgstr "Přepočítávání dat Z driftu..." + +#: modules/volume/volume_drift.c:513 +msgid "Updating lateral drift data..." +msgstr "Přepočítávání dat driftu v rovině..." + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "Extrahuje Z souřadnice izoplochy objemových dat do obrázku." #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "/Obrázek _Izoploch..." +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/SPM mód_y/Obrázek _Izoploch..." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -18650,81 +18979,93 @@ msgid "Isosurface z for %.*f %s" msgstr "Izoplocha Z pro %.*f %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "Zobrazuje 3D representaci objemových dat" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/3D zobrazení..." +#: modules/volume/volume_extract.c:197 +msgid "/_Basic Operations/3D View..." +msgstr "/_Jednoduché operace/3D zobrazení..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "Zobrazit objemová data ve 3D" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Objemová data" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "_Vykreslit" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "_Uložit obrázek" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "_Práh drátového modelu" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Škála o_pacity" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "Perspektivní zobrazení" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "Okamžité vykreslení 3D" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "X pohled" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Y pohled" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Z pohled" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "Zatím nebyl vykreslen žádný obrázek" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "Exportovat 3D pohled" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "Chyba Cairo během ukládání obrázku" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "Vytváření drátového modelu..." +#: modules/volume/volume_facetlevel.c:44 +msgid "Performs facet leveling on all XY planes" +msgstr "Vyrovnává všechny XY roginy objemových dat podle plošek." + +#: modules/volume/volume_facetlevel.c:58 +msgid "/_Correct Data/_XY Facet Level" +msgstr "/_Korekce dat/Vyrovnání XY rovin podle p_lošek" + +#: modules/volume/volume_facetlevel.c:62 +msgid "Facet leveling of all XY planes" +msgstr "Vyrovnat všechny XY roviny podle plošek" + +#: modules/volume/volume_facetlevel.c:85 +msgid "Facet leveled" +msgstr "Vyrovnaný podle plošek" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Vyhodnocuje objemová F-D data." #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." -msgstr "/_Vyhodnotit FD data..." +msgid "/SPM M_odes/_Evaluate FD Data..." +msgstr "/SPM mód_y/_Vyhodnotit FD data..." #: modules/volume/volume_fdfit.c:217 msgid "Evaluate force-distance volume data" @@ -18746,10 +19087,6 @@ msgid "Inverts value in volume data" msgstr "Převrací hodnoty v objemových datech" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Inverze hodnoty" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Převrátit hodnoty kolem průměru" @@ -18759,8 +19096,8 @@ msgstr "Počítá K-průměrové shlukování objemových dat." #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." -msgstr "/_K-průměrové shlukování..." +msgid "/_Statistics/_K-Means Clustering..." +msgstr "/_Statistika/_K-průměrové shlukování..." #: modules/volume/volume_kmeans.c:113 msgid "Calculate K-means clustering on volume data" @@ -18823,8 +19160,8 @@ msgstr "Počítá K-mediánové shlukování objemových dat." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." -msgstr "/_K-mediánové shlukování..." +msgid "/_Statistics/_K-Medians Clustering..." +msgstr "/_Statistika/_K-mediánové shlukování..." #: modules/volume/volume_kmedians.c:106 msgid "Calculate K-medians clustering on volume data" @@ -18858,8 +19195,8 @@ msgstr "Vytváří mapu křivek z objemových dat." #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "/Převést na _mapu křivek..." +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/_Jednoduché operace/Převést na _mapu křivek..." #: modules/volume/volume_lawnize.c:103 msgid "Convert to curve map" @@ -18885,13 +19222,29 @@ msgid "Z calibration" msgstr "Kalibrace Z" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "Srovnává řádky ve všech úrovních objemových dat." + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "Srovnat řádky ve všech úrovních." + +#: modules/volume/volume_linelevel.c:227 +msgid "Line leveled" +msgstr "Srovnané řádky" + +#: modules/volume/volume_linelevel.c:265 +msgid "Line level" +msgstr "Syrovnání řádků" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "Souhrnně charakterizuje profily objemových dat do kanálu." #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "/Sumarizovat _profily..." +msgid "/_Statistics/Summarize _Profiles..." +msgstr "/_Statistika/Sumarizovat _profily..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 msgid "Summarize profiles" @@ -18909,9 +19262,36 @@ msgid "Summarize Volume Profiles" msgstr "Sumarizovat profily objemových dat" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/SPM mód_y/_Hrot/_Konvoluce hrotu..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +msgid "_Peak width" +msgstr "Šírka _píku" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Výsledek lokalizace" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Kalibrační křivka osy Z" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." -msgstr "/_Magnetická data na gradient síly..." +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/SPM Mód_y/_Magnetická data na gradient síly..." #: modules/volume/volume_mfmrecalc.c:233 msgid "Recalculated Data" @@ -18942,8 +19322,8 @@ msgstr "Odstraňuje vybočující hodnoty ze všech XY rovin" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/Vybočující hodnoty v _XY rovinách" +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/_Korekce dat/V_ybočující hodnoty v XY rovinách" #: modules/volume/volume_outliers.c:62 msgid "Remove outliers from XY planes" @@ -18954,20 +19334,24 @@ msgstr "Vyrovnává všechny XY roviny." #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/Vyrovnání _XY rovin" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/_Korekce dat/_Vyrovnat XY roviny" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "Vyrovnat všechny XY roviny" +#: modules/volume/volume_planelevel.c:85 +msgid "Leveled" +msgstr "Vyrovnaný" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "Souhrnně charakterizuje roviny objemových dat do grafu." #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." -msgstr "/Sumarizovat ro_viny..." +msgid "/_Statistics/Summarize P_lanes..." +msgstr "/_Statistika/Sumarizovat ro_viny..." #: modules/volume/volume_planestat.c:249 msgid "Summarize planes" @@ -18981,73 +19365,106 @@ msgid "Summarize Volume Planes" msgstr "Sumarizovat roviny objemových dat" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "Počítá objemovou PSF." -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/Odhadnout _přenosovou fukci..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "Odhadnout přenosovou funkci ze známých dat a ideálního obrazu" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "_Ideální odezva:" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Metoda:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "_Sigma:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "Od_hadnout sigma pro každou úroveň" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "Od_hadnout velikost pro každou úroveň" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "Typ _okénkové funkce:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "Úroveň _Z:" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "Sigma nafitována na úrovni Z:" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "Okra_j:" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "_Zobrazovat:" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "Počítám objemovou přenosovou funkci..." -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "Objemová přenosová funkce" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "Úroveň z" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "Odstranit jednu rovinu z objemových dat" + +#: modules/volume/volume_removeframe.c:105 +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/_Jednoduché operace/O_dstranit XY rovinu..." + +#: modules/volume/volume_removeframe.c:109 +msgid "Remove single XY plane" +msgstr "Odstranit jednu XY rovinu" + +#: modules/volume/volume_removeframe.c:125 +msgid "_Extract the plane" +msgstr "Vytvořit o_brázek roviny" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "Odstraněna rovina" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "Extrahovaná rovina (%d)" + +#: modules/volume/volume_removeframe.c:223 +msgid "Remove XY Plane" +msgstr "Odstranit XY rovinu" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "Odstranit současnou _rovinu" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "Přehazuje fázi v souvislých datech podle vyběru uživatele" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." -msgstr "/_Upravit fázi..." +msgid "/SPM M_odes/_Adjust Phase..." +msgstr "/SPM mód_y/_Upravit fázi..." #: modules/volume/volume_rephase.c:168 msgid "Change phase in continuous data" @@ -19098,13 +19515,33 @@ msgid "Volume Z graphs" msgstr "Z-grafy z objemových dat" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "Odstraňuje šrámy ve všech XY rovinách objemových dat" + +#: modules/volume/volume_scars.c:115 +msgid "/_Correct Data/_Scars..." +msgstr "/_Korekce dat/O_značení šrámů..." + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "Odstranit šrámy ve všech XY rovinách" + +#: modules/volume/volume_scars.c:181 +msgid "Scars corrected" +msgstr "Odstraněné šrámy" + +#: modules/volume/volume_scars.c:364 +msgid "Removing scars..." +msgstr "Odstraňování šrámů..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "Extrahuje obrazové roviny a grafy podél os z objemových dat." #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Řezat a _krájet..." +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/_Jednoduché operace/Řezat a _krájet..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19168,6 +19605,26 @@ msgid "Volume Y graphs" msgstr "Y-grafy z objemových dat" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "Perspektivní pokřivení" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Odstraňuje vybočující hodnoty ze všech XY rovin" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Afinní pokřivení" + +#: modules/volume/volume_stepline.c:91 +#, fuzzy +msgid "Step line corrected" +msgstr "Síla mimo kontakt" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "Vývoj jedné hodnoty" @@ -19181,8 +19638,8 @@ msgstr "Kontroluje konsistenci závislosti rozptylového pole." #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "/_Konzistence rozptylového pole..." +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/SPM Mód_y/_Konzistence rozptylového pole..." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -19196,69 +19653,162 @@ msgid "Building stray field dependence..." msgstr "Počtám závislost rozptylového pole..." -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "Prohazuje osy v objemových datech" -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/Změnit _osy..." +#: modules/volume/volume_swaxes.c:96 +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/_Jednoduché operace/Změnit _osy..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "Změnit osy" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X, obrácená" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y, obrácená" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z, obrácená" -#: modules/volume/volume_swaxes.c:175 +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" +msgstr "Současná osa _X se stane" + +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" +msgstr "Současná osa _Y se stane" + +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" +msgstr "Současná osa _Z se stane" + +#: modules/volume/volume_swaxes.c:176 msgid "Swap Volume Axes" msgstr "Vyměnit osy objemových dat" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" -msgstr "Současná osa _X se stane:" - -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" -msgstr "Současná osa _Y se stane:" - -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" -msgstr "Současná osa _Z se stane:" - -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "Kalibrace osy Z bude ztracena." +#: modules/volume/volume_xyarithmetics.c:146 +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Jednoduché aritmetické operace s rovinami objemových dat." + +#: modules/volume/volume_xyarithmetics.c:160 +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/_Jednoduché operace/_XY Aritmetika..." + +#: modules/volume/volume_xyarithmetics.c:164 +msgid "Arithmetic operations on volume and plane data" +msgstr "Aritmetické operace rovinami objemových dat" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "Objemová–rovinová aritmetika" + +#: modules/volume/volume_xyarithmetics.c:323 +msgid "Volume data:" +msgstr "Objemová data:" + +#: modules/volume/volume_xyarithmetics.c:332 +msgid "Images:" +msgstr "Obrázky:" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "Výraz neobsahuje objemová data" + +#: modules/volume/volume_xystitch.c:96 +msgid "Merges all XY planes into XYZ data" +msgstr "Slučuje všechny XY roviny na XYZ data" + +#: modules/volume/volume_xystitch.c:110 +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/SPM mód_y/_XY sešití..." + +#: modules/volume/volume_xystitch.c:114 +msgid "Merge all the XY planes to XYZ data" +msgstr "Sloučit všechny XY roviny na XYZ data" + +#: modules/volume/volume_xystitch.c:129 +msgid "_X offsets graph" +msgstr "Graf posunů v _X" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "Křivka posunů v _X" + +#: modules/volume/volume_xystitch.c:131 +msgid "_Y offsets graph" +msgstr "Graf posunů v _Y" + +#: modules/volume/volume_xystitch.c:132 +msgid "Y o_ffsets curve" +msgstr "Křivka posunů v _Y" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "_Převrátit osu X" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "_Převrátit osu Y" + +#: modules/volume/volume_xystitch.c:135 +msgid "_Adjust shifts" +msgstr "_Upravit posuny..." + +#: modules/volume/volume_xystitch.c:136 +msgid "A_djust rotation" +msgstr "Upravit ro_taci" + +#: modules/volume/volume_xystitch.c:137 +msgid "_Shift range" +msgstr "_Posunout rozsah" + +#: modules/volume/volume_xystitch.c:138 +msgid "_Rotation range" +msgstr "_Rozsah rotace" + +#: modules/volume/volume_xystitch.c:179 +msgid "Stitched" +msgstr "Sešito" + +#: modules/volume/volume_xystitch.c:212 +msgid "XY Stitch" +msgstr "XY sešití" + +#: modules/volume/volume_xystitch.c:214 +msgid "verb|_Stitch" +msgstr "_Sešít" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "Připojuje, extrahuje a odstraňuje kalibraci osy z objemových dat." #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/_Z-Kalibrace..." +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/_Jednoduché operace/_Z-kalibrace..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -19330,8 +19880,8 @@ msgstr "Posouvá hodnoty profilech podél Z, aby byly v definované poloze nula." #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." -msgstr "/Posunout hodnoty do _nuly..." +msgid "/_Correct Data/S_hift Value To Zero..." +msgstr "/_Korekce dat/Posunout hodnoty do _nuly..." #: modules/volume/volume_zposlevel.c:166 msgid "Shift value at some z plane to zero" @@ -19343,13 +19893,29 @@ msgstr "Posunuté do nuly pro Z úroveň %d" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Extrahovat _náhled" +msgid "/_Basic Operations/Extract _Preview" +msgstr "/_Jednoduché operace/Extrahovat _náhled" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "Extrahovat náhled objemových dat do obrázku" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "Jednoduché automatické oříznutí XYZ dat." + +#: modules/xyz/xyz_autocrop.c:60 +msgid "/Crop Automatically" +msgstr "/_Automaticky oříznout" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "Automaticky oříznout data na skenovanou oblast" + +#: modules/xyz/xyz_autocrop.c:90 +msgid "Cropped" +msgstr "Oříznutý" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Analyzuje drift v XYZ datech." @@ -19378,18 +19944,6 @@ msgid "Y drift" msgstr "Y-ový drift" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "drift podél y" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Z-ový drift" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "drift podél z" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Analyzovat XYZ drift" @@ -19630,6 +20184,83 @@ msgid "Merged" msgstr "Sloučený" +#, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Vyrovnávání podle plošek..." + +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/_Korekce dat/_Srovnat řádky..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/_Korekce dat/Srovnání s_chodů v řádcích" + +#~ msgid "_Step detection kernel:" +#~ msgstr "_Jádro detekce nespojitostí:" + +#~ msgid "Step detection _threshold:" +#~ msgstr "_Práh detekce nespojitostí" + +#~ msgid "Step _broadening:" +#~ msgstr "_Rozšíření nespojitostí:" + +#~ msgid "_Polynomial degree:" +#~ msgstr "_Stupeň polynomu:" + +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "M_inimální stupeň polynomu:" + +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "_Maximální stupeň polynomu:" + +#~ msgid "Minimum broadening:" +#~ msgstr "Minimální rozšíření:" + +#~ msgid "Maximum broadening:" +#~ msgstr "Maximální rozšíření:" + +#~ msgid "Survey cannot be run with independent degrees." +#~ msgstr "Průzkum nelze provést s nezávislými stupni polynomu." + +#~ msgid "/_Arithmetic..." +#~ msgstr "/_Aritmetika..." + +#~ msgid "/Export _Text..." +#~ msgstr "/Export jako _text..." + +#~ msgid "_Precision:" +#~ msgstr "_Přesnost:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Rozsah a jednotky..." + +#~ msgid "/3D View..." +#~ msgstr "/3D zobrazení..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Inverze hodnoty" + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/Vybočující hodnoty v _XY rovinách" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/Vyrovnání _XY rovin" + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/Odhadnout _přenosovou fukci..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Řezat a _krájet..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/Změnit _osy..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/_Z-Kalibrace..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Extrahovat _náhled" + #~ msgid "Change unit" #~ msgstr "Změnit jednotky" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/de.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/de.gmo differ diff -Nru gwyddion-2.62/po/de.po gwyddion-2.63/po/de.po --- gwyddion-2.62/po/de.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/de.po 2023-06-13 13:20:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2021-06-11 15:47+0200\n" "Last-Translator: Julian Hofer\n" "Language-Team: deutsch \n" @@ -158,9 +158,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -176,7 +176,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Unbenannt" @@ -305,39 +305,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Ja" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "Nein" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "Grad" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -409,8 +409,8 @@ msgid "Maximum value" msgstr "Maximalwert" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Mittelwert" @@ -438,11 +438,11 @@ msgid "Pixel area" msgstr "Pixel-Fläche" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Projizierte Fläche" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Oberflächen-Flächeninhalt" @@ -554,13 +554,13 @@ msgid "Direction of maximum Martin diameter" msgstr "" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Neigungswinkel θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Neigungswinkel φ" @@ -579,12 +579,12 @@ msgid "Curvature center z value" msgstr "Z-Position des Krümmungszentrums" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 #, fuzzy msgid "Curvature 1" msgstr "Krümmung 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 #, fuzzy msgid "Curvature 2" msgstr "Krümmung 2" @@ -620,14 +620,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Position" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Wert" @@ -637,7 +637,7 @@ msgstr "Fläche" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volumen" @@ -651,7 +651,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Neigung" @@ -709,12 +709,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Horizontal" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Vertikal" @@ -755,12 +755,12 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Linear" @@ -1391,7 +1391,7 @@ msgid "Hide full controls" msgstr "Kontrollelemente ausblenden" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "" @@ -1446,12 +1446,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1460,7 +1460,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1470,20 +1470,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1537,11 +1538,11 @@ msgstr "L_ichtquelle θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1564,7 +1565,7 @@ msgid "Maximum z value" msgstr "Maximaler z-Wert" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "_Beschriftung:" @@ -1660,7 +1661,7 @@ msgstr "Versteckt" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Punkte" @@ -1718,7 +1719,7 @@ msgid "_Line type:" msgstr "_Linientyp:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Linien_dicke:" @@ -1741,7 +1742,7 @@ msgid "Diamond" msgstr "Diamant" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 #, fuzzy msgid "Cross" msgstr "Kreuz" @@ -1827,7 +1828,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Modus" @@ -1866,8 +1867,8 @@ msgstr "" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Graph" @@ -1875,7 +1876,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Daten" @@ -1917,12 +1918,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Länge" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1930,7 +1931,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Höhe" @@ -1959,8 +1960,8 @@ msgstr "Bevorzugt" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Name" @@ -1997,12 +1998,12 @@ msgid "A_dd symbol" msgstr "" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Vorschau" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Datei kann nicht zum Lesen geöffnet werden: %s." @@ -2168,36 +2169,36 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Mittelwert" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Minimum" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Maximum" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 #, fuzzy msgid "Min. position" msgstr "Maximaler z-Wert" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 #, fuzzy msgid "Max. position" @@ -2208,7 +2209,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 #, fuzzy msgid "RMS" msgstr "Quadratmittel" @@ -2237,42 +2239,42 @@ msgid "Change Curve Map Preview" msgstr "Keine Vorschau möglich" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Unbekannter Kanal %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, fuzzy, c-format msgid "Unknown volume %d" msgstr "Unbekannte Linie %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, fuzzy, c-format msgid "Unknown XYZ %d" msgstr "Unbekannte Linie %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "Unbekannte Linie %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, fuzzy, c-format msgid "Points: %d" msgstr "Punkte" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "Kurven" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 #, fuzzy msgid "Segments:" msgstr "Segmentierung" @@ -2342,11 +2344,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "A_ktualisieren" @@ -2394,7 +2396,7 @@ msgid "Open File" msgstr "Datei öffnen" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2550,64 +2552,64 @@ msgid "Cannot preview" msgstr "Keine Vorschau möglich" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "" -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "" -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "" -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "" -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "" -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Horizontale Größe" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Vertikale Größe" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 #, fuzzy msgid "S_quare image" msgstr "Quadrat" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2617,7 +2619,7 @@ msgstr "_Breite" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2634,7 +2636,7 @@ msgstr "_Höhe" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2642,14 +2644,14 @@ msgstr "Quadrat" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "Physische Ausmaße" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2664,21 +2666,22 @@ msgstr "" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Auflösung" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Physische Abmessungen" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Einheiten" @@ -2698,28 +2701,28 @@ msgid "Generated" msgstr "" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Kann nicht in Datei schreiben: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: Datensatz muss quadratisch sein." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Ebenen-Modul fehlt." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2728,32 +2731,32 @@ "Dieses Werkzeug erfordert eine Ebene vom Typ %s, der nicht installiert zu " "sein scheint. Bitte überprüfen Sie Ihre Installation." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 #, fuzzy msgid "Clear selected objects" msgstr "Ausgewählte Elemente löschen" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Ursprung" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Größe" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Breite" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 #, fuzzy msgid "Save Results to File" msgstr "Tabelle in eine Datei speichern" @@ -2813,7 +2816,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "de" @@ -2835,7 +2838,7 @@ msgid "_Close" msgstr "_Schließen" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Typ" @@ -2843,11 +2846,11 @@ msgid "Function" msgstr "F_unktion" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parameter" @@ -2905,8 +2908,8 @@ msgid "_New" msgstr "_Neu" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Löschen" @@ -2924,103 +2927,130 @@ msgid "Save Metadata" msgstr "Metadaten speichern" -#: app/param-def.c:337 +#: app/param-def.c:338 #, fuzzy msgid "_Masking" msgstr "_Maske" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "_Interpolationstyp" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Richtung" -#: app/param-def.c:349 +#: app/param-def.c:350 #, fuzzy msgid "Combine with existing mask" msgstr "Projizierte Fläche" -#: app/param-def.c:353 +#: app/param-def.c:354 #, fuzzy msgid "_Windowing type" msgstr "_Randausblendungsmethode" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 #, fuzzy msgid "_Distance type" msgstr "X Abstand" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "Diagramm_stil" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "_Sofort aktualisieren" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 #, fuzzy msgid "Randomi_ze" msgstr "Fenstergröße" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "_Maskenfarbe" -#: app/param-def.c:875 +#: app/param-def.c:876 #, fuzzy msgid "Target _graph" msgstr "_Graphen zeichnen" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "Kurve" -#: app/param-def.c:1138 +#: app/param-def.c:1139 #, fuzzy msgid "_Segment" msgstr "Segmentierung" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "Auswahl zeigen" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "Anzahl an Körnern" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "_Auswahlmodus:" + +#: app/param-def.c:1251 #, fuzzy msgid "R_andom seed" msgstr "Fenstergröße" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 #, fuzzy msgid "New graph" msgstr "Graph" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +#, fuzzy +msgid "range|to" +msgstr "bis" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Ändern" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 #, fuzzy msgid "seed|_New" msgstr "_Neu" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Einheiten ändern" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 #, fuzzy @@ -3047,40 +3077,40 @@ msgid "Set selected item as default" msgstr "Ausgewähltes Element als Standard setzen" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Datei kann nicht zum Schreiben geöffnet werden: %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Dateiinhalt kann nicht gelesen werden: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "Die Datei ist leer." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "" -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "" -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Kann Benutzer-Konfigurationsverzeichnis nicht anlegen %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, fuzzy, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Kann Benutzer-Konfigurationsverzeichnis nicht anlegen %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Kann Benutzer-Modulverzeichnis nicht anlegen %s: %s" @@ -3205,68 +3235,68 @@ "Lizenzformulierung finden Sie in der Datei COPYING, die im Quellpaket " "enthalten ist." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Lizenz" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Entwickler" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Übersetzer" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "" "Die Entwicklung dieser Software wird unterstützt vom Tschechischen " "Metrologie-Institut: " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "OpenGL 3D-Ansicht" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "X11-Protokoll\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Win32-Protokoll\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Python Skripting-Schnittstelle" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "" @@ -3777,7 +3807,7 @@ msgstr "_Bearbeiten" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Entfernen" @@ -3790,7 +3820,7 @@ msgid "Move _Down" msgstr "Runter" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "_Breite:" @@ -3852,7 +3882,7 @@ msgid "XYZ Data" msgstr "XYZ Daten" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Werkzeug" @@ -4097,7 +4127,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Methode" @@ -4111,7 +4141,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "Ausgabe_art" @@ -4208,32 +4238,34 @@ msgid "/_Basic Operations/_Crop" msgstr "/_Grundfunktionen/_Verkippen..." -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Daten zuschneiden" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 #, fuzzy msgid "Keep lateral offsets" msgstr "Seitlichen Versatz behalten" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Zuschneiden" @@ -4242,34 +4274,36 @@ msgid "New Dimensions" msgstr "Abmessungen" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Optionen" @@ -4339,7 +4373,7 @@ msgstr "Kurve" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "" @@ -4458,7 +4492,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 #, fuzzy msgid "fit" msgstr "Fest" @@ -4536,51 +4570,56 @@ msgid "Convert FZ to FD Curve" msgstr "FD-Kurve fitten" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Median" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Bereich" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 #, fuzzy msgid "Ra" msgstr "Realteil" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 #, fuzzy msgid "Rt" msgstr "Rect" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "" @@ -4610,8 +4649,8 @@ msgstr "Keine Vorschau möglich" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 #, fuzzy msgid "_Quantity" @@ -4620,7 +4659,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 #, fuzzy msgid "Output type" msgstr "Ausgabe_art" @@ -4659,7 +4698,7 @@ msgstr "Differenz" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 #, fuzzy msgid "_Degree" msgstr "_Gleiche Grade" @@ -4669,9 +4708,9 @@ msgid "_Show" msgstr "_Maske anzeigen" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplitude" @@ -4700,7 +4739,7 @@ msgid "Remove polynomial background from all curves" msgstr "Polynomiellen Untergrund entfernen" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Polynomiellen Untergrund entfernen" @@ -4837,12 +4876,12 @@ msgid "Output images" msgstr "Ausgabe_größe" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 #, fuzzy msgid "verb|Display" msgstr "Anzeige" @@ -4879,15 +4918,16 @@ msgid "DMT fit" msgstr "1D FFT-Filter" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 #, fuzzy msgid "Fit Results" msgstr "Fit-Ergebnisse" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 #, fuzzy msgid "Results" msgstr "Ergebnisse\n" @@ -4907,20 +4947,20 @@ msgid "Remove sine background from all curves" msgstr "Diagrammkurven nivellieren" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "Polynomiellen Untergrund entfernen" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Importiert Accurex II Textdateien." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Accurex II Textdateien (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4947,52 +4987,52 @@ msgid "AIST-NT files (.aist)" msgstr "AIST-NT-Dateien (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Importiert Alicona Imaging AL3D Dateien." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Alicona Imaging AL3D Dateien (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Ungültige Ebenen Nummer %u in Tag ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "" -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "" @@ -5075,17 +5115,17 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "" -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 #, fuzzy msgid "Wrong number of header rows or columns." msgstr "Anzahl der Spalten" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -5099,91 +5139,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "Importiert LEXT-Dateien." -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Importiert APE-Dateien (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "APE-Dateien (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Exportiert Daten als einfache ASCII-Matrix." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "ASCII-Datenmatrix (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Genauigkeit" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Text exportieren" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Kanal:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Breite:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Höhe:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Einheiten:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Importiert Assing AFM-Dateien." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Assing AFM-Dateien (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Importiert Attocube Systems ASC-Dateien." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Attocube ASCII-Dateien (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Importiert Image Metrology BCR-Dateien." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "BCR-Dateien (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Unbekannte Dateityp-Kopfzeile: `%s'." @@ -5217,17 +5258,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "" -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Importiert Code V interferogram Dateien." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Code V interferogram Dateien (.int)" @@ -5244,18 +5285,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Weder `%s'- noch `%s'-Kopfzeilen-Feld gefunden." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "" -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" @@ -5390,22 +5431,22 @@ msgid "Scan size header field overlaps with data." msgstr "Kopfzeilen-Feld der Scangröße überlappt mit Daten." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, fuzzy, c-format msgid "Cannot read from file: %s." msgstr "Kann nicht in Datei schreiben: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "Datei ist zu klein, um vom angenommenen Dateityp zu sein." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5414,7 +5455,7 @@ "Die Datei ist keine %s-Datei. Sie ist ernsthaft beschädigt, oder stammt von " "einer unbekannten Format-Version." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, fuzzy, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5424,21 +5465,21 @@ "%u Bytes." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "" -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, fuzzy, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5447,40 +5488,44 @@ "Die Anzahl an Bits pro Abtastung %d ist ungültig oder für diesen Dateityp " "nicht unterstützt." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Der Datentyp %d ist ungültig oder wird nicht unterstützt." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Kopfzeilen-Feld `%s' fehlt." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "Der Wert des Parameters `%s' ist ungültig oder wird nicht unterstützt." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Der Parameter `%s' fehlt oder ist ungültig." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "Die Datei enthält keine (importierbaren) Daten." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "Die Datei enthält keine exportierbaren Kanäle." -#: modules/file/err.h:196 +#: modules/file/err.h:199 #, fuzzy msgid "File import was canceled by user." msgstr "Datei-Import durch Benutzer abgebrochen." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "" @@ -5507,7 +5552,7 @@ msgid "Garbage before first header section." msgstr "Ausschussdaten vor dem ersten Dateikopf-Abschnitt." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "" @@ -5549,8 +5594,8 @@ msgid "FemtoScan SPM files" msgstr "MicroProf FRT-Textdateien (.txt)." -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "" @@ -5642,7 +5687,7 @@ msgid "Following features" msgstr "" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 #, fuzzy msgid "Z scale" msgstr "_Skala" @@ -5678,15 +5723,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5699,14 +5744,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Importiere %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 #, fuzzy msgid "Number of points" @@ -5727,24 +5773,24 @@ msgid "Z-range" msgstr "_X-Bereich" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Importiert DME GDEF-Dateien." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "DME GDEF-Dateien (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, fuzzy, c-format msgid "File version %u.%u is not supported." msgstr "Die Dateiversion %u.%u wird nicht unterstützt." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "" -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Unbekannter Variablentyp %u." @@ -5775,77 +5821,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "" -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "" -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "" -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "" -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -#, fuzzy -msgid "Cannot obtain the uncompressed file size." -msgstr "Temporäre Datei kann nicht gelesen werden: %s." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -#, fuzzy -msgid "Cannot read file contents." -msgstr "Dateiinhalt kann nicht gelesen werden: %s." - #: modules/file/gwyzip.h:184 #, fuzzy msgid "Unknown error" @@ -5855,6 +5879,11 @@ msgid "End of file" msgstr "" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "" + #: modules/file/gwyzip.h:193 #, fuzzy msgid "Parameter error" @@ -5880,11 +5909,28 @@ msgstr "" #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "" +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "" + +#: modules/file/gwyzip.h:703 +#, fuzzy +msgid "Cannot obtain the uncompressed file size." +msgstr "Temporäre Datei kann nicht gelesen werden: %s." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +#, fuzzy +msgid "Cannot read file contents." +msgstr "Dateiinhalt kann nicht gelesen werden: %s." + #: modules/file/gxyzffile.c:112 #, fuzzy msgid "Imports Gwyddion XYZ field files." @@ -5908,50 +5954,54 @@ msgid "Export GXYZF" msgstr "Text exportieren" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Kanal" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "XYZ-Daten" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Importiert Dateien im \" Hierarchical Data Format\" (HDF), Version 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Psi HDF4-Dateien (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "" -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "" -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 #, fuzzy msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Importiert Dateien im \" Hierarchical Data Format\" (HDF), Version 4." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5976,22 +6026,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "_Horizontale Größe" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "_Vertikale Größe" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "_Z-Skalierung (pro Abtast-Einheit)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "Quadrat" @@ -6052,12 +6102,12 @@ msgstr "Der Datentyp %d ist ungültig oder wird nicht unterstützt." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "" @@ -6066,7 +6116,7 @@ msgid "Failed to read image data." msgstr "Die Datei enthält keine (importierbaren) Daten." -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Kanäle" @@ -6076,11 +6126,11 @@ msgid "Pages" msgstr "FFT Imaginärteil" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Bildinformation" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "Wertebereich" @@ -6113,7 +6163,7 @@ msgstr "Hitachi AFM-Dateien (.afm)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" @@ -6154,429 +6204,429 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows- oder OS2-Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 #, fuzzy msgid "Portable document format (.pdf)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 #, fuzzy msgid "Scalable Vector Graphics (.svg)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 #, fuzzy msgid "Horiz./vert. lines" msgstr "Drift-_Linien" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "Kreuze" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Ellipsen" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Linien" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Rechtecke" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 #, fuzzy msgid "Lattice" msgstr "_Linientyp:" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 #, fuzzy msgid "ruler|_None" msgstr "_Keine" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 #, fuzzy msgid "title|None" msgstr "_Keine" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." msgstr "" -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 #, fuzzy msgid "Select Color" msgstr "Kurvenfarbe setzen" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 #, fuzzy msgid "Black" msgstr "Blackman" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 #, fuzzy msgid "Pi_xel size:" msgstr "_Punktgröße:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zoom:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Höhe:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 #, fuzzy msgid "_Font:" msgstr "Schri_ftgröße:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "Schri_ftgröße:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 #, fuzzy msgid "_Border width:" msgstr "S_teigung:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 #, fuzzy msgid "_Tick length:" msgstr "_Länge:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 #, fuzzy msgid "Colors" msgstr "Farbe" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 #, fuzzy msgid "_Transparent background" msgstr "Untergrund e_xtrahieren" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 #, fuzzy msgid "_Background color:" msgstr "Untergrund" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 #, fuzzy msgid "left" msgstr "Links" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 #, fuzzy msgid "center" msgstr "Mitte" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 #, fuzzy msgid "right" msgstr "Rechts" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 #, fuzzy msgid "Lateral scale" msgstr "_Laterale Skala:" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Länge:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 #, fuzzy msgid "Hori_zontal gap:" msgstr "Horizontal" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 #, fuzzy msgid "_Vertical gap:" msgstr "_Vertikal:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 #, fuzzy msgid "Colo_r:" msgstr "Farbe:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 #, fuzzy msgid "O_utline thickness:" msgstr "Linien_dicke:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 #, fuzzy msgid "O_pacity:" msgstr "_Skala:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 #, fuzzy msgid "Draw _ticks" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 #, fuzzy msgid "Draw _label" msgstr "_Beschriftungen anzeigen" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 #, fuzzy msgid "Image" msgstr "FFT Imaginärteil" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "_Interpolationstyp:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 #, fuzzy msgid "Draw _frame" msgstr "_Rahmen anzeigen" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 #, fuzzy msgid "Draw mask _legend" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Werteskala" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 #, fuzzy msgid "Fi_xed precision:" msgstr "_Genauigkeit:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 #, fuzzy msgid "Fixed _kilo threshold:" msgstr "_Weicher Schwellwert:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 #, fuzzy msgid "Title" msgstr "_Titel:" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 #, fuzzy msgid "Posi_tion:" msgstr "Position:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objekte" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 #, fuzzy msgid "Lateral" msgstr "GL-Material" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 #, fuzzy msgid "verb|_Load" msgstr "_Laden" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 #, fuzzy msgid "_Rename" msgstr "_Umbenennen" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 #, fuzzy msgid "Lateral Scale" msgstr "Laterale Skala" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 #, fuzzy msgid "Values" msgstr "Wert" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 #, fuzzy msgid "Selection" msgstr "Richtung:" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "Das Bild ist zu groß, um als TARGA gespeichert zu werden." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 #, fuzzy msgid "Draw _numbers" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 #, fuzzy msgid "Marker _radius:" msgstr "Fehlerzeilen markieren" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Maske" @@ -6595,89 +6645,89 @@ "Invalid data address 0x%0x found. File is in some unknown format version." msgstr "" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Importiert Intematix SDF-Dateien." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Intematix SDF-Dateien (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." msgstr "" -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, fuzzy, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Dateiende wurde erreicht, als Datenwert erwartet wurde." -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 #, fuzzy msgid "Missing end-of-data marker." msgstr "Markierung des Datenfeld-Endes fehlt." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "" -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Importiert JEOL-Dateien." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "JEOL-Dateien (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" @@ -6707,41 +6757,41 @@ msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "" -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 #, fuzzy msgid "Reading files..." msgstr "Markiere Grenzen" -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 #, fuzzy msgid "Creating volume data..." msgstr "Nivellierte Daten" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 #, fuzzy msgid "Non-uniform channel lists are not supported." msgstr "Abstands-Kraft-Kurven werden nicht unterstützt." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, fuzzy, c-format msgid "Header properties file for index %u is missing." msgstr "Kopfzeilen-Feld `%s' fehlt." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "" @@ -6761,11 +6811,11 @@ msgstr "" #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "" @@ -6903,7 +6953,7 @@ msgid "MetroPro files (.dat)" msgstr "MetroPro-Dateien (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "" @@ -6919,12 +6969,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "MicroProf FRT-Textdateien (.txt)." -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, fuzzy, c-format msgid "Duplicate block %02x." msgstr "Duplizieren" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "" @@ -6961,32 +7011,32 @@ msgid "Unique id record is too short." msgstr "" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Importiert Molecular Imaging MI-Dateien." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "PicoView-Dateien (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Importiert Aarhus MUL-Dateien." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Aarhus MUL-Dateien (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "" @@ -7012,21 +7062,21 @@ msgid "Spectra data starts past the end of file." msgstr "" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, fuzzy, c-format msgid "Profile %u" msgstr "Profil" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "" @@ -7048,7 +7098,7 @@ msgid "Nanonics files (.nan)" msgstr "Nanonics-Dateien (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -7059,7 +7109,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -7082,7 +7132,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Nanonis SXM-Dateien (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "" @@ -7096,12 +7146,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "" -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "" -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "" @@ -7134,11 +7184,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Importiert Digital Instruments Nanoscope-II-Dateien." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope-II-Dateien" @@ -7168,21 +7218,21 @@ "transfer that attempts to store text platform-independently." msgstr "" -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 #, fuzzy msgid "Reading channels..." msgstr "Markiere Grenzen" -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "" -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "" -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "" @@ -7204,57 +7254,57 @@ msgid "Nanotop files (.spm)" msgstr "Nanotop-Dateien (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 #, fuzzy msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Importiert \"Network Common Data Form\"-Dateien (netCDF)." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "GSXM netCDF-Dateien (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "" -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "" -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 #, fuzzy msgid "Reading of fast scan files is not implemented - yet." msgstr "Das Dateiformat der Version %.1f wird nicht unterstützt." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "" -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "" -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "" @@ -7274,7 +7324,7 @@ msgstr "Der Import von XYZ-Rohdaten muss interaktiv ausgeführt werden." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "" @@ -7283,7 +7333,7 @@ msgid "Import NMM Profile Set" msgstr "Importiert Matlab MAT-Dateien, v5." -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Information" @@ -7315,13 +7365,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "_Horizontale Größe:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "_Vertikale Größe:" @@ -7410,17 +7460,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "" -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "" @@ -7486,7 +7536,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Importiert MapVue-Dateien (.map)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "" @@ -7560,7 +7611,7 @@ msgid "Header line starts with a colon." msgstr "" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "" @@ -7594,46 +7645,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Importiert Wyko OPD- und ASC-Dateien." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Wyko OPD-Dateien (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "" @@ -7657,7 +7708,7 @@ msgstr "" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 #, fuzzy msgid "Data block is truncated." msgstr "X Abstand" @@ -7741,37 +7792,37 @@ "of available formats depends on available GDK pixbuf loaders." msgstr "" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Verwende" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 #, fuzzy msgid "_Hue offset" msgstr "Korrigier_te Daten" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "" -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "" -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "" -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "als Daten" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7826,7 +7877,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "" -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "" @@ -7855,21 +7906,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "Markiere Grenzen" -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "Nivellierte Daten" @@ -7941,223 +7988,223 @@ msgid "Quesant files (.afm)" msgstr "Quesant-Dateien (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." msgstr "" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "TAB-Zeichen" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Anderes Zeichen" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "_Textdaten" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "_Binärdaten" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 #, fuzzy msgid "Start from _line" msgstr "Profile extrahieren" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "Hinzuzufügender _Datensatz:" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 #, fuzzy msgid "Start at _offset" msgstr "Korrigier_te Daten" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 #, fuzzy msgid "_Sample size" msgstr "_Tropfengröße:" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "" -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Datei" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 #, fuzzy msgid "fields" msgstr "Felder" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "Bytes" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 #, fuzzy msgid "bits" msgstr "Bits" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binär" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Text" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "Ungültiges Argument des Operators %c" -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -8165,45 +8212,45 @@ "`%s' is only %u bytes." msgstr "" -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" "The contents of `%s' does not match format: %s." msgstr "" -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8220,8 +8267,8 @@ msgid "_Title" msgstr "_Titel" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Kurve" @@ -8272,36 +8319,36 @@ msgid "Random points order unsupported" msgstr "" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Importiert RHK Technology SM3-Dateien." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "RHK SM3-Dateien (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "" -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "" -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "" -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "" -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Unbekannte Linie %d" @@ -8314,17 +8361,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "RHK SM4-Dateien (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Kann das Objekt %s in %s nicht finden." @@ -8359,7 +8406,7 @@ msgid "data ranges" msgstr "" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "" @@ -8440,17 +8487,17 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Sensofar PLu-Dateien (.plu)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Profil" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 #, fuzzy msgid "Reads Sensofar PLUx files." msgstr "Sensofar PLu-Dateien (.plu)" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 #, fuzzy msgid "Sensofar PLUx files (.plux)" msgstr "Sensofar PLu-Dateien (.plu)" @@ -8463,16 +8510,16 @@ msgid "Sensolytics text files (.dat)" msgstr "Sensolytics-Textdateien (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 #, fuzzy msgid "Imports Shimadzu SPM data files." msgstr "Importiert Shimadzu SPM-Dateien, Version 2." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Shimadzu-Dateien" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "" @@ -8493,31 +8540,31 @@ msgid "SIS files (.sis)" msgstr "SIS-Dateien (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "" @@ -8838,35 +8885,35 @@ msgid "Unknown data type `%s'." msgstr "Unbekannter Datentyp `%s'." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 #, fuzzy msgid "Exports data as simple XYZ text file." msgstr "Exportiert Daten als einfache ASCII-Matrix." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "XYZ-Daten:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 #, fuzzy msgid "Lateral units:" msgstr "_Laterale Einheiten:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 #, fuzzy msgid "Export XYZ" msgstr "Text exportieren" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 #, fuzzy msgid "Imports Carl Zeiss SEM images." msgstr "Importiert Aarhus MUL-Dateien." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "" @@ -8904,12 +8951,12 @@ msgid "Data line %u does not contain four items." msgstr "" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, fuzzy, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Der Datentyp %d ist ungültig oder wird nicht unterstützt." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "" @@ -8941,9 +8988,8 @@ msgid "Fit Graph" msgstr "Graph anfitten" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 #, fuzzy msgid "_Graph curve:" msgstr "_Graph" @@ -8953,29 +8999,18 @@ msgid "F_unction:" msgstr "F_unktion:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -#, fuzzy -msgid "range|to" -msgstr "bis" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -9029,30 +9064,30 @@ msgid "Results\n" msgstr "Ergebnisse\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 #, fuzzy msgid "Cut graph" msgstr "Graph" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 #, fuzzy msgid "/_Basic Operations/_Cut..." msgstr "/_Grundfunktionen/_Verkippen..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 #, fuzzy msgid "Extract part of graph into new one" msgstr "Teil des Graphen in einen neuen extrahieren" -#: modules/graph/graph_cut.c:145 +#: modules/graph/graph_cut.c:98 +msgid "Cut _all curves" +msgstr "" + +#: modules/graph/graph_cut.c:138 #, fuzzy msgid "Cut Graph" msgstr "Graph" -#: modules/graph/graph_cut.c:173 -msgid "Cut _all curves" -msgstr "" - #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Zustandsdichte Spektrum" @@ -9111,6 +9146,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 #, fuzzy msgid "Style" msgstr "Linientyp" @@ -9137,7 +9173,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 #, fuzzy msgid "Export to Text File" msgstr "Text exportieren" @@ -9349,8 +9385,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/_FD-Kurve fitten..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 #, fuzzy msgid "_All curves" msgstr "Kurven angleichen" @@ -9365,8 +9401,8 @@ msgid "Zero position" msgstr "Maximaler z-Wert" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "FD-Kurve fitten" @@ -9470,6 +9506,100 @@ msgid "Logscale Transform" msgstr "Hough-Transformation" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "Abstände messen" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "Abstände messen" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +#, fuzzy +msgid "Save Parameters" +msgstr "Rauigkeits-Parameter speichern" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "Untergrund e_xtrahieren" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "Datei schließen" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "Facetten markieren" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Schnelle Fouriertransformation" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "Korrelations_methode:" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "Richtung" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "Starte " + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "Gefilterte FFT" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "Gefilterte FFT" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Abdruck-Justage" + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Maximaler z-Wert" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "Nivellierte Daten" + #: modules/graph/graph_peaks.c:105 #, fuzzy msgid "Finds peaks on graph curves." @@ -9490,7 +9620,7 @@ msgstr "" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 #, fuzzy msgid "Zero" msgstr "Auf _Null setzen" @@ -9527,96 +9657,96 @@ msgid "Graph Peaks" msgstr "Graphen" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 #, fuzzy msgid "Data + fit" msgstr "Hinzuzufügender _Datensatz:" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Nivellierte Daten" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Polynomiellen Untergrund entfernen" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 #, fuzzy msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/_Nivellierung/_Polynomischer Untergrund..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "Polynomiellen Untergrund entfernen" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 #, fuzzy msgid "Curve to fit" msgstr "Maximaler z-Wert" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "Ausgabe_art:" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "Fit-Ergebnisse" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Höhenverteilung" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Winkelverteilung" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9631,7 +9761,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "Statistik-Funktionen" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "1D-Statistik-Funktionen berechnen" @@ -9643,15 +9773,15 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 #, fuzzy msgid "_Fixed resolution" msgstr "Auflösung" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Statistik-Funktionen" @@ -9674,125 +9804,113 @@ msgid "pick points" msgstr "Ausgewählte Punkte" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "Polynomiellen Untergrund entfernen" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 #, fuzzy msgid "Calculates simple graph curve statistics." msgstr "Einfache Körnungsstatistiken" -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "Statistische Größen" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 #, fuzzy msgid "Calculate graph curve statistics" msgstr "Statistikfunktionen für Zeile/Spalte berechnen" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -#, fuzzy -msgid "Save Parameters" -msgstr "Rauigkeits-Parameter speichern" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Statistische Größen" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 #, fuzzy msgid "Simple Parameters" msgstr "Fit-Parameter" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 #, fuzzy msgid "Integrals" msgstr "Interpolationstyp:" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 #, fuzzy msgid "Graph Statistics" msgstr "Korn-Statistiken" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 #, fuzzy msgid "Projected length" msgstr "Projizierte Umrandungslänge" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 #, fuzzy msgid "Developed length" msgstr "Entwickler" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 #, fuzzy msgid "Variation" msgstr "Varianz" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 #, fuzzy msgid "Area under curve" msgstr "_Graph" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 #, fuzzy msgid "Positive area" msgstr "Positiv" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 #, fuzzy msgid "Negative area" msgstr "Negativ" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 #, fuzzy msgid "Data + polynomials" msgstr "Polynomisch verzerren" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9801,228 +9919,218 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Differenz" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 #, fuzzy msgid "Leveled surface" msgstr "Nivellierte Daten" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 #, fuzzy msgid "Polynomial background" msgstr "Polynomiellen Untergrund entfernen" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 #, fuzzy msgid "Fits terraces with polynomial background." msgstr "Subtrahiert polynomischen Untergrund" -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 #, fuzzy msgid "Fit terraces with polynomial background" msgstr "Subtrahiert polynomischen Untergrund" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -#, fuzzy -msgid "Fitted step height" -msgstr "Gefittete Sphäre" - -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -#, fuzzy -msgid "Mean square difference" -msgstr "X Differenz" - -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "" - -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -#, fuzzy -msgid "Number of terraces" -msgstr "Anzahl an Körnern" - -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 +#: modules/graph/graph_terraces.c:252 #, fuzzy -msgid "Fit Terraces" -msgstr "Fit-Ergebnis" - -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "" +msgid "Step detection" +msgstr "_Auswahlmodus:" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 -#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 -#: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 #, fuzzy -msgid "Output" -msgstr "Ausgabe_art:" +msgid "_Step detection kernel" +msgstr "_Auswahlmodus" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 #, fuzzy -msgid "Survey" -msgstr "Kurve" +msgid "Step detection _threshold" +msgstr "_Weicher Schwellwert" -#: modules/graph/graph_terraces.c:520 +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 #, fuzzy -msgid "_Step detection kernel:" +msgid "Step _broadening" msgstr "_Auswahlmodus:" -#: modules/graph/graph_terraces.c:528 -#, fuzzy -msgid "Step detection _threshold:" -msgstr "_Weicher Schwellwert:" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "" - -#: modules/graph/graph_terraces.c:546 +#: modules/graph/graph_terraces.c:268 #, fuzzy -msgid "Minimum terrace _length:" +msgid "Minimum terrace _length" msgstr "Minimale _Länge:" -#: modules/graph/graph_terraces.c:554 +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 #, fuzzy -msgid "_Polynomial degree:" +msgid "_Polynomial degree" msgstr "Polynomiell (0. Ordnung)" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 #, fuzzy msgid "_Independent heights" msgstr "Unabhängige Grade" -#: modules/graph/graph_terraces.c:580 -#, fuzzy -msgid "Step detection" -msgstr "_Auswahlmodus:" - -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -#, fuzzy -msgid "_Display:" -msgstr "_Anzeige:" - -#: modules/graph/graph_terraces.c:587 +#: modules/graph/graph_terraces.c:274 #, fuzzy msgid "Select regions _manually" msgstr "_Auswahlmodus:" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 -#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 -#: modules/process/mark_with.c:284 modules/process/neural.c:543 -#: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 -msgid "Result" -msgstr "Ergebnis" - -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 #, fuzzy msgid "Save Terrace Table" msgstr "X Abstand" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 +#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 +#: modules/process/multiprofile.c:273 modules/process/pid.c:151 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 #, fuzzy -msgid "_Polynomial degree" -msgstr "Polynomiell (0. Ordnung)" - -#: modules/graph/graph_terraces.c:889 -#, fuzzy -msgid "M_inimum polynomial degree:" -msgstr "_Maximaler Grad des Polynoms:" +msgid "Output" +msgstr "Ausgabe_art:" -#: modules/graph/graph_terraces.c:899 +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 #, fuzzy -msgid "_Maximum polynomial degree:" -msgstr "_Maximaler Grad des Polynoms:" +msgid "M_inimum polynomial degree" +msgstr "_Maximaler Grad des Polynoms" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 #, fuzzy -msgid "Step _broadening" -msgstr "_Auswahlmodus:" +msgid "_Maximum polynomial degree" +msgstr "_Maximaler Grad des Polynoms" -#: modules/graph/graph_terraces.c:921 +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 #, fuzzy -msgid "Minimum broadening:" -msgstr "_Minimum:" +msgid "Minimum broadening" +msgstr "_Minimum" -#: modules/graph/graph_terraces.c:932 +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 #, fuzzy -msgid "Maximum broadening:" +msgid "Maximum broadening" msgstr "Maximale Abmessung" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +#, fuzzy +msgid "Fit Terraces" +msgstr "Fit-Ergebnis" + +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, fuzzy, c-format -msgid "Number of combinations: %u." +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +#, fuzzy +msgid "Survey" +msgstr "Kurve" + +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 +#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 +#: modules/process/mark_with.c:284 modules/process/neural.c:543 +#: modules/process/psf.c:354 modules/process/terracefit.c:572 +#: modules/volume/volume_psf.c:548 +msgid "Result" +msgstr "Ergebnis" + +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "" + +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +#, fuzzy +msgid "Fitted step height" +msgstr "Gefittete Sphäre" + +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +#, fuzzy +msgid "Mean square difference" +msgstr "X Differenz" + +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "" + +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +#, fuzzy +msgid "Number of terraces" msgstr "Anzahl an Körnern" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "" + +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 msgid "No free parameters are selected." msgstr "" -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, fuzzy, c-format +msgid "Number of combinations: %u." +msgstr "Anzahl an Körnern" + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, fuzzy, c-format msgid "Segment %u" msgstr "Segmentierung" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, fuzzy, c-format msgid "Level %d" msgstr "Nivellierte Daten" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 #, fuzzy msgid "No terraces were found" msgstr "H_öhe:" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 #, fuzzy msgid "Save Terrace Fit Survey" msgstr "X Abstand" @@ -10164,7 +10272,7 @@ msgstr "Ebene nivellieren" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Zoom" @@ -10184,8 +10292,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 #, fuzzy msgid "_Thickness" msgstr "Rahmendicke:" @@ -10216,7 +10324,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 #, fuzzy msgid "Mask in use" msgstr "Maskier-Modus" @@ -10320,7 +10428,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 #, fuzzy msgid "_Number of iterations" msgstr "Anzahl an Körnern" @@ -10370,8 +10478,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "" @@ -10383,13 +10491,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 #, fuzzy msgid "Dimensions" @@ -10399,18 +10508,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 #, fuzzy msgid "Simulation Parameters" msgstr "Fit-Parameter" @@ -10422,15 +10533,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 #, fuzzy msgid "_Like Current Image" @@ -10440,10 +10552,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10454,8 +10567,9 @@ msgstr "Initialisiere..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 #, fuzzy msgid "Running computation..." msgstr "Triangulation..." @@ -10486,7 +10600,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Radius" @@ -10529,66 +10643,82 @@ msgid "Arithmetic operations on data" msgstr "Arithmetische Operationen" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Ausdruck" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 #, fuzzy msgid "Specify un_its" msgstr "Spezifiziere E_inheiten" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Arithmetik" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Ausdruck:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Operanden" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 #, fuzzy msgid "Specify un_its:" msgstr "Spezifiziere E_inheiten:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Pixelgrößen unterscheiden sich" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "" @@ -10626,7 +10756,7 @@ "Grundfunktionen wie Spiegelung, Invertierung und Rotation um Vielfache von " "90 Grad." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/_Grundfunktionen/Wert _invertieren" @@ -10657,36 +10787,37 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 #, fuzzy msgid "Co_verage" msgstr "_Minimalwert" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "" @@ -11108,27 +11239,30 @@ msgid "Building mesh..." msgstr "" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "X-Korrektur" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Y-Korrektur" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Z-Korrektur" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "" @@ -11162,6 +11296,7 @@ msgstr "" #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/_Grundfunktionen/_Abmessungen und Einheiten..." @@ -11260,7 +11395,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 #, fuzzy msgid "Create new image" msgstr "Ein neues Element erzeugen" @@ -11314,10 +11449,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - #: modules/process/classify.c:299 modules/process/classify.c:565 #, fuzzy msgid "Mask A" @@ -11503,6 +11634,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -11667,14 +11799,14 @@ msgid "Convolution _kernel" msgstr "Faltungsfilter" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 #, fuzzy msgid "Convolved" msgstr "_Laplace von Gaussglocke gefaltet" @@ -11711,13 +11843,13 @@ msgstr "/Ko_rrigieren/_Median Zeilenkorrektur" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Vorschau-Optionen" @@ -11927,7 +12059,7 @@ msgstr "" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "_Schwellwert" @@ -12022,13 +12154,13 @@ msgid "Curvature Sections" msgstr "Krümmungsabschnitte" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 #, fuzzy msgid "Output type:" @@ -12144,7 +12276,7 @@ msgid "Deconvolve" msgstr "_Laplace von Gaussglocke gefaltet" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "" @@ -12542,7 +12674,8 @@ msgid "drift" msgstr "" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 #, fuzzy msgid "x-axis drift" msgstr "Drift in X-Richtung" @@ -12560,6 +12693,48 @@ msgid "rows" msgstr "Zeilen" +#: modules/process/dune_synth.c:108 +#, fuzzy +msgid "Generates images by simulating formation of sand dunes." +msgstr "Relative Linien" + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/S_ynthetisch/_Deposition/_Fasern..." + +#: modules/process/dune_synth.c:126 +#, fuzzy +msgid "Generate image by transporting sand" +msgstr "Relative Linien" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "_Minimum" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "Such-Größe" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "Maximalwert" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "Zweidimensionale DWT (Diskrete Wavelet-Transformation)." @@ -12903,7 +13078,7 @@ msgstr "Auswahl als Maske setzen" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Abstand" @@ -12929,10 +13104,11 @@ msgstr "Ebene nivellieren" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Facetten-Nivellierung..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Visualisiert, markiert und misst Facetten-Orientierung." @@ -12955,11 +13131,11 @@ msgid "_Number points" msgstr "Anzahl an Körnern" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 #, fuzzy msgid "_Mark" msgstr "Markiert" @@ -13047,7 +13223,7 @@ msgid "Create _Points" msgstr "_Punkte" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 #, fuzzy msgid "Save Facet Vectors" msgstr "Rauigkeits-Parameter speichern" @@ -13057,50 +13233,50 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 #, fuzzy msgid "/Measure _Features/Facet _Measurement..." msgstr "/_Statistik/Facetten-_Messung..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 #, fuzzy msgid "Measure facet angles" msgstr "Abstände messen" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 #, fuzzy msgid "_Facet plane size" msgstr "_Punktgröße:" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Toleranz" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 #, fuzzy msgid "Selected φ" msgstr "Richtung" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 #, fuzzy msgid "Selected ϑ" msgstr "Richtung" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 #, fuzzy msgid "Measure Facets" msgstr "Facetten markieren" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 #, fuzzy msgid "Mea_sure" msgstr "Kornoberfl. Flächeninhalte" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 #, fuzzy msgid "points" msgstr "Punkte" @@ -13357,7 +13533,7 @@ msgid "Clear the entire filter mask" msgstr "Entfernt die gesamte Filtermaske" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "_Ausfüllen" @@ -13379,7 +13555,7 @@ msgid "Zoom:" msgstr "Zoom:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Ausgabe-Optionen" @@ -13453,7 +13629,7 @@ msgid "Triangle" msgstr "Dreieck hoch" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 #, fuzzy msgid "Rectangle" msgstr "Rechtecke" @@ -13507,7 +13683,7 @@ msgstr "Fenstergröße" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Form" @@ -13541,7 +13717,7 @@ msgstr "Gefittete Sphäre" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Beides" @@ -13823,6 +13999,7 @@ msgstr "Zwei Bilder zusammenführen" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 #, fuzzy msgid "_Trim fraction" msgstr "_Richtung" @@ -14923,7 +15100,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Korrigiert Zeilendefekte (überwiegend experimentelle Algorithmen)" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/Ko_rrigieren/_Stufen Zeilenkorrektur" @@ -14940,35 +15117,35 @@ msgid "Mark lines with inverted sign" msgstr "Körner mittels Schwellwert markieren" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 #, fuzzy msgid "linematch|Polynomial" msgstr "Polynomiell" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 #, fuzzy msgid "Median of differences" msgstr "X Differenz" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 #, fuzzy msgid "Modus" msgstr "FFT Betrag" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 #, fuzzy msgid "Trimmed mean of differences" msgstr "X Differenz" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 #, fuzzy msgid "Facet-level tilt" msgstr "Facetten-Nivellierung..." @@ -14977,7 +15154,7 @@ msgid "Aligns rows by various methods." msgstr "" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/Ko_rrigieren/_Reihen anpassen..." @@ -15019,7 +15196,7 @@ msgid "Steps" msgstr "" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 #, fuzzy msgid "Scars" msgstr "Fehlerzeilen markieren" @@ -15029,7 +15206,7 @@ msgstr "" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Verkippen" @@ -15189,7 +15366,7 @@ msgid "_Hessian" msgstr "Gauß" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 #, fuzzy msgid "_Regularization parameter" msgstr "Fit-Parameter" @@ -15218,10 +15395,12 @@ msgstr "Daten markieren, die weiter als 3σ vom Mittelwert abweichen" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positiv" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negativ" @@ -15368,7 +15547,7 @@ msgid "Two-sided" msgstr "" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "" @@ -15510,130 +15689,150 @@ msgid "Shift Mask" msgstr "Filtermaske" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 #, fuzzy msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidaten/_Kreuzkorrelation..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 #, fuzzy msgid "Search for a detail using correlation" msgstr "Detailbild über Korrelationssuche im Gesamtbild lokalisieren" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 #, fuzzy msgid "Correlation, raw" msgstr "Korrelation" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 #, fuzzy msgid "Correlation, leveled" msgstr "Korrelation" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 #, fuzzy msgid "Correlation score" msgstr "Korrelations-Wert" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 #, fuzzy msgid "Height difference, raw" msgstr "Richtungsdifferenz" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 #, fuzzy msgid "Height difference, leveled" msgstr "Richtungsdifferenz" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 #, fuzzy msgid "Height difference score" msgstr "X Differenz" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Nur Phase" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "Korrelations_methode" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 #, fuzzy msgid "Use _mask" msgstr "Maske invertieren" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 #, fuzzy msgid "_Plot mask" msgstr "Maske invertieren" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 #, fuzzy msgid "_Detail to search" msgstr "Hinzuzufügender _Datensatz" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 #, fuzzy msgid "Correlation Search" msgstr "Korrelationsmatrix" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Grundfunktionen mit Masken: invertieren, entfernen, extrahieren." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Maske/Maske _entfernen" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Maske vom Datensatz entfernen" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Maske/Maske _invertieren" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Maske invertieren" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Maske/Maske e_xtrahieren" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 #, fuzzy msgid "Extract mask to a new image" msgstr "Maske in neuen Kanal extrahieren" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +#, fuzzy +msgid "/_Grains/_Extract Numbers" +msgstr "/_Maske/Maske e_xtrahieren" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "Maske in neuen Kanal extrahieren" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Körnung/_Entferne Rand-Berührende" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 #, fuzzy msgid "Remove grains touching image edges" msgstr "Körner mittels Schwellwert entfernen" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Maske/_Verdünnen" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 #, fuzzy msgid "Thin mask" msgstr "Maske bearbeiten" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "_Maske zeichnen" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "" @@ -15790,7 +15989,7 @@ msgid "Second image" msgstr "Zwei Bilder zusammenführen" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 #, fuzzy msgid "Average" @@ -16195,7 +16394,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 #, fuzzy msgid "_Mode" msgstr "Modus" @@ -16300,8 +16499,8 @@ msgid "Re_initialize" msgstr "Initialisiere" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Maskier-Modus" @@ -16890,6 +17089,63 @@ msgid "Pile Up Shapes" msgstr "Sphäre fitten" +#: modules/process/plateau_synth.c:131 +msgid "Generates images with stacked plateau-like structures." +msgstr "" + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/S_ynthetisch/_Muster..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Relative Linien" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Maximale _Breite" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Minimum" + +#: modules/process/plateau_synth.c:166 +msgid "Size power _law" +msgstr "" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "_Richtung:" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Abmessungen" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "_Höhe:" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Fenstergröße" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Markiere Grenzen" + #: modules/process/polydistort.c:134 #, fuzzy msgid "Applies polynomial distortion in the horizontal plane." @@ -16955,11 +17211,6 @@ msgid "_Vertical polynomial degree" msgstr "Grad des Polynoms _vertikal" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -#, fuzzy -msgid "_Maximum polynomial degree" -msgstr "_Maximaler Grad des Polynoms" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "_Gleiche Grade" @@ -16977,6 +17228,10 @@ msgid "Copy table to clipboard" msgstr "Tabelle in die Zwischenablage kopieren" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "" + #: modules/process/presentationops.c:58 #, fuzzy msgid "Basic operations with presentation: extraction, removal." @@ -17133,8 +17388,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 #, fuzzy msgid "Transfer function" msgstr "Delta-Funktion" @@ -17158,7 +17413,7 @@ msgid "Transfer function estimation" msgstr "Präsentation: Canny Kantenerkennung" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Statistik/_Übertragungsfunktion-Vermutung..." @@ -17166,16 +17421,16 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 #, fuzzy msgid "Regularized filter" msgstr "Shimadzu-Dateien" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 #, fuzzy msgid "Wiener filter" msgstr "Linearer Fit" @@ -17185,20 +17440,20 @@ msgid "_Border" msgstr "Rand" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 #, fuzzy msgid "_Fit Sigma" msgstr "Sphäre fitten" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 #, fuzzy msgid "Transfer Function Size" msgstr "Delta-Funktion" @@ -17218,25 +17473,25 @@ msgid "Transfer Function" msgstr "Delta-Funktion" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 #, fuzzy msgid "TF width" msgstr "Suchbereich _Breite:" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 #, fuzzy msgid "TF height" msgstr "Neue _Höhe:" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 #, fuzzy msgid "Difference norm" msgstr "Differenz" @@ -17375,7 +17630,7 @@ msgid "Proportion" msgstr "_proportional" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "" @@ -17618,7 +17873,7 @@ msgid "_Assume symmetry" msgstr "Symmetrie" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Rotierter Datensatz" @@ -17698,23 +17953,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Horizontale Fehlerzeilen (Striche, Schmisse) korrigieren" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Fehlzeilen-Typ" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "_Harter Schwellwert" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "_Weicher Schwellwert" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Minimale _Länge" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Maximale _Breite" @@ -17982,16 +18237,6 @@ msgid "Marked terraces" msgstr "Fehlerzeilen markieren" -#: modules/process/terracefit.c:282 -#, fuzzy -msgid "_Step detection kernel" -msgstr "_Auswahlmodus" - -#: modules/process/terracefit.c:284 -#, fuzzy -msgid "Step detection _threshold" -msgstr "_Weicher Schwellwert" - #: modules/process/terracefit.c:289 #, fuzzy msgid "Minimum terrace _area" @@ -18001,25 +18246,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -#, fuzzy -msgid "M_inimum polynomial degree" -msgstr "_Maximaler Grad des Polynoms" - -#: modules/process/terracefit.c:308 -#, fuzzy -msgid "Minimum broadening" -msgstr "_Minimum" - -#: modules/process/terracefit.c:310 -#, fuzzy -msgid "Maximum broadening" -msgstr "Maximale Abmessung" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "" @@ -18070,7 +18296,7 @@ msgid "Limit Range" msgstr "Bereich einschränken" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "" @@ -18837,146 +19063,146 @@ msgid "Function written in Python" msgstr "In Python geschriebene Funktion" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 #, fuzzy msgid "Correlation length tool." msgstr "Korrelations_methode:" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 #, fuzzy msgid "line-leveling|None" msgstr "Ebene nivellieren" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 #, fuzzy msgid "Line leveling" msgstr "Ebene nivellieren" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 #, fuzzy msgid "Correlation Length" msgstr "Korrelations_methode:" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 #, fuzzy msgid "Correlation Length T" msgstr "Korrelations_methode:" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 #, fuzzy msgid "Relation to Image Size" msgstr "Zwei Bilder zusammenführen" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 #, fuzzy msgid "Selected area" msgstr "Projizierte Fläche" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 #, fuzzy msgid "PSDF Gaussian fit" msgstr "Gauß" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 #, fuzzy msgid "PSDF exponential fit" msgstr "Exponentiell" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 #, fuzzy msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "Ebene zur Auswahl horizontaler oder vertikaler Linien." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "Lese horizontale und/oder vertikale Profile aus" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Profile" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Optionen" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, fuzzy, c-format msgid "Vertical profile %d" msgstr "_Vertikal" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, fuzzy, c-format msgid "Horizontal profile %d" msgstr "Horizontale Größe:" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "" +#: modules/tools/distance.c:123 +#, fuzzy +msgid "Save Distance Table" +msgstr "X Abstand" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 #, fuzzy msgid "_Number lines" msgstr "A_nzahl an Schritten:" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Abstände und Richtungen zwischen Punkten messen" -#: modules/tools/distance.c:227 -#, fuzzy -msgid "Save Distance Table" -msgstr "X Abstand" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -19031,7 +19257,7 @@ "Grain removal tool, removes continuous parts of mask and/or underlying data." msgstr "" -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "" @@ -19039,7 +19265,7 @@ msgid "Fractal correction" msgstr "" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -19047,7 +19273,7 @@ msgid "Remove" msgstr "Entfernen" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "_Interpolationsmethode" @@ -19059,85 +19285,94 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Einzelne Körner entfernen (zusammenhängende Bereiche der Maske)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." msgstr "" -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "Stern" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +#, fuzzy +msgid "_Adapt color range to selection" +msgstr "Farbskalierung auf Datenintervall strecken" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Farbskalierung" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Farbskalierung auf Datenintervall strecken" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Gesamter Farbbereich vom kleinsten zum größten Wert" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Bewusst einen festen Farbbereich setzen" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 #, fuzzy msgid "Automatic color range with tails cut off" msgstr "Farbskalierung auf Datenintervall strecken" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "_Standard" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Höhen-Histogramm" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "Farbskalierung" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 #, fuzzy msgid "Set to _Unmasked" msgstr "Maske invertieren" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 #, fuzzy msgid "_Invert Mapping" msgstr "Höhe _invertieren" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "_X-Bereich:" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " "three selected points." msgstr "" -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 #, fuzzy msgid "_Averaging radius" msgstr "_Integrationsradius" @@ -19159,137 +19394,141 @@ msgid "Level data by fitting a plane through three points" msgstr "Daten mittels Ebene durch drei Punkte nivellieren" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." msgstr "" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "_Zeilen" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Spa_lten" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Zeilen-/Spalten-Statistik" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Statistikfunktionen für Zeile/Spalte berechnen" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "_Formen" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Auswahl als Maske setzen" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Auswahl zur Maske hinzufügen" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Auswahl von Maske subtrahieren" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Rechteckige Formen" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Elliptische Formen" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Dünne Linien" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 #, fuzzy msgid "Fill continuous empty areas with mask" msgstr "Bestimmt Kornverteilungen (Zusammenhängende maskierte Bereiche)." -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 #, fuzzy msgid "Erase continuous parts of mask" msgstr "Bestimmt Kornverteilungen (Zusammenhängende maskierte Bereiche)." -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 #, fuzzy msgid "_Amount" msgstr "Anzahl" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Masken-Editor" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Maske bearbeiten" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Editor" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 #, fuzzy msgid "Actions" msgstr "Kreuzungen" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Invertieren" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "" @@ -19306,108 +19545,113 @@ msgid "Level rows using intersections with given lines" msgstr "Reihen nivellieren unter Benutzung von Überschneidung gegebener Linien" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "" -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 #, fuzzy msgid "calib-data|None" msgstr "Kalibrierungen" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 #, fuzzy msgid "_Show profile" msgstr "Profil 1" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 #, fuzzy msgid "_Calibration data" msgstr "Kalibrierungsdaten einladen" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "Extrahiere Profile entlang beliebiger Linien" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 #, fuzzy msgid "Improve _Direction" msgstr "_Richtung:" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 #, fuzzy msgid "Improve _All" msgstr "Ver_bessern" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "X-Fehler %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Y-Fehler %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Z-Fehler %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, fuzzy, c-format msgid "X uncertainty %d" msgstr "Bestimmtheitskarte" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, fuzzy, c-format msgid "Y uncertainty %d" msgstr "Bestimmtheitskarte" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, fuzzy, c-format msgid "Z uncertainty %d" msgstr "Bestimmtheitskarte" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "" -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Auswahl zeigen" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +#, fuzzy +msgid "Adapt color range to detail" +msgstr "Farbskalierung auf Datenintervall strecken" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Wert auslesen" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Wert unter dem Mauszeiger auslesen" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Auf _Null setzen" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Facette" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 #, fuzzy msgid "Curvatures" msgstr "Krümmung" @@ -19416,16 +19660,16 @@ msgid "Calculate surface profile parameters." msgstr "" -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Rauigkeit" @@ -19437,7 +19681,7 @@ msgid "BRC" msgstr "BRC" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "" @@ -19449,189 +19693,189 @@ msgid "Calculate roughness parameters" msgstr "Rauigkeits-Parameter berechnen" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Rauigkeits-Parameter" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 #, fuzzy msgid "Selected line" msgstr "Richtung:" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 #, fuzzy msgid "parameters|Hybrid" msgstr "Parameter" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "Parameter" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "Neue _Höhe" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 #, fuzzy msgid "Amplitude Distribution Function" msgstr "Winkelverteilung" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 #, fuzzy msgid "Creates angularly averaged profile graphs." msgstr "Profile extrahieren" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 #, fuzzy msgid "Radial Profiles" msgstr "Profile extrahieren" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "Extrahiere kreisförmig gemittelte Profile" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 #, fuzzy msgid "Radial profiles" msgstr "Profile extrahieren" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 #, fuzzy msgid "S_ymmetrize" msgstr "Symmetrie" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 #, fuzzy msgid "Symmetrize _All" msgstr "Symmetrie" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, fuzzy, c-format msgid "Radial profile %d" msgstr "Profile extrahieren" @@ -19672,43 +19916,52 @@ msgid "_Copy" msgstr "_Kopieren" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." msgstr "" -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 #, fuzzy msgid "Angular spectrum" msgstr "Spektraldichtefunktion" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +#, fuzzy +msgid "IDF" +msgstr "ADF" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "" @@ -19736,176 +19989,216 @@ msgid "Spectroscopy" msgstr "Spektroskopie" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." msgstr "" -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 #, fuzzy msgid "Ellipse" msgstr "Ellipsen" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Fehlstellen entfernen" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Kleine Fehlstellen interpolieren (manuelle Auswahl)" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Statistik-Werkzeug." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Statistische Größen" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 #, fuzzy msgid "Average value" msgstr "_Minimalwert" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 #, fuzzy msgid "RMS roughness" msgstr "Rauigkeit" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 #, fuzzy msgid "Mean roughness" msgstr "Rauigkeit" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 #, fuzzy msgid "Maximum peak height" msgstr "Maximaler z-Wert" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 #, fuzzy msgid "Maximum pit depth" msgstr "Maximale _Breite:" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 #, fuzzy msgid "Maximum height" msgstr "Maximaler z-Wert" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 #, fuzzy msgid "Surface slope" msgstr "Oberflächen-Flächeninhalt" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 -#, fuzzy -msgid "Simple arithmetic operations with volume data." +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" msgstr "" -"Einfache Rechenoperationen mit zwei Datenfeldern (oder einem Datenfeld und " -"einer skalaren Größe)." - -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/_Arithmetisch..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_addframe.c:113 #, fuzzy -msgid "Arithmetic operations on volume data" -msgstr "Arithmetische Operationen" +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/_Grundfunktionen/Wert _invertieren" -#: modules/volume/volume_arithmetic.c:572 -#, fuzzy -msgid "Z-axis calibrations differ" -msgstr "Kalibrierfaktor _Z:" +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_addframe.c:132 #, fuzzy -msgid "Exports volume data in simple ASCII formats." -msgstr "Exportiert Daten als einfache ASCII-Matrix." - -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Exportieren als _Text..." +msgid "Data to insert" +msgstr "Daten-Browser" -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_addframe.c:170 +#, fuzzy +msgid "Frame added" +msgstr "Oberflächen-Flächeninhalt" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "/_Nivellierung/_Facetten-Nivellierung" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 +#, fuzzy +msgid "Simple arithmetic operations with volume data." +msgstr "" +"Einfache Rechenoperationen mit zwei Datenfeldern (oder einem Datenfeld und " +"einer skalaren Größe)." + +#: modules/volume/volume_arithmetic.c:159 +#, fuzzy +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/_Grundfunktionen/_Verkippen..." + +#: modules/volume/volume_arithmetic.c:163 +#, fuzzy +msgid "Arithmetic operations on volume data" +msgstr "Arithmetische Operationen" + +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 +#, fuzzy +msgid "Z-axis calibrations differ" +msgstr "Kalibrierfaktor _Z:" + +#: modules/volume/volume_asciiexport.c:72 +#, fuzzy +msgid "Exports volume data in simple ASCII formats." +msgstr "Exportiert Daten als einfache ASCII-Matrix." + +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." +msgstr "/_Grundfunktionen/_Erweitern..." + +#: modules/volume/volume_asciiexport.c:90 #, fuzzy msgid "Export volume data to a text file" msgstr "Diagrammdaten als Textdatei exportieren" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 #, fuzzy msgid "VTK structured grid" msgstr "Exportiert Daten als einfache ASCII-Matrix." -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Genauigkeit:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +#, fuzzy +msgid "Volume data" +msgstr "Volumen" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Abmessungen und Einheiten..." - #: modules/volume/volume_calibrate.c:170 #, fuzzy msgid "Match voxel size" @@ -19942,7 +20235,7 @@ msgstr "Kalibrierfaktor _X:" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 #, fuzzy msgid "Create new volume data" msgstr "Nivellierte Daten" @@ -19957,13 +20250,89 @@ msgid "Z Dimension" msgstr "Abmessungen" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/Ko_rrigieren/D_rehung korrigieren..." + +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "_Abschätzung" + +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "Profile extrahieren" + +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "Daten zuschneiden" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "_X:" + +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "_Vertikal" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "_Laterale Einheiten" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +#, fuzzy +msgid "y-axis drift" +msgstr "Drift in X-Richtung" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +#, fuzzy +msgid "Z drift" +msgstr "Drift in X-Richtung" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +#, fuzzy +msgid "z-axis drift" +msgstr "Drift in X-Richtung" + +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "Korrigierte Daten driften" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "_Abschätzung" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "Nivellierte Daten" + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "Nivellierte Daten" + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "" #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/Spi_tze/_Oberflächenrekonstruktion..." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -19993,92 +20362,109 @@ msgid "Isosurface z for %.*f %s" msgstr "es existiert kein Spektrum %d für %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 #, fuzzy msgid "Shows 3D representations of volume data" msgstr "Präsentation vom Datensatz entfernen" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/3D Ansicht..." +#: modules/volume/volume_extract.c:197 +#, fuzzy +msgid "/_Basic Operations/3D View..." +msgstr "/_Grundfunktionen/_Verkippen..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 #, fuzzy msgid "Show a 3D view for the volume data" msgstr "Invertiert Wert in Volumendaten" -#: modules/volume/volume_extract.c:274 -#, fuzzy -msgid "Volume data" -msgstr "Volumen" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 #, fuzzy msgid "_Render" msgstr "_Umbenennen" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 #, fuzzy msgid "_Save image" msgstr "Quadrat" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 #, fuzzy msgid "Wireframe threshold" msgstr "_Weicher Schwellwert:" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 #, fuzzy msgid "Opacity scale" msgstr "_Skala:" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 #, fuzzy msgid "Instant 3D render" msgstr "_Sofort aktualisieren" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 #, fuzzy msgid "X view" msgstr "Vorschau" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 #, fuzzy msgid "Y view" msgstr "Vorschau" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 #, fuzzy msgid "Z view" msgstr "Vorschau" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 #, fuzzy msgid "Export 3D view" msgstr "3D-Ansicht exportieren" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "" +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "Diagrammkurven nivellieren" + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/Ko_rrigieren/Fehler_zeilen entfernen" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "Graphen mit Gerade nivellieren." + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "Ebene nivellieren" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." +#, fuzzy +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/_Evaluiere FD Daten..." #: modules/volume/volume_fdfit.c:217 @@ -20105,10 +20491,6 @@ msgid "Inverts value in volume data" msgstr "Invertiert Wert in Volumendaten" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Invertiere Wert" - #: modules/volume/volume_invert.c:57 #, fuzzy msgid "Invert value in volume data" @@ -20119,7 +20501,8 @@ msgstr "" #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Means Clustering..." msgstr "/_K-Means Clustering..." #: modules/volume/volume_kmeans.c:113 @@ -20190,7 +20573,8 @@ msgstr "Berechne K-Medians Clustering für Volumen Daten." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Medians Clustering..." msgstr "/_K-Medians Clustering..." #: modules/volume/volume_kmedians.c:106 @@ -20228,8 +20612,9 @@ msgstr "Nivellierte Daten" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/_Grundfunktionen/_Verkippen..." #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -20261,12 +20646,31 @@ msgid "Z calibration" msgstr "Kalibrierungen" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "Ebene nivellieren" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "Ebene nivellieren" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." msgstr "/Profile zusammenfassen..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 @@ -20287,8 +20691,37 @@ msgid "Summarize Volume Profiles" msgstr "" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/SPM M_odus/_Spitze/_Blinde Abschätzung..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "Neue _Breite" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Fit-Ergebnisse" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Kalibrierfaktor _Z:" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." msgstr "/_Magnetische Daten zu Kraftgradient..." #: modules/volume/volume_mfmrecalc.c:233 @@ -20327,8 +20760,9 @@ msgstr "Diagrammkurven nivellieren" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/_XY Ebene Fehlstellen entfernen" +#, fuzzy +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/Ko_rrigieren/_Ausreißer markieren" #: modules/volume/volume_outliers.c:62 #, fuzzy @@ -20341,20 +20775,27 @@ msgstr "Graphen mit Gerade nivellieren." #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/_XY Ebene nivellieren" +#, fuzzy +msgid "/_Correct Data/_XY Plane Level" +msgstr "/Ko_rrigieren/Fehler_zeilen entfernen" #: modules/volume/volume_planelevel.c:62 #, fuzzy msgid "Level all XY planes" msgstr "Graphen mit Gerade nivellieren." +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "Nivellierte Daten" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "" #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." +#, fuzzy +msgid "/_Statistics/Summarize P_lanes..." msgstr "/Ebenen zusammenfassen..." #: modules/volume/volume_planestat.c:249 @@ -20372,79 +20813,120 @@ msgid "Summarize Volume Planes" msgstr "Shimadzu-Dateien" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "" -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/_Übertragungsfunktion-Vermutung..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Methode:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 #, fuzzy msgid "_Windowing type:" msgstr "_Randausblendungsmethode" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 #, fuzzy msgid "_Z level:" msgstr "Ebene nivellieren" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 #, fuzzy msgid "_Border:" msgstr "Rand" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +#, fuzzy +msgid "_Display:" +msgstr "_Anzeige:" + +#: modules/volume/volume_psf.c:1079 #, fuzzy msgid "Calculating volume transfer function..." msgstr "Statistikfunktionen für Zeile/Spalte berechnen" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 #, fuzzy msgid "Volume TF" msgstr "Volumen" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 #, fuzzy msgid "z level" msgstr "Ebene nivellieren" +#: modules/volume/volume_removeframe.c:91 +#, fuzzy +msgid "Remove one frame from volume data stack" +msgstr "Maske vom Datensatz entfernen" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/_Grundfunktionen/_Skalieren..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "Graphen mit Gerade nivellieren." + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "Profile extrahieren" + +#: modules/volume/volume_removeframe.c:165 +#, fuzzy +msgid "Frame removed" +msgstr "Körner entfernen" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "Graphen mit Gerade nivellieren." + +#: modules/volume/volume_removeframe.c:236 +#, fuzzy +msgid "_Remove Current Level" +msgstr "Derzeitiger Kanal" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 #, fuzzy -msgid "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/_Form fitten..." #: modules/volume/volume_rephase.c:168 @@ -20501,13 +20983,38 @@ msgid "Volume Z graphs" msgstr "Volumen" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "/Ko_rrigieren/_Fehlerzeilen markieren..." + +#: modules/volume/volume_scars.c:119 +#, fuzzy +msgid "Remove scars in all levels" +msgstr "Körner mittels Schwellwert entfernen" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "Korrigierte Daten driften" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "Markiere Grenzen" + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Cut and _Slice..." +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/_Grundfunktionen/_Skalieren..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -20578,6 +21085,25 @@ msgid "Volume Y graphs" msgstr "Volumen" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "/Ko_rrigieren/_Median Zeilenkorrektur" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Diagrammkurven nivellieren" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Laplace-Korrektur" + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "" + #: modules/volume/volume_strayfield.c:132 #, fuzzy msgid "Single value evolution" @@ -20593,7 +21119,8 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." msgstr "/_Streufeld Konsistenz..." #: modules/volume/volume_strayfield.c:254 @@ -20609,73 +21136,188 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 #, fuzzy msgid "Swaps axes of volume data." msgstr "Invertiert Wert in Volumendaten" -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/Achsen vertauschen..." +#: modules/volume/volume_swaxes.c:96 +#, fuzzy +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/_Grundfunktionen/_Skalieren..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 #, fuzzy msgid "Swap axes" msgstr "_Achsen anzeigen" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 #, fuzzy msgid "X" msgstr "_X:" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 #, fuzzy msgid "Y" msgstr "_Y:" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" msgstr "" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "" +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "" +"Einfache Rechenoperationen mit zwei Datenfeldern (oder einem Datenfeld und " +"einer skalaren Größe)." + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/_Grundfunktionen/_Verkippen..." + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "Arithmetische Operationen" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "Volumen" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "FFT Imaginärteil" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "Graphen mit Gerade nivellieren." + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/SPM M_odus/_Spitze/_Modell Spitze..." + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "XYZ-Daten importieren" + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "_Graphen zeichnen" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "Datei schließen" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "_Graphen zeichnen" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "Datei schließen" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/_Form fitten..." + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "Drehung korrigieren" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "Such-Größe" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "Rotieren" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "Datensatz skalieren" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "Datensatz skalieren" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "Speichern" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/_Z-Kalibrierung..." +#, fuzzy +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/_Grundfunktionen/_Verkippen..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -20750,7 +21392,7 @@ #: modules/volume/volume_zposlevel.c:162 #, fuzzy -msgid "/S_hift Value To Zero..." +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "Mittelwert als Nullpunkt setzen" #: modules/volume/volume_zposlevel.c:166 @@ -20764,14 +21406,33 @@ msgstr "" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Extrahiere _Vorschau" +#, fuzzy +msgid "/_Basic Operations/Extract _Preview" +msgstr "/_Grundfunktionen/Rotieren im _Uhrzeigersinn" #: modules/volume/volumeops.c:57 #, fuzzy msgid "Extract volume data preview to an image" msgstr "3D-Ansicht als Bild speichern" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "" + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "Größe _automatisch skalieren" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "Zuschneiden" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "" @@ -20800,21 +21461,6 @@ msgid "Y drift" msgstr "Drift in X-Richtung" -#: modules/xyz/xyz_drift.c:421 -#, fuzzy -msgid "y-axis drift" -msgstr "Drift in X-Richtung" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -#, fuzzy -msgid "Z drift" -msgstr "Drift in X-Richtung" - -#: modules/xyz/xyz_drift.c:440 -#, fuzzy -msgid "z-axis drift" -msgstr "Drift in X-Richtung" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "" @@ -21083,6 +21729,85 @@ msgstr "Zusammengefügte Bilder" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Facetten-Nivellierung..." + +#, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/Ko_rrigieren/_Reihen anpassen..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/Ko_rrigieren/_Stufen Zeilenkorrektur" + +#, fuzzy +#~ msgid "_Step detection kernel:" +#~ msgstr "_Auswahlmodus:" + +#, fuzzy +#~ msgid "Step detection _threshold:" +#~ msgstr "_Weicher Schwellwert:" + +#, fuzzy +#~ msgid "_Polynomial degree:" +#~ msgstr "Polynomiell (0. Ordnung)" + +#, fuzzy +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "_Maximaler Grad des Polynoms:" + +#, fuzzy +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "_Maximaler Grad des Polynoms:" + +#, fuzzy +#~ msgid "Minimum broadening:" +#~ msgstr "_Minimum:" + +#, fuzzy +#~ msgid "Maximum broadening:" +#~ msgstr "Maximale Abmessung" + +#~ msgid "/_Arithmetic..." +#~ msgstr "/_Arithmetisch..." + +#~ msgid "/Export _Text..." +#~ msgstr "/Exportieren als _Text..." + +#~ msgid "_Precision:" +#~ msgstr "_Genauigkeit:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Abmessungen und Einheiten..." + +#~ msgid "/3D View..." +#~ msgstr "/3D Ansicht..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Invertiere Wert" + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/_XY Ebene Fehlstellen entfernen" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/_XY Ebene nivellieren" + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/_Übertragungsfunktion-Vermutung..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Cut and _Slice..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/Achsen vertauschen..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/_Z-Kalibrierung..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Extrahiere _Vorschau" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "_Horizontale Größe" @@ -21771,10 +22496,6 @@ #~ msgstr "Schnittpunkte" #, fuzzy -#~ msgid "Shown cut direction:" -#~ msgstr "_Vertikal" - -#, fuzzy #~ msgid "Graph cut direction:" #~ msgstr "_Graph" @@ -21867,9 +22588,6 @@ #~ msgid "pixels" #~ msgstr "Pixel" -#~ msgid "Fast Fourier Transform" -#~ msgstr "Schnelle Fouriertransformation" - #, fuzzy #~ msgid "Surface _coverage:" #~ msgstr "Oberflächen-Flächeninhalt:" @@ -22085,9 +22803,6 @@ #~ msgid "Watershed" #~ msgstr "Watershed" -#~ msgid "Laplace correction" -#~ msgstr "Laplace-Korrektur" - #, fuzzy #~ msgid "Use antialiasing" #~ msgstr "Initialisiere" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/en_GB.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/en_GB.gmo differ diff -Nru gwyddion-2.62/po/en_GB.po gwyddion-2.63/po/en_GB.po --- gwyddion-2.62/po/en_GB.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/en_GB.po 2023-06-13 13:20:08.000000000 +0000 @@ -1,10 +1,10 @@ -# @(#) $Id: en_GB.po 25117 2022-10-19 15:49:08Z yeti-dn $ +# @(#) $Id: en_GB.po 25385 2023-05-30 14:19:58Z yeti-dn $ msgid "" msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" -"PO-Revision-Date: 2022-10-19 17:48+0200\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" +"PO-Revision-Date: 2023-05-30 16:19+0200\n" "Last-Translator: Yeti \n" "Language-Team: None, I suppose\n" "Language: en_GB\n" @@ -145,9 +145,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -163,7 +163,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Untitled" @@ -289,39 +289,39 @@ msgid "Resource directory cannot be created." msgstr "Resource directory cannot be created." -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Yes" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "No" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(fixed)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "deg" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -391,8 +391,8 @@ msgid "Maximum value" msgstr "Maximum value" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Mean value" @@ -417,11 +417,11 @@ msgid "Pixel area" msgstr "Pixel area" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Projected area" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Surface area" @@ -523,13 +523,13 @@ msgid "Direction of maximum Martin diameter" msgstr "Direction of maximum Martin diameter" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Inclination θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Inclination φ" @@ -545,11 +545,11 @@ msgid "Curvature center z value" msgstr "Curvature centre z-value" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Curvature 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Curvature 2" @@ -582,14 +582,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Position" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Value" @@ -599,7 +599,7 @@ msgstr "Area" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volume" @@ -612,7 +612,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Slope" @@ -669,12 +669,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Horizontal" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Vertical" @@ -715,12 +715,12 @@ msgstr "Scale and space adaptive" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Round" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Linear" @@ -1294,7 +1294,7 @@ msgid "Hide full controls" msgstr "Hide full controls" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Basic" @@ -1345,12 +1345,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1359,7 +1359,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1369,20 +1369,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1434,11 +1435,11 @@ msgstr "L_ight θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1461,7 +1462,7 @@ msgid "Maximum z value" msgstr "Maximum z-value" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "_Label:" @@ -1551,7 +1552,7 @@ msgstr "Hidden" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Points" @@ -1608,7 +1609,7 @@ msgid "_Line type:" msgstr "_Line type:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Line t_hickness:" @@ -1629,7 +1630,7 @@ msgid "Diamond" msgstr "Diamond" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Cross" @@ -1703,7 +1704,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Mode" @@ -1739,8 +1740,8 @@ msgstr "Abscissa" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Graph" @@ -1748,7 +1749,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Data" @@ -1787,12 +1788,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Length" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1800,7 +1801,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Height" @@ -1827,8 +1828,8 @@ msgstr "Preferred" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Name" @@ -1865,12 +1866,12 @@ msgid "A_dd symbol" msgstr "A_dd symbol" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Preview" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Cannot open file for reading: %s." @@ -2029,35 +2030,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Mean" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Minimum" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Maximum" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Min. position" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Max. position" @@ -2067,7 +2068,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2091,41 +2093,41 @@ msgid "Change Curve Map Preview" msgstr "Change Curve Map Preview" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Unknown channel %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Unknown volume %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "Unknown XYZ %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, c-format msgid "Unknown curve map %d" msgstr "Unknown curve map %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Z levels: %d, Z unit: %s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Points: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 msgid "Curves:" msgstr "Curves:" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "Segments:" @@ -2190,11 +2192,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "_Update" @@ -2252,7 +2254,7 @@ msgid "Open File" msgstr "Open File" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2403,63 +2405,63 @@ msgid "Cannot preview" msgstr "Cannot preview" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "Section %s ended at line %u but it has never started." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "Section %s ended at line %u instead of %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "Section %s started at line %u before %s ended." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Empty section name at header line %u." -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "Header line %u lacks prefix %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "Header line %u lacks key-value separator." -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "Key at header line %u is empty." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "Header has suddenly ended at line %u; end of header marker is missing" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Horizontal size" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Vertical size" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "S_quare image" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2469,7 +2471,7 @@ msgstr "_Width" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2486,20 +2488,20 @@ msgstr "_Height" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 msgid "_Square pixels" msgstr "_Square pixels" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 msgid "_Dimensions unit" msgstr "_Dimensions unit" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 msgid "_Value unit" msgstr "_Value unit" @@ -2513,21 +2515,22 @@ msgstr "_Start from the current image" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Resolution" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Physical Dimensions" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Units" @@ -2546,28 +2549,28 @@ msgid "Generated" msgstr "Generated" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Cannot write to file: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "%s: Lateral dimensions and value must be the same physical quantity." -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: Data must be square." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Missing layer module." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2576,31 +2579,31 @@ "This tool requires layer of type %s to work, which does not seem to be " "installed. Please check your installation." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Clear selected objects" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origin" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Size" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Width" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "Save Results to File" @@ -2660,7 +2663,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "en_GB" @@ -2681,7 +2684,7 @@ msgid "_Close" msgstr "_Close" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Type" @@ -2689,11 +2692,11 @@ msgid "Function" msgstr "Function" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parameters" @@ -2749,8 +2752,8 @@ msgid "_New" msgstr "_New" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Delete" @@ -2768,92 +2771,115 @@ msgid "Save Metadata" msgstr "Save Metadata" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "_Masking" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "_Interpolation type" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Direction" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "Combine with existing mask" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "_Windowing type" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "_Distance type" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "Plot _style" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "I_nstant updates" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Randomi_se" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "_Mask colour" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "Target _graph" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 msgid "C_urve" msgstr "C_urve" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "_Segment" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +msgid "Hold selection" +msgstr "Hold selection" + +#: app/param-def.c:1212 +msgid "Replace existing selection" +msgstr "Replace existing selection" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "Replace even with empty (clear selection)" + +#: app/param-def.c:1217 +msgid "_Hold selection" +msgstr "_Hold selection" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "R_andom seed" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "Expanded groups" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "New graph" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "to" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Change" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_New" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Change Units" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2879,40 +2905,40 @@ msgid "Set selected item as default" msgstr "Set selected item as default" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Cannot open file for writing: %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Cannot read file contents: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "File is empty." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "File is corrupted, magic header does not match." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "File is corrupted, deserialisation failed." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Cannot create user config directory %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Cannot create user ui directory %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Cannot create user module directory %s: %s" @@ -3034,66 +3060,66 @@ "version. For full licence text see file COPYING included in the source " "tarball." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "Or read the licence at" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licence" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Features" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Developers" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Translators" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "Development is supported by the Czech Metrology Institute: " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "OpenGL 3D View" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "OpenMP parallelisation" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "X11 protocol\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Win32 protocol\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Remote Control" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Python Scripting Interface" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "Released %s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "Development version, built %s" @@ -3719,7 +3745,7 @@ msgstr "_Edit" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Remove" @@ -3731,7 +3757,7 @@ msgid "Move _Down" msgstr "Move _Down" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "_Width:" @@ -3792,7 +3818,7 @@ msgid "XYZ Data" msgstr "XYZ Data" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Tool" @@ -4028,7 +4054,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Method" @@ -4041,7 +4067,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "Output _type" @@ -4131,31 +4157,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/_Basic Operations/_Crop" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Crop data" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "Keep lateral offsets" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Detail" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Crop" @@ -4163,34 +4191,36 @@ msgid "New Dimensions" msgstr "New Dimensions" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Options" @@ -4253,7 +4283,7 @@ msgstr "Z curve" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Fitting in progress..." @@ -4353,7 +4383,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "fit" @@ -4424,49 +4454,54 @@ msgid "Convert FZ to FD Curve" msgstr "Convert FZ to FD Curve" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Median" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Range" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Skew" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "Excess kurtosis" @@ -4492,8 +4527,8 @@ msgstr "Set _preview" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Quantity" @@ -4501,7 +4536,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "Output type" @@ -4534,7 +4569,7 @@ msgstr "Reference" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "_Degree" @@ -4542,9 +4577,9 @@ msgid "_Show" msgstr "_Show" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplitude" @@ -4569,7 +4604,7 @@ msgid "Remove polynomial background from all curves" msgstr "Remove polynomial background from all curves" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Remove Polynomial Background" @@ -4691,12 +4726,12 @@ msgid "Output images" msgstr "Output images" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Display" @@ -4729,14 +4764,15 @@ msgid "DMT fit" msgstr "DMT fit" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "Fit Results" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Results" @@ -4752,19 +4788,19 @@ msgid "Remove sine background from all curves" msgstr "Remove sine background from all curves" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 msgid "Remove Sine Background" msgstr "Remove Sine Background" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Imports Accurex II text files." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Accurex II text files (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "File header cannot be converted from ISO-8859-1 character set: %s" @@ -4790,52 +4826,52 @@ msgid "AIST-NT files (.aist)" msgstr "AIST-NT files (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Imports Alicona Imaging AL3D files." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Alicona Imaging AL3D files (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Invalid plane number %u in tag ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "Header tag key is not nul-terminated." -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "Header tag key is empty." -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "Header tag ‘%s’ key is not nul-padded." -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "Header tag ‘%s’ lacks CRLF terminator." -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "Header tag ‘%s’ value is not nul-terminated." -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "Header tag ‘%s’ value is not nul-padded." -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "Comment lacks CRLF termination." -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "Comment is not nul-terminated." @@ -4913,16 +4949,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "FileDescBegin has no corresponding FileDescEnd." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "Wrong number of header rows or columns." -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "Cannot parse data values at line %d." -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "Coordinates do not form a regular grid." @@ -4934,91 +4970,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Imports APE (Applied Physics and Engineering) data files." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "APE files (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Exports data as simple ASCII matrix." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "ASCII data matrix (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Add _informational comment header" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Use _dot as decimal separator" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "Conca_tenate exports of all images" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Precision" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Export Text" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Channel:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Width:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Height:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Value units:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Imports Assing AFM data files." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Assing AFM files (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Imports Attocube Systems ASC files." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Attocube ASCII files (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Imports Image Metrology BCR data files." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "BCR files (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "Cannot convert string from UTF-16." -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Unknown file type header: `%s'." @@ -5052,17 +5089,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Burleigh exported data (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "Missing colon in header line." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Imports Code V interferogram files." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Code V interferogram files (.int)" @@ -5079,18 +5116,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Neither `%s' nor `%s' header field found." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "zlib initialisation failed with error %d, cannot decompress data." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "Decompression of compressed data failed with error %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "Cannot decompress compressed data. Zlib support was not built in." @@ -5224,22 +5261,22 @@ msgid "Scan size header field overlaps with data." msgstr "Scan size header field overlaps with data." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Cannot read from file: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "No data file corresponding to ‘%s’ has been found." -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "File is too short to be of the assumed file type." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5248,7 +5285,7 @@ "File is not a %s file, it is seriously damaged, or it is of an unknown " "format version." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5258,21 +5295,21 @@ "size is %u bytes." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "File component/item ‘%s’ is truncated." -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "File header is truncated." -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Invalid field dimension: %d." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5281,39 +5318,43 @@ "The number of bits per sample %d is invalid or unsupported for this file " "type." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Data type %d is invalid or unsupported." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Header field ‘%s’ is missing." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "The value of parameter ‘%s’ is invalid or unsupported." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Parameter ‘%s’ is missing or invalid." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "File contains no (importable) data." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "Inconsistent structure of individual spectra." + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "File contains no exportable channel." -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "File import was cancelled by user." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "Missing header." @@ -5337,7 +5378,7 @@ msgid "Garbage before first header section." msgstr "Rubbish before the first header section." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Malformed header line (missing =)." @@ -5376,8 +5417,8 @@ msgid "FemtoScan SPM files" msgstr "FemtoScan SPM files" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Image data are outside the file." @@ -5463,7 +5504,7 @@ msgid "Following features" msgstr "Following features" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Z scale" @@ -5493,15 +5534,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Export %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5513,14 +5554,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Import %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Number of points" @@ -5537,24 +5579,24 @@ msgid "Z-range" msgstr "Z-range" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Imports DME GDEF data files." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "DME GDEF files (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "File version %u.%u is not supported." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "Control block mark is not CB, file is damaged." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Unknown variable type %u." @@ -5586,75 +5628,55 @@ msgstr "" "Data deserialisation succeeded, but resulted in an unexpected object %s." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "Required tag %u was not found." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "TIFF directory %lu ended unexpectedly." -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "BigTIFF data type %u was found in a classic TIFF." -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Invalid tag data positions were found." -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "BigTIFF reserved fields are %u and %u instead of 8 and 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Compression type %u is not supported." -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "Non-uniform bits per sample are unsupported." -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "Planar configuration %u is not supported." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Unsupported sample format" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "%s cannot open the file as a ZIP file." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "%s error while reading the zip file: %s." - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "End of list of files" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Cannot obtain the uncompressed file size." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Cannot read file contents." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Unknown error" @@ -5663,6 +5685,11 @@ msgid "End of file" msgstr "End of file" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "End of list of files" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Parameter error" @@ -5685,11 +5712,26 @@ msgstr "%s error while reading the zip file: %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "File %s is missing in the zip file." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "%s error while reading the zip file: %s." + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Cannot obtain the uncompressed file size." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Cannot read file contents." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Imports Gwyddion XYZ field files." @@ -5711,49 +5753,53 @@ msgid "Export GXYZF" msgstr "Export GXYZF" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Channel" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "XYZ data" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Imports Hierarchical Data Format (HDF) files, version 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Psi HDF4 files (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "PSI binary header is too short." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "HDF data with ‘native’ type is not supported." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Imports files based on Hierarchical Data Format (HDF), version 5." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "Asylum Research Ergo HDF5 files (.h5)" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." -msgstr "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" +msgstr "Shilps Sciences Lucent HDF5 files (.h5)" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "Dataset %s has %d items, which does not match image resolution %d×%d." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "HDF5 library error %ld in function %s." + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5778,22 +5824,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "TIFF and BigTIFF images with high depth (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "_Horizontal size" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "_Vertical size" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "_Z-scale (per sample unit)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 msgid "Just use _pixels" msgstr "Just use _pixels" @@ -5849,12 +5895,12 @@ msgstr "OpenEXR data type %u is invalid or unsupported." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "libpng initialisation error (in %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "libpng error occurred" @@ -5862,7 +5908,7 @@ msgid "Failed to read image data." msgstr "Failed to read image data." -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Channels" @@ -5871,11 +5917,11 @@ msgid "Pages" msgstr "Pages" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Image Information" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 msgid "Value Mapping" msgstr "Value Mapping" @@ -5905,7 +5951,7 @@ msgstr "Hitachi SEM files (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "No corresponding data file was found for header file." @@ -5946,105 +5992,105 @@ msgid "Cannot read channel labels." msgstr "Cannot read channel labels." -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows or OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Horiz./vert. lines" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "Crosses" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Ellipses" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Lines" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Rectangles" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Lattice" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Path" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "_None" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "_Rulers" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "_Inset scale bar" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "_False colour ruler" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "None" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "At the top" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Along the right edge" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6054,283 +6100,283 @@ "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Select Colour" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "White" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Black" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Pi_xel size:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "Pixels per _inch:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zoom:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Height:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "_Font:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "_Font size:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "_Border width:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "_Tick length:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Tie sizes to _data pixels" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "_Decimal separator is comma" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Colours" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "_Line and text colour:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "_Transparent background" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "_Background colour:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Placement" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "left" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "centre" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "right" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "top" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "bottom" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "Lateral scale" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Length:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "Hori_zontal gap:" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "_Vertical gap:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "Colou_r:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "Out_line colour:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "O_utline thickness:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "O_pacity:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Draw _ticks" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Draw _label" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "Draw text _above scale bar" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Image" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "_Interpolation type:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Draw _frame" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Draw _mask" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Draw mask _legend" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Value Scale" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Fi_xed precision:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Fixed _kilo threshold:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Title" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Posi_tion:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "_Gap:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Put _units to title" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Draw _selection" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objects" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "Lateral" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "_Load" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "_Store" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Rename" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "Preset _name:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Export as 1_6 bit grey scale" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "Lateral Scale" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Values" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Selection" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Presets" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Cairo error occurred: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Pixbuf save failed: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "Image is too large to be stored as TARGA." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Draw _numbers" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "_End marker length:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "Marker _radius:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Mask" @@ -6349,31 +6395,31 @@ msgstr "" "Invalid data address 0x%0x found. File is in some unknown format version." -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Imports Intematix SDF data files." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Intematix SDF data files (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "Parameter tag set is incomplete." -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "image depth" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "Imports and exports ISO 28600:2011 SPM data transfer format." -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "ISO 28600:2011 SPM data transfer files (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6382,57 +6428,57 @@ "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "End of file reached when reading sample #%u of %u" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "Malformed data encountered when reading sample #%u" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Missing end-of-data marker." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "End of file was reached when reading sample #%d of %d" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "Malformed data encountered when reading sample #%d of %d" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "Line %u does not contain mandatory label ‘%s’." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Imports JEOL data files." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "JEOL data files (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "The type of data is unknown. Please report it to the developers." @@ -6460,38 +6506,38 @@ msgid "File does not contain grid dimensions." msgstr "File does not contain grid dimensions." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "Scanning file (%u curves)..." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Reading files..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "Creating volume data..." -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Non-uniform point and/or segment numbering is not supported." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Non-uniform channel lists are not supported." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Data file %s was found instead of expected %s." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "Header properties file for index %u is missing." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Cannot find any height channel." @@ -6509,11 +6555,11 @@ msgstr "Header block %u has invalid position or size." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Cannot find image header block." -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Cannot find piezo header block." @@ -6644,7 +6690,7 @@ msgid "MetroPro files (.dat)" msgstr "MetroPro files (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "File header is larger than file." @@ -6660,12 +6706,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "MicroProf FRT text files (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "Duplicate block %02x." -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "File contains fewer than XSize*YSize data points." @@ -6702,33 +6748,33 @@ msgid "Unique id record is too short." msgstr "Unique id record is too short." -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Imports Molecular Imaging MI data files." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "PicoView Data Files (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Spectroscopy Graph" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Imports Aarhus MUL files." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Aarhus MUL files (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" "Image number in the label %u does not match the number %u in the index." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "Label string length %u is larger than 20." @@ -6754,21 +6800,21 @@ msgid "Spectra data starts past the end of file." msgstr "Spectra data starts past the end of file." -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "Profile %u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "F-D spectra" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "I-V spectra" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "I-Z spectra" @@ -6788,7 +6834,7 @@ msgid "Nanonics files (.nan)" msgstr "Nanonics files (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6799,7 +6845,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "HeaderLength %u differs from the actual header length %u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "Expected header start marker ‘%s’ but found ‘%s’." @@ -6820,7 +6866,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Nanonis SXM files (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "File header ended unexpectedly." @@ -6834,12 +6880,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFO does not contain the expected columns: %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "DATA_INFO line contains fewer than %d fields." -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Missing data start marker \\x1a\\x04." @@ -6871,11 +6917,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "NanoScanTech data (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Imports Digital Instruments Nanoscope II data files." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope II files" @@ -6909,20 +6955,20 @@ "compressed folder’ in some versions of MS Windows, or any other file " "transfer that attempts to store text platform-independently." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "Reading channels..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Cannot parse ‘Scan size’ field." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Rubbish after data sample #%u." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Truncated header line." @@ -6942,55 +6988,55 @@ msgid "Nanotop files (.spm)" msgstr "Nanotop files (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Imports network Common Data Form (netCDF) files created by GXSM." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "GSXM netCDF files (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "Variable ‘%s’ refers to invalid or non-existent data." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "NetCDF records are not supported." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "Value series values must be of type FLOAT." -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "Time values must be of type DOUBLE." -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "Reading of fast scan files is not implemented - yet." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "Time series order is wrong." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "File ended unexpectedly inside ‘%s’." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "Expected ‘%s’ array or ’ABSENT’." -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "Array ‘%s’ has non-zero number of elements in spite of being absent." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "More than one record dimension found." @@ -7007,7 +7053,7 @@ msgstr "Nano Measuring Machine data import must be run as interactive." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Rendering surface..." @@ -7015,7 +7061,7 @@ msgid "Import NMM Profile Set" msgstr "Import NMM Profile Set" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Information" @@ -7044,13 +7090,13 @@ msgstr "Align scan lines with X axis" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "_Horizontal size:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "_Vertical size:" @@ -7134,17 +7180,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "Field byteskip specifies more bytes than there are in the file." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "Items of per-axis header field %s are not quoted." -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "Per-axis header field %s contains too many items." -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "Per-axis header field %s contains too few items." @@ -7205,7 +7251,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Olympus packed OIR data files (.poir)" -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "Chunk type %u occured multiple times." @@ -7277,7 +7324,7 @@ msgid "Header line starts with a colon." msgstr "Header line starts with a colon." -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "Channel information has ended unexpectedly." @@ -7311,46 +7358,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Imports Wyko OPD and ASC files." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Wyko OPD files (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Wyko ASCII export files (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "Item ‘%s’ is beyond the end of the file." -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Nested directories found" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Reads ISO 5436-2 OpenGPS .x3p files." -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "ISO 5436-2 OpenGPS data (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "Too many DataList items for given matrix dimensions." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "File main.xml contains multiple data elements." #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "Only type %s is supported for axis %s." @@ -7374,7 +7421,7 @@ msgstr "Invalid object nesting at line %u." #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "Data block is truncated." @@ -7458,36 +7505,36 @@ "Imports data from low-depth pixmap images (PNG, TIFF, JPEG, ...). The set " "of available formats depends on available GDK pixbuf loaders." -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Use" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "_Hue offset" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "Pixmap has not registered file type `%s'." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Cannot get pixbuf loader: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "Pixbuf loader refused data: %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "as data" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7538,7 +7585,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "Header is too short (only %lu bytes)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "Spectroscopy header is too short (only %lu bytes)." @@ -7565,20 +7612,16 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "Unexpected JSON structure: %s should be %s." -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "Inconsistent structure of individual spectra." - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "JSON parsing error: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 msgid "Reading frame table..." msgstr "Reading frame table..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 msgid "Reading curve data..." msgstr "Reading curve data..." @@ -7649,59 +7692,59 @@ msgid "Quesant files (.afm)" msgstr "Quesant files (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "User-specified" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Signed byte" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Unsigned byte" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "Signed 16bit word" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "Unsigned 16bit word" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "Signed 32bit word" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "Unsigned 32bit word" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "Signed 64bit word" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "Unsigned 64bit word" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE single" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE double" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "IEEE half" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Pascal real" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7709,158 +7752,158 @@ "Imports raw data files, both ASCII and binary, according to user-specified " "format." -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "Raw data files" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Any white-space" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "TAB character" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Other character" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "_Field delimiter" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "_Automatically offer raw data import of unknown files" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "_Text data" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "_Binary data" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "Missin_g value substitute" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "Start from _line" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "_Each row skip" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "_Other delimiter" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 msgid "Data t_ype" msgstr "Data t_ype" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "Byte s_wap pattern" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "Start at _offset" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "_Sample size" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "After each sample s_kip" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "After each _row skip" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "_Reverse bits in bytes" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Reverse bi_ts in samples" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Samples are si_gned" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "Raw data import must be run as interactive." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Read Raw File" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Data Format" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "File" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "fields" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "bytes" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bits" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binary" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Text" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Delimiter: white-space" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Delimiter: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Delimiter: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 msgid "Invalid preset name." msgstr "Invalid preset name." -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -7871,7 +7914,7 @@ "The format would require %lu bytes long file (at least), but the length of " "‘%s’ is only %u bytes." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -7880,38 +7923,38 @@ "Parsing failed\n" "The contents of ‘%s’ does not match format: %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Not enough lines (%d) for offset (%d)" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "Expected white-space to skip more fields in row %u, got `%.16s'" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "Expected ‘%c’ to skip more fields in row %u but found ‘%.16s’" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "Expected ‘%s’ to skip more fields in row %u but found ‘%.16s’" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Rubbish ‘%.16s’ in row %u, column %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "Expected delimiter ‘%c’ after data in row %u, column %u, found ‘%c’" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "Expected delimiter ‘%s’ after data in row %u, column %u, found ‘%.16s’" @@ -7928,8 +7971,8 @@ msgid "_Title" msgstr "_Title" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Curve" @@ -7973,36 +8016,36 @@ msgid "Random points order unsupported" msgstr "Random points order is unsupported" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Imports RHK Technology SM3 data files." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "RHK SM3 files (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "End of file reached in page header." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "magic page header" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "End of file reached in string #%u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "End of file reached in colour data header." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "End of file reached in colour data." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Unknown line %d" @@ -8015,17 +8058,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "RHK SM4 files (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "Object list in %s is truncated." -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "Object of type %s is truncated." -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Cannot find object %s in %s." @@ -8060,7 +8103,7 @@ msgid "data ranges" msgstr "data ranges" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "data offset" @@ -8136,16 +8179,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Sensofar PLu files (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Profile" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Reads Sensofar PLUx files." -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Sensofar PLUx files (.plux)" @@ -8157,15 +8200,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Sensolytics text files (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Imports Shimadzu SPM data files." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Shimadzu files" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Cannot parse data values after %d of %d." @@ -8186,31 +8229,31 @@ msgid "SIS files (.sis)" msgstr "SIS files (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Block not a document block." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Too short document info." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Too short parameter info." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Unexpected image block." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "End of file reached in image block." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "End of file reached in channel block." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "End of file reached when another channel was expected." @@ -8512,31 +8555,31 @@ msgid "Unknown data type `%s'." msgstr "Unknown data type ‘%s’." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Exports data as simple XYZ text file." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "XYZ text data (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "XYZ data:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Lateral units:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Export XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Imports Carl Zeiss SEM images." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Carl Zeiss SEM scans (.tif)" @@ -8569,12 +8612,12 @@ msgid "Data line %u does not contain four items." msgstr "Data line %u does not contain four items." -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Unit code %d is invalid or unsupported." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "The first line contains too many items." @@ -8602,9 +8645,8 @@ msgid "Fit Graph" msgstr "Fit Graph" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "_Graph curve:" @@ -8613,28 +8655,18 @@ msgid "F_unction:" msgstr "F_unction:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Range:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "to" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "_Draw whole circle" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8686,26 +8718,26 @@ msgid "Results\n" msgstr "Results\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Cut graph" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "/_Basic Operations/_Cut..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Extract part of graph into new one" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Cut Graph" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Cut _all curves" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Cut Graph" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "DOS Spectrum" @@ -8761,6 +8793,7 @@ msgstr "Igor Pro text wave" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "Style" @@ -8785,7 +8818,7 @@ msgstr "Single _merged abscissa" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Export to Text File" @@ -8970,8 +9003,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/_Force Distance/_FZ to FD Curve..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "_All curves" @@ -8983,8 +9016,8 @@ msgid "Zero position" msgstr "Zero position" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 msgid "FD curve" msgstr "FD curve" @@ -9076,6 +9109,85 @@ msgid "Logscale Transform" msgstr "Logscale Transform" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "Evaluates the period of a one-dimensional periodic structure." + +#: modules/graph/graph_measure_period.c:105 +msgid "/Measure _Features/_Period..." +msgstr "/Measure _Features/_Period..." + +#: modules/graph/graph_measure_period.c:108 +msgid "Measure grating period" +msgstr "Measure grating period" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "Save Parameters" + +#: modules/graph/graph_measure_period.c:126 +msgid "_Subtract background" +msgstr "_Subtract background" + +#: modules/graph/graph_measure_period.c:127 +msgid "Show _leveled curve" +msgstr "Show _levelled curve" + +#: modules/graph/graph_measure_period.c:166 +msgid "Measure Period" +msgstr "Measure Period" + +#: modules/graph/graph_measure_period.c:187 +msgid "Fourier Transform" +msgstr "Fourier Transform" + +#: modules/graph/graph_measure_period.c:189 +msgid "Autocorrelation" +msgstr "Autocorrelation" + +#: modules/graph/graph_measure_period.c:191 +msgid "Direct Methods" +msgstr "Direct Methods" + +#: modules/graph/graph_measure_period.c:237 +msgid "Grating Period" +msgstr "Grating Period" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "%{from}v to %{to}v" + +#: modules/graph/graph_measure_period.c:250 +msgid "Simple FFT" +msgstr "Simple FFT" + +#: modules/graph/graph_measure_period.c:251 +msgid "Refined FFT" +msgstr "Refined FFT" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "Simple ACF" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "Multi-peak ACF" + +#: modules/graph/graph_measure_period.c:254 +msgid "Gravity centers" +msgstr "Gravity centres" + +#: modules/graph/graph_measure_period.c:255 +msgid "Zero crossings" +msgstr "Zero crossings" + +#: modules/graph/graph_measure_period.c:1050 +msgid "Leveled profile" +msgstr "Levelled profile" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "Finds peaks on graph curves." @@ -9093,7 +9205,7 @@ msgstr "Prominence" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Zero" @@ -9125,90 +9237,90 @@ msgid "Graph Peaks" msgstr "Graph Peaks" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "Data + fit" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Levelled data" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Remove polynomial background" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/_Force Distance/Remove _Polynomial Background..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 msgid "Remove polynomial background from FZ curve" msgstr "Remove polynomial background from FZ curve" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "Curve to fit" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 msgid "_Output" msgstr "_Output" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 msgid "Fit results" msgstr "Fit results" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "P0" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "P1" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "P2" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "P3" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "P4" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "P5" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Height distribution" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Cum. height distribution" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Distribution of angles" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Cum. distribution of angles" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9224,7 +9336,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/_Statistics/Statistical _Functions..." -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Calculate 1D statistical functions" @@ -9235,14 +9347,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "_Fixed resolution" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Statistical Functions" @@ -9262,110 +9374,99 @@ msgid "pick points" msgstr "pick points" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 msgid "Remove sine background" msgstr "Remove sine background" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "/_Force Distance/_Remove Sine Background..." -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "Remove interference effects from FZ curve" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "Period" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "Y offset" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "Calculates simple graph curve statistics." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 msgid "/_Statistics/_Statistical Quantities..." msgstr "/_Statistics/_Statistical Quantities..." -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "Calculate graph curve statistics" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "Save Parameters" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Statistical Quantities" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "Simple Parameters" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "Integrals" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "Graph Statistics" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "%{from}v to %{to}v" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "Rms (Rq)" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "Projected length" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "Developed length" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variation" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "Area under curve" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "Positive area" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "Negative area" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "Root mean square" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "Data + polynomials" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9374,202 +9475,194 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Difference" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "Terraces (ideal)" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "Levelled surface" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "Polynomial background" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "Fits terraces with polynomial background." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "/Measure _Features/_Terraces..." -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "Fit terraces with polynomial background" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "Fitted step height" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" +msgstr "Step detection" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "Mean square difference" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" +msgstr "_Step detection kernel" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "Terrace discrepancy" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" +msgstr "Step detection _threshold" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" -msgstr "Number of terraces" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" +msgstr "Step _broadening" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "Fit Terraces" +#: modules/graph/graph_terraces.c:268 +msgid "Minimum terrace _length" +msgstr "Minimum terrace _length" + +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "_Polynomial degree" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "Terrace List" +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" +msgstr "_Independent heights" + +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" +msgstr "Select regions _manually" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" +msgstr "Save Terrace Table" + +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 msgid "Output" msgstr "Output" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" -msgstr "Survey" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" +msgstr "M_inimum polynomial degree" -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "_Step detection kernel:" - -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" -msgstr "Step detection _threshold:" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "Step _broadening:" - -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "Minimum terrace _length:" - -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "_Polynomial degree:" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" +msgstr "_Maximum polynomial degree" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" -msgstr "_Independent heights" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" +msgstr "Minimum broadening" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" -msgstr "Step detection" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" +msgstr "Maximum broadening" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "_Display:" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "Fit Terraces" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "Select regions _manually" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "Terrace List" + +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" +msgstr "Survey" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "Result" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "Save Terrace Table" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "_Execute" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "_Polynomial degree" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "Fitted step height" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" -msgstr "M_inimum polynomial degree:" - -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" -msgstr "_Maximum polynomial degree:" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "Mean square difference" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" -msgstr "Step _broadening" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "Terrace discrepancy" -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" -msgstr "Minimum broadening:" - -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" -msgstr "Maximum broadening:" - -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." -msgstr "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" +msgstr "Number of terraces" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, c-format -msgid "Number of combinations: %u." -msgstr "Number of combinations: %u." +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "Survey cannot be run with independent heights." -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 msgid "No free parameters are selected." msgstr "No free parameters are selected." -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, c-format +msgid "Number of combinations: %u." +msgstr "Number of combinations: %u." + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "Segment %u" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "Level %d" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "Fit failed" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "No suitable terrace steps were found" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "No terraces were found" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Save Table" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "Save Terrace Fit Survey" @@ -9701,7 +9794,7 @@ msgstr "Plane levelling" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Zoom" @@ -9719,8 +9812,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "_Thickness" @@ -9747,7 +9840,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "Mask in use" @@ -9839,7 +9932,7 @@ msgstr "Generate image by annealing a lattice gas" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Number of iterations" @@ -9883,8 +9976,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Progressive preview" @@ -9896,13 +9989,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Dimensions" @@ -9911,18 +10005,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Generator" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Simulation Parameters" @@ -9933,15 +10029,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "_Like Current Image" @@ -9950,10 +10047,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -9964,8 +10062,9 @@ msgstr "Initialising..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "Running computation..." @@ -9995,7 +10094,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Radius" @@ -10035,64 +10134,80 @@ msgid "Arithmetic operations on data" msgstr "Arithmetic operations on data" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Expression" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Specify un_its" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "_Fixed filler value" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Calculated" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Arithmetic" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Expression:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Operands" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Take result units from data d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Specify un_its:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Specify result units explicitly" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "Expression contains unknown identifiers" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Pixel dimensions differ" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "Lateral dimensions are different physical quantities" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Physical dimensions differ" @@ -10128,7 +10243,7 @@ "Basic operations like flipping, value inversion, and rotation by multiples " "of 90 degrees." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/_Basic Operations/_Invert Value" @@ -10158,35 +10273,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "Co_verage" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "Spread" @@ -10587,27 +10703,30 @@ msgid "Building mesh..." msgstr "Building mesh..." -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "X correction" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Y correction" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Z correction" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "X uncertainty" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Y uncertainty" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Z uncertainty" @@ -10640,6 +10759,7 @@ msgstr "Recalibrates scan lateral dimensions or value range." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/_Basic Operations/_Dimensions and Units..." @@ -10722,7 +10842,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "Create new image" @@ -10771,10 +10891,6 @@ msgid "Classify" msgstr "Classify" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "_Execute" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "Mask A" @@ -10939,6 +11055,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 msgid "_Height scale" msgstr "_Height scale" @@ -11088,14 +11205,14 @@ msgid "Convolution _kernel" msgstr "Convolution _kernel" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Normalise as _integral" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "Convolved" @@ -11129,13 +11246,13 @@ msgstr "Affine Correction" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "_Refine" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Preview Options" @@ -11329,7 +11446,7 @@ msgstr "Add _low-score results mask" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "T_hreshold" @@ -11413,13 +11530,13 @@ msgid "Curvature Sections" msgstr "Curvature Sections" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Profile %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Output type:" @@ -11519,7 +11636,7 @@ msgid "Deconvolve" msgstr "Deconvolve" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "Sigma" @@ -11877,7 +11994,8 @@ msgid "drift" msgstr "drift" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "x-axis drift" @@ -11893,6 +12011,42 @@ msgid "rows" msgstr "rows" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "Generates images by simulating formation of sand dunes." + +#: modules/process/dune_synth.c:122 +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/S_ynthetic/_Deposition/_Dunes..." + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "Generate image by transporting sand" + +#: modules/process/dune_synth.c:145 +msgid "_Minimum step" +msgstr "_Minimum step" + +#: modules/process/dune_synth.c:146 +msgid "Step range" +msgstr "Step range" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "Sticking probability on _rock" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "Sticking _probability on sand" + +#: modules/process/dune_synth.c:149 +msgid "Maximum s_lope" +msgstr "Maximum s_lope" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "Dunes" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "Two-dimensional DWT (Discrete Wavelet Transform)." @@ -12197,7 +12351,7 @@ msgstr "There is no path selection." #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Distance" @@ -12222,10 +12376,11 @@ msgstr "Facet-Level" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Facet-levelling..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Visualises, marks and measures facet orientation." @@ -12246,11 +12401,11 @@ msgid "_Number points" msgstr "_Number points" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "_Clear" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "_Mark" @@ -12322,7 +12477,7 @@ msgid "Create _Points" msgstr "Create _Points" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "Save Facet Vectors" @@ -12331,43 +12486,43 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f deg, φ = %.2f deg" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." msgstr "/Measure _Features/Facet _Measurement..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "Measure facet angles" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "_Facet plane size" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Tolerance" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "Selected φ" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "Selected ϑ" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "I_nstant facet marking" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "Measure Facets" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "Mea_sure" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "points" @@ -12603,7 +12758,7 @@ msgid "Clear the entire filter mask" msgstr "Clear the entire filter mask" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "_Fill" @@ -12623,7 +12778,7 @@ msgid "Zoom:" msgstr "Zoom:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Output Options" @@ -12692,7 +12847,7 @@ msgid "Triangle" msgstr "Triangle" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "Rectangle" @@ -12740,7 +12895,7 @@ msgstr "Random Fibres" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Shape" @@ -12771,7 +12926,7 @@ msgstr "Fitted shape" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Both" @@ -13029,6 +13184,7 @@ msgstr "Create _mask" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "_Trim fraction" @@ -14012,7 +14168,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Corrects line defects (mostly experimental algorithms)." -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/_Correct Data/Ste_p Line Correction" @@ -14028,31 +14184,31 @@ msgid "Mark lines with inverted sign" msgstr "Mark lines with inverted sign" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Polynomial" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Median of differences" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Modus" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Matching" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "Trimmed mean" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "Trimmed mean of differences" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "Facet-level tilt" @@ -14060,7 +14216,7 @@ msgid "Aligns rows by various methods." msgstr "Aligns rows by various methods." -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/_Correct Data/_Align Rows..." @@ -14096,7 +14252,7 @@ msgid "Steps" msgstr "Steps" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Scars" @@ -14105,7 +14261,7 @@ msgstr "Ridges" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Tilt" @@ -14249,7 +14405,7 @@ msgid "_Hessian" msgstr "_Hessian" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "_Regularisation parameter" @@ -14274,10 +14430,12 @@ msgstr "Mark data disconnected from other values" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positive" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negative" @@ -14410,7 +14568,7 @@ msgid "Two-sided" msgstr "Two-sided" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Shrink from _border" @@ -14534,115 +14692,132 @@ msgid "Shift Mask" msgstr "Shift Mask" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "Searches for a detail in another image using correlation." -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidata/Correlation _Search..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "Search for a detail using correlation" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "Correlation, raw" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "Correlation, levelled" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Correlation score" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "Height difference, raw" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "Height difference, levelled" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "Height difference score" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Phase-only" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Objects marked" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Correlation maxima" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "Correlation _method" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Use _mask" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "_Plot mask" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "_Detail to search" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "Correlation Search" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Basic operations with mask: inversion, removal, extraction." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Mask/_Remove Mask" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Remove mask from data" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Mask/_Invert Mask" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Invert mask" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Mask/_Extract Mask" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "Extract mask to a new image" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "/_Grains/_Extract Numbers" + +#: modules/process/maskops.c:85 +msgid "Extract grain numbers to a new image" +msgstr "Extract grain numbers to a new image" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Grains/_Remove Edge-Touching" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Remove grains touching image edges" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Mask/Thi_n" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Thin mask" +#: modules/process/maskops.c:193 +msgid "Grain Numbers" +msgstr "Grain Numbers" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Crops non-intersecting regions of two images." @@ -14787,7 +14962,7 @@ msgid "Second image" msgstr "Second image" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Average" @@ -15145,7 +15320,7 @@ msgid "Use _first mask for all images" msgstr "Use _first mask for all images" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "_Mode" @@ -15238,8 +15413,8 @@ msgid "Re_initialize" msgstr "Re_initialise" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Masking Mode" @@ -15760,6 +15935,65 @@ msgid "Pile Up Shapes" msgstr "Pile Up Shapes" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Generates phase-separated structures." + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/S_ynthetic/_Pattern..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Generate image with domains" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Maximum _width" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Minimum step" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Size spread" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "_Slope fraction" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Scales _with size" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "_Height scale" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Random linear" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Generating fibres..." + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Applies polynomial distortion in the horizontal plane." @@ -15820,10 +16054,6 @@ msgid "_Vertical polynomial degree" msgstr "_Vertical polynomial degree" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "_Maximum polynomial degree" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "_Same degrees" @@ -15840,6 +16070,10 @@ msgid "Copy table to clipboard" msgstr "Copy table to clipboard" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Save Table" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Basic operations with presentation: extraction, removal." @@ -15983,8 +16217,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "Transfer function" @@ -16004,7 +16238,7 @@ msgid "Transfer function estimation" msgstr "Transfer function estimation" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Statistics/_Transfer Function Guess..." @@ -16012,15 +16246,15 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "Estimate transfer function from known data and ideal image" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "Regularised filter" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "Least squares" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "Wiener filter" @@ -16028,19 +16262,19 @@ msgid "_Border" msgstr "_Border" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "Image is too small." -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "Estimate Transfer Function" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "_Fit Sigma" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "Transfer Function Size" @@ -16056,23 +16290,23 @@ msgid "Transfer Function" msgstr "Transfer Function" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "TF width" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "TF height" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "TF norm" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "Difference norm" @@ -16195,7 +16429,7 @@ msgid "Proportion" msgstr "Proportion" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "Offset" @@ -16413,7 +16647,7 @@ msgid "_Assume symmetry" msgstr "_Assume symmetry" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Rotated Data" @@ -16489,23 +16723,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Correct horizontal scars (strokes)" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Scars type" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "_Hard threshold" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "_Soft threshold" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Minimum _length" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Maximum _width" @@ -16756,14 +16990,6 @@ msgid "Marked terraces" msgstr "Marked terraces" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "_Step detection kernel" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "Step detection _threshold" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "Minimum terrace _area" @@ -16772,22 +16998,6 @@ msgid "Do not _segment, use only mask" msgstr "Do not _segment, use only mask" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "M_inimum polynomial degree" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "Minimum broadening" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "Maximum broadening" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "Survey cannot be run with independent heights." - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Limit the data range using a lower/upper threshold." @@ -16832,7 +17042,7 @@ msgid "Limit Range" msgstr "Limit Range" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "Set to _Full Range" @@ -17519,134 +17729,134 @@ msgid "Function written in Python" msgstr "Function written in Python" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "Correlation length tool." -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "None" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "Line levelling" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Save Statistical Quantities" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "Correlation Length" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "Correlation Length T" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "Relation to Image Size" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "Selected area" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i at (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v at (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "Naïve ACF decay to 1/e" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "Extrapolated ACF decay to 1/e" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "ACF decay to zero" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "PSDF Gaussian fit" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "PSDF exponential fit" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "Ratio α = T/L" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "Image size measured in T" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "Profile tool which reads horizontal and/or vertical scan lines." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "Cross at _zero" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "Profiles Along Axes" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "Read horizontal and/or vertical profiles" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Profiles" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Options" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "Vertical profile %d" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "Horizontal profile %d" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Crop tool, crops data to smaller size." -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Distance measurement tool, measures distances and angles." +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "Save Distance Table" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "_Number lines" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Measure distances and directions between points" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "Save Distance Table" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -17705,7 +17915,7 @@ msgstr "" "Grain removal tool, removes continuous parts of mask and/or underlying data." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Laplace solver" @@ -17713,7 +17923,7 @@ msgid "Fractal correction" msgstr "Fractal correction" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "Fractal-Laplace blend" @@ -17721,7 +17931,7 @@ msgid "Remove" msgstr "Remove" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "_Interpolation method" @@ -17733,7 +17943,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Remove individual grains (continuous parts of mask)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -17741,66 +17951,74 @@ "Interactive colour range tool, allows selecting the data range false colour " "scale should map to, either on data or on height distribution histogram." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 msgid "_Start" msgstr "_Start" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "_End" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "_Adapt colour range to selection" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Colour Range" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Stretch colour range to part of data" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Full colour range from minimum to maximum" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Explicitly set fixed colour range" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Automatic colour range with tails cut off" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Adaptive non-linear colour mapping" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "_default" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Height histogram" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 msgid "Color Mapping" msgstr "Colour Mapping" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Set to _Masked" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "Set to _Unmasked" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Invert Mapping" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 msgid "Data Range" msgstr "Data Range" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "Set Zero to Colour Map Minimum" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -17809,7 +18027,7 @@ "Three-point level tool, levels data by subtracting a plane fitted through " "three selected points." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "_Averaging radius" @@ -17829,7 +18047,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Level data by fitting a plane through three points" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -17837,128 +18055,132 @@ "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Ro_ws" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Co_lumns" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Row/Column Statistics" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Calculate row/column statistical functions" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "Mask editor tool, allows interactive modification of parts of the mask." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "_Shapes" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "_Drawing Tools" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Set mask to selection" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Add selection to mask" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Subtract selection from mask" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Intersect selection with mask" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Rectangular shapes" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Elliptic shapes" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Thin lines" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Freehand mask drawing" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Freehand mask erasing" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Fill continuous empty areas with mask" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Erase continuous parts of mask" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "_Amount" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "Fill non-simple-connected" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "_Prevent grain merging by growing" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "Thin lines are 4-connected" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Mask Editor" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Edit mask" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Editor" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Actions" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Grow/Shrink" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Invert" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "Fill _Voids" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "_Grow" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "Shrin_k" @@ -17974,103 +18196,107 @@ msgid "Level rows using intersections with given lines" msgstr "Level rows using intersections with given lines" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Profile tool, creates profile graphs from selected lines." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "None" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "_Separate profiles" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "_Show profile" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "_Calibration data" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "Extract profiles along arbitrary lines" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "Improve _Direction" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "Improve _All" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "X error %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Y error %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Z error %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "X uncertainty %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Y uncertainty %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Z uncertainty %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Zunc up bound %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Zunc low bound %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Pointer tool, reads value under pointer." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Show _selection" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "Adapt colour range to detail" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Read Value" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Read value under mouse cursor" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Set _Zero" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Facet" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Curvatures" @@ -18078,16 +18304,16 @@ msgid "Calculate surface profile parameters." msgstr "Calculate surface profile parameters." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Texture" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Waviness" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Roughness" @@ -18099,7 +18325,7 @@ msgid "BRC" msgstr "BRC" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Peak Count" @@ -18111,179 +18337,179 @@ msgid "Calculate roughness parameters" msgstr "Calculate roughness parameters" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Roughness Parameters" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "Selected line" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "Cut-off" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Roughness average" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Root mean square roughness" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Maximum height of the roughness" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Maximum roughness valley depth" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Maximum roughness peak height" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Average maximum height of the roughness" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Average maximum roughness valley depth" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Average maximum roughness peak height" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "Average third highest peak to third lowest valley height" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Average maximum height of the profile" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "Maximum peak to valley roughness" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Skewness" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Kurtosis" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Waviness average" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Root mean square waviness" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Waviness maximum height" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Maximum height of the profile" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Spatial" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "Mean spacing of profile irregularities" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Average wavelength of the profile" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Root mean square (RMS) wavelength of the profile" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "Hybrid" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Average absolute slope" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Root mean square (RMS) slope" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Developed profile length" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Profile length ratio" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 msgid "parameters|Functional" msgstr "Functional" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 msgid "Swedish height" msgstr "Swedish height" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "No profile in the image selected." -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Amplitude Distribution Function" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "The Bearing Ratio Curve" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Surface Profiles" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "Creates angularly averaged profile graphs." -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "Radial Profiles" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "Extract angularly averaged profiles" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "Radial profiles" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "S_ymmetrise" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Symmetrise _All" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "Radial profile %d" @@ -18320,7 +18546,7 @@ msgid "_Copy" msgstr "_Copy" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -18330,35 +18556,43 @@ "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "Radial PSDF" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "Angular spectrum" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "Radial ACF" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Minkowski volume" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Minkowski boundary" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Minkowski connectivity" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "Area scale graph" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "IDF" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "Radial IDF" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "_Separate uncertainty" @@ -18386,7 +18620,7 @@ msgid "Spectroscopy" msgstr "Spectroscopy" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -18394,154 +18628,187 @@ "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Hyperbolic flatten" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Pseudo-Laplace" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Fractal interpolation" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "Ellipse" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Remove Spots" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Interpolate small defects, manually selected" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "No point in the image selected." -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "No area in the zoom selected." -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Statistics tool." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Statistical quantities" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "Moment-Based" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "Order-Based" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Hybrid" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "Other" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "Average value" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "RMS roughness" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "RMS (grain-wise)" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "Mean roughness" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "Maximum peak height" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "Maximum pit depth" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "Maximum height" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "Surface slope" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "Scan line discrepancy" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "Add one frame to volume data stack" + +#: modules/volume/volume_addframe.c:113 +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/_Basic Operations/I_nsert XY Plane..." + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "Insert single XY plane to some level." + +#: modules/volume/volume_addframe.c:132 +msgid "Data to insert" +msgstr "Data to insert" + +#: modules/volume/volume_addframe.c:170 +msgid "Frame added" +msgstr "Frame added" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "Add XY Plane" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "Insert _Before Current Level" + +#: modules/volume/volume_addframe.c:224 +msgid "_Replace Current Level" +msgstr "_Replace Current Level" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "Insert _After Current Level" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "Simple arithmetic operations with volume data." -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/_Arithmetic..." +#: modules/volume/volume_arithmetic.c:159 +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/_Basic Operations/_Arithmetic..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "Arithmetic operations on volume data" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "Z-axis calibrations differ" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "Exports volume data in simple ASCII formats." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Export _Text..." +#: modules/volume/volume_asciiexport.c:86 +msgid "/_Basic Operations/Export _Text..." +msgstr "/_Basic Operations/Export _Text..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "Export volume data to a text file" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "VTK structured grid" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "One Z-profile per line" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "One XY-layer per line" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "Blank-line separated matrices" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Precision:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Volume data" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "Recalibrate volume data dimensions or value range." -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Dimensions and Units..." - #: modules/volume/volume_calibrate.c:170 msgid "Match voxel size" msgstr "Match voxel size" @@ -18571,7 +18838,7 @@ msgstr "_Value correction factor" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "Create new volume data" @@ -18583,13 +18850,74 @@ msgid "Z Dimension" msgstr "Z Dimension" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "Estimates drift across stacked high-speed SPM frames." + +#: modules/volume/volume_drift.c:156 +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Correct Data/Estimate _Drift..." + +#: modules/volume/volume_drift.c:160 +msgid "Estimates drift" +msgstr "Estimates drift" + +#: modules/volume/volume_drift.c:169 +msgid "_Extract drift" +msgstr "_Extract drift" + +#: modules/volume/volume_drift.c:170 +msgid "_Crop data" +msgstr "_Crop data" + +#: modules/volume/volume_drift.c:175 +msgid "_Z" +msgstr "_Z" + +#: modules/volume/volume_drift.c:185 +msgid "Show direction" +msgstr "Show direction" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +msgid "Lateral drift" +msgstr "Lateral drift" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "y-axis drift" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Z drift" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "z-axis drift" + +#: modules/volume/volume_drift.c:279 +msgid "Drift corrected" +msgstr "Drift-corrected" + +#: modules/volume/volume_drift.c:330 +msgid "Estimate drift" +msgstr "Estimate drift" + +#: modules/volume/volume_drift.c:449 +msgid "Updating z drift data..." +msgstr "Updating Z drift data..." + +#: modules/volume/volume_drift.c:513 +msgid "Updating lateral drift data..." +msgstr "Updating lateral drift data..." + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "Extracts z-coordinates of isosurfaces from volume data to an image." #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "/_Isosurface Image..." +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/SPM M_odes/_Isosurface Image..." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -18616,81 +18944,93 @@ msgid "Isosurface z for %.*f %s" msgstr "Isosurface z for %.*f %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "Shows 3D representations of volume data" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/3D View..." +#: modules/volume/volume_extract.c:197 +msgid "/_Basic Operations/3D View..." +msgstr "/_Basic Operations/3D View..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "Show a 3D view for the volume data" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Volume data" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "_Render" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "_Save image" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "Wireframe threshold" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Opacity scale" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "Apply perspective" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "Instant 3D render" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "X view" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Y view" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Z view" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "No image has been rendered so far" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "Export 3D view" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "Cairo error while saving image" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "Building wireframe model..." +#: modules/volume/volume_facetlevel.c:44 +msgid "Performs facet leveling on all XY planes" +msgstr "Performs facet levelling on all XY planes" + +#: modules/volume/volume_facetlevel.c:58 +msgid "/_Correct Data/_XY Facet Level" +msgstr "/_Correct Data/_XY Facet Level" + +#: modules/volume/volume_facetlevel.c:62 +msgid "Facet leveling of all XY planes" +msgstr "Facet levelling of all XY planes" + +#: modules/volume/volume_facetlevel.c:85 +msgid "Facet leveled" +msgstr "Facet-levelled" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Evaluate volume force-distance data" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." -msgstr "/_Evaluate FD Data..." +msgid "/SPM M_odes/_Evaluate FD Data..." +msgstr "/SPM M_odes/_Evaluate FD Data..." #: modules/volume/volume_fdfit.c:217 msgid "Evaluate force-distance volume data" @@ -18712,10 +19052,6 @@ msgid "Inverts value in volume data" msgstr "Inverts value in volume data" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Invert Value" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Invert value in volume data" @@ -18725,8 +19061,8 @@ msgstr "Calculates K-means clustering on volume data." #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." -msgstr "/_K-Means Clustering..." +msgid "/_Statistics/_K-Means Clustering..." +msgstr "/_Statistics/_K-Means Clustering..." #: modules/volume/volume_kmeans.c:113 msgid "Calculate K-means clustering on volume data" @@ -18789,8 +19125,8 @@ msgstr "Calculates K-medians clustering on volume data." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." -msgstr "/_K-Medians Clustering..." +msgid "/_Statistics/_K-Medians Clustering..." +msgstr "/_Statistics/_K-Medians Clustering..." #: modules/volume/volume_kmedians.c:106 msgid "Calculate K-medians clustering on volume data" @@ -18824,8 +19160,8 @@ msgstr "Creates curve map data from volume data." #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "/Convert to _Curve Map..." +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/_Basic Operations/Convert to _Curve Map..." #: modules/volume/volume_lawnize.c:103 msgid "Convert to curve map" @@ -18851,13 +19187,29 @@ msgid "Z calibration" msgstr "Z calibration" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "Performe line levelling for all the volume data levels." + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "Performs line levelling of all levels" + +#: modules/volume/volume_linelevel.c:227 +msgid "Line leveled" +msgstr "Line-levelled" + +#: modules/volume/volume_linelevel.c:265 +msgid "Line level" +msgstr "Line levelling" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "Summarises profiles of volume data to a channel." #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "/Summarise _Profiles..." +msgid "/_Statistics/Summarize _Profiles..." +msgstr "/_Statistics/Summarise _Profiles..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 msgid "Summarize profiles" @@ -18875,9 +19227,33 @@ msgid "Summarize Volume Profiles" msgstr "Summarise Volume Profiles" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "Perform localisation merge" + +#: modules/volume/volume_localdetect.c:100 +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/SPM M_odes/_Localisation Merge..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "Performs localisation merge of all the levels" + +#: modules/volume/volume_localdetect.c:119 +msgid "_Peak width" +msgstr "_Peak width" + +#: modules/volume/volume_localdetect.c:156 +msgid "Localization result" +msgstr "Localisation result" + +#: modules/volume/volume_localdetect.c:191 +msgid "Localization Merge" +msgstr "Localisation Merge" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." -msgstr "/_Magnetic Data to Force Gradient..." +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/SPM M_odes/_Magnetic Data to Force Gradient..." #: modules/volume/volume_mfmrecalc.c:233 msgid "Recalculated Data" @@ -18908,8 +19284,8 @@ msgstr "Removes outliers from all XY planes" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/_XY Plane Outliers" +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/_Correct Data/_XY Plane Outliers" #: modules/volume/volume_outliers.c:62 msgid "Remove outliers from XY planes" @@ -18920,20 +19296,24 @@ msgstr "Levels all XY planes" #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/_XY Plane Level" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/_Correct Data/_XY Plane Level" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "Level all XY planes" +#: modules/volume/volume_planelevel.c:85 +msgid "Leveled" +msgstr "Levelled" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "Summarises volume data planes to a graph." #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." -msgstr "/Summarise P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." +msgstr "/_Statistics/Summarise P_lanes..." #: modules/volume/volume_planestat.c:249 msgid "Summarize planes" @@ -18947,73 +19327,106 @@ msgid "Summarize Volume Planes" msgstr "Summarise Volume Planes" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "Calculates the volume PSF." -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/_Transfer Function Guess..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "Estimate transfer function from known data and ideal images" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "_Ideal response:" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Method:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "_Sigma:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "_Estimate sigma for each level" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "_Estimate size for each level" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "_Windowing type:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "_Z level:" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "Sigma fitted at Z level:" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "_Border:" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "_Display:" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "Calculating volume transfer function..." -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "Volume TF" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "z level" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "Remove one frame from volume data stack" + +#: modules/volume/volume_removeframe.c:105 +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/_Basic Operations/_Remove XY Plane..." + +#: modules/volume/volume_removeframe.c:109 +msgid "Remove single XY plane" +msgstr "Remove a single XY plane" + +#: modules/volume/volume_removeframe.c:125 +msgid "_Extract the plane" +msgstr "_Extract the plane" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "Frame removed" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "Extracted frame (%d)" + +#: modules/volume/volume_removeframe.c:223 +msgid "Remove XY Plane" +msgstr "Remove XY Plane" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "_Remove Current Level" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "Swaps phase in continuous data based on user's selection" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." -msgstr "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." +msgstr "/SPM M_odes/_Adjust Phase..." #: modules/volume/volume_rephase.c:168 msgid "Change phase in continuous data" @@ -19064,13 +19477,33 @@ msgid "Volume Z graphs" msgstr "Volume Z graphs" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "Performs scars removal for all the volume data levels." + +#: modules/volume/volume_scars.c:115 +msgid "/_Correct Data/_Scars..." +msgstr "/_Correct Data/_Scars..." + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "Remove scars in all levels" + +#: modules/volume/volume_scars.c:181 +msgid "Scars corrected" +msgstr "Scars corrected" + +#: modules/volume/volume_scars.c:364 +msgid "Removing scars..." +msgstr "Removing scars..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "Extracts image planes and line graphs from volume data." #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Cut and _Slice..." +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/_Basic Operations/Cut and _Slice..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19134,6 +19567,22 @@ msgid "Volume Y graphs" msgstr "Volume Y graphs" +#: modules/volume/volume_stepline.c:50 +msgid "Performs step line correction" +msgstr "Performs step line correction" + +#: modules/volume/volume_stepline.c:68 +msgid "Step line correction in all XY planes" +msgstr "Step line correction in all XY planes" + +#: modules/volume/volume_stepline.c:87 +msgid "Step line correction..." +msgstr "Step line correction..." + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "Step line corrected" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "Single-value evolution" @@ -19147,8 +19596,8 @@ msgstr "Checks the stray field dependence consistency." #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "/_Stray Field Consistency..." +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/SPM M_odes/_Stray Field Consistency..." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -19162,69 +19611,161 @@ msgid "Building stray field dependence..." msgstr "Building stray field dependence..." -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "Swaps axes of volume data." -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/S_wap Axes..." +#: modules/volume/volume_swaxes.c:96 +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/_Basic Operations/S_wap Axes..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "Swap axes" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X, reversed" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y, reversed" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z, reversed" -#: modules/volume/volume_swaxes.c:175 +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" +msgstr "Current _X axis will become" + +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" +msgstr "Current _Y axis will become" + +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" +msgstr "Current _Z axis will become" + +#: modules/volume/volume_swaxes.c:176 msgid "Swap Volume Axes" msgstr "Swap Volume Axes" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" -msgstr "Current _X axis will become:" - -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" -msgstr "Current _Y axis will become:" - -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" -msgstr "Current _Z axis will become:" - -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "Z axis calibration will be lost." +#: modules/volume/volume_xyarithmetics.c:146 +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Simple arithmetic operations with volume and plane data." + +#: modules/volume/volume_xyarithmetics.c:160 +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/_Basic Operations/_XY Arithmetic..." + +#: modules/volume/volume_xyarithmetics.c:164 +msgid "Arithmetic operations on volume and plane data" +msgstr "Arithmetic operations on volume and plane data" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "Volume - Plane Arithmetic" + +#: modules/volume/volume_xyarithmetics.c:323 +msgid "Volume data:" +msgstr "Volume data:" + +#: modules/volume/volume_xyarithmetics.c:332 +msgid "Images:" +msgstr "Images:" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "No volume data in the expression" + +#: modules/volume/volume_xystitch.c:96 +msgid "Merges all XY planes into XYZ data" +msgstr "Merges all XY planes into XYZ data" + +#: modules/volume/volume_xystitch.c:110 +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/SPM M_odes/_XY Stitch..." + +#: modules/volume/volume_xystitch.c:114 +msgid "Merge all the XY planes to XYZ data" +msgstr "Merge all the XY planes to XYZ data" + +#: modules/volume/volume_xystitch.c:129 +msgid "_X offsets graph" +msgstr "_X offsets graph" + +#: modules/volume/volume_xystitch.c:130 +msgid "X _offsets curve" +msgstr "X _offsets curve" + +#: modules/volume/volume_xystitch.c:131 +msgid "_Y offsets graph" +msgstr "_Y offsets graph" + +#: modules/volume/volume_xystitch.c:132 +msgid "Y o_ffsets curve" +msgstr "Y o_ffsets curve" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "_Flip X axis" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "_Flip Y axis" + +#: modules/volume/volume_xystitch.c:135 +msgid "_Adjust shifts" +msgstr "_Adjust shifts" + +#: modules/volume/volume_xystitch.c:136 +msgid "A_djust rotation" +msgstr "A_djust rotation" + +#: modules/volume/volume_xystitch.c:137 +msgid "_Shift range" +msgstr "_Shift range" + +#: modules/volume/volume_xystitch.c:138 +msgid "_Rotation range" +msgstr "_Rotation range" + +#: modules/volume/volume_xystitch.c:179 +msgid "Stitched" +msgstr "Stitched" + +#: modules/volume/volume_xystitch.c:212 +msgid "XY Stitch" +msgstr "XY Stitch" + +#: modules/volume/volume_xystitch.c:214 +msgid "verb|_Stitch" +msgstr "_Stitch" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "Attaches, extracts and removes volume data z-axis calibration." #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/_Z-Calibration..." +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/_Basic Operations/_Z-Calibration..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -19296,8 +19837,8 @@ msgstr "Shifts values in z curves to be zero at defined position." #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." -msgstr "/S_hift Value To Zero..." +msgid "/_Correct Data/S_hift Value To Zero..." +msgstr "/_Correct Data/S_hift Value To Zero..." #: modules/volume/volume_zposlevel.c:166 msgid "Shift value at some z plane to zero" @@ -19309,13 +19850,29 @@ msgstr "Shifted to zero for z level = %d" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Extract _Preview" +msgid "/_Basic Operations/Extract _Preview" +msgstr "/_Basic Operations/Extract _Preview" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "Extract volume data preview to an image" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "Simple XYZ automated crop." + +#: modules/xyz/xyz_autocrop.c:60 +msgid "/Crop Automatically" +msgstr "/Crop Automatically" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "Crop data automatically to cover scanned areas" + +#: modules/xyz/xyz_autocrop.c:90 +msgid "Cropped" +msgstr "Cropped" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Analyses drift in XYZ data." @@ -19344,18 +19901,6 @@ msgid "Y drift" msgstr "Y drift" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "y-axis drift" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Z drift" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "z-axis drift" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Analyse XYZ Drift" @@ -19598,6 +20143,84 @@ msgstr "Merged" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Facet-levelling..." + +#, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/_Correct Data/_Align Rows..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/_Correct Data/Ste_p Line Correction" + +#~ msgid "_Step detection kernel:" +#~ msgstr "_Step detection kernel:" + +#~ msgid "Step detection _threshold:" +#~ msgstr "Step detection _threshold:" + +#~ msgid "Step _broadening:" +#~ msgstr "Step _broadening:" + +#~ msgid "_Polynomial degree:" +#~ msgstr "_Polynomial degree:" + +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "M_inimum polynomial degree:" + +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "_Maximum polynomial degree:" + +#~ msgid "Minimum broadening:" +#~ msgstr "Minimum broadening:" + +#~ msgid "Maximum broadening:" +#~ msgstr "Maximum broadening:" + +#~ msgid "Survey cannot be run with independent degrees." +#~ msgstr "Survey cannot be run with independent degrees." + +#~ msgid "/_Arithmetic..." +#~ msgstr "/_Arithmetic..." + +#~ msgid "/Export _Text..." +#~ msgstr "/Export _Text..." + +#~ msgid "_Precision:" +#~ msgstr "_Precision:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Dimensions and Units..." + +#~ msgid "/3D View..." +#~ msgstr "/3D View..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Invert Value" + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/_XY Plane Outliers" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/_XY Plane Level" + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/_Transfer Function Guess..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Cut and _Slice..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/S_wap Axes..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/_Z-Calibration..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Extract _Preview" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "_Horizontal size" @@ -20526,9 +21149,6 @@ #~ msgid "Projections" #~ msgstr "Projections" -#~ msgid "Shown cut direction:" -#~ msgstr "Shown cut direction:" - #~ msgid "Graph cut direction:" #~ msgstr "Graph cut direction:" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/es.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/es.gmo differ diff -Nru gwyddion-2.62/po/es.po gwyddion-2.63/po/es.po --- gwyddion-2.62/po/es.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/es.po 2023-06-13 13:20:08.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2021-06-11 15:47+0200\n" "Last-Translator: François RIGUET \n" "Language-Team: the Gwyddion team \n" @@ -148,9 +148,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -166,7 +166,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Sin título" @@ -299,39 +299,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Sí" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "No" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "grad" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -401,8 +401,8 @@ msgid "Maximum value" msgstr "Valor máximo" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Valor medio" @@ -428,11 +428,11 @@ msgid "Pixel area" msgstr "" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Área proyectada" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Área de superficie" @@ -534,13 +534,13 @@ msgid "Direction of maximum Martin diameter" msgstr "" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Inclinación θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Inclinación φ" @@ -556,11 +556,11 @@ msgid "Curvature center z value" msgstr "Centro de curvatura valor z" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Curvatura 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Curvatura 2" @@ -595,14 +595,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Posición" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Valor" @@ -612,7 +612,7 @@ msgstr "Área" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volumen" @@ -627,7 +627,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Rampa" @@ -684,12 +684,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Horizontal" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Vertical" @@ -730,12 +730,12 @@ msgstr "Adaptable en en escala y espacio" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Redondo" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Lineal" @@ -1384,7 +1384,7 @@ msgid "Hide full controls" msgstr "Esconder controles completos" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "" @@ -1439,12 +1439,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1453,7 +1453,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1463,20 +1463,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1535,11 +1536,11 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aisleriot" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1568,7 +1569,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "E_tiqueta:" @@ -1673,7 +1674,7 @@ msgstr "Oculto" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Puntos" @@ -1737,7 +1738,7 @@ msgid "_Line type:" msgstr "" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "" @@ -1765,7 +1766,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "dia" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Cruz" @@ -1849,7 +1850,7 @@ # based on translation from "anjuta" #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Modo" @@ -1891,8 +1892,8 @@ msgstr "_Abscisa" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Gráfico" @@ -1902,7 +1903,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Data" @@ -1943,14 +1944,14 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Longitud" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gtk2_ardour" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1958,7 +1959,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Altura" @@ -1993,8 +1994,8 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "lang" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Nombre" @@ -2041,12 +2042,12 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Vista previa" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "No puedo abrir archivo para lectura: %s." @@ -2230,7 +2231,7 @@ # based on translation from "coccinella" #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Mezquino" @@ -2238,29 +2239,29 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "drupal6-mod-cck" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Mínimo" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Máximo" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "" @@ -2270,7 +2271,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2303,42 +2305,42 @@ msgid "Change Curve Map Preview" msgstr "" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, c-format msgid "Unknown curve map %d" msgstr "" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, fuzzy, c-format msgid "Points: %d" msgstr "Puntos" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "Curvas" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 #, fuzzy msgid "Segments:" msgstr "Segmentación" @@ -2417,11 +2419,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "_Actualizar" @@ -2468,7 +2470,7 @@ msgid "Open File" msgstr "Abre Archivo" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2636,59 +2638,59 @@ msgid "Cannot preview" msgstr "No se puede previsualizar" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "" -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "" -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "" -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "" -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "" -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 #, fuzzy msgid "Horizontal size" msgstr "Horizontal" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 #, fuzzy msgid "Vertical size" msgstr "Vertical" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "" @@ -2696,7 +2698,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2708,7 +2710,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2725,7 +2727,7 @@ msgstr "_Alto" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2735,14 +2737,14 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "banshee-community-extensions" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "Dimensiones" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2759,23 +2761,24 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "data" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Resolución" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "freeciv" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Unidades" @@ -2796,65 +2799,65 @@ msgid "Generated" msgstr "Generado el" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "" -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "" -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "" -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " "installed. Please check your installation." msgstr "" -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "amule" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origen" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "accerciser" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Tamaño" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "awn-extras-applets" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Anchura" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 #, fuzzy msgid "Save Results to File" msgstr "Guardar tabla a un archivo" @@ -2918,7 +2921,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "es" @@ -2945,7 +2948,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Tipo" @@ -2957,11 +2960,11 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parámetros" @@ -3032,8 +3035,8 @@ msgid "_New" msgstr "_Nuevo" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Suprimir" @@ -3055,111 +3058,143 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: app/param-def.c:337 +#: app/param-def.c:338 #, fuzzy msgid "_Masking" msgstr "_Máscara" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: app/param-def.c:341 +#: app/param-def.c:342 #, fuzzy msgid "_Interpolation type" msgstr "Interpolación:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Dirección" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "" -#: app/param-def.c:353 +#: app/param-def.c:354 #, fuzzy msgid "_Windowing type" msgstr "No" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "xfce4-settings" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 #, fuzzy msgid "_Distance type" msgstr "_Distancia" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "easytag" -#: app/param-def.c:837 +#: app/param-def.c:838 #, fuzzy msgid "_Mask color" msgstr "Editor de máscaras" -#: app/param-def.c:875 +#: app/param-def.c:876 #, fuzzy msgid "Target _graph" msgstr "Corta Gráfico" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "cairo-dock-plug-ins" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "Curva" -#: app/param-def.c:1138 +#: app/param-def.c:1139 #, fuzzy msgid "_Segment" msgstr "Segmentación" -#: app/param-def.c:1219 +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "aptitude" +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "Sección: " + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "lyx" +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "Variación:" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "aptitude" +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "Sección: " + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "S_emilla" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 #, fuzzy msgid "New graph" msgstr "Corta Gráfico" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Cambiar" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_Nueva" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -3185,40 +3220,40 @@ msgid "Set selected item as default" msgstr "" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "" -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "El archivo está vacío" -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "El archivo esta corrupto, cabecero mágico no concuerda." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "" -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "" @@ -3346,68 +3381,68 @@ "elección) cualquiera de las versiones posteriores. Para ver la licencia " "completa ve el archivo COPYING incluido en la tarball fuente." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licencia" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Características" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Desarrolladores" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Traductores" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "" -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "Vista 3D OpenGL" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "Protocolo X11\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Protocolo Win32\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "src" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Control remoto" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "" @@ -3952,7 +3987,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "Quita_r" @@ -3966,7 +4001,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "A_ncho:" @@ -4035,7 +4070,7 @@ msgid "XYZ Data" msgstr "_Datos" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Herramienta" @@ -4309,7 +4344,7 @@ # based on translation from "audacious-plugins" #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Método" @@ -4325,7 +4360,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 #, fuzzy msgid "Output _type" @@ -4416,35 +4451,37 @@ msgid "/_Basic Operations/_Crop" msgstr "" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "customfield" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Detalle" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gtk2_ardour" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Recortar" @@ -4455,34 +4492,36 @@ msgid "New Dimensions" msgstr "Dimensiones" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Opciones" @@ -4556,7 +4595,7 @@ msgstr "Curva" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "" @@ -4682,7 +4721,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "" @@ -4764,51 +4803,56 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "setup" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Medo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gedit-plugins" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Rango" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Asimetría" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 #, fuzzy msgid "Excess kurtosis" @@ -4843,8 +4887,8 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "eqonomize" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 #, fuzzy msgid "_Quantity" @@ -4855,7 +4899,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 #, fuzzy msgid "Output type" msgstr "Opciones de salida" @@ -4898,7 +4942,7 @@ msgstr "Diferencia" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "" @@ -4908,9 +4952,9 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplitud" @@ -4947,7 +4991,7 @@ msgid "Remove polynomial background from all curves" msgstr "Fondo" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "" @@ -5104,12 +5148,12 @@ msgid "Output images" msgstr "Opciones de salida" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Mostrar" @@ -5145,7 +5189,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 #, fuzzy @@ -5154,8 +5198,9 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 #, fuzzy msgid "Results" msgstr "Resultado" @@ -5177,20 +5222,20 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "Fondo" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Importa Accurex II archivos de texto." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Archivos de texto Accurex II (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -5218,52 +5263,52 @@ msgid "AIST-NT files (.aist)" msgstr "Archivos AIST-NT (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Importa Alicona Imaging AL3D archivos." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Archivos Alicona Imaging AL3D (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "" -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "" -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "" @@ -5346,16 +5391,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "" -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -5368,100 +5413,101 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "Archivos A.P.E. Research DAX (.dax)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Importa APE (Applied Physics and Engineering) archivos de datos." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "Archivos APE (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "" -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 #, fuzzy msgid "_Precision" msgstr "Consejo _anterior" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "subtitleeditor" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Exportar Texto" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "centerim" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Canal:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Anchura:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Altura:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Importa Assing AFM archivos de datos." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Archivos Assing AFM (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Importa Attocube Systems ASC archivos." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Archivos Attocube ASCII (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Importa Image Metrology BCR archivos de datos." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "Archivos BCR (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "" @@ -5495,17 +5541,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Burleigh datos exportados (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "" -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Importa Code V interferogram archivos." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Archivos Code V interferogram (.int)" @@ -5522,18 +5568,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "" -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "" -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" @@ -5674,29 +5720,29 @@ msgid "Scan size header field overlaps with data." msgstr "" -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "" -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "" -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " "format version." msgstr "" -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5704,60 +5750,64 @@ msgstr "" #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "" -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " "type." msgstr "" -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "" -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "" -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "" -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "" -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "" -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "" -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "" -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "" @@ -5783,7 +5833,7 @@ msgid "Garbage before first header section." msgstr "" -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "" @@ -5825,8 +5875,8 @@ msgid "FemtoScan SPM files" msgstr "Archivos de texto Accurex II (.txt)" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "" @@ -5920,7 +5970,7 @@ msgid "Following features" msgstr "Características" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "" @@ -5954,15 +6004,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5976,14 +6026,15 @@ # based on translation from "brasero" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Importar %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 #, fuzzy msgid "Number of points" @@ -6010,24 +6061,24 @@ msgid "Z-range" msgstr "Rango" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Importa DME GDEF archivos de datos." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "Archivos DME GDEF (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "" -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "" -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "" @@ -6058,81 +6109,58 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "" -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "" -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "" -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "spek" -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Formato de muestra no soportado" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "drgeo" -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, fuzzy, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Error al cargar el archivo «%s»" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "" - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -#, fuzzy -msgid "Cannot read file contents." -msgstr "No puedo abrir archivo para lectura: %s." - -# Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bacula" #: modules/file/gwyzip.h:184 msgid "Unknown error" @@ -6144,6 +6172,11 @@ msgid "End of file" msgstr "Fin del archivo" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "sympa" #: modules/file/gwyzip.h:193 @@ -6170,11 +6203,29 @@ msgstr "" #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "" +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "drgeo" +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, fuzzy, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Error al cargar el archivo «%s»" + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "" + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +#, fuzzy +msgid "Cannot read file contents." +msgstr "No puedo abrir archivo para lectura: %s." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Importa Gwyddion XYZ archivos." @@ -6201,51 +6252,55 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "centerim" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Canal" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 #, fuzzy msgid "XYZ data" msgstr "Archivos de datos XYZ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Importa Hierarchical Data Format (HDF) archivos, versión 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Archivos Psi HDF4 (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "" -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "" -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 #, fuzzy msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Importa Hierarchical Data Format (HDF) archivos, versión 4." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -6268,24 +6323,24 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 #, fuzzy msgid "_Horizontal size" msgstr "Horizontal" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 #, fuzzy msgid "_Vertical size" msgstr "Vertical" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "Cuadrado" @@ -6349,12 +6404,12 @@ msgstr "" #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "" @@ -6364,7 +6419,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gtk2_ardour" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Canales" @@ -6377,11 +6432,11 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "f-spot" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Información de la imagen" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "Valor" @@ -6412,7 +6467,7 @@ msgstr "Archivos Hitachi SEM (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" @@ -6453,310 +6508,310 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows o OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 #, fuzzy msgid "Portable document format (.pdf)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 #, fuzzy msgid "Scalable Vector Graphics (.svg)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "dia" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 #, fuzzy msgid "Crosses" msgstr "Cruz" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Elipses" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Líneas" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Rectángulos" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "_Reglas" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." msgstr "" -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 #, fuzzy msgid "Black" msgstr "Blackmann" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "docky" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zoom:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Alto:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 #, fuzzy msgid "_Font:" msgstr "Tipo de letra:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 #, fuzzy msgid "_Border width:" msgstr "Nueva _anchura:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "banshee" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 #, fuzzy msgid "_Tick length:" msgstr "longitud" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 #, fuzzy msgid "Colors" msgstr "Color" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 #, fuzzy msgid "_Background color:" msgstr "Fondo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Colocación" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "izquierda" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "centro" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "derecha" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bluefish" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "arriba" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bluefish" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "abajo" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 #, fuzzy msgid "Lateral scale" msgstr "Material GL" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 #, fuzzy msgid "Hori_zontal gap:" msgstr "Horizontal" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 #, fuzzy msgid "_Vertical gap:" msgstr "_Verticalmente:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 #, fuzzy msgid "Colo_r:" msgstr "Color:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 #, fuzzy msgid "O_utline thickness:" msgstr "G_rosor:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" @@ -6764,148 +6819,148 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "orage" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 #, fuzzy msgid "Draw _frame" msgstr "Mostrar _marco" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 #, fuzzy msgid "Fixed _kilo threshold:" msgstr "_Umbral:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 #, fuzzy msgid "Title" msgstr "_Título:" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 #, fuzzy msgid "Posi_tion:" msgstr "Posición:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "po" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 #, fuzzy msgid "_Gap:" msgstr "Intervalo:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "celestia" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objetos" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 #, fuzzy msgid "Lateral" msgstr "Material GL" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "_Cargar" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "_Archivar" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Renombrar" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 #, fuzzy msgid "Values" msgstr "Valor" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 #, fuzzy msgid "Selection" msgstr "Sección: " # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacious-plugins" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Predefinidos" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 #, fuzzy msgid "Marker _radius:" msgstr "Radio medio" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "eiciel" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Máscara" @@ -6924,88 +6979,88 @@ "Invalid data address 0x%0x found. File is in some unknown format version." msgstr "" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Importa Intematix SDF archivos de datos." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Archivos Intematix SDF data (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." msgstr "" -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "" -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "" -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Importa JEOL archivos de datos." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "Archivos JEOL data (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" @@ -7036,38 +7091,38 @@ msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "" -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "" -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "" -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "" @@ -7085,11 +7140,11 @@ msgstr "" #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "" @@ -7226,7 +7281,7 @@ msgid "MetroPro files (.dat)" msgstr "Archivos MetroPro (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "" @@ -7244,12 +7299,12 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gtk2_ardour" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, fuzzy, c-format msgid "Duplicate block %02x." msgstr "Duplicar" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "" @@ -7286,32 +7341,32 @@ msgid "Unique id record is too short." msgstr "" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Importa Molecular Imaging MI archivos de datos." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "Archivos de datos PicoView (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Gráfico Espectroscópico" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Importa Aarhus MUL archivos." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Archivos Aarhus MUL (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "" @@ -7339,21 +7394,21 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta-extras" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, fuzzy, c-format msgid "Profile %u" msgstr "Perfil" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "" @@ -7373,7 +7428,7 @@ msgid "Nanonics files (.nan)" msgstr "Archivos Nanonics (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -7384,7 +7439,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -7407,7 +7462,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Archivos Nanonis SXM (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "" @@ -7421,12 +7476,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "" -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "" -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "" @@ -7460,11 +7515,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "Datos NanoScanTech (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Importa Digital Instruments Nanoscope II archivos de datos." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope II archivos" @@ -7494,20 +7549,20 @@ "transfer that attempts to store text platform-independently." msgstr "" -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "" -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "" -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "" -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "" @@ -7529,55 +7584,55 @@ msgid "Nanotop files (.spm)" msgstr "Archivos Nanotop (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "" -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "Archivos GSXM netCDF (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "" -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "" -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "" -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "" -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "" -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "" @@ -7597,7 +7652,7 @@ msgstr "La importación de gráfico ASCII debe ser ejecutado como interactivo." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "" @@ -7608,7 +7663,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "amule" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Información" @@ -7642,13 +7697,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "" @@ -7733,17 +7788,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "" -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "" @@ -7809,7 +7864,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Importa MapVue archivos de datos (.map)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "" @@ -7880,7 +7936,7 @@ msgid "Header line starts with a colon." msgstr "" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "" @@ -7914,46 +7970,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Archivos Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Importa Wyko OPD y ASC archivos." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Archivos Wyko OPD (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Archivos Wyko ASCII (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "" @@ -7977,7 +8033,7 @@ msgstr "" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "" @@ -8062,40 +8118,40 @@ "of available formats depends on available GDK pixbuf loaders." msgstr "" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 #, fuzzy msgid "Use" msgstr "Usuario" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 #, fuzzy msgid "_Hue offset" msgstr "Desplazamiento _X" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "" -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "" -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "" -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -8145,7 +8201,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "" -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "" @@ -8174,20 +8230,16 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 msgid "Reading frame table..." msgstr "" -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 msgid "Reading curve data..." msgstr "" @@ -8257,234 +8309,234 @@ msgid "Quesant files (.afm)" msgstr "Archivos Quesant (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." msgstr "" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "rkward" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Cualquier espacio" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "Datos de _texto" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "Datos _binarios" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "Valor" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 #, fuzzy msgid "Start at _offset" msgstr "Desplazamiento _X:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "po" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 #, fuzzy msgid "_Sample size" msgstr "Intervalo:" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "" -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Archivo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "drupal6-mod-cck" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "los campos" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "bytes" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bits" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "coccinella" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binario" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Texto" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "amule" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "Operador inválido argumento %c " -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -8492,45 +8544,45 @@ "`%s' is only %u bytes." msgstr "" -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" "The contents of `%s' does not match format: %s." msgstr "" -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8551,8 +8603,8 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "cairo-dock-plug-ins" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Curva" @@ -8606,36 +8658,36 @@ msgid "Random points order unsupported" msgstr "" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Importa RHK Technology SM3 archivos de datos." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "Archivos RHK SM3 (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "" -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "" -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "" -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "" -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "" @@ -8648,17 +8700,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "Archivos RHK SM4 (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "" @@ -8693,7 +8745,7 @@ msgid "data ranges" msgstr "" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "" @@ -8772,17 +8824,17 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta-extras" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Perfil" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 #, fuzzy msgid "Reads Sensofar PLUx files." msgstr "Archivos Sensofar PLu (.plu)" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 #, fuzzy msgid "Sensofar PLUx files (.plux)" msgstr "Archivos Sensofar PLu (.plu)" @@ -8795,15 +8847,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Archivos Sensolytics texto (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Importa Shimadzu SPM archivos de datos." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Archivos Shimadzu" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "" @@ -8824,31 +8876,31 @@ msgid "SIS files (.sis)" msgstr "Archivos SIS (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "" @@ -9161,37 +9213,37 @@ msgid "Unknown data type `%s'." msgstr "" -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 #, fuzzy msgid "Exports data as simple XYZ text file." msgstr "Exporta datos de gráfico a archivos de texto. " -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 #, fuzzy msgid "XYZ data:" msgstr "Archivos de datos XYZ" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 #, fuzzy msgid "Lateral units:" msgstr "Material GL" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "almanah" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 #, fuzzy msgid "Export XYZ" msgstr "_Exportar" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Importa Carl Zeiss SEM imágenes." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "" @@ -9228,12 +9280,12 @@ msgid "Data line %u does not contain four items." msgstr "" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "" -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "" @@ -9265,9 +9317,8 @@ msgid "Fit Graph" msgstr "Aproxima Gráfico" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "_Curva de Gráfico:" @@ -9278,28 +9329,18 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "beast" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Rango:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -9351,26 +9392,26 @@ msgid "Results\n" msgstr "" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Corta Gráfico" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "" -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Extrae parte del gráfico a uno nuevo" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Corta Gráfico" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Corta Gráfico" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Espectro DOS" @@ -9434,6 +9475,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "" @@ -9460,7 +9502,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "subtitleeditor" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 #, fuzzy msgid "Export to Text File" msgstr "Exportar Texto" @@ -9665,8 +9707,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "" -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 #, fuzzy msgid "_All curves" msgstr "Nivela curvas de gráfico" @@ -9685,8 +9727,8 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "cairo-dock-plug-ins" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "Curva" @@ -9794,6 +9836,109 @@ msgid "Logscale Transform" msgstr "Transformada de Hough" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gnumeric" +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "Funciones estadísticas" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "Medir distancias en gráfico" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +#, fuzzy +msgid "Save Parameters" +msgstr "Guardar Parámetros de Rugosidad " + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "abiword" +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "Fondo" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "Cierra archivo" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "Medir distancias en gráfico" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Transformada rápida de Fourier" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gnumeric" +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "Correlación" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "beast" +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "Dirección" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "e17" +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "Iniciando" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +msgid "Simple FFT" +msgstr "" + +#: modules/graph/graph_measure_period.c:251 +msgid "Refined FFT" +msgstr "" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +msgid "Gravity centers" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "clawsker" +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Posición X" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "Nivela curvas de gráfico" + #: modules/graph/graph_peaks.c:105 #, fuzzy msgid "Finds peaks on graph curves." @@ -9816,7 +9961,7 @@ msgstr "" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "" @@ -9856,99 +10001,99 @@ msgid "Graph Peaks" msgstr "Gráficos" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "Fondo" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "calibre" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "Opciones de salida" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "Resultado" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "" @@ -9965,7 +10110,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "Funciones estadísticas" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "" @@ -9981,17 +10126,17 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 #, fuzzy msgid "_Fixed resolution" msgstr "Resolución _X" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Funciones estadísticas" @@ -10016,20 +10161,20 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "Fondo" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" @@ -10037,75 +10182,63 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 #, fuzzy msgid "Y offset" msgstr "Desplazamiento _Y:" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "Funciones estadísticas" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 #, fuzzy msgid "Calculate graph curve statistics" msgstr "Guardar estadísticas de grano" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -#, fuzzy -msgid "Save Parameters" -msgstr "Guardar Parámetros de Rugosidad " - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 #, fuzzy msgid "Simple Parameters" msgstr "Parámetros" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 #, fuzzy msgid "Integrals" msgstr "Interpolación:" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 #, fuzzy msgid "Graph Statistics" msgstr "Guardar estadísticas de grano" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 #, fuzzy msgid "Rms (Rq)" msgstr "Rms (Sq):" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 #, fuzzy msgid "Projected length" msgstr "Área proyectada" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 #, fuzzy msgid "Developed length" @@ -10113,43 +10246,43 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "lyx" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variación" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 #, fuzzy msgid "Area under curve" msgstr "_Curva de Gráfico:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 #, fuzzy msgid "Positive area" msgstr "Positivo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "compiz-fusion-plugins-extra" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 #, fuzzy msgid "Negative area" msgstr "Negativo" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -10158,17 +10291,17 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Diferencia" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 #, fuzzy msgid "Leveled surface" @@ -10176,220 +10309,212 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 #, fuzzy msgid "Polynomial background" msgstr "Fondo" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "" -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "" +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "aptitude" +#: modules/graph/graph_terraces.c:252 +#, fuzzy +msgid "Step detection" +msgstr "Sección: " # Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "gimp-gap" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 +# based on translation from "aptitude" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 #, fuzzy -msgid "Mean square difference" -msgstr "Diferencia" +msgid "_Step detection kernel" +msgstr "Sección: " -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +#, fuzzy +msgid "Step detection _threshold" +msgstr "_Umbral" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "aptitude" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 #, fuzzy -msgid "Number of terraces" -msgstr "_Número de Lados:" +msgid "Step _broadening" +msgstr "Sección: " -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" +#: modules/graph/graph_terraces.c:268 +#, fuzzy +msgid "Minimum terrace _length" +msgstr "Área de superficie" + +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +#, fuzzy +msgid "_Polynomial degree" +msgstr "Polinomial(orden 0)" + +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" msgstr "" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" msgstr "" +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +#, fuzzy +msgid "Save Terrace Table" +msgstr "Guardar Tabla" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "calibre" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 #, fuzzy msgid "Output" msgstr "Opciones de salida" -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "cairo-dock-plug-ins" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 #, fuzzy -msgid "Survey" -msgstr "Curva" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "" +msgid "M_inimum polynomial degree" +msgstr "Polinomial(orden 0)" -#: modules/graph/graph_terraces.c:528 +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 #, fuzzy -msgid "Step detection _threshold:" -msgstr "_Umbral:" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "" +msgid "_Maximum polynomial degree" +msgstr "Polinomial(orden 0)" -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +#, fuzzy +msgid "Minimum broadening" +msgstr "_Mínimo" -#: modules/graph/graph_terraces.c:554 +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 #, fuzzy -msgid "_Polynomial degree:" -msgstr "Polinomial(orden 0)" +msgid "Maximum broadening" +msgstr "Valor máximo" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" msgstr "" -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "aptitude" -#: modules/graph/graph_terraces.c:580 -#, fuzzy -msgid "Step detection" -msgstr "Sección: " +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "audacious-plugins" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 +# based on translation from "cairo-dock-plug-ins" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 #, fuzzy -msgid "_Display:" -msgstr "Mostrar:" - -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "" +msgid "Survey" +msgstr "Curva" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "Resultado" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -#, fuzzy -msgid "Save Terrace Table" -msgstr "Guardar Tabla" - -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -#, fuzzy -msgid "_Polynomial degree" -msgstr "Polinomial(orden 0)" - -#: modules/graph/graph_terraces.c:889 -#, fuzzy -msgid "M_inimum polynomial degree:" -msgstr "Polinomial(orden 0)" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "" -#: modules/graph/graph_terraces.c:899 -#, fuzzy -msgid "_Maximum polynomial degree:" -msgstr "Polinomial(orden 0)" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "aptitude" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 +# based on translation from "gimp-gap" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 #, fuzzy -msgid "Step _broadening" -msgstr "Sección: " +msgid "Mean square difference" +msgstr "Diferencia" -#: modules/graph/graph_terraces.c:921 -#, fuzzy -msgid "Minimum broadening:" -msgstr "_Mínimo:" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "" -#: modules/graph/graph_terraces.c:932 +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 #, fuzzy -msgid "Maximum broadening:" -msgstr "Valor máximo" +msgid "Number of terraces" +msgstr "_Número de Lados:" + +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 +msgid "No free parameters are selected." msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 #, fuzzy, c-format msgid "Number of combinations: %u." msgstr "_Número de Lados:" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 -msgid "No free parameters are selected." -msgstr "" - -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, fuzzy, c-format msgid "Segment %u" msgstr "Segmentación" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "cairo-clock" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 #, fuzzy msgid "No terraces were found" msgstr "A_ltura" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Guardar Tabla" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 #, fuzzy msgid "Save Terrace Fit Survey" msgstr "Guardar Tabla" @@ -10524,7 +10649,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Ampliación" @@ -10545,8 +10670,8 @@ # based on translation from "gimp" #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "G_rosor" @@ -10581,7 +10706,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "" @@ -10683,7 +10808,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 #, fuzzy msgid "_Number of iterations" msgstr "_Número de Lados:" @@ -10741,8 +10866,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "" @@ -10756,13 +10881,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Dimensiones" @@ -10773,18 +10899,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Generador" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "" @@ -10795,15 +10923,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "" @@ -10814,10 +10943,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10828,8 +10958,9 @@ msgstr "Inicializando…" #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "" @@ -10859,7 +10990,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Radio" @@ -10901,69 +11032,85 @@ msgid "Arithmetic operations on data" msgstr "" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 #, fuzzy msgid "_Expression" msgstr "Expresión vacia" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Calculado" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Aritmético" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "" @@ -10997,7 +11144,7 @@ "of 90 degrees." msgstr "" -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "" @@ -11029,36 +11176,37 @@ # based on translation from "enigma" #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 #, fuzzy msgid "Co_verage" msgstr "Media:" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "" @@ -11500,27 +11648,30 @@ msgid "Building mesh..." msgstr "" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "" @@ -11553,6 +11704,7 @@ msgstr "" #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "" @@ -11671,7 +11823,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 #, fuzzy msgid "Create new image" msgstr "Crea un nuevo dato" @@ -11727,10 +11879,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "eiciel" #: modules/process/classify.c:299 modules/process/classify.c:565 @@ -11933,6 +12081,7 @@ # based on translation from "plugin_htmlbar" #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -12106,14 +12255,14 @@ msgid "Convolution _kernel" msgstr "" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "" @@ -12148,7 +12297,7 @@ msgstr "" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "" @@ -12156,7 +12305,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "src" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Opciones de vista previa" @@ -12380,7 +12529,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "xfce4-settings" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "Um_bral" @@ -12476,13 +12625,13 @@ msgid "Curvature Sections" msgstr "" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "" @@ -12597,7 +12746,7 @@ msgid "Deconvolve" msgstr "" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 #, fuzzy msgid "Sigma" msgstr "_Señal:" @@ -13025,7 +13174,8 @@ msgid "drift" msgstr "" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "" @@ -13043,6 +13193,46 @@ msgid "rows" msgstr "rows" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "" + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "_Guardar estadísticas" + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "_Mínimo" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "Guardar Parámetros de Rugosidad " + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "Valor máximo" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "" @@ -13380,7 +13570,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "celestia" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Distancia" @@ -13403,10 +13593,11 @@ msgstr "" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "" -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "" @@ -13430,14 +13621,14 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacious" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 #, fuzzy msgid "_Clear" msgstr "Limpia_r" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "claws-mail" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 #, fuzzy msgid "_Mark" msgstr "Marcado" @@ -13523,7 +13714,7 @@ msgid "Create _Points" msgstr "_Puntos" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 #, fuzzy msgid "Save Facet Vectors" msgstr "Guardar Parámetros de Rugosidad " @@ -13535,52 +13726,52 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 #, fuzzy msgid "/Measure _Features/Facet _Measurement..." msgstr "Funciones estadísticas" -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 #, fuzzy msgid "Measure facet angles" msgstr "Medir distancias en gráfico" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 #, fuzzy msgid "Selected φ" msgstr "Sección: " # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 #, fuzzy msgid "Selected ϑ" msgstr "Sección: " -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 #, fuzzy msgid "Measure Facets" msgstr "Medir distancias en gráfico" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 #, fuzzy msgid "points" msgstr "Puntos" @@ -13849,7 +14040,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "banshee" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "Relle_nar" @@ -13873,7 +14064,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "calibre" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Opciones de salida" @@ -13954,7 +14145,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 #, fuzzy msgid "Rectangle" msgstr "Rectángulos" @@ -14018,7 +14209,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Forma" @@ -14051,7 +14242,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "awn-extras-applets" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Ambos" @@ -14340,6 +14531,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 #, fuzzy msgid "_Trim fraction" msgstr "_Dirección" @@ -15436,7 +15628,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "" @@ -15454,41 +15646,41 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 #, fuzzy msgid "linematch|Polynomial" msgstr "Polinómico" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 #, fuzzy msgid "Median of differences" msgstr "Diferencia" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnomint" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 #, fuzzy msgid "Modus" msgstr "Módulo" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 #, fuzzy msgid "Trimmed mean of differences" msgstr "Diferencia" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "" @@ -15496,7 +15688,7 @@ msgid "Aligns rows by various methods." msgstr "" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "" @@ -15542,7 +15734,7 @@ msgid "Steps" msgstr "Pasos" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "" @@ -15555,7 +15747,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "compiz-fusion-plugins-extra" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Mosaico" @@ -15720,7 +15912,7 @@ msgid "_Hessian" msgstr "Gaussiano" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 #, fuzzy msgid "_Regularization parameter" msgstr "Guardar Parámetros de Rugosidad " @@ -15748,12 +15940,14 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positivo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "compiz-fusion-plugins-extra" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negativo" @@ -15909,7 +16103,7 @@ msgid "Two-sided" msgstr "" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "" @@ -16053,140 +16247,158 @@ msgid "Shift Mask" msgstr "" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 #, fuzzy msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidatos/_Fusionar..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 #, fuzzy msgid "Correlation, raw" msgstr "Correlación" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 #, fuzzy msgid "Correlation, leveled" msgstr "Correlación" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 #, fuzzy msgid "Height difference, raw" msgstr "Diferencia" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 #, fuzzy msgid "Height difference, leveled" msgstr "Diferencia" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 #, fuzzy msgid "Height difference score" msgstr "Diferencia" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Sólo Fase" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 #, fuzzy msgid "Correlation _method" msgstr "Correlación" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 #, fuzzy msgid "_Plot mask" msgstr "_Presenta gráfico" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 #, fuzzy msgid "Correlation Search" msgstr "Correlación" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "" -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 #, fuzzy msgid "Extract mask to a new image" msgstr "Extrae máscara a un nuevo canal" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "Extrae máscara a un nuevo canal" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 #, fuzzy msgid "Thin mask" msgstr "Editar máscara" +#: modules/process/maskops.c:193 +msgid "Grain Numbers" +msgstr "" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "" @@ -16348,7 +16560,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "enigma" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Media" @@ -16768,7 +16980,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 #, fuzzy msgid "_Mode" msgstr "_Modelo" @@ -16872,8 +17084,8 @@ msgid "Re_initialize" msgstr "" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "" @@ -17496,6 +17708,69 @@ msgid "Pile Up Shapes" msgstr "Aproxima esfera" +#: modules/process/plateau_synth.c:131 +msgid "Generates images with stacked plateau-like structures." +msgstr "" + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "_Guardar estadísticas" + +#: modules/process/plateau_synth.c:149 +msgid "Generate image with random plateaus" +msgstr "" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Valor máximo" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Mínimo" + +#: modules/process/plateau_synth.c:166 +msgid "Size power _law" +msgstr "" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "goffice" +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "_Dirección:" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "banshee-community-extensions" +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Dimensiones" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "plugin_htmlbar" +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "_Alto:" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "fontforge" +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Al azar" + +#: modules/process/plateau_synth.c:673 +msgid "Generating objects..." +msgstr "" + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "" @@ -17558,11 +17833,6 @@ msgid "_Vertical polynomial degree" msgstr "Polinomial(orden 0)" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -#, fuzzy -msgid "_Maximum polynomial degree" -msgstr "Polinomial(orden 0)" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "" @@ -17579,6 +17849,10 @@ msgid "Copy table to clipboard" msgstr "" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Guardar Tabla" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "" @@ -17734,8 +18008,8 @@ # based on translation from "gimp" #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 #, fuzzy msgid "Transfer function" msgstr "Función Delta" @@ -17765,7 +18039,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 #, fuzzy msgid "/_Statistics/_Transfer Function Guess..." msgstr "Funciones estadísticas" @@ -17774,16 +18048,16 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 #, fuzzy msgid "Regularized filter" msgstr "Archivos Shimadzu" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "" @@ -17794,22 +18068,22 @@ msgid "_Border" msgstr "Bordes" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 #, fuzzy msgid "_Fit Sigma" msgstr "_Señal:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 #, fuzzy msgid "Transfer Function Size" msgstr "Función Delta" @@ -17833,27 +18107,27 @@ msgid "Transfer Function" msgstr "Función Delta" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 #, fuzzy msgid "TF width" msgstr "Nueva _anchura:" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 #, fuzzy msgid "TF height" msgstr "Nueva _altura" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 #, fuzzy msgid "Difference norm" msgstr "Diferencia" @@ -17998,7 +18272,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 #, fuzzy msgid "Offset" msgstr "Desplazamiento _X:" @@ -18254,7 +18528,7 @@ msgid "_Assume symmetry" msgstr "Simétrico" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "" @@ -18339,30 +18613,30 @@ msgid "Correct horizontal scars (strokes)" msgstr "" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 #, fuzzy msgid "_Hard threshold" msgstr "U_mbral" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "xfce4-settings" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 #, fuzzy msgid "_Soft threshold" msgstr "Um_bral:" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 #, fuzzy msgid "Minimum _length" msgstr "Valor mínimo" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 #, fuzzy msgid "Maximum _width" msgstr "Valor máximo" @@ -18634,18 +18908,6 @@ msgid "Marked terraces" msgstr "Radio medio" -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "aptitude" -#: modules/process/terracefit.c:282 -#, fuzzy -msgid "_Step detection kernel" -msgstr "Sección: " - -#: modules/process/terracefit.c:284 -#, fuzzy -msgid "Step detection _threshold" -msgstr "_Umbral" - #: modules/process/terracefit.c:289 #, fuzzy msgid "Minimum terrace _area" @@ -18655,25 +18917,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -#, fuzzy -msgid "M_inimum polynomial degree" -msgstr "Polinomial(orden 0)" - -#: modules/process/terracefit.c:308 -#, fuzzy -msgid "Minimum broadening" -msgstr "_Mínimo" - -#: modules/process/terracefit.c:310 -#, fuzzy -msgid "Maximum broadening" -msgstr "Valor máximo" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "" @@ -18719,7 +18962,7 @@ msgid "Limit Range" msgstr "" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "" @@ -19515,157 +19758,157 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 #, fuzzy msgid "Correlation length tool." msgstr "Correlación" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 #, fuzzy msgid "line-leveling|None" msgstr "Polinómico" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 #, fuzzy msgid "Line leveling" msgstr "Polinómico" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 #, fuzzy msgid "Correlation Length" msgstr "Correlación" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 #, fuzzy msgid "Correlation Length T" msgstr "Correlación" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 #, fuzzy msgid "Relation to Image Size" msgstr "Fusiona dos imágenes" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 #, fuzzy msgid "Selected area" msgstr "Área proyectada" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 #, fuzzy msgid "PSDF Gaussian fit" msgstr "Gaussiano" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 #, fuzzy msgid "PSDF exponential fit" msgstr "Exponencial" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "" -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Perfiles" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Opciones" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "clawsker" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, fuzzy, c-format msgid "Vertical profile %d" msgstr "Posición X" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, fuzzy, c-format msgid "Horizontal profile %d" msgstr "Horizontal" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "" +#: modules/tools/distance.c:123 +#, fuzzy +msgid "Save Distance Table" +msgstr "Guardar Tabla" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 #, fuzzy msgid "_Number lines" msgstr "_Número de Lados:" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "" -#: modules/tools/distance.c:227 -#, fuzzy -msgid "Save Distance Table" -msgstr "Guardar Tabla" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -19719,7 +19962,7 @@ "Grain removal tool, removes continuous parts of mask and/or underlying data." msgstr "" -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "" @@ -19727,7 +19970,7 @@ msgid "Fractal correction" msgstr "" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -19740,7 +19983,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 #, fuzzy msgid "_Interpolation method" msgstr "Interpolación:" @@ -19753,7 +19996,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -19761,76 +20004,84 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "fontforge" -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "Estrella" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "pinta" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Rango de color" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "pinta" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "Rango de color" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 #, fuzzy msgid "_Invert Mapping" msgstr "_Invertir" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "Valor" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -19839,7 +20090,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 #, fuzzy msgid "_Averaging radius" msgstr "Interpolación" @@ -19860,145 +20111,149 @@ msgid "Level data by fitting a plane through three points" msgstr "" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." msgstr "" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Fi_las" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Co_lumnas" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gaupol" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "C_antidad" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "" +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "easytag" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Editor de máscaras" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Editar máscara" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Editor" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Acciones" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Invertir" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "C_recer" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "" @@ -20014,110 +20269,115 @@ msgid "Level rows using intersections with given lines" msgstr "" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "" -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 #, fuzzy msgid "_Calibration data" msgstr "Dilatación" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 #, fuzzy msgid "Improve _Direction" msgstr "_Dirección:" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 #, fuzzy msgid "Improve _All" msgstr "_Mejorar" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "" -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +#, fuzzy +msgid "Adapt color range to detail" +msgstr "¿Datos mayor que detalle?" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "dia" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Faceta" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "" @@ -20127,18 +20387,18 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Textura" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Rugosidad" @@ -20150,7 +20410,7 @@ msgid "BRC" msgstr "" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "" @@ -20162,193 +20422,193 @@ msgid "Calculate roughness parameters" msgstr "" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 #, fuzzy msgid "Selected line" msgstr "Sección: " -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Asimetría" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Curtosis" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 #, fuzzy msgid "parameters|Hybrid" msgstr "Parámetros" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "Parámetros" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "Nueva _altura" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 #, fuzzy msgid "Radial Profiles" msgstr "Archivos Shimadzu" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 #, fuzzy msgid "Radial profiles" msgstr "Archivos Shimadzu" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 #, fuzzy msgid "S_ymmetrize" msgstr "Simétrico" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 #, fuzzy msgid "Symmetrize _All" msgstr "Simétrico" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, fuzzy, c-format msgid "Radial profile %d" msgstr "Archivos Shimadzu" @@ -20387,42 +20647,50 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." msgstr "" -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "" @@ -20450,186 +20718,227 @@ msgid "Spectroscopy" msgstr "" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." msgstr "" -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 #, fuzzy msgid "Ellipse" msgstr "Elipses" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "" -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "hybrid" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Híbrido" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "enigma" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 #, fuzzy msgid "Average value" msgstr "Media:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 #, fuzzy msgid "RMS roughness" msgstr "Rugosidad" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 #, fuzzy msgid "Mean roughness" msgstr "Rugosidad" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 #, fuzzy msgid "Maximum peak height" msgstr "Valor máximo" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 #, fuzzy msgid "Maximum pit depth" msgstr "Valor máximo" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 #, fuzzy msgid "Maximum height" msgstr "Valor máximo" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 #, fuzzy msgid "Surface slope" msgstr "Área de superficie" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "inkscape" +#: modules/volume/volume_addframe.c:113 +#, fuzzy +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "Aritmético" + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "compiz-fusion-plugins-extra" +#: modules/volume/volume_addframe.c:132 +#, fuzzy +msgid "Data to insert" +msgstr "Deformación" + +#: modules/volume/volume_addframe.c:170 +#, fuzzy +msgid "Frame added" +msgstr "Área de superficie" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +msgid "_Replace Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 #, fuzzy msgid "Simple arithmetic operations with volume data." msgstr "Encaja una función en los datos de la gráfica" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/volume/volume_arithmetic.c:156 +#: modules/volume/volume_arithmetic.c:159 #, fuzzy -msgid "/_Arithmetic..." +msgid "/_Basic Operations/_Arithmetic..." msgstr "Aritmético" -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 #, fuzzy msgid "Arithmetic operations on volume data" msgstr "Encaja una función en los datos de la gráfica" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 #, fuzzy msgid "Z-axis calibrations differ" msgstr "Dilatación" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 #, fuzzy msgid "Exports volume data in simple ASCII formats." msgstr "Importa Quesant archivos." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." msgstr "/Exportar _texto..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 #, fuzzy msgid "Export volume data to a text file" msgstr "Exporta datos de gráfico a archivo de texto" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" msgstr "" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "" - # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "po" #: modules/volume/volume_calibrate.c:170 @@ -20674,7 +20983,7 @@ msgstr "Corrección" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 #, fuzzy msgid "Create new volume data" msgstr "Crea un nuevo dato" @@ -20693,13 +21002,91 @@ msgid "Z Dimension" msgstr "Dimensiones" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "Transformada de Hough" + +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "Punta estimada" + +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "Exporta imagen EXR" + +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "Archivos de datos XYZ" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "_X:" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "beast" +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "Dirección" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "Material GL" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "xscreensaver" +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +#, fuzzy +msgid "Z drift" +msgstr "Deriva" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "foxtrotgps" +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "Corrección:" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "Punta estimada" + +#: modules/volume/volume_drift.c:449 +msgid "Updating z drift data..." +msgstr "" + +#: modules/volume/volume_drift.c:513 +msgid "Updating lateral drift data..." +msgstr "" + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "" #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/_Punta/_Reconstrucción de Superficie... " #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -20731,86 +21118,106 @@ msgid "Isosurface z for %.*f %s" msgstr "" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." +#: modules/volume/volume_extract.c:197 +msgid "/_Basic Operations/3D View..." msgstr "" -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "" - # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 #, fuzzy msgid "_Render" msgstr "_Renombrar" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 #, fuzzy msgid "_Save image" msgstr "Guardar archivo" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 #, fuzzy msgid "Export 3D view" msgstr "Exportar la vista 3D" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "" +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "anjuta" +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "Quita_r" + +#: modules/volume/volume_facetlevel.c:58 +msgid "/_Correct Data/_XY Facet Level" +msgstr "" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "Nivela grávido por línea" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "goffice" +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "Polinómico" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Evaluate FD Data..." +msgstr "/_Punta/_Mapa de certidumbre..." #: modules/volume/volume_fdfit.c:217 msgid "Evaluate force-distance volume data" @@ -20832,13 +21239,6 @@ msgid "Inverts value in volume data" msgstr "" -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "gimp" -#: modules/volume/volume_invert.c:53 -#, fuzzy -msgid "/_Invert Value" -msgstr "_Invertir" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "" @@ -20849,7 +21249,7 @@ #: modules/volume/volume_kmeans.c:109 #, fuzzy -msgid "/_K-Means Clustering..." +msgid "/_Statistics/_K-Means Clustering..." msgstr "Dilatación" #: modules/volume/volume_kmeans.c:113 @@ -20921,7 +21321,7 @@ #: modules/volume/volume_kmedians.c:102 #, fuzzy -msgid "/_K-Medians Clustering..." +msgid "/_Statistics/_K-Medians Clustering..." msgstr "Dilatación" #: modules/volume/volume_kmedians.c:106 @@ -20961,8 +21361,9 @@ msgstr "Crea un nuevo dato" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "Importa datos XYZ" #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -20992,13 +21393,36 @@ msgid "Z calibration" msgstr "Dilatación" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "goffice" +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "Polinómico" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "goffice" +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "Polinómico" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "" +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." +msgstr "_Guardar estadísticas" #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 #, fuzzy @@ -21018,10 +21442,41 @@ msgid "Summarize Volume Profiles" msgstr "" -#: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/_Punta/_Estimación Ciega... " + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" msgstr "" +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "Nueva _anchura" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "audacity" +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Resultado" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Dilatación" + +#: modules/volume/volume_mfmrecalc.c:116 +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/_Punta/_Dilatación... " + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" #: modules/volume/volume_mfmrecalc.c:233 @@ -21069,7 +21524,7 @@ # based on translation from "anjuta" #: modules/volume/volume_outliers.c:58 #, fuzzy -msgid "/_XY Plane Outliers" +msgid "/_Correct Data/_XY Plane Outliers" msgstr "Quita_r" # Translation for this string generated by http://littlesvr.ca/ostd/ @@ -21088,7 +21543,7 @@ # based on translation from "goffice" #: modules/volume/volume_planelevel.c:58 #, fuzzy -msgid "/_XY Plane Level" +msgid "/_Correct Data/_XY Plane Level" msgstr "Polinómico" #: modules/volume/volume_planelevel.c:62 @@ -21096,13 +21551,20 @@ msgid "Level all XY planes" msgstr "Nivela grávido por línea" +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "audacity" +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "Resultado" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "" #: modules/volume/volume_planestat.c:245 #, fuzzy -msgid "/Summarize P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." msgstr "Archivos Shimadzu" #: modules/volume/volume_planestat.c:249 @@ -21122,83 +21584,124 @@ msgid "Summarize Volume Planes" msgstr "Archivos Shimadzu" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "" -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "" - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gok" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Método:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 #, fuzzy msgid "_Sigma:" msgstr "_Señal:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 #, fuzzy msgid "_Z level:" msgstr "Polinómico" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 #, fuzzy msgid "_Border:" msgstr "Bordes" -#: modules/volume/volume_psf.c:1078 +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "audacious-plugins" +#: modules/volume/volume_psf.c:542 +#, fuzzy +msgid "_Display:" +msgstr "Mostrar:" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 #, fuzzy msgid "Volume TF" msgstr "Volumen" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/Guardar_Como..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "Nivela grávido por línea" + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "Exporta imagen EXR" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "Nivela grávido por línea" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Adjust Phase..." +msgstr "/_Punta/_Estimación Ciega... " #: modules/volume/volume_rephase.c:168 msgid "Change phase in continuous data" @@ -21253,12 +21756,36 @@ msgid "Volume Z graphs" msgstr "Volumen %g\n" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "Transformada de Hough" + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "foxtrotgps" +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "Corrección:" + +#: modules/volume/volume_scars.c:364 +msgid "Removing scars..." +msgstr "" + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." +msgid "/_Basic Operations/Cut and _Slice..." msgstr "" #: modules/volume/volume_slice.c:217 @@ -21327,6 +21854,29 @@ msgid "Volume Y graphs" msgstr "Volumen %g\n" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "Área proyectada" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "anjuta" +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Quita_r" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "aptitude" +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Sección: " + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "" @@ -21343,8 +21893,9 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/_Punta/_Reconstrucción de Superficie... " #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -21358,72 +21909,192 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "" -#: modules/volume/volume_swaxes.c:118 +#: modules/volume/volume_swaxes.c:96 #, fuzzy -msgid "/S_wap Axes..." +msgid "/_Basic Operations/S_wap Axes..." msgstr "/Guardar_Como..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 #, fuzzy msgid "X" msgstr "_X:" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 #, fuzzy msgid "Y" msgstr "_Y:" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" msgstr "" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "" +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Encaja una función en los datos de la gráfica" + +#: modules/volume/volume_xyarithmetics.c:160 +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "Encaja una función en los datos de la gráfica" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "Volumen" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "abiword" +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "Páginas:" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "Nivela grávido por línea" + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/_Punta/_Estimación Ciega... " + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "Importa datos XYZ" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gimp" +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "Desplazamiento _X" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "Cierra archivo" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gimp" +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "Desplazamiento _Y" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gimp" +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "Desplazamiento _Y:" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "Nueva _anchura" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "cairo-dock-plug-ins" +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "Girar" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "Guardar Parámetros de Rugosidad " + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "cairo-dock-plug-ins" +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "Girar" + +#: modules/volume/volume_xystitch.c:179 +msgid "Stitched" +msgstr "" + +#: modules/volume/volume_xystitch.c:212 +msgid "XY Stitch" +msgstr "" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "_Ajustar" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" #: modules/volume/volume_zcal.c:126 #, fuzzy -msgid "/_Z-Calibration..." +msgid "/_Basic Operations/_Z-Calibration..." msgstr "Dilatación" #: modules/volume/volume_zcal.c:130 @@ -21493,8 +22164,9 @@ msgstr "" #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." -msgstr "" +#, fuzzy +msgid "/_Correct Data/S_hift Value To Zero..." +msgstr "Transformada de Hough" #: modules/volume/volume_zposlevel.c:166 msgid "Shift value at some z plane to zero" @@ -21507,7 +22179,7 @@ #: modules/volume/volumeops.c:53 #, fuzzy -msgid "/Extract _Preview" +msgid "/_Basic Operations/Extract _Preview" msgstr "Exporta imagen EXR" #: modules/volume/volumeops.c:57 @@ -21515,6 +22187,28 @@ msgid "Extract volume data preview to an image" msgstr "Guardar vista 3D a una imagen" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gnumeric" +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "Automáticamente detectado" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gtk2_ardour" +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "Recortar" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "" @@ -21547,21 +22241,6 @@ msgid "Y drift" msgstr "Deriva" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "" - -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "xscreensaver" -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -#, fuzzy -msgid "Z drift" -msgstr "Deriva" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "" @@ -21850,6 +22529,40 @@ msgstr "Imágenes fusionadas" #, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "Transformada de Hough" + +#, fuzzy +#~ msgid "Step detection _threshold:" +#~ msgstr "_Umbral:" + +#, fuzzy +#~ msgid "_Polynomial degree:" +#~ msgstr "Polinomial(orden 0)" + +#, fuzzy +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "Polinomial(orden 0)" + +#, fuzzy +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "Polinomial(orden 0)" + +#, fuzzy +#~ msgid "Minimum broadening:" +#~ msgstr "_Mínimo:" + +#, fuzzy +#~ msgid "Maximum broadening:" +#~ msgstr "Valor máximo" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gimp" +#, fuzzy +#~ msgid "/_Invert Value" +#~ msgstr "_Invertir" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "Horizontal" @@ -22351,9 +23064,6 @@ #~ msgid "pixels" #~ msgstr "píxeles" -#~ msgid "Fast Fourier Transform" -#~ msgstr "Transformada rápida de Fourier" - # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "dia" #~ msgid "Distribute" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/fr.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/fr.gmo differ diff -Nru gwyddion-2.62/po/fr.po gwyddion-2.63/po/fr.po --- gwyddion-2.62/po/fr.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/fr.po 2023-06-13 13:20:08.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: French localization\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" -"PO-Revision-Date: 2022-05-22 10:42+0200\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" +"PO-Revision-Date: 2023-04-10 12:00+0200\n" "Last-Translator: François Riguet \n" "Language-Team: François RIGUET \n" "Language: fr_FR\n" @@ -22,7 +22,7 @@ #: libgwyddion/gwyexpr.c:883 msgid "Invalid token" -msgstr "" +msgstr "Jeton invalide" #: libgwyddion/gwyexpr.c:892 msgid "Empty expression" @@ -123,37 +123,37 @@ #: libgwyddion/gwyfdcurvepreset.c:1502 msgid "Hertz: spherical" -msgstr "" +msgstr "Hertz : sphérique" #: libgwyddion/gwyfdcurvepreset.c:1514 msgid "Hertz: spherical, fixed film" -msgstr "" +msgstr "Hertz : sphérique, film fixe" #: libgwyddion/gwyfdcurvepreset.c:1526 msgid "Hertz: spherical, free film" -msgstr "" +msgstr "Hertz : sphérique, film libre" #: libgwyddion/gwyfdcurvepreset.c:1538 msgid "DMT: spherical" -msgstr "" +msgstr "DMT : sphérique" #: libgwyddion/gwyfdcurvepreset.c:1550 msgid "Sneddon: conical" -msgstr "" +msgstr "Sneddon : conique" #: libgwyddion/gwyfdcurvepreset.c:1562 msgid "Sneddon: conical, fixed film" -msgstr "" +msgstr "Sneddon : conique, film fixe" #: libgwyddion/gwyfdcurvepreset.c:1574 msgid "Sneddon: conical, free film" -msgstr "" +msgstr "Sneddon : conique, film libre" #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -169,7 +169,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Sans titre" @@ -293,41 +293,41 @@ #: libgwyddion/gwyresource.c:886 msgid "Resource directory cannot be created." -msgstr "" +msgstr "Le répertoire des ressources ne peut être créé." -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Oui" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "Non" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(fixé)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "deg" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -397,8 +397,8 @@ msgid "Maximum value" msgstr "Maximum" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Moyenne" @@ -423,11 +423,11 @@ msgid "Pixel area" msgstr "Aire du pixel" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Surface projetée" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Surface" @@ -529,13 +529,13 @@ msgid "Direction of maximum Martin diameter" msgstr "Direction du diamètre de Martin maximal" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Inclinaison θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Inclinaison φ" @@ -551,11 +551,11 @@ msgid "Curvature center z value" msgstr "Valeur z du centre de courbure" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Courbure 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Courbure 2" @@ -588,14 +588,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Position" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Valeur" @@ -605,7 +605,7 @@ msgstr "Surface" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volume" @@ -618,7 +618,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Pente" @@ -675,12 +675,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Horizontale" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Verticale" @@ -721,12 +721,12 @@ msgstr "Échelle et espace adaptatifs" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Arrondi" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Linéaire" @@ -865,7 +865,7 @@ #: libprocess/gwyshapefitpreset.c:232 msgid "Angle from horizontal plane" -msgstr "" +msgstr "Angle par rapport au plan horizontal" #: libprocess/gwyshapefitpreset.c:233 libprocess/gwyshapefitpreset.c:304 #: libprocess/gwyshapefitpreset.c:341 libprocess/gwyshapefitpreset.c:505 @@ -913,16 +913,16 @@ #: libprocess/gwyshapefitpreset.c:262 libprocess/gwyshapefitpreset.c:274 #: libprocess/gwyshapefitpreset.c:299 msgid "Spatial period (pitch)" -msgstr "" +msgstr "Période spatiale (pas)" #: libprocess/gwyshapefitpreset.c:264 libprocess/gwyshapefitpreset.c:278 msgid "Fill ratio at base" -msgstr "" +msgstr "Rapport de remplissage à la base" #: libprocess/gwyshapefitpreset.c:266 libprocess/gwyshapefitpreset.c:283 #: libprocess/gwyshapefitpreset.c:338 msgid "Offset from origin" -msgstr "" +msgstr "Décalage à l'origine" #: libprocess/gwyshapefitpreset.c:268 msgid "Top edge sharpness" @@ -962,29 +962,27 @@ #: libprocess/gwyshapefitpreset.c:296 msgid "Offset from origin in X" -msgstr "" +msgstr "Décalage X" #: libprocess/gwyshapefitpreset.c:297 msgid "Offset from origin in Y" -msgstr "" +msgstr "Décalage Y" #: libprocess/gwyshapefitpreset.c:303 -#, fuzzy msgid "Corner roundness" -msgstr "Circularité" +msgstr "Arrondi du coin" #: libprocess/gwyshapefitpreset.c:308 msgid "Width at base" -msgstr "" +msgstr "Largeur à la base" #: libprocess/gwyshapefitpreset.c:309 msgid "Width at the top" msgstr "Largeur au sommet" #: libprocess/gwyshapefitpreset.c:310 -#, fuzzy msgid "Corner radius" -msgstr "_Rayon du marqueur :" +msgstr "Rayon du coin" #: libprocess/gwyshapefitpreset.c:314 libprocess/gwyshapefitpreset.c:326 #: libprocess/gwyshapefitpreset.c:350 libprocess/gwyshapefitpreset.c:367 @@ -993,7 +991,7 @@ #: libprocess/gwyshapefitpreset.c:455 libprocess/gwyshapefitpreset.c:469 #: libprocess/gwyshapefitpreset.c:487 libprocess/gwyshapefitpreset.c:501 msgid "X-coordinate of the center" -msgstr "" +msgstr "Coordonnée X du centre" #: libprocess/gwyshapefitpreset.c:315 libprocess/gwyshapefitpreset.c:327 #: libprocess/gwyshapefitpreset.c:351 libprocess/gwyshapefitpreset.c:368 @@ -1002,16 +1000,15 @@ #: libprocess/gwyshapefitpreset.c:456 libprocess/gwyshapefitpreset.c:470 #: libprocess/gwyshapefitpreset.c:488 libprocess/gwyshapefitpreset.c:502 msgid "Y-coordinate of the center" -msgstr "" +msgstr "Coordonnée Y du centre" #: libprocess/gwyshapefitpreset.c:321 modules/process/mask_morph.c:145 msgid "Radius" msgstr "Rayon" #: libprocess/gwyshapefitpreset.c:322 -#, fuzzy msgid "Value at the apex" -msgstr "Plage de valeurs" +msgstr "Valeur à l'apex" #: libprocess/gwyshapefitpreset.c:342 #, fuzzy @@ -1042,7 +1039,7 @@ #: libprocess/gwyshapefitpreset.c:444 libprocess/gwyshapefitpreset.c:461 #: libprocess/gwyshapefitpreset.c:476 msgid "Direction of elongation (φ=0 means y-axis)" -msgstr "" +msgstr "Direction d'élongation (φ=0 pour l'axe Y)" #: libprocess/gwyshapefitpreset.c:362 msgid "Standard deviation 1" @@ -1098,7 +1095,7 @@ #: libprocess/gwyshapefitpreset.c:507 msgid "Distance between centers" -msgstr "" +msgstr "Distance entre centres" #: libprocess/gwyshapefitpreset.c:508 msgid "Inner radius" @@ -1310,7 +1307,7 @@ msgid "Hide full controls" msgstr "Masquer tous les contrôles" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Basique" @@ -1361,12 +1358,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1375,7 +1372,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1385,20 +1382,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1450,11 +1448,11 @@ msgstr "Angle lum_ière θ :" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1477,7 +1475,7 @@ msgid "Maximum z value" msgstr "Valeur Z maximale" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "_Légende :" @@ -1567,7 +1565,7 @@ msgstr "Caché" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Points" @@ -1624,7 +1622,7 @@ msgid "_Line type:" msgstr "Type de _ligne :" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Épaisseur de ligne :" @@ -1645,7 +1643,7 @@ msgid "Diamond" msgstr "Losange" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Croix" @@ -1719,7 +1717,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Mode" @@ -1755,8 +1753,8 @@ msgstr "Abscisse" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Graphe" @@ -1764,7 +1762,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Données" @@ -1803,12 +1801,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Longueur" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1816,7 +1814,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Hauteur" @@ -1843,8 +1841,8 @@ msgstr "Préféré" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Nom" @@ -1881,12 +1879,12 @@ msgid "A_dd symbol" msgstr "Ajouter un symbole" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Aperçu" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Impossible d'ouvrir le fichier pour le lire : %s." @@ -2045,35 +2043,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Moyenne" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Minimum" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Maximum" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Position min" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Position max" @@ -2083,7 +2081,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2108,41 +2107,41 @@ msgid "Change Curve Map Preview" msgstr "Modifier l'aperçu des données volumiques" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Canal inconnu %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Volume %d inconnu" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "Donnée XYZ %d inconnue" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "Volume %d inconnu" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Niveaux Z : %d, unités Z : %s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Points : %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 msgid "Curves:" msgstr "Courbes :" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "Segments :" @@ -2187,9 +2186,8 @@ msgstr "XYZ" #: app/data-browser.c:5935 gwyddion/toolbox-editor.c:934 -#, fuzzy msgid "Curve Maps" -msgstr "Courbes" +msgstr "Cartes de courbes" #: app/data-browser.c:6968 #, c-format @@ -2208,11 +2206,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "Mise à jour" @@ -2270,7 +2268,7 @@ msgid "Open File" msgstr "Ouvrir un fichier" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2421,42 +2419,42 @@ msgid "Cannot preview" msgstr "Impossible de prévisualiser" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "La section %s termine à la ligne %u mais elle n'a pas de début." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "La section %s se termine à la ligne %u au lieu de %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "La section %s commence à la ligne %u avant que %s ne soit terminée." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Nom de section vide à la ligne %u de l'en-tête." -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "Il manque à la ligne %u de l'en-tête le préfixe %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "Il manque à la ligne %u de l'en-tête le séparateur de valeur clé." -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "La clé à la ligne %u de l'en-tête est vide." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" @@ -2464,22 +2462,22 @@ "est manquant." #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Taille horizontale" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Taille verticale" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "Image carrée" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2489,7 +2487,7 @@ msgstr "Largeur" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2506,20 +2504,20 @@ msgstr "_Hauteur" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 msgid "_Square pixels" msgstr "Échantillons carré_s" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 msgid "_Dimensions unit" msgstr "Unités de _dimensions" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 msgid "_Value unit" msgstr "Unités de _valeur" @@ -2533,21 +2531,22 @@ msgstr "Ajouter à partir de l'image courante" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Résolution" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Dimensions physiques" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Unités" @@ -2566,30 +2565,30 @@ msgid "Generated" msgstr "Généré" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Impossible d'écrire dans le fichier : %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" "%s : les dimensions latérales et les valeurs doivent être les mêmes " "quantités physiques." -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s : les données doivent être carrées." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Il manque un module." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2598,31 +2597,31 @@ "Cet outil nécessite une couche de type %s pour fonctionner, et qui ne semble " "pas installée. Vérifiez votre installation s'il vous plaît." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Enlever les objets sélectionnés" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origine" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Taille" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Largeur" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "Enregistrer les résultats dans un fichier" @@ -2682,7 +2681,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "fr" @@ -2703,7 +2702,7 @@ msgid "_Close" msgstr "Fermer" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Type" @@ -2711,11 +2710,11 @@ msgid "Function" msgstr "Fonction" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Paramètres" @@ -2744,9 +2743,8 @@ msgstr "Données _XYZ" #: app/menu.c:674 gwyddion/toolbox.c:611 -#, fuzzy msgid "_Curve Maps" -msgstr "_Courbe" +msgstr "_Cartes de courbes" #: app/menu.c:702 msgid "Re-show Last" @@ -2772,8 +2770,8 @@ msgid "_New" msgstr "_Nouveau" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "Supprimer" @@ -2791,92 +2789,118 @@ msgid "Save Metadata" msgstr "Enregistrer les méta-données" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "_Masquage" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "Type d'_interpolation" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Direction" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "Combiner avec le masque existant" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "Type de fenêtre d'apodisation" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "Type de _distance" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "_Style de graphe" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "Mise à jour instantanée" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Randomiser" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "Couleur du _masque" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "_Graphe cible" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 msgid "C_urve" msgstr "Co_urbe" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "_Segment" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "Montrer la _sélection" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "Directions moyennes de débruitage" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "Définir la _sélection" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "Graine _aléatoire" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" -msgstr "" +msgstr "Groupes étendus" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "Nouveau graphe" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "jusqu'à" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Changer" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_Nouvelle" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Changer les unités" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2902,40 +2926,40 @@ msgid "Set selected item as default" msgstr "Utiliser l'élément sélectionné comme défaut" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Impossible d'ouvrir le fichier pour écrire : %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Impossible de lire le contenu du fichier : %s." -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "Le fichier est vide." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "Le fichier est corrompu, l'en-tête ne correspond pas." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "Le fichier est corrompu, la désérialisation a échoué." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Impossible de créer le répertoire de configuration utilisateur %s : %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Impossible de créer le répertoire d'interface utilisateur %s : %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Impossible de créer le répertoire de modules utilisateur %s : %s" @@ -3057,66 +3081,66 @@ "toute version ultérieure. Pour obtenir le texte complet de la licence " "reportez vous au fichier COPYING inclus dans le code source." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" -msgstr "" +msgstr "Ou lisez la licence à" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licence" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Fonctionnalités" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Développeurs" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Traducteurs" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "Le développement est supporté par l'Institut Tchèque de Métrologie : " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "Vue 3D OpenGL" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "Parallélisation OpenMP" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "Protocole X11\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Protocole Win32\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Contrôle à distance" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Interface de script Python" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "Version publiée le %s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "Version de développement, compilation %s" @@ -3771,7 +3795,7 @@ msgstr "_Éditer" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "Supprimer" @@ -3783,7 +3807,7 @@ msgid "Move _Down" msgstr "_Descendre" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "Largeur :" @@ -3844,7 +3868,7 @@ msgid "XYZ Data" msgstr "Données XYZ" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Outil" @@ -4081,7 +4105,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Méthode" @@ -4094,7 +4118,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "_Type de sortie" @@ -4183,39 +4207,40 @@ msgstr "Supprimer la présentation des données" #: modules/cmap/cmap_crop.c:76 -#, fuzzy msgid "Crop curve map data." -msgstr "Calcul des données de la courbe en L..." +msgstr "Rogner les données de carte de courbes." #: modules/cmap/cmap_crop.c:90 msgid "/_Basic Operations/_Crop" msgstr "/Opérations _basiques/_Rogner" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Rogner les données" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "Conserver les décalages latéraux" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Détail" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Rognage" @@ -4223,34 +4248,36 @@ msgid "New Dimensions" msgstr "Nouvelles dimensions" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Options" @@ -4313,7 +4340,7 @@ msgstr "Courbe Z" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Ajustement en cours" @@ -4325,7 +4352,7 @@ #: modules/cmap/cmap_extractcurve.c:106 msgid "Extracts individual curves from a curve map." -msgstr "" +msgstr "Extraie des courbes individuelles à partir d'une carte de courbes." #: modules/cmap/cmap_extractcurve.c:120 msgid "/_Extract Curves..." @@ -4337,7 +4364,7 @@ #: modules/cmap/cmap_extractcurve.c:144 msgid "Reorder by abscissa" -msgstr "" +msgstr "Triés par abscisse" #: modules/cmap/cmap_extractcurve.c:145 modules/volume/volume_slice.c:425 #, fuzzy @@ -4346,21 +4373,19 @@ #: modules/cmap/cmap_extractcurve.c:213 msgid "Extract Map Curves" -msgstr "" +msgstr "Extraire des courbes de la carte" #: modules/cmap/cmap_fdfit.c:191 msgid "Fit FD curves." msgstr "Ajuster les courbes FD." #: modules/cmap/cmap_fdfit.c:205 -#, fuzzy msgid "/Fit _FD Curves..." msgstr "/Ajuster la courbe _force-distance..." #: modules/cmap/cmap_fdfit.c:209 -#, fuzzy msgid "Fit FD curves by a function" -msgstr "Fonction ajustée" +msgstr "Ajuster les courbes force-distance à l'aide d'une fonction" #: modules/cmap/cmap_fdfit.c:225 modules/process/fit-shape.c:288 msgid "_Function" @@ -4378,7 +4403,7 @@ #: modules/cmap/cmap_fdfit.c:235 msgid "Run _estimate at each point" -msgstr "" +msgstr "Lancer une _estimation sur chaque point" #: modules/cmap/cmap_fdfit.c:236 msgid "Get adhesion directly" @@ -4402,14 +4427,12 @@ msgstr "Ajuster les courbes FD" #: modules/cmap/cmap_fdfit.c:340 -#, fuzzy msgid "verb|_Estimate single" -msgstr "_Estimer" +msgstr "_Estimer un seul" #: modules/cmap/cmap_fdfit.c:341 -#, fuzzy msgid "verb|_Fit single" -msgstr "Ajuster" +msgstr "Ajuster un seul" #: modules/cmap/cmap_fdfit.c:364 modules/cmap/cmap_lockin.c:334 #: modules/cmap/cmap_polylevel.c:253 modules/cmap/cmap_sinebg.c:258 @@ -4418,7 +4441,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "ajustement" @@ -4454,14 +4477,12 @@ msgstr "Erreur" #: modules/cmap/cmap_fztofd.c:121 -#, fuzzy msgid "Converts FZ to FD curve map." -msgstr "Convertir un champ de données en données volumiques 3D." +msgstr "Convertit une carte de courbes FZ en FD." #: modules/cmap/cmap_fztofd.c:135 -#, fuzzy msgid "/_FZ Curves to FD..." -msgstr "/Ajuster la courbe _force-distance..." +msgstr "/Courbes _FZ vers FD..." #: modules/cmap/cmap_fztofd.c:139 modules/graph/graph_fztofd.c:120 msgid "Convert Force-Z Piezo to Force-Distance" @@ -4473,7 +4494,7 @@ #: modules/cmap/cmap_fztofd.c:165 modules/graph/graph_fztofd.c:137 msgid "_Z input" -msgstr "" +msgstr "Entrée _Z" #: modules/cmap/cmap_fztofd.c:167 modules/graph/graph_fztofd.c:142 msgid "Cantilever _stiffness" @@ -4485,56 +4506,60 @@ #: modules/cmap/cmap_fztofd.c:169 modules/graph/graph_fztofd.c:143 msgid "_Deflection sensitivity" -msgstr "" +msgstr "Sensibilité à la _déflection" #: modules/cmap/cmap_fztofd.c:240 modules/graph/graph_fztofd.c:210 -#, fuzzy msgid "Convert FZ to FD Curve" -msgstr "Ajuster la courbe FD" +msgstr "Convertit une courbe FZ en FD." -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Médiane" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Plage" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Asymétrie" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "Kurtosis d'excès" @@ -4563,8 +4588,8 @@ msgstr "Définir l'a_perçu" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Quantité" @@ -4572,7 +4597,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "Type de sortie" @@ -4587,40 +4612,36 @@ #: modules/cmap/cmap_lockin.c:139 msgid "Detect oscillations in a curve." -msgstr "" +msgstr "Détecter les oscillations dans une courbe." #: modules/cmap/cmap_lockin.c:153 -#, fuzzy msgid "/_Demodulation..." -msgstr "Dilatation..." +msgstr "/_Démodulation..." #: modules/cmap/cmap_lockin.c:157 msgid "Detect oscillations in a curve" -msgstr "" +msgstr "Détecter les oscillations dans une courbe" #: modules/cmap/cmap_lockin.c:167 -#, fuzzy msgid "Extract amplitude/phase" -msgstr "Extraire plusieurs élé_ments" +msgstr "Extraire l'amplitude et la phase" #: modules/cmap/cmap_lockin.c:171 modules/cmap/cmap_lockin.c:181 -#, fuzzy msgid "Reference" -msgstr "Différence" +msgstr "Référence" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "_Degré" #: modules/cmap/cmap_lockin.c:190 -#, fuzzy msgid "_Show" -msgstr "Montrer" +msgstr "Afficher" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplitude" @@ -4630,9 +4651,8 @@ msgstr "Phase" #: modules/cmap/cmap_lockin.c:311 -#, fuzzy msgid "Demodulation" -msgstr "Dilatation" +msgstr "Démodulation" #: modules/cmap/cmap_polylevel.c:118 msgid "Removes polynomial background from curves." @@ -4646,7 +4666,7 @@ msgid "Remove polynomial background from all curves" msgstr "Supprimer l'arrière-plan polynomial de toutes les courbes" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Supprimer l'arrière-plan polynomial" @@ -4656,37 +4676,32 @@ msgstr "" #: modules/cmap/cmap_possearch.c:143 -#, fuzzy msgid "/_Position Search..." -msgstr "Recherche par corrélation" +msgstr "/Recherche de _position..." #: modules/cmap/cmap_possearch.c:147 -#, fuzzy msgid "Search for a threshold" -msgstr "Seuil du modèle filaire" +msgstr "Recherche d'un seuil" #: modules/cmap/cmap_possearch.c:156 -#, fuzzy msgid "Below threshold" -msgstr "Seuil bas" +msgstr "Sous le seuil" #: modules/cmap/cmap_possearch.c:157 -#, fuzzy msgid "Above threshold" -msgstr "Seuil bas" +msgstr "Au-dessus du seuil" #: modules/cmap/cmap_possearch.c:160 msgid "Left to right" -msgstr "" +msgstr "Gauche vers droite" #: modules/cmap/cmap_possearch.c:161 msgid "Right to left" -msgstr "" +msgstr "Droite vers gauche" #: modules/cmap/cmap_possearch.c:164 -#, fuzzy msgid "Extract quantity" -msgstr "Extraire plusieurs élé_ments" +msgstr "Extraire la quantité" #: modules/cmap/cmap_possearch.c:176 modules/process/arc-revolve.c:121 #: modules/process/crosscor.c:109 modules/process/measure_lattice.c:340 @@ -4699,23 +4714,20 @@ msgstr "" #: modules/cmap/cmap_possearch.c:179 -#, fuzzy msgid "Search curve" -msgstr "Plage de recherche" +msgstr "Rechercher une courbe" #: modules/cmap/cmap_possearch.c:180 modules/process/grain_edge.c:181 msgid "Threshold" msgstr "Seuil" #: modules/cmap/cmap_possearch.c:280 -#, fuzzy msgid "Search for threshold" -msgstr "Spécifier les seuils" +msgstr "Recherche de seuil" #: modules/cmap/cmap_simplemech.c:155 modules/graph/graph_simplemech.c:568 -#, fuzzy msgid "DMT modulus" -msgstr "Module" +msgstr "Module DMT" #: modules/cmap/cmap_simplemech.c:156 modules/graph/graph_simplemech.c:569 msgid "Adhesion" @@ -4746,11 +4758,11 @@ #: modules/cmap/cmap_simplemech.c:180 msgid "/_Nanomechanical Fit..." -msgstr "" +msgstr "/Ajustement _nanomécanique..." #: modules/cmap/cmap_simplemech.c:184 modules/graph/graph_simplemech.c:93 msgid "Evaluate DMT modulus, adhesion, deformation and dissipation" -msgstr "" +msgstr "Évalue les données DMT : module, adhésion, déformation et dissipation" #: modules/cmap/cmap_simplemech.c:213 msgid "Force curve" @@ -4758,11 +4770,11 @@ #: modules/cmap/cmap_simplemech.c:217 modules/graph/graph_simplemech.c:116 msgid "Fit _upper limit" -msgstr "" +msgstr "Aj_uster la limite haute" #: modules/cmap/cmap_simplemech.c:218 modules/graph/graph_simplemech.c:117 msgid "Fit _lower limit" -msgstr "" +msgstr "Ajuster _la limite hausse" #: modules/cmap/cmap_simplemech.c:219 modules/graph/graph_simplemech.c:118 #: modules/process/hertz.c:125 @@ -4777,19 +4789,19 @@ msgid "Output images" msgstr "Images de sortie" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Afficher" #: modules/cmap/cmap_simplemech.c:259 #, c-format msgid "%s: Curves have to be segmented." -msgstr "" +msgstr "%s : les courbes doivent être segmentées." #: modules/cmap/cmap_simplemech.c:259 modules/cmap/cmap_simplemech.c:343 #: modules/graph/graph_simplemech.c:178 @@ -4808,55 +4820,50 @@ msgstr "Points de contrôle" #: modules/cmap/cmap_simplemech.c:393 modules/graph/graph_simplemech.c:523 -#, fuzzy msgid "Baseline fit" -msgstr "Ajustement linéaire" +msgstr "Ajustement de la base" #: modules/cmap/cmap_simplemech.c:403 modules/graph/graph_simplemech.c:534 -#, fuzzy msgid "DMT fit" -msgstr "Filtre FFT 1D" +msgstr "Ajustement DMT" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "Résultats de l'ajustement" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Résultats" #: modules/cmap/cmap_sinebg.c:123 -#, fuzzy msgid "Remove sine background from curves." -msgstr "Supprimer le bruit présent dans des courbes" +msgstr "Supprimer l'arrière-plan sinusoïdal des courbes." #: modules/cmap/cmap_sinebg.c:137 -#, fuzzy msgid "/Remove _Sine Background..." -msgstr "Supprimer l'arrière-plan polynomial" +msgstr "/Supprimer l'arrière-plan _sinusoïdal..." #: modules/cmap/cmap_sinebg.c:141 -#, fuzzy msgid "Remove sine background from all curves" -msgstr "Supprimer le bruit présent dans des courbes" +msgstr "Supprimer l'arrière-plan sinusoïdal de toutes les courbes" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 -#, fuzzy +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 msgid "Remove Sine Background" -msgstr "Supprimer l'arrière-plan polynomial" +msgstr "Supprimer l'arrière-plan sinusoïdal" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Importe les fichiers texte Accurex II." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Accurex II texte (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4874,7 +4881,7 @@ #: modules/file/afmw-spec.c:438 modules/file/nanonis-spec.c:446 #: modules/file/nanoobserver.c:407 msgid "Data block is truncated" -msgstr "Le bloc de données est tronqué." +msgstr "Le bloc de données est tronqué" #: modules/file/aistfile.c:117 msgid "Imports AIST-NT data files." @@ -4884,54 +4891,54 @@ msgid "AIST-NT files (.aist)" msgstr "AIST-NT (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Importe les fichiers Alicona Imaging AL3D." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Alicona Imaging AL3D (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Numéro de plan %u invalide dans la balise ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "La balise d'en-tête ne se termine pas par le caractère nul." -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "La balise d'en-tête est vide." -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "La balise d'en-tête ‘%s’ ne se termine pas par des caractères nuls." -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "Il manque le terminateur CRLF à la balise d'en-tête ‘%s’." -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "" "La valeur de la balise d'en-tête ‘%s’ ne se termine pas par le caractère nul." -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" "La valeur de balise d'en-tête ‘%s’ ne se termine pas par des caractères nuls." -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "Les commentaires ne terminent pas par CRLF." -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "Le commentaire ne se termine pas par le caractère nul." @@ -5009,17 +5016,17 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "FileDescBegin n'a pas de FileDescEnd correspondant." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 #, fuzzy msgid "Wrong number of header rows or columns." msgstr "Nombre de colonnes" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, fuzzy, c-format msgid "Cannot parse data values at line %d." msgstr "Impossible d'analyser les valeurs de données après %d sur %d." -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 #, fuzzy msgid "Coordinates do not form a regular grid." msgstr "" @@ -5034,92 +5041,93 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "A.P.E. Research DAX (.dax) et APDT (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Importe les fichiers de données APE (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "APE (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Exporte les données sous forme de matrice ASCII." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "Matrice de données ASCII (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Ajouter un en-tête de commenta_ires" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Utiliser le point comme séparateur de décimale" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "Expor_t groupé de toutes les images" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Précision" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Exporter au format texte" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Canal :" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Largeur :" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Hauteur :" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Unités :" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Importe les fichiers Assing AFM." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Assing AFM (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Importe les fichiers Attocube Systems ASC." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Attocube ASCII (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Importe les fichiers Image Metrology BCR" -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "BCR (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 #, fuzzy msgid "Cannot convert string from UTF-16." msgstr "Impossible de convertir la chaîne de caractères depuis UTF-16 : %s" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Type d'en-tête inconnu : `%s'." @@ -5147,29 +5155,29 @@ #: modules/file/burleigh_exp.c:88 msgid "Imports Burleigh text/bin exported images." -msgstr "Importe les images Burleigh texte / binaire" +msgstr "Importe les images Burleigh texte / binaire." #: modules/file/burleigh_exp.c:101 msgid "Burleigh exported data (.txt, .bin)" msgstr "Burleigh données exportées (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "Il manque une colonne dans la ligne d'en-tête." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." -msgstr "Importe les interférogrammes Code V" +msgstr "Importe les interférogrammes Code V." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Interférogramme Code V (.int)" #: modules/file/createc.c:133 msgid "Imports Createc data files." -msgstr "Importe les fichiers Createc" +msgstr "Importe les fichiers Createc." #: modules/file/createc.c:146 msgid "Createc files (.dat)" @@ -5180,20 +5188,20 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Les champs d'en-tête `%s' et `%s' n'ont pas été trouvés." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" "L'initialisation de zlib a échoué avec l'erreur %d, impossible de " "décompresser les données." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "La décompression des données a échoué avec l'erreur %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" "Impossible de décompresser les données. Le support Zlib n'a pas été intégré." @@ -5328,22 +5336,22 @@ msgid "Scan size header field overlaps with data." msgstr "Le champ d'en-tête de la taille de scan recouvre les données." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Impossible de lire à partir du fichier : %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "Aucun fichier de données correspondant à `%s' n'a été trouvé." -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "Le fichier est trop court pour être du type supposé." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5352,7 +5360,7 @@ "Les fichier n'est pas un fichier %s, est sérieusement endommagé, ou " "correspond à une version de format inconnue." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5362,21 +5370,21 @@ "la taille réelle est de %u octets." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "L'élément ou le composant ‘%s’ du fichier est tronqué." -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "L'en-tête de fichier est tronqué." -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Champ des dimensions invalide : %d." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5385,39 +5393,43 @@ "Le nombre de bits par échantillon %d est invalide ou non supporté pour ce " "type de fichier." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Le type de données %d est invalide ou non supporté." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Il manque le champ d'en-tête `%s'." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "La valeur du paramètre `%s' est invalide ou non supportée." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Le paramètre `%s' manque ou est invalide." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "Le fichier ne contient aucune donnée (importable)." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "Structure non consistante des spectres individuels." + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "Le fichier ne contient aucun canal exportable." -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "Import de fichier annulé par l'utilisateur." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "En-tête manquant." @@ -5441,7 +5453,7 @@ msgid "Garbage before first header section." msgstr "Éléments inutiles avant la première section d'en-tête." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Ligne d'en-tête non conf.orme (il manque =)" @@ -5481,8 +5493,8 @@ msgid "FemtoScan SPM files" msgstr "FemtoScan SPM (.spm)" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Les données de l'image sont en dehors du fichier." @@ -5569,7 +5581,7 @@ msgid "Following features" msgstr "Fonctionnalités" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Échelle Z" @@ -5599,15 +5611,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Exporter au format %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5619,14 +5631,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Importer %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Nombre de points" @@ -5643,24 +5656,24 @@ msgid "Z-range" msgstr "Plage Z" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Importe les fichiers DME GDEF." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "DME GDEF (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "La version de fichier %u.%u n'est pas supporté." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "La marque de bloc de contrôle n'est pas CB, le fichier est endommagé." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Type de variable %u inconnu." @@ -5693,77 +5706,57 @@ "La désérialisation des données a fonctionné, mais a abouti à un objet " "inattendu %s." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "La balise %u n'a pas été trouvée." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "Le répertoire TIFF %lu se termine de manière inattendue." -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "" "Des données BigTIFF de type %u ont été trouvées dans un TIFF classique." -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Des positions invalides de balises ont été trouvées." -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "Les champs réservés au BigTIFF sont %u et %u au lieu de 8 et 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Le type de compression %u n'est pas supporté." -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "" "Les échantillons avec un nombre de bits non uniforme ne sont pas supportés." -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "La configuration plane %u n'est pas supportée." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Format non supporté" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, fuzzy, c-format msgid "%s cannot open the file as a ZIP file." msgstr "Libizip n'arrive pas à ouvrir le fichier en tant que fichier ZIP." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, fuzzy, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Erreur de Libzip lors de la lecture du fichier zip : %s." - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "Fin de la liste des fichiers" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Impossible d'obtenir la taille du fichier décompressé." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Impossible de lire le contenu du fichier." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Erreur inconnue" @@ -5772,6 +5765,11 @@ msgid "End of file" msgstr "Fin de fichier" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "Fin de la liste des fichiers" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Erreur de paramètre" @@ -5794,11 +5792,26 @@ msgstr "Erreur de Minizip lors de la lecture du fichier zip : %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "Le fichier %s est absent du fichier zip." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, fuzzy, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Erreur de Libzip lors de la lecture du fichier zip : %s." + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Impossible d'obtenir la taille du fichier décompressé." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Impossible de lire le contenu du fichier." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Importe les fichiers Gwyddion XYZ." @@ -5821,53 +5834,57 @@ msgid "Export GXYZF" msgstr "Exporter au format GXYZ" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Canal" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "Données XYZ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Importe les fichiers Hierarchical Data Format (HDF) version 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Psi HDF4 (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "L'en-tête PSI binaire est trop court." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "Les données HDF avec le type `natif' ne sont pas supportées." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "" "Importe les fichiers basé sur le formar Hierarchical Data Format (HDF) " "version 5." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "Fichiers Asylum Research Ergo HDF5 (.h5)" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." -msgstr "Erreur %ld de la librairie HDF5 à la fonction %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" +msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" "l'ensemble des données %s possède %d éléments, qui ne correspond pas aux " "dimensions de l'image %d×%d." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "Erreur %ld de la librairie HDF5 à la fonction %s." + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5892,25 +5909,24 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "TIFF et BigTIFF à grande dynamique (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "Taille _horizontale" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "Taille _verticale" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "Échelle _Z (par unité d'échantillon)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 -#, fuzzy +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 msgid "Just use _pixels" -msgstr "Échantillons carré_s" +msgstr "Utiliser les _pixels" #: modules/file/hdrimage.cc:319 msgid "Half (16bit float)" @@ -5942,18 +5958,16 @@ msgstr "Plages de données" #: modules/file/hdrimage.cc:440 -#, fuzzy msgid "Representable range" -msgstr "Représentable" +msgstr "Plage représentative" #: modules/file/hdrimage.cc:441 msgid "Suggested Z-scale" -msgstr "" +msgstr "Échelle Z suggérée" #: modules/file/hdrimage.cc:451 -#, fuzzy msgid "_Use Suggested" -msgstr "_Suggérer" +msgstr "_Utiliser la suggestion" #: modules/file/hdrimage.cc:598 #, c-format @@ -5966,12 +5980,12 @@ msgstr "Le type de données OpenEXR %u est invalide ou non supportée." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "Erreur d'initialisation de libpng (dans %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "Une erreur s'est produite dans libpng" @@ -5979,21 +5993,20 @@ msgid "Failed to read image data." msgstr "Échec de la lecture des données." -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Canaux" #: modules/file/hdrimage.cc:1888 -#, fuzzy msgid "Pages" -msgstr "Pages : " +msgstr "Pages" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Information sur l'image" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "Plage de valeurs" @@ -6024,7 +6037,7 @@ msgstr "Hitachi SEM (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" "Aucun fichier de données correspondant n'a été trouvé dans le fichier d'en-" @@ -6071,105 +6084,105 @@ msgid "Cannot read channel labels." msgstr "Impossible de lire les légendes des canaux." -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Image PNG (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "Image JPEG (.jpeg, .jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "Image TIFF (.tiff, .tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Image PPM (.ppm, .pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Image BMP (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "Image TARGA (.tga, .targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "Image WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Document PDF (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Document PostScript encapsulé (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Image vectorielle SVG (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Lignes horiz./vert." -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "Croix" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Ellipses" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Lignes" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Rectangles" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Maillage" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Chemin" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "_Aucune" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "G_raduations" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "Échelle" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "Échelle de couleurs" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "Aucun" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "En haut" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Le long du bord droit" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6179,283 +6192,283 @@ "JPEG, TIFF, WebP, PPM, BMP, TARGA). L'export sous certains formats est basé " "sur GDK et d'autres librairies, et peut ainsi dépendre de votre installation." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Couleur des sélections" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "Blanc" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Noir" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Taille des pi_xels :" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "P_ixels par pouce :" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zoom :" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Hauteur :" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "Police :" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "Taille de police :" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "Épaisseur des bordures :" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "Longueur des gradua_tions :" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Lier les _dimensions aux pixels" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "Le séparateur de décimale est la virgule" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Couleurs" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "Cou_leur des lignes et du texte :" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "Arrière-plan transparent" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "Couleur d'arrière-plan :" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Positionnement" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "gauche" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "centre" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "droite" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "haut" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "bas" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "Échelle latérale" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Longueur :" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "Écart hori_zontal :" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "Écart vertical :" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "Couleu_r :" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "Cou_leur des contours :" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "Épaisse_ur des contours :" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "O_pacité :" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Afficher les ex_trémités" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Afficher _l'annotation" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "Dessiner le texte _au-dessus de l'échelle" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Image" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "Type d'interpolation :" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Dessiner le cadre" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Dessiner le _masque" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Afficher la _légende du masque" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Échelle de valeurs" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Précision fi_xée :" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Seuil d'unité :" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Titre" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Posi_tion :" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "Écart :" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Ajouter les _unités dans le titre" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Dessiner les _sélections" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objets" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "Latéral" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "Charger" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "Enregi_strer" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Renommer" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "_Nom du préréglage :" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Exporter en niveaux de gris 1_6 bits" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "Échelle latérale" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Valeurs" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Sélection" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Préréglages" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Une erreur s'est produite dans Cairo : %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "La sauvegarde de l'image à échoué : %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "L'image est trop grande pour être enregistrée au format TARGA" -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Dessiner les _nombres" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "Longu_eur du marqueur de fin :" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "_Rayon du marqueur :" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Masque" @@ -6475,33 +6488,33 @@ "Adresse de donnée 0x%0x invalide. Le format de fichier semble être d'une " "version non reconnue." -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Importe les fichiers Internatix SDF." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Internatix SDF (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "L'ensemble des paramètres de balise est incomplet." -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "profondeur d'image" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" "Importe et exporte les fichiers de transfert de données SPM au format ISO " "28600:2011." -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "ISO 28600:2011 SPM (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6510,60 +6523,60 @@ "Seuls les maillages réguliers et irréguliers sont implémentés mais le " "fichier a le type de maillage ‘%s’." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" "La liste ‘%s’ contient %u éléments, ce qui est différent du nombre %u donnée " "par ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Fin du fichier atteinte lors de la lecture de l'échantillon #%u sur %u" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "Données mal mises en forme lors de la lecture de l'échantillon #%u" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Marqueur de fin de données manquant." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "Fin du fichier atteinte lors de la lecture de l'échantillon #%d sur %d" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "" "Données mal mises en forme lors de la lecture de l'échantillon #%d de %d" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "La ligne %u ne contient le label obligatoire ‘%s’." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Importe les fichiers JEOL." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "JEOL (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" "Le type de données n'est pas connu. Faites en part aux développeurs s'il " @@ -6593,40 +6606,40 @@ msgid "File does not contain grid dimensions." msgstr "Le fichier ne contient pas les dimensions de la grille." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "Scan du fichier (%u des courbes)..." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Lecture des fichiers..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "Création des données volumiques" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" "La numérotation non uniforme des points et/ou des segments n'est pas " "supportée." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Les listes non uniformes de canaux ne sont pas supportées." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Le fichier %s a été trouvé alors que %s était attendu." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "Il manque le fichier d'en-tête pour l'indice %u." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Impossible de trouver un canal de hauteurs." @@ -6644,11 +6657,11 @@ msgstr "Le bloc d'en-tête %u a une position ou une taille invalide." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Impossible de trouver le bloc d'en-tête de l'image." -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Impossible de trouver le bloc d'en-tête piezo." @@ -6788,7 +6801,7 @@ msgid "MetroPro files (.dat)" msgstr "MetroPro (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "L'en-tête de fichier est plus grand que le fichier." @@ -6804,12 +6817,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "MicroProf FRT texte (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "Bloc %02x dupliqué." -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "Le fichier contient moins de XSize*YSize points de données." @@ -6846,34 +6859,34 @@ msgid "Unique id record is too short." msgstr "L'identifiant unique est trop court." -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Importe les fichiers Molecular Imaging MI." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "PicoView (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Courbe de spectroscopie" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Importe les fichiers Aarhus MUL." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Aarhus MUL (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" "Le numéro d'image dans le label %u ne correspond pas au nombre %u dans " "l'index." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "La longueur du label %u est supérieure à 20." @@ -6899,21 +6912,21 @@ msgid "Spectra data starts past the end of file." msgstr "Les données du spectre commencent après la fin du fichier." -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "Profil %u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "Spectres F-D" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "Spectres I-V" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "Spectres I-Z" @@ -6933,7 +6946,7 @@ msgid "Nanonics files (.nan)" msgstr "Nanonis NAN (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6946,7 +6959,7 @@ "La valeur HeaderLength %u est différente de la longueur réelle de l'en-tête " "%u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -6968,7 +6981,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Nanonis SXM (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "L'en-tête de se termine de manière inattendue." @@ -6984,12 +6997,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFO ne contient pas les colonnes attendues : %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "La ligne DATA_INFO contient moins de %d champs." -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Marqueur de début de données \\x1a\\x04 absent." @@ -7021,11 +7034,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "NanoScanTech (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Importe les fichiers Digital Instruments Nanoscope II." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope II" @@ -7061,20 +7074,20 @@ "dans certaines versions de MS Windows, ou tout autre transfert de fichier " "qui essaie d'enregistrer en texte indépendamment de la plateforme." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "Lecture des canaux..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Impossible d'analyser le champ `Scan size'." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Données erronées après l'échantillon #%u." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Ligne d'en-tête tronquée." @@ -7094,58 +7107,58 @@ msgid "Nanotop files (.spm)" msgstr "Nanotop (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Importe les fichiers network Common Data Form (netCDF) créés par GXSM." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "GSXM netCDF (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "" "La variable `%s' fait référence à des données invalides ou inexistantes." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "Les enregistrements au format NetCDF ne sont pas supportés." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "Les valeurs de série doivent être de type FLOAT." -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "Les valeurs de temps doivent être de type DOUBLE." -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "" "La lecture des fichiers de scan rapide n'est pas implémentée (pour " "l'instant)." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "L'ordre des séries de temps est incorrect." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "Le fichier s'est terminé de manière inattendue dans `%s'." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "Tableau `%s' attendu ou `ABSENT'." -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "Le tableau `%s', bien qu'absent, possède un nombre d'élément non nul." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "Plus d'une dimension d'enregistrement a été trouvée." @@ -7164,7 +7177,7 @@ "interactive." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Calcul de la surface..." @@ -7172,7 +7185,7 @@ msgid "Import NMM Profile Set" msgstr "Importer un ensemble de profils NMM" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Information" @@ -7201,13 +7214,13 @@ msgstr "Aligner les lignes de scan avec l'axe X" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "Taille _horizontale :" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "Taille _verticale :" @@ -7303,18 +7316,18 @@ msgstr "" "Le champ de saut d'octet spécifie plus d'octets que n'en contient le fichier." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" "Les éléments du champ d'en-tête d'axe %s ne sont pas entre apostrophes." -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "Le champ d'en-tête d'axe %s contient trop d'éléments." -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "Le champ d'en-tête d'axe %s ne contient pas assez d'éléments." @@ -7376,7 +7389,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Olympus OIR empaqueté (.poir)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "Type de morceau %u trouvé à plusieurs reprises." @@ -7450,7 +7464,7 @@ msgid "Header line starts with a colon." msgstr "La ligne d'en-tête commence par un double point." -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "Les informations sur le canal s'arrêtent de manière inattendue." @@ -7487,48 +7501,48 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Importe les fichiers Wyko OPD et ASC." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Wyko OPD (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Wyko ASCII (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "L'élément `%s' est au-delà de la fin du fichier." -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Des dossiers emboîtés ont été trouvés" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Importe les fichiers ISO 5436-2 OpenGPS (.x3p)" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "ISO 5436-2 OpenGPS (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" "Il y a trop d'éléments DataList par rapport aux dimensions données pour la " "matrice." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "Le fichier main.xml contient plusieurs éléments de données." #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "Seul le type %s est supporté pour l'axe %s." @@ -7552,7 +7566,7 @@ msgstr "Objet invalide imbriqué à la ligne %u." #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "Le bloc de données est tronqué." @@ -7637,36 +7651,36 @@ "JPEG...). La quantité de formats supportés dépend des modules de chargement " "de GDK-PixBuf." -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Utiliser" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "Décalage de teinte" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "L'image ne peut enregistrée avec le type de fichier `%s'." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Chargeur d'image non disponible : %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "Le chargeur d'image refuse les données : %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "en tant que données" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7718,7 +7732,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "L'en-tête est trop court (seulement %lu octets)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "L'en-tête de spectroscopie est trop court (seulement %lu octets)." @@ -7745,21 +7759,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "Structure JSON inattendue : %s au lieu de %s." -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "Structure non consistante des spectres individuels." - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "Erreur d'analyse de syntaxe JSON : %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "Lecture des fichiers..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "Calcul des données de la courbe en L..." @@ -7819,7 +7829,7 @@ #: modules/file/quazarnpic.c:427 #, c-format msgid "Invalid stack state for opcode %02x." -msgstr "" +msgstr "État de la pile invalide pour le code %02x." #: modules/file/quazarnpic.c:743 #, c-format @@ -7834,59 +7844,59 @@ msgid "Quesant files (.afm)" msgstr "Quesant (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "Défini par l'utilisateur" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Octet signé" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Octet non signé" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "Mot de 16 bits signé" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "Mot de 16 bits non signé" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "Mot de 32 bits signé" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "Mot de 32 bits non signé" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "Mot de 64 bits signé" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "Mot de 64 bits non signé" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE simple précision" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE double précision" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "IEEE demie précision" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Nombre rationnel Pascal" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7894,167 +7904,164 @@ "Importe des fichiers bruts, ASCII ou binaire, selon un format défini par " "l'utilisateur." -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "Données ASCII ou binaires" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "N'importe quel espace" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "Tabulation" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Autre caractère" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "Délimiteur de champ" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" "Proposer _automatiquement l'import des fichiers ASCII ou binaires pour les " "fichiers de type inconnu" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "Données texte" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "Données _binaires" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 #, fuzzy msgid "Missin_g value substitute" msgstr "Valeur des pixels invalides" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "Débuter à la _ligne" -#: modules/file/rawfile.c:360 -#, fuzzy +#: modules/file/rawfile.c:359 msgid "_Each row skip" -msgstr "Sauter à ch_aque ligne :" +msgstr "Saut_er à chaque ligne" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "Autre délimiteur" -#: modules/file/rawfile.c:366 -#, fuzzy +#: modules/file/rawfile.c:365 msgid "Data t_ype" -msgstr "Données à comparer :" +msgstr "T_ype de données" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "Ordre des octets (byte _swap)" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "Démarrer avec le décalage" -#: modules/file/rawfile.c:370 -#, fuzzy +#: modules/file/rawfile.c:369 msgid "_Sample size" -msgstr "Taille d'échantillon : " +msgstr "Taille d'échantillon" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "Sauter après chaque échantillon" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "Sauter après chaque ligne" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "Inve_rser les bits dans les octets" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Inverser les bi_ts dans les échantillons" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Les échantillons sont signés" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "" "L'import des fichiers ASCII ou binaires doit être fait de manière " "interactive." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Lire le fichier ASCII ou binaire" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Format de données" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Fichier" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "champs" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "octets" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bits" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binaire" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Texte" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Délimiteur : espace" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Délimiteur : 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Délimiteur : %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "En-tête de fichier invalide" -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, fuzzy, c-format msgid "" "Too short file\n" @@ -8065,7 +8072,7 @@ "Le format nécessite un fichier de %u octets (au moins), mais `%s' ne fait " "que %u octets." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -8074,46 +8081,46 @@ "L'analyse du contenu à échoué\n" "Le contenu de `%s' ne correspond pas au format : %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Pas assez de lignes (%d) pour décaler (%d)" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" "Un espace est nécessaire pour sauter plus de champs dans la ligne %u, obtenu " "`%.16s'" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" "`%c' est nécessaire pour sauter plus de champs dans la ligne %u, obtenu " "`%.16s'" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" "`%s' est nécessaire pour sauter plus de champs dans la ligne %u, obtenu " "`%.16s'" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Données erronées `%.16s' à la ligne %u, colonne %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" "Le délimiteur `%c' est nécessaire après les données dans la ligne %u, " "colonne %u, obtenu `%c'" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8132,8 +8139,8 @@ msgid "_Title" msgstr "_Titre" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Courbe" @@ -8150,9 +8157,8 @@ msgstr "_Unités X" #: modules/file/rawgraph.c:130 -#, fuzzy msgid "Y u_nits" -msgstr "_Unités X :" +msgstr "U_nités Y" #: modules/file/rawgraph.c:193 msgid "ASCII graph import must be run as interactive." @@ -8178,36 +8184,36 @@ msgid "Random points order unsupported" msgstr "Les points donnés dans un ordre aléatoire ne sont pas supportés." -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Importe les fichiers RHK Technology SM3." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "RHK SM3 (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "Fin du fichier atteinte dans l'en-tête de page." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "en-tête de page" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "Fin du fichier atteinte dans la chaîne #%u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "Fin du fichier atteinte dans l'en-tête de couleur des données." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "Fin du fichier atteinte dans les données de couleur." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Ligne inconnue %d" @@ -8220,17 +8226,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "RHK SM4 (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "La liste d'objets dans %s est tronquée." -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "L'objet de type %s est tronqué." -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Impossible de trouver l'objet %s dans %s." @@ -8265,7 +8271,7 @@ msgid "data ranges" msgstr "Plages de données" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "Offset de données" @@ -8341,16 +8347,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Sensofar PLu (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Profil" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Importe les fichiers Sensofar PLUx." -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Sensofar PLUx (.plux)" @@ -8362,15 +8368,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Sensolytics texte (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Importe les fichiers Shimadzu SPM." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Shimadzu" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Impossible d'analyser les valeurs de données après %d sur %d." @@ -8391,31 +8397,31 @@ msgid "SIS files (.sis)" msgstr "SIS (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Le bloc n'est pas un bloc document." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Information de document trop courte." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Information de paramètre trop courte." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Bloc image inattendu." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "Fin du fichier atteinte dans le bloc image." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "Fin du fichier atteinte dans le bloc de canal." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "Fin du fichier atteinte alors qu'un autre canal était attendu." @@ -8718,31 +8724,31 @@ msgid "Unknown data type `%s'." msgstr "Type de données `%s' inconnu." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Exporte les coordonnées XYZ au format texte." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "Données texte XYZ (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "Données XYZ :" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Unités latérales :" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Exporter au format XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Importe les fichiers Carl Zeiss SEM." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Carl Zeiss SEM (.tif)" @@ -8775,12 +8781,12 @@ msgid "Data line %u does not contain four items." msgstr "La ligne de données %u ne contient pas quatre éléments" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Le code d'unité %d est invalide ou n'est pas supporté." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "La première ligne contient trop d'éléments." @@ -8809,9 +8815,8 @@ msgid "Fit Graph" msgstr "Ajuster le graphe" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "_Graphe :" @@ -8820,28 +8825,18 @@ msgid "F_unction:" msgstr "Fonction :" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Plage :" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "jusqu'à" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "_Dessiner un cercle entier" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8893,26 +8888,26 @@ msgid "Results\n" msgstr "Résultats\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Couper le graphe" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "/Opérations _basiques/_Couper" -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Extraire la partie du graphe en nouveau graphe" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Couper le graphe" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Couper toute les courbes" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Couper le graphe" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Spectre DOS" @@ -8969,6 +8964,7 @@ msgstr "Igor Pro wave texte" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "Style" @@ -8993,7 +8989,7 @@ msgstr "Abscisse unique fusionnée" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Exporter au format texte" @@ -9180,8 +9176,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/_Force-Distance/Courbe _FZ vers FD..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "Toutes les courbes" @@ -9193,8 +9189,8 @@ msgid "Zero position" msgstr "Position du zéro" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 msgid "FD curve" msgstr "Courbe FD" @@ -9287,25 +9283,120 @@ msgid "Logscale Transform" msgstr "Échelle logarithmique" -#: modules/graph/graph_peaks.c:105 -msgid "Finds peaks on graph curves." -msgstr "Localise les pics dans un graphe." +#: modules/graph/graph_measure_period.c:91 +#, fuzzy +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "Calcule l'entropie d'une distribution angulaire bi-dimensionnelle." -#: modules/graph/graph_peaks.c:119 +#: modules/graph/graph_measure_period.c:105 #, fuzzy -msgid "/Measure _Features/Find _Peaks..." +msgid "/Measure _Features/_Period..." msgstr "/Mesure de moti_fs/_Terrasses..." -#: modules/graph/graph_peaks.c:122 -msgid "Find graph curve peaks" -msgstr "Localisation de pics dans un graphe" - +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "Mesure de maille" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "Enregistrer les paramètres" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "E_xtraire l'arrière-plan" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "Courbe fermée" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "Mesurer les facettes" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Transformée de Fourier Rapide (FFT)" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "Longueur d’auto-corrélation :" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "Direction" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "Image du réseau" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "%{from}v à %{to}v" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "FFT filtrée" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "Affine_r" + +#: modules/graph/graph_measure_period.c:252 +#, fuzzy +msgid "Simple ACF" +msgstr "ACF radiale" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "ACF multi-pics" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Centres de gravité" + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Position du zéro" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "Surface mise à niveau" + +#: modules/graph/graph_peaks.c:105 +msgid "Finds peaks on graph curves." +msgstr "Localise les pics dans un graphe." + +#: modules/graph/graph_peaks.c:119 +#, fuzzy +msgid "/Measure _Features/Find _Peaks..." +msgstr "/Mesure de moti_fs/_Terrasses..." + +#: modules/graph/graph_peaks.c:122 +msgid "Find graph curve peaks" +msgstr "Localisation de pics dans un graphe" + #: modules/graph/graph_peaks.c:132 msgid "Prominence" msgstr "Proéminence" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Zéro" @@ -9337,91 +9428,91 @@ msgid "Graph Peaks" msgstr "Pics du graphe" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "Données + ajustement" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Données mises à niveau" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Supprimer l'arrière-plan polynomial" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/_Force-Distance/Supprimer l'arrière-plan _polynomial..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 msgid "Remove polynomial background from FZ curve" msgstr "Supprimer l'arrière-plan polynomial de la courbe FZ" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 #, fuzzy msgid "Curve to fit" msgstr "Position _X de la courbe :" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 msgid "_Output" msgstr "S_ortie" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 msgid "Fit results" msgstr "Résultat de l'ajustement" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "P0" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "P1" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "P2" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "P3" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "P4" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "P5" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Distribution des hauteurs" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Distribution des hauteurs cumulée" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Distribution angulaire" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Distribution cumulée des angles" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9437,7 +9528,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/_Statistiques/_Fonctions statistiques..." -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Calcule les fonctions statistiques 1D" @@ -9448,14 +9539,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "Résolution _fixe" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Fonctions statistiques" @@ -9476,110 +9567,99 @@ msgid "pick points" msgstr "Points spéciaux" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 msgid "Remove sine background" msgstr "Supprimer l'arrière-plan sinusoïdal" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "/Force-Distance/Supp_rimer l'arrière plan sinusoïdal..." -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" -msgstr "" +msgstr "Supprimer les effets d'interférences des courbes FZ" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "Période" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "Décalage Y" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "Calcule les statistiques de base de courbes." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 msgid "/_Statistics/_Statistical Quantities..." msgstr "/_Statistiques/Données _statistiques..." -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "Calculer les statistiques de courbes" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "Enregistrer les paramètres" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Statistiques" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "Paramètres simples" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "Entiers" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "Statistiques des graphes" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "%{from}v à %{to}v" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "RMS (Rq) :" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "Longueur projetée" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "Longueur développée" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variation" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "Aire sous la courbe" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "Aire positive" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "Aire négative" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "Racine quadratique" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "Données + polynômes" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9588,202 +9668,195 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Différence" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "Terrasses (idéales)" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "Surface mise à niveau" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "Arrière-plan polynomial" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "Ajuste des terrasses avec un arrière-plan polynomial." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "/Mesure de moti_fs/_Terrasses..." -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "Ajuster des terrasses avec un arrière-plan polynomial." -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "Hauteur de marche ajustée" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" +msgstr "Détection des marches" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "Différence quadratique moyenne" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" +msgstr "Noyau de détection des marche_s" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "Écart entre terrasses" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" +msgstr "Seuil de détection des marches" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" -msgstr "Nombre de terrasses" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" +msgstr "Incrément de l'élargissement" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "Ajuster des terrasses" +#: modules/graph/graph_terraces.c:268 +#, fuzzy +msgid "Minimum terrace _length" +msgstr "Longueur minimale des terrasses :" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "Liste des terrasses" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "Degré du _polynôme" + +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" +msgstr "Hauteurs _indépendantes" + +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" +msgstr "Sélectionner _manuellement les régions" + +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" +msgstr "Sauvegarder la table des terrasses" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 msgid "Output" msgstr "Sortie" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" -msgstr "Sondage" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "Noyau de détection des marche_s" - -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" -msgstr "Seuil de détection des marches" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "Élargissement de la marche :" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" +msgstr "Degré _minimum du polynôme" -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "Longueur minimale des terrasses :" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" +msgstr "Degré _maximum du polynôme" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "Degré du _polynôme :" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" +msgstr "Élargissement minimum" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" -msgstr "Hauteurs _indépendantes" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" +msgstr "Élargissement maximum" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" -msgstr "Détection des marches" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "Ajuster des terrasses" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "Affichage :" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "Liste des terrasses" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "Sélectionner _manuellement les régions" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" +msgstr "Sondage" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "Résultat" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "Sauvegarder la table des terrasses" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "_Exécuter" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "Degré du _polynôme" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "Hauteur de marche ajustée" + +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "Différence quadratique moyenne" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" -msgstr "Degré _minimum du polynôme :" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "Écart entre terrasses" -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" -msgstr "Degré _maximum du polynôme" +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" +msgstr "Nombre de terrasses" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" -msgstr "Incrément de l'élargissement" +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "Le sondage ne peut être lancé avec des hauteurs indépendantes." -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" -msgstr "Élargissement _minimum :" - -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" -msgstr "Élargissement maximum :" - -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." -msgstr "Le sondage ne peut être lancé avec des degrés indépendants." +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 +msgid "No free parameters are selected." +msgstr "Aucune paramètre libre sélectionné." -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 #, c-format msgid "Number of combinations: %u." msgstr "Nombre de combinaisons : %u." -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 -msgid "No free parameters are selected." -msgstr "Aucune paramètre libre sélectionné." - -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "Segment %u" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "Niveau %d" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "Échec de l'ajustement" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "Aucune terrasse adaptée trouvée " -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "Aucune terrasse n'a été trouvée" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Enregistrer le tableau" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "Sauvegarder le sondage des terrasses" @@ -9918,7 +9991,7 @@ msgstr "Mise à niveau du plan" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Zoom" @@ -9936,8 +10009,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "Épaisseur" @@ -9964,7 +10037,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "Masque utilisé" @@ -10011,12 +10084,10 @@ msgstr "Calculer la distribution angulaire bi-dimensionnelle" #: modules/process/angle_dist.c:112 modules/process/slope_dist.c:149 -#, fuzzy msgid "Output size" -msgstr "Taille de _sortie" +msgstr "Taille de sortie" #: modules/process/angle_dist.c:113 -#, fuzzy msgid "Number of steps" msgstr "Nombre de pas" @@ -10058,7 +10129,7 @@ msgstr "Générer une image à partir du recuit d'un gaz sur réseau" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Nombre d'itérations" @@ -10102,8 +10173,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Aperçu progressif" @@ -10115,13 +10186,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Dimensions" @@ -10130,18 +10202,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Générateur" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Paramètres de simulation" @@ -10152,15 +10226,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "Comme _l'image courante" @@ -10169,10 +10244,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10183,8 +10259,9 @@ msgstr "Initialisation..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "Calcul en cours..." @@ -10214,7 +10291,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Rayon" @@ -10254,64 +10331,80 @@ msgid "Arithmetic operations on data" msgstr "Opérations arithmétiques sur les données" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Expression" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Spécifier les un_ités" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "Valeur de remplissage _fixée" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Calculée" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Arithmétique" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Expression :" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Opérandes" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Prendre les unités du résultat à partir des données d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Spécifier les un_ités :" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Spécifier explicitement les unités du résultat" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "L'expression contient des identifiants inconnus" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Les dimensions des pixels diffèrent" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "Les dimensions latérales sont des quantités physiques différentes" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Les dimensions physiques diffèrent" @@ -10347,7 +10440,7 @@ "Opérations basiques : renversement, inversion de valeur et rotation par " "multiples de 90 degrés." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/Opérations _basiques/_Inverser les valeurs" @@ -10379,35 +10472,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "Cou_verture" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "Étalement" @@ -10809,27 +10903,30 @@ msgid "Building mesh..." msgstr "Maillage en cours..." -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "Correction X" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Correction Y" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Correction Z" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "Incertitude X" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Incertitude Y" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Incertitude X" @@ -10862,6 +10959,7 @@ msgstr "Recalibre les dimensions latérales ou l'échelle des valeurs." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/Opérations _basiques/_Dimensions et unités..." @@ -10945,7 +11043,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "Créer une nouvelle image" @@ -10967,7 +11065,6 @@ #: modules/process/calibrate.c:600 modules/volume/volume_calibrate.c:450 #: modules/volume/volume_calibrate.c:480 modules/volume/volume_calibrate.c:506 #: modules/volume/volume_calibrate.c:527 -#, fuzzy msgid "Current" msgstr "Image courante" @@ -10995,10 +11092,6 @@ msgid "Classify" msgstr "Classifier" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "_Exécuter" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "Masque A" @@ -11169,6 +11262,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 msgid "_Height scale" msgstr "Échelle de _hauteur" @@ -11318,14 +11412,14 @@ msgid "Convolution _kernel" msgstr "Noyau de convolution" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Normaliser l'_intégrale" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "Convoluée" @@ -11359,13 +11453,13 @@ msgstr "Correction affine" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "Affine_r" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Option d'aperçu" @@ -11560,7 +11654,7 @@ msgstr "Ajouter un masque de corré_lation basse" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "Seuil" @@ -11644,13 +11738,13 @@ msgid "Curvature Sections" msgstr "Sections de courbure" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Profil %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Type de sortie :" @@ -11750,7 +11844,7 @@ msgid "Deconvolve" msgstr "Déconvoluer" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "Sigma" @@ -12115,7 +12209,8 @@ msgid "drift" msgstr "dérive" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "dérive selon l'axe x" @@ -12131,6 +12226,50 @@ msgid "rows" msgstr "lignes" +#: modules/process/dune_synth.c:108 +#, fuzzy +msgid "Generates images by simulating formation of sand dunes." +msgstr "Génère des images en faisant un recuit d'un gaz sur réseau." + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/S_ynthèse/_Dépôt/_Fibres..." + +#: modules/process/dune_synth.c:126 +#, fuzzy +msgid "Generate image by transporting sand" +msgstr "Générer une image à partir du recuit d'un gaz sur réseau" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "_Minimum" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "Définir la plage" + +#: modules/process/dune_synth.c:147 +#, fuzzy +msgid "Sticking probability on _rock" +msgstr "Probabilité d'accroche :" + +#: modules/process/dune_synth.c:148 +#, fuzzy +msgid "Sticking _probability on sand" +msgstr "Probabilité d'accroche :" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "Maximum" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "Dunes" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "DWT bi-dimensionnelle (transformée en ondelettes discrète)" @@ -12437,7 +12576,7 @@ msgstr "Il n'y a aucun chemin." #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Distance" @@ -12462,10 +12601,11 @@ msgstr "Niveau des facettes" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Mise à niveau des facettes..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Visualise, marque et mesure l'orientation des facettes." @@ -12486,11 +12626,11 @@ msgid "_Number points" msgstr "_Numéroter les points" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "Effa_cer" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "_Marquer" @@ -12562,7 +12702,7 @@ msgid "Create _Points" msgstr "Créer les _points" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "Sauvegarder les vecteurs des facettes" @@ -12571,43 +12711,43 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f deg, φ = %.2f deg" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." msgstr "/Mesure de moti_fs/_Mesure des facettes..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "Mesurer les angles des facettes" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "Taille des _facettes" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Tolérance" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "φ sélectionné" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "ϑ sélectionné" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "Marquage de facettes instantané" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "Mesurer les facettes" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "Me_sure" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "points" @@ -12843,7 +12983,7 @@ msgid "Clear the entire filter mask" msgstr "Supprimer complètement le masque filtre" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "Remplir" @@ -12863,7 +13003,7 @@ msgid "Zoom:" msgstr "_Zoom :" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Options de sortie" @@ -12932,7 +13072,7 @@ msgid "Triangle" msgstr "Triangle" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "Rectangle" @@ -12980,7 +13120,7 @@ msgstr "Fibres aléatoires" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Forme" @@ -13011,7 +13151,7 @@ msgstr "Forme ajustée" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Les deux" @@ -13271,6 +13411,7 @@ msgstr "Créer le _masque" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "Fraction _tronquée" @@ -13855,32 +13996,26 @@ msgstr "Exterieur" #: modules/process/indent_analyze.c:214 -#, fuzzy msgid "Imprint" -msgstr "Impression" +msgstr "Empreinte" #: modules/process/indent_analyze.c:215 -#, fuzzy msgid "Imprint faces" -msgstr "Ajustement d'empreintes" +msgstr "Faces de l'empreinte" #: modules/process/indent_analyze.c:216 modules/process/indent_analyze.c:400 -#, fuzzy msgid "Contact area" -msgstr "Contact" +msgstr "Aire de contact" #: modules/process/indent_analyze.c:217 -#, fuzzy msgid "Pile-up" msgstr "Enfoncement" #: modules/process/indent_analyze.c:218 -#, fuzzy msgid "Inner pile-up" msgstr "Enfoncement" #: modules/process/indent_analyze.c:219 -#, fuzzy msgid "Outer pile-up" msgstr "Débordement" @@ -13893,106 +14028,88 @@ msgstr "" #: modules/process/indent_analyze.c:230 -#, fuzzy msgid "Exterior width" -msgstr "Exterieur" +msgstr "Largeur extérieure" #: modules/process/indent_analyze.c:231 msgid "Ref. plane _tolerance" msgstr "_Tolérance du plan de référence" #: modules/process/indent_analyze.c:232 -#, fuzzy msgid "_Angle tolerance" -msgstr "Tolérance angle _1 :" +msgstr "Tolérance _angulaire" #: modules/process/indent_analyze.c:233 -#, fuzzy msgid "_Indenter shape" -msgstr "Type d'_indenteur :" +msgstr "Forme de l'_indenteur" #: modules/process/indent_analyze.c:262 -#, fuzzy msgid "Analyze imprint" -msgstr "Analyser l'empreinte d'indentation" +msgstr "Analyser l'empreinte" #: modules/process/indent_analyze.c:325 -#, fuzzy msgid "Analyze Imprint" -msgstr "Analyser la dérive de données XYZ" +msgstr "Analyser l'empreinte" #: modules/process/indent_analyze.c:335 msgid "Leveling" msgstr "Mise à niveau" #: modules/process/indent_analyze.c:340 -#, fuzzy msgid "Marking" -msgstr "_Masquage" +msgstr "Marquage" #: modules/process/indent_analyze.c:388 msgid "Indentation" msgstr "Indentation" #: modules/process/indent_analyze.c:393 -#, fuzzy msgid "Imprint center x" -msgstr "Centre de la nano-indentation à " +msgstr "Centre X de l'empreinte" #: modules/process/indent_analyze.c:394 -#, fuzzy msgid "Imprint center y" -msgstr "Centre de la nano-indentation à " +msgstr "Centre Y de l'empreinte" #: modules/process/indent_analyze.c:398 -#, fuzzy msgid "Imprint surface area" -msgstr "Surface" +msgstr "Surface de l'empreinte" #: modules/process/indent_analyze.c:399 -#, fuzzy msgid "Imprint projected area" -msgstr "Surface projetée" +msgstr "Surface projetée de l'empreinte" #: modules/process/indent_analyze.c:401 -#, fuzzy msgid "Imprint volume" -msgstr "Volume d'indentation" +msgstr "Volume de l'empreinte" #: modules/process/indent_analyze.c:402 -#, fuzzy msgid "Pile-up volume" -msgstr "volume" +msgstr "Volume de débordement" #: modules/process/indent_analyze.c:403 -#, fuzzy msgid "Pile-up surface area" -msgstr "Surface" +msgstr "Surface du débordement" #: modules/process/indent_analyze.c:404 -#, fuzzy msgid "Pile-up projected area" -msgstr "Surface projetée" +msgstr "Surface projetée du débordement" #: modules/process/indent_analyze.c:405 -#, fuzzy msgid "Inner pile-up surface area" -msgstr "Enfoncement" +msgstr "Surface de l'enfoncement" #: modules/process/indent_analyze.c:406 -#, fuzzy msgid "Inner pile-up projected area" -msgstr "Surface projetée" +msgstr "Surface projetée de l'enfoncement" #: modules/process/indent_analyze.c:407 -#, fuzzy msgid "Outer pile-up surface area" -msgstr "Débordement" +msgstr "Surface du débordement externe" #: modules/process/indent_analyze.c:408 -#, fuzzy msgid "Outer pile-up projected area" -msgstr "Surface projetée" +msgstr "Surface projetée du débordement externe" #: modules/process/laplace.c:43 msgid "" @@ -14133,7 +14250,6 @@ msgstr "Surface" #: modules/process/lat_synth.c:503 modules/process/lat_synth.c:505 -#, fuzzy msgid "steps" msgstr "marches" @@ -14286,7 +14402,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Corrige les défauts des lignes (algorithmes expérimentaux)." -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/_Correction des données/Correction des sauts dans les lignes" @@ -14302,31 +14418,31 @@ msgid "Mark lines with inverted sign" msgstr "Marquer les lignes ayant un signe inverse" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Polynôme" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Médiane des différences" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Valeur dominante" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Correspondance" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "Moyenne tronquée" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "Moyenne des différences tronquée" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "Inclinaison du nivellement des facettes" @@ -14334,7 +14450,7 @@ msgid "Aligns rows by various methods." msgstr "Aligne les lignes à l'aide de différentes méthodes." -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/_Correction des données/_Aligner les lignes..." @@ -14370,7 +14486,7 @@ msgid "Steps" msgstr "Marches" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Défauts linéaires" @@ -14379,7 +14495,7 @@ msgstr "Créneaux" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Angle" @@ -14523,7 +14639,7 @@ msgid "_Hessian" msgstr "_Hessienne" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "Paramètre de _régularisation" @@ -14548,10 +14664,12 @@ msgstr "Marque les données éloignées des autres valeurs" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positif" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Négatif" @@ -14684,7 +14802,7 @@ msgid "Two-sided" msgstr "Les deux côtés" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Éroder à partir du _bord" @@ -14808,116 +14926,136 @@ msgid "Shift Mask" msgstr "Décaler le masque" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "Recherche par corrélation un détail dans une autre image." -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidonnées/Recherche par _corrélation..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "Recherche d'un détail par corrélation" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "Corrélation, brute" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "Corrélation, mise à niveau" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Score de corrélation" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "Différence de hauteur, brute" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "Différence de hauteur, mise à niveau" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "Score de la différence de hauteur" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Phase uniquement" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Objets marqués" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Maximum de corrélation" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "_Méthode de corrélation" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Utiliser le _masque" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "Dessiner le masque" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "_Détail à rechercher" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "Recherche par corrélation" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "" "Opérations basiques sur les masques : inversion, suppresion, extraction." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Masque/Supp_rimer le masque" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Supprime le masque" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Masque/_Inverser le masque" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Inverse le masque" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Masque/Extraire le masque" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "Extrait le masque vers une nouvelle image" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +#, fuzzy +msgid "/_Grains/_Extract Numbers" +msgstr "/_Grains/_Extraire les numéros" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "Extraire les numéros des grains vers une nouvelle image" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Grains/Supp_rimer les grains en contact avec les bords" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Supprimer les grains en contact avec le bord de l'image" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Masque/Affiner" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Affiner le masque" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "Numéro du grain" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Rogne les régions non croisées de deux images." @@ -14968,11 +15106,11 @@ #: modules/process/measure_lattice.c:201 msgid "Measure single vector" -msgstr "" +msgstr "Mesurer un vecteur individuel" #: modules/process/measure_lattice.c:202 msgid "Show vector numbers" -msgstr "" +msgstr "Afficher le numéro des vecteurs" #: modules/process/measure_lattice.c:281 modules/process/measure_lattice.c:331 msgid "Measure Lattice" @@ -15062,7 +15200,7 @@ msgid "Second image" msgstr "Deuxième image" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Moyenne" @@ -15334,9 +15472,8 @@ msgstr "Constante de ressort" #: modules/process/mfm_recalc.c:174 -#, fuzzy msgid "_Quality factor" -msgstr "Facteur de _qualité :" +msgstr "Facteur de _qualité" #: modules/process/mfm_recalc.c:176 msgid "_Base frequency" @@ -15347,14 +15484,12 @@ msgstr "Amplitude de _base" #: modules/process/mfm_recalc.c:180 -#, fuzzy msgid "_Create new image" -msgstr "Créer une nouvelle image" +msgstr "_Créer une nouvelle image" #: modules/process/mfm_recalc.c:182 -#, fuzzy msgid "Result _type" -msgstr "Type de résultat :" +msgstr "_Type de résultat" #: modules/process/mfm_recalc.c:198 modules/volume/volume_mfmrecalc.c:134 msgid "Data value units must be deg, rad, m, Hz or V for the recalculation" @@ -15430,7 +15565,7 @@ msgid "Use _first mask for all images" msgstr "Utiliser le premier masque pour toutes les images" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "_Mode" @@ -15524,8 +15659,8 @@ msgid "Re_initialize" msgstr "Réinitialiser" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Utilisation du masque" @@ -16049,7 +16184,66 @@ msgid "Pile Up Shapes" msgstr "Formes empilées" -#: modules/process/polydistort.c:134 +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Génère des structures séparées par des phases." + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/S_ynthèse/_Particules..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Génère une image formée de domaines" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Largeur maximale" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Minimum" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Étalement (taille)" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "Fraction de pente" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Mettre à l'échelle avec la taille" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "Échelle de _hauteur" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Aléatoire linéaire" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Génération des fibres..." + +#: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Applique une distorsion polynomiale dans le plan horizontal." @@ -16109,10 +16303,6 @@ msgid "_Vertical polynomial degree" msgstr "Degré du polynôme _vertical" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "Degré _maximum du polynôme" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "Degré_s identiques" @@ -16129,6 +16319,10 @@ msgid "Copy table to clipboard" msgstr "Copier la table vers le presse-papier" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Enregistrer le tableau" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Opérations basiques avec une présentation : extraction, suppression." @@ -16275,8 +16469,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "Fonction de transfert" @@ -16296,7 +16490,7 @@ msgid "Transfer function estimation" msgstr "Estimation de la fonction de transfert" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Statistiques/Estimation de la fonction de _transfert..." @@ -16306,15 +16500,15 @@ "Estimer la fonction de transfert à partir de données connues et d'une image " "idéale" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "Filtre régularisé" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "Moindres carrés" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "Filtre de Wiener" @@ -16322,19 +16516,19 @@ msgid "_Border" msgstr "_Bord" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "L'image est trop petite." -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "Estimer la fonction de transfert" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "Sigma de l'ajustement" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "Taille de la fonction de transfert" @@ -16350,23 +16544,23 @@ msgid "Transfer Function" msgstr "Fonction de transfert" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "Largeur de la fonction de transfert" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "Hauteur de la fonction de transfert" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "Norme de la fonction de transfert" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "Norme de la différence" @@ -16490,7 +16684,7 @@ msgid "Proportion" msgstr "Proportion" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "Décalage" @@ -16711,7 +16905,7 @@ msgid "_Assume symmetry" msgstr "Symétrie" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Données pivotées" @@ -16788,23 +16982,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Corriger les marques horizontales (traits)" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Type de marques" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "Seuil dur" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "_Seuil doux" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Longueur minimale" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Largeur maximale" @@ -17058,14 +17252,6 @@ msgid "Marked terraces" msgstr "Terrasses marquées" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "Noyau de détection des marche_s" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "Seuil de détection des marches" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "_Aire minimale des terrasses" @@ -17074,22 +17260,6 @@ msgid "Do not _segment, use only mask" msgstr "Ne pas _segmenter, utiliser uniquement le masque" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "Degré _minimum du polynôme" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "Élargissement minimum" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "Élargissement maximum" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "Le sondage ne peut être lancé avec des hauteurs indépendantes." - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Limiter la plage de données en utilisant des seuils haut/bas." @@ -17134,7 +17304,7 @@ msgid "Limit Range" msgstr "Limiter la plages des valeurs" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "Afficher la plage des données complète" @@ -17260,7 +17430,6 @@ msgstr "_Type de pointe" #: modules/process/tip_model.c:130 -#, fuzzy msgid "_Number of sides" msgstr "_Nombre de côtés" @@ -17475,9 +17644,8 @@ msgstr "Résolution _Z" #: modules/process/volumize_layers.c:110 modules/volume/volume_calibrate.c:209 -#, fuzzy msgid "Z _unit" -msgstr "_Unités X :" +msgstr "_Unités Z :" #: modules/process/volumize_layers.c:151 msgid "All datafields must have same resolution to make a volume from them." @@ -17542,19 +17710,16 @@ msgstr "Fréquence" #: modules/process/wfr_synth.c:98 -#, fuzzy msgid "Generates images by simulating a propagating wetting front." -msgstr "Génère des images en faisant un recuit d'un gaz sur réseau." +msgstr "Génère des images en simulant la propagation d'un front de mouillage." #: modules/process/wfr_synth.c:112 -#, fuzzy msgid "/S_ynthetic/_Wetting..." -msgstr "/S_ynthèse/Mai_llage..." +msgstr "/S_ynthèse/Mouillage..." #: modules/process/wfr_synth.c:116 -#, fuzzy msgid "Generate image by propagating wetting front" -msgstr "Générer une image à partir du recuit d'un gaz sur réseau" +msgstr "Générer une image en propageant un front de mouillage" #: modules/process/wfr_synth.c:132 msgid "_Diffusion" @@ -17562,7 +17727,7 @@ #: modules/process/wfr_synth.c:203 msgid "Wetting Front" -msgstr "" +msgstr "Front de mouillage" #: modules/process/wpour_mark.c:117 msgid "Segments image using watershed with pre- and postprocessing." @@ -17647,7 +17812,7 @@ #: modules/process/wrapvalue.c:120 modules/process/wrapvalue.c:127 #: modules/process/wrapvalue.c:131 msgid "_Keep unchanged" -msgstr "" +msgstr "Conserver" #: modules/process/wrapvalue.c:121 modules/process/wrapvalue.c:128 #: modules/process/wrapvalue.c:132 modules/process/wrapvalue.c:142 @@ -17830,138 +17995,137 @@ msgid "Function written in Python" msgstr "Fonction écrite en Python" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "Outil longueur de corrélation." -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "Aucune" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "Mise à niveau des lignes" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Enregistrer les statistiques" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "Longueur de corrélation" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "Longueur de corrélation T" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "Relation avec la taille image" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "Surface sélectionnée" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i à (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v à (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "Décroissance naïve de l'ACF à 1/e" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "Décroissance extrapolée de l'ACF à 1/e" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "Décroissance de l'ACF à zéro" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "Ajustement PSDF gaussienne" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "Ajustement PSDF exponentielle" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "Rapport α = T/L" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "La taille de l'image est mesurées en T" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "" "Outil de profil permettant de lire des lignes de scan horizontales et/ou " "verticales." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "Coupure à zéro" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "Profils selon des axes" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "Lire des profils horizontaux et/ou verticaux" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Profils" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Options" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "Profil vertical %d" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "Profil horizontal %d" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Rognage, limite les données à une zone plus petite." -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Outil de mesure de distance, mesure des distances et des angles." +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "Enregistrer la table de distance" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "_Numéroter les lignes" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Mesure de distances et de directions entre des points" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "Enregistrer la table de distance" - #: modules/tools/filter.c:117 -#, fuzzy msgid "" "Filter tool, processes selected part of data with a filter (conservative " "denoise, mean, median, Kuwahara, minimum, maximum)." @@ -18020,7 +18184,7 @@ "Outil de suppression de grains, supprime des parties continues d'un masque " "et/ou des données sous-jacentes." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Solveur laplacien" @@ -18028,7 +18192,7 @@ msgid "Fractal correction" msgstr "Correction fractale" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "Mélange fractal-Laplace" @@ -18036,7 +18200,7 @@ msgid "Remove" msgstr "Supprimer" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "Méthode d'_interpolation" @@ -18048,7 +18212,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Suppression de grains individuels (parties continues d'un masque)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -18058,66 +18222,74 @@ "couleurs, à partir des données ou de l'histogramme de distribution des " "hauteurs." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 msgid "_Start" msgstr "Début" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "Fin" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "_Adapter la plage de couleurs à la sélection" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Visualisation des couleurs" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Étale la plage de visualisation sur une partie des données" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Plage de visualisation complète du minimum au maximum" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Plage de visualisation fixée" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Plage de visualisation automatique avec suppression des extrémités" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Plage de visualisation non-linéaire adaptative" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "_défaut" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Histogramme des hauteurs" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 msgid "Color Mapping" msgstr "Échelle de couleurs" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Ajuster sur la partie _masquée" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "Aj_uster sur la partie non-masquée" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Inverser les couleurs" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 msgid "Data Range" msgstr "Plages de données" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -18126,7 +18298,7 @@ "Outil de mise à niveau avec trois points, met à niveau les données en " "soustrayant un plan ajusté sur trois points sélectionnés." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "R_ayon de moyennage" @@ -18146,7 +18318,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Met à niveaux les données en ajustant un plan grâce à 3 points" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -18154,129 +18326,133 @@ "Outil de calcul statistique de ligne/colonne, calcule les valeurs moyenne, " "médiane, maximale, minimale, RMS, ..., de lignes ou de colonnes." -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Lignes" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Colonnes" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Statistiques de ligne/colonne" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Calcule les statistiques de ligne/colonne" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "Outil d'édition de masque, permet de modifier des parties du masque de " "manière interactive." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "Forme_s" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "Outils de _dessin" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Définir la sélection comme masque" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Ajouter la sélection au masque" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Soustraire la sélection du masque" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Insérer la sélection avec un masque" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Rectangles" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Ellipses" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Lignes" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Dessin manuel de masque" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Effacement manuel d'un masque" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Remplir les parties vides continues avec un masque" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Effacer les parties continues d'un masque" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "Qu_antité" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "Remplir les vides à connexions multiples" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "Em_pêcher la fusion de grains lors d'une dilatation" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Éditeur de masque" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Éditer le masque" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Éditeur" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Actions" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Dilater / Éroder" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Inverser" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "Remplir les _vides" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "Dilater" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "Éroder" @@ -18296,103 +18472,107 @@ "Met à niveau les lignes en utilisant les intersections des lignes définies " "par l'utilisateur" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Outil profil, crée des profils à partir des lignes sélectionnées." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "Aucune" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "Profils _séparés" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "Montrer le profil" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "Données de _calibration" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "Extraire des profils le long de lignes arbitraires" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "Améliorer la _direction" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "Tout _améliorer" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "Erreur X %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Erreur Y %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Erreur Z %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "Incertitude X %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Incertitude Y %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Incertitude Z %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Z inc. limite haute %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Z inc. limite basse %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Outil de pointage, lit la valeur sous le pointeur." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Montrer la _sélection" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "Adapter la plage de couleurs au détail" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Lire la valeur" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Lire la valeur sous le curseur" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Mise à zéro" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Facette" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Courbures" @@ -18400,16 +18580,16 @@ msgid "Calculate surface profile parameters." msgstr "Calculer les paramètres du profil de surface." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Texture" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Ondulation" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Rugosité" @@ -18421,7 +18601,7 @@ msgid "BRC" msgstr "Distribution d'amplitude cumulée" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Comptage des pics" @@ -18433,182 +18613,181 @@ msgid "Calculate roughness parameters" msgstr "Calculer les paramètres de rugosité" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Paramètres de rugosité" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "Ligne sélectionnée" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "(%{x1}i, %{y1}i) à (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "(%{x1}v, %{y1}v) à (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "Coupure" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Rugosité moyenne" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Rugosité RMS" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Amplitude maximale" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Profondeur minimale des vallées" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Hauteur maximale des pics" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Amplitude moyenne" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Profondeur moyenne des vallées" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Hauteur moyenne des pics" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "Profondeur de rugosité" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Hauteur maximale moyenne du profil" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "Rugosité crête-à-crête maximale" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Asymétrie" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Kurtosis" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Ondulation moyenne" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Ondulation RMS" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Hauteur maximale de l'ondulation" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Hauteur maximale du profil" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Spatial" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "Écart moyen des irrégularités du profil" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Longueur d'onde moyenne du profil" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Longueur d'onde RMS du profil" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" -msgstr "Hybride" +msgstr "Hybrides" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Pente absolue moyenne" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Pente RMS" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Longueur du profil développé" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Rapport de longueur de profil" -#: modules/tools/roughness.c:481 -#, fuzzy +#: modules/tools/roughness.c:482 msgid "parameters|Functional" -msgstr "Hybride" +msgstr "Fonctionnels" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "Hauteur de marche" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 #, fuzzy msgid "No profile in the image selected." msgstr "Aucun point sélectionné dans l'image." -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Distribution d'amplitude" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "Distribution d'amplitude cumulée" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Profils de surface" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "Crée des profils moyennés angulairement." -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "Profils radiaux" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "Extraire les profils moyennés angulairement" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "Profils radiaux" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "S_ymétriser" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Tout symétriser" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "Profil radial %d" @@ -18645,7 +18824,7 @@ msgid "_Copy" msgstr "_Copier" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -18655,35 +18834,45 @@ "(distribution de hauteur, correlations, PSDF, fonctions de Minkowski) de la " "partie sélectionnée des données." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "PSDF radiale" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "Spectre angulaire" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "ACF radiale" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Volume de Minkowski" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Limite de Minkowski" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Connectivité de Minkowski" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "Graphe d'échelle d'aire" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +#, fuzzy +msgid "IDF" +msgstr "Distribution d'amplitude" + +#: modules/tools/sfunctions.c:187 +#, fuzzy +msgid "Radial IDF" +msgstr "PSDF radiale" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "Incertitudes _séparées" @@ -18711,7 +18900,7 @@ msgid "Spectroscopy" msgstr "Spectroscopie" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -18719,203 +18908,294 @@ "Outil de suppression des points chauds, interpole de petites parties des " "données (affichée sur une vue agrandie) en utilisant un algorithme choisi." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Applatissement hyperbolique" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Pseudo-Laplace" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Interpolation fractale" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "Ellipse" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Supprimer les points chauds" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Interpoler de petits défauts sélectionnés manuellement" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "Aucun point sélectionné dans l'image." -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "Aucune zone sélectionnée pour le zoom." -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Outil statistique." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Statistiques" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "Basé sur le moment" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "Basé sur l'ordre" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Hybride" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "Autre" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "Valeur moyenne" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "Rugosité RMS" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "RMS (grains)" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "Rugosité moyenne" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "Hauteur maximale des pics" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "Profondeur maximale des creux" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "Hauteur maximale" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "Pente de la surface" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "Désaccord entre les lignes de scan" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +#: modules/volume/volume_addframe.c:113 +#, fuzzy +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/Opérations _basiques/Insérer le plan XY..." + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +#: modules/volume/volume_addframe.c:132 +msgid "Data to insert" +msgstr "Données à insérer" + +#: modules/volume/volume_addframe.c:170 +msgid "Frame added" +msgstr "Image ajoutée" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "Ajouter le plan XY" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "_Remplacer l'image courante" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "Opérations arithmétiques simples sur des données volumiques." -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/_Arithmétique..." +#: modules/volume/volume_arithmetic.c:159 +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/Opérations _basiques/_Arithmétique..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "Opérations arithmétiques sur les données volumiques" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "Les axes de calibration Z sont différents" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "Exporte les données volumiques au format ASCII." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Exporter au format _texte..." +#: modules/volume/volume_asciiexport.c:86 +msgid "/_Basic Operations/Export _Text..." +msgstr "/Opérations _basiques/Exporter au format _texte..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "Exporter les données volumiques dans un fichier texte" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "Grille VTK structurée" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "Un profil Z par ligne" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "Une couche XY par ligne" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "Matrices séparées par des lignes vides" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Précision :" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Données volumiques" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" "Recalibre les dimensions des données volumiques ou la plage de valeurs." -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Dimensions et unités..." - #: modules/volume/volume_calibrate.c:170 -#, fuzzy msgid "Match voxel size" -msgstr "Faire correspondre la taille des pixels" +msgstr "Faire correspondre la taille des voxels" #: modules/volume/volume_calibrate.c:206 -#, fuzzy msgid "_Z range" -msgstr "Plage _Z : " +msgstr "Plage _Z" #: modules/volume/volume_calibrate.c:215 -#, fuzzy msgid "Z offset" -msgstr "Décalage _Z :" +msgstr "Décalage Z" #: modules/volume/volume_calibrate.c:222 -#, fuzzy msgid "Value _range" -msgstr "Plage" +msgstr "Plage de valeu_rs" #: modules/volume/volume_calibrate.c:223 -#, fuzzy msgid "Value _minimum" -msgstr "_Minimum Z" +msgstr "Valeur _minimum" #: modules/volume/volume_calibrate.c:224 msgid "Value shi_ft" msgstr "Décalage" #: modules/volume/volume_calibrate.c:225 -#, fuzzy msgid "_Value correction factor" -msgstr "Facteur de correction X" +msgstr "Facteur de correction des _valeurs" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "Créer de nouvelles données volumiques" #: modules/volume/volume_calibrate.c:448 -#, fuzzy msgid "XY Dimensions" -msgstr "Dimensions" +msgstr "Dimensions XY" #: modules/volume/volume_calibrate.c:478 -#, fuzzy msgid "Z Dimension" -msgstr "Dimensions" +msgstr "Dimension Z" + +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Correction des données/Estimer la _dérive..." + +#: modules/volume/volume_drift.c:160 +msgid "Estimates drift" +msgstr "Estimer la dérive" + +#: modules/volume/volume_drift.c:169 +msgid "_Extract drift" +msgstr "_Extraire la dérive" + +#: modules/volume/volume_drift.c:170 +msgid "_Crop data" +msgstr "Rogner les données" + +#: modules/volume/volume_drift.c:175 +msgid "_Z" +msgstr "_Z" + +#: modules/volume/volume_drift.c:185 +msgid "Show direction" +msgstr "Afficher la direction" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +msgid "Lateral drift" +msgstr "Dérive latérale" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "dérive selon l'axe y" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Dérive Z" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "dérive selon l'axe z" + +#: modules/volume/volume_drift.c:279 +msgid "Drift corrected" +msgstr "Corrigé de la dérive" + +#: modules/volume/volume_drift.c:330 +msgid "Estimate drift" +msgstr "Dérive estimée" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "Calcul des données de la courbe en L..." + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "Création des données volumiques" #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." @@ -18924,7 +19204,8 @@ "volumiques." #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." msgstr "/_Isosurface..." #: modules/volume/volume_equiplane.c:158 @@ -18952,80 +19233,98 @@ msgid "Isosurface z for %.*f %s" msgstr "Isosurface z pour %.*f %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "Affiche une représentation 3D des données volumiques" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/Vue 3D..." +#: modules/volume/volume_extract.c:197 +#, fuzzy +msgid "/_Basic Operations/3D View..." +msgstr "/Opérations _basiques/Inclinaison..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "Affiche une vue 3D des données volumiques" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Données volumiques" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "_Rendu" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "_Sauvegarder l'image" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "Seuil du modèle filaire" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Opacité" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "Appliquer la perspective" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "Rendu 3D instantané" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "Vue X" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Vue Y" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Vue Z" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "Aucune image n'a pour l'instant été générée" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "Exporter la vue 3D" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "Erreur de Cairo lors de la sauvegarde de l'image" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "Construction du modèle filaire..." +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "Supprime les points aberrants de tous les plans XY" + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/_Correction des données/Niveau" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "Mettre à niveau tous les plans XY" + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "Niveau des facettes" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Évaluer les données force-distance volumiques" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." +#, fuzzy +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/_Évaluer les données F-D (force-distance)..." #: modules/volume/volume_fdfit.c:217 @@ -19048,10 +19347,6 @@ msgid "Inverts value in volume data" msgstr "Inverse les valeurs dans les données volumiques" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Inverser les valeurs" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Inverser les valeurs dans les données volumiques" @@ -19061,8 +19356,8 @@ msgstr "Calcule le partitionnement par k-moyennes de données volumiques." #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." -msgstr "/Partitionnement par _k-moyennes..." +msgid "/_Statistics/_K-Means Clustering..." +msgstr "/_Statistiques/Partitionnement par _k-moyennes..." #: modules/volume/volume_kmeans.c:113 msgid "Calculate K-means clustering on volume data" @@ -19125,8 +19420,8 @@ msgstr "Calcule le partitionnement par k-médianes de données volumiques." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." -msgstr "/Partitionnement par _k-médianes..." +msgid "/_Statistics/_K-Medians Clustering..." +msgstr "/_Statistiques/Partitionnement par _k-médianes..." #: modules/volume/volume_kmedians.c:106 msgid "Calculate K-medians clustering on volume data" @@ -19160,8 +19455,9 @@ msgstr "Crée une carte de courbes à partir de données volumiques." #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/Convertir en carte de courbes..." #: modules/volume/volume_lawnize.c:103 msgid "Convert to curve map" @@ -19187,13 +19483,31 @@ msgid "Z calibration" msgstr "Calibration Z" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "Mise à niveau des lignes" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "Mise à niveau des lignes" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "Compile dans un canal les profils de données volumiques." #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "/Compiler les _profils..." +msgid "/_Statistics/Summarize _Profiles..." +msgstr "/_Statistiques/Compiler les _profils..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 msgid "Summarize profiles" @@ -19206,14 +19520,43 @@ #: modules/volume/volume_linestat.c:210 msgid "Z _to" -msgstr "" +msgstr "Z vers" #: modules/volume/volume_linestat.c:294 modules/volume/volume_zposlevel.c:263 msgid "Summarize Volume Profiles" msgstr "Compiler les profils volumiques" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/M_odes SPM/Sonde/_Dilatation..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "Largeur moyenn" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Résultat de l'ajustement" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Courbe de calibration _Z" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." msgstr "/Données _magnétiques vers gradient de force..." #: modules/volume/volume_mfmrecalc.c:233 @@ -19245,8 +19588,9 @@ msgstr "Supprime les points aberrants de tous les plans XY" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/Points aberrants des plans _XY" +#, fuzzy +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/_Correction des données/Marquer les p_oints aberrants" #: modules/volume/volume_outliers.c:62 msgid "Remove outliers from XY planes" @@ -19257,20 +19601,25 @@ msgstr "Met à niveau tous les plans XY" #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/Mise à niveau du plan _XY" +#, fuzzy +msgid "/_Correct Data/_XY Plane Level" +msgstr "/_Correction des données/Niveau" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "Mettre à niveau tous les plans XY" +#: modules/volume/volume_planelevel.c:85 +msgid "Leveled" +msgstr "Mis à niveau" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "Compile les plans des données volumiques en un graphe." #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." -msgstr "/Compiler les p_lans..." +msgid "/_Statistics/Summarize P_lanes..." +msgstr "/_Statistiques/Compiler les p_lans..." #: modules/volume/volume_planestat.c:249 msgid "Summarize planes" @@ -19285,68 +19634,108 @@ msgid "Summarize Volume Planes" msgstr "Compiler les plans volumiques" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "Calcule la PSF du volume." -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/Estimation de la fonction de _transfert..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" "Estimer la fonction de transfert à partir de données connues et d'images " "idéales" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "Réponse _idéale :" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Méthode :" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "_Sigma :" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "_Estimer le sigma pour chaque niveau" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "_Estimer la taille pour chaque niveau" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "Type de fenêtre d'apodisation :" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "Niveau _Z :" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "Sigma ajusté au niveau Z :" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "_Bord :" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "Affichage :" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "Calcul de la fonction de transfert volumique..." -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "Fonction de transfert volumique" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "Niveau Z" +#: modules/volume/volume_removeframe.c:91 +#, fuzzy +msgid "Remove one frame from volume data stack" +msgstr "Supprime le masque" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/Opérations _basiques/Supprimer le plan XY..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "Met à niveau tous les plans XY" + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "_Extraire l'image" + +#: modules/volume/volume_removeframe.c:165 +#, fuzzy +msgid "Frame removed" +msgstr "Suppresion de grain" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "Image extraite (%d)" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "Mettre à niveau tous les plans XY" + +#: modules/volume/volume_removeframe.c:236 +#, fuzzy +msgid "_Remove Current Level" +msgstr "Identique au canal courant" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" @@ -19354,7 +19743,8 @@ "l'utilisateur" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." +#, fuzzy +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/_Ajuster la phase..." #: modules/volume/volume_rephase.c:168 @@ -19406,14 +19796,38 @@ msgid "Volume Z graphs" msgstr "Graphes volumiques Z" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +msgid "/_Correct Data/_Scars..." +msgstr "/_Correction des données/Défaut_s linéaires..." + +#: modules/volume/volume_scars.c:119 +#, fuzzy +msgid "Remove scars in all levels" +msgstr "Supprimer les grains en contact avec le bord de l'image" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "Dérive corrigée" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "Sphère..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "" "Extrait des plans de coupe et des profils à partir de données volumiques." #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Profil et coupe..." +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/Opérations _basiques/Échelle..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19477,6 +19891,26 @@ msgid "Volume Y graphs" msgstr "Graphes volumiques Y" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "Correction projective" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Supprime les points aberrants de tous les plans XY" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Correction de Laplace" + +#: modules/volume/volume_stepline.c:91 +#, fuzzy +msgid "Step line corrected" +msgstr "Force de base" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "Évolution de la valeur" @@ -19490,7 +19924,8 @@ msgstr "Vérifie la cohérence de la dépendance du champ résiduel." #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." msgstr "/Cohérence du champ ré_siduel..." #: modules/volume/volume_strayfield.c:254 @@ -19499,76 +19934,193 @@ #: modules/volume/volume_strayfield.c:343 msgid "_Quantity:" -msgstr "Quantité" +msgstr "_Quantité :" #: modules/volume/volume_strayfield.c:645 msgid "Building stray field dependence..." msgstr "Construction de la dépendance du champ résiduel..." -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "Intervertit les axes des données volumiques." -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/Intervertir les axes..." +#: modules/volume/volume_swaxes.c:96 +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/Opérations _basiques/Intervertir les axes..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "Intervertir les axes" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X, inversé" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y, inversé" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z, inversé" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" -msgstr "Intervertir les axes du volume" - -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:123 +#, fuzzy +msgid "Current _X axis will become" msgstr "L'axe _X courant deviendra :" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:125 +#, fuzzy +msgid "Current _Y axis will become" msgstr "L'axe _Y courant deviendra :" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:127 +#, fuzzy +msgid "Current _Z axis will become" msgstr "L'axe _Z courant deviendra :" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" +msgstr "Intervertir les axes du volume" + +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "L'axe de calibration Z sera perdu." +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Opérations arithmétiques simples sur des données volumiques." + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/Opérations _basiques/Inclinaison..." + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "Opérations arithmétiques sur les données volumiques" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "Données volumiques" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "Images" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "Met à niveau tous les plans XY" + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/M_odes SPM/Sonde/_Dilatation..." + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "Convertir trois canaux en données XYZ" + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "Décalage _X" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "Courbe fermée" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "Décalage _Y" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "Décalage Y" + +#: modules/volume/volume_xystitch.c:133 +#, fuzzy +msgid "_Flip X axis" +msgstr "Inverser l'axe Z" + +#: modules/volume/volume_xystitch.c:134 +#, fuzzy +msgid "_Flip Y axis" +msgstr "Inverser l'axe Z" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/_Ajuster la phase..." + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "Réinitialiser la rotation" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "Définir la plage" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "Rotation" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "Assemblage" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "Assemblage" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "Ajuster" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" "Attache, extrait et supprimer la calibration selon z de données volumiques." #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/Calibration selon _Z..." +#, fuzzy +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/Opérations _Basiques/_Recalibrer..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -19641,7 +20193,8 @@ "Décale les valeurs des courbes Z pour être à zéro à une position donnée." #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." +#, fuzzy +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "/Décaler la valeur vers zéro..." #: modules/volume/volume_zposlevel.c:166 @@ -19654,13 +20207,33 @@ msgstr "Décalé à zéro pour le niveau z = %d" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Extraire l'a_perçu" +#, fuzzy +msgid "/_Basic Operations/Extract _Preview" +msgstr "/Opérations _basiques/Rotation sens indirect" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "Extraire l'aperçu des données volumiques vers une image" +#: modules/xyz/xyz_autocrop.c:46 +#, fuzzy +msgid "Simple XYZ automated crop." +msgstr "Mise à niveau basique de données XYZ." + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "Mise à l'échelle _automatique" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "Rognage" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Analyse la dérive dans des données XYZ." @@ -19689,18 +20262,6 @@ msgid "Y drift" msgstr "Dérive Y" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "dérive selon l'axe y" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Dérive Z" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "dérive selon l'axe z" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Analyser la dérive de données XYZ" @@ -19946,6 +20507,83 @@ msgstr "Fusionnées" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Mise à niveau des facettes..." + +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/_Correction des données/_Aligner les lignes..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/_Correction des données/Correction des sauts dans les lignes" + +#~ msgid "_Step detection kernel:" +#~ msgstr "Noyau de détection des marche_s" + +#~ msgid "Step detection _threshold:" +#~ msgstr "Seuil de détection des marches" + +#~ msgid "Step _broadening:" +#~ msgstr "Élargissement de la marche :" + +#~ msgid "_Polynomial degree:" +#~ msgstr "Degré du _polynôme :" + +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "Degré _minimum du polynôme :" + +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "Degré _maximum du polynôme" + +#~ msgid "Minimum broadening:" +#~ msgstr "Élargissement _minimum :" + +#~ msgid "Maximum broadening:" +#~ msgstr "Élargissement maximum :" + +#~ msgid "Survey cannot be run with independent degrees." +#~ msgstr "Le sondage ne peut être lancé avec des degrés indépendants." + +#~ msgid "/_Arithmetic..." +#~ msgstr "/_Arithmétique..." + +#~ msgid "/Export _Text..." +#~ msgstr "/Exporter au format _texte..." + +#~ msgid "_Precision:" +#~ msgstr "_Précision :" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Dimensions et unités..." + +#~ msgid "/3D View..." +#~ msgstr "/Vue 3D..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Inverser les valeurs" + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/Points aberrants des plans _XY" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/Mise à niveau du plan _XY" + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/Estimation de la fonction de _transfert..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Profil et coupe..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/Intervertir les axes..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/Calibration selon _Z..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Extraire l'a_perçu" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "Taille _horizontale" @@ -20927,9 +21565,6 @@ #~ msgid "Projections" #~ msgstr "Intersections" -#~ msgid "Shown cut direction:" -#~ msgstr "Direction de coupe affichée :" - #~ msgid "Graph cut direction:" #~ msgstr "Direction de coupe du graphe :" @@ -21103,9 +21738,6 @@ #~ msgid "pixels" #~ msgstr "pixels" -#~ msgid "_Like Current Channel" -#~ msgstr "Identique au canal courant" - #~ msgid "Surface _coverage:" #~ msgstr "Taux de _couverture :" @@ -21115,9 +21747,6 @@ #~ msgid "Show mode:" #~ msgstr "Mode d'affichage : " -#~ msgid "Fast Fourier Transform" -#~ msgstr "Transformée de Fourier Rapide (FFT)" - #~ msgid "built-in SimpleFFT\n" #~ msgstr "Algorithme SimpleFFT interne\n" @@ -21154,9 +21783,6 @@ #~ msgid "Stitch operations on data fields." #~ msgstr "Assemblage de données." -#~ msgid "/S_ynthetic/_Particles..." -#~ msgstr "/S_ynthèse/_Particules..." - #~ msgid "Graph function written in Python" #~ msgstr "Fonction graphique écrite en Python" @@ -21353,9 +21979,6 @@ #~ "La correction des lignes par médiane permet d'utiliser ou exclure la zone " #~ "masquée si un masque est présent dans les données." -#~ msgid "Calculates entropy of two-dimensional distribution of slopes." -#~ msgstr "Calcule l'entropie d'une distribution angulaire bi-dimensionnelle." - #~ msgid "Angular distribution on sphere" #~ msgstr "Distribution angulaire sur la sphère" @@ -21513,9 +22136,6 @@ #~ msgid "Watershed" #~ msgstr "Ligne de partage des eaux" -#~ msgid "Laplace correction" -#~ msgstr "Correction de Laplace" - #~ msgid "" #~ "Menus can be torn off by clicking the dashed line near the top for quick " #~ "access to a subset of functions." @@ -21603,9 +22223,6 @@ #~ msgid "Log10 of _flux:" #~ msgstr "Log10 du _flux:" -#~ msgid "_Sticking _probability:" -#~ msgstr "Probabilité d'accroche :" - #~ msgid "Sch_woebel probability:" #~ msgstr "Probabilité de Sch_woebel :" @@ -21785,9 +22402,6 @@ #~ msgid "Calibrate" #~ msgstr "Calibrer" -#~ msgid "/_Basic Operations/_Recalibrate..." -#~ msgstr "/Opérations _Basiques/_Recalibrer..." - #~ msgid "Simulate spherical particle deposition." #~ msgstr "Simuler un dépôt de particules sphériques." diff -Nru gwyddion-2.62/po/gwyddion.pot gwyddion-2.63/po/gwyddion.pot --- gwyddion-2.62/po/gwyddion.pot 2022-11-03 09:50:21.000000000 +0000 +++ gwyddion-2.63/po/gwyddion.pot 2023-06-13 13:20:08.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -149,9 +149,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -167,7 +167,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "" @@ -293,39 +293,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -395,8 +395,8 @@ msgid "Maximum value" msgstr "" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "" @@ -421,11 +421,11 @@ msgid "Pixel area" msgstr "" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "" @@ -527,13 +527,13 @@ msgid "Direction of maximum Martin diameter" msgstr "" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "" @@ -549,11 +549,11 @@ msgid "Curvature center z value" msgstr "" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "" @@ -586,14 +586,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "" @@ -603,7 +603,7 @@ msgstr "" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "" @@ -616,7 +616,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "" @@ -673,12 +673,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "" @@ -719,12 +719,12 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "" @@ -1298,7 +1298,7 @@ msgid "Hide full controls" msgstr "" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "" @@ -1349,12 +1349,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1363,7 +1363,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1373,20 +1373,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1438,11 +1439,11 @@ msgstr "" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1465,7 +1466,7 @@ msgid "Maximum z value" msgstr "" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "" @@ -1555,7 +1556,7 @@ msgstr "" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "" @@ -1612,7 +1613,7 @@ msgid "_Line type:" msgstr "" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "" @@ -1633,7 +1634,7 @@ msgid "Diamond" msgstr "" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "" @@ -1707,7 +1708,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "" @@ -1743,8 +1744,8 @@ msgstr "" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "" @@ -1752,7 +1753,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "" @@ -1791,12 +1792,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1804,7 +1805,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "" @@ -1831,8 +1832,8 @@ msgstr "" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "" @@ -1869,12 +1870,12 @@ msgid "A_dd symbol" msgstr "" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "" @@ -2030,35 +2031,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "" @@ -2068,7 +2069,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "" @@ -2092,41 +2094,41 @@ msgid "Change Curve Map Preview" msgstr "" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, c-format msgid "Unknown curve map %d" msgstr "" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 msgid "Curves:" msgstr "" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "" @@ -2191,11 +2193,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "" @@ -2242,7 +2244,7 @@ msgid "Open File" msgstr "" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2392,63 +2394,63 @@ msgid "Cannot preview" msgstr "" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "" -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "" -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "" -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "" -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "" -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2458,7 +2460,7 @@ msgstr "" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2475,20 +2477,20 @@ msgstr "" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 msgid "_Square pixels" msgstr "" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 msgid "_Dimensions unit" msgstr "" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 msgid "_Value unit" msgstr "" @@ -2502,21 +2504,22 @@ msgstr "" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "" @@ -2535,59 +2538,59 @@ msgid "Generated" msgstr "" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "" -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "" -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "" -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " "installed. Please check your installation." msgstr "" -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "" @@ -2643,7 +2646,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "" @@ -2664,7 +2667,7 @@ msgid "_Close" msgstr "" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "" @@ -2672,11 +2675,11 @@ msgid "Function" msgstr "" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "" @@ -2732,8 +2735,8 @@ msgid "_New" msgstr "" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "" @@ -2751,92 +2754,115 @@ msgid "Save Metadata" msgstr "" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 msgid "C_urve" msgstr "" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +msgid "Hold selection" +msgstr "" + +#: app/param-def.c:1212 +msgid "Replace existing selection" +msgstr "" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +msgid "_Hold selection" +msgstr "" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2862,40 +2888,40 @@ msgid "Set selected item as default" msgstr "" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "" -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "" -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "" -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "" -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "" @@ -3012,66 +3038,66 @@ "tarball." msgstr "" -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "" -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "" @@ -3572,7 +3598,7 @@ msgstr "" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "" @@ -3584,7 +3610,7 @@ msgid "Move _Down" msgstr "" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "" @@ -3645,7 +3671,7 @@ msgid "XYZ Data" msgstr "" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "" @@ -3879,7 +3905,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "" @@ -3892,7 +3918,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "" @@ -3981,31 +4007,33 @@ msgid "/_Basic Operations/_Crop" msgstr "" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "" @@ -4013,34 +4041,36 @@ msgid "New Dimensions" msgstr "" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "" @@ -4103,7 +4133,7 @@ msgstr "" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "" @@ -4203,7 +4233,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "" @@ -4274,49 +4304,54 @@ msgid "Convert FZ to FD Curve" msgstr "" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "" @@ -4342,8 +4377,8 @@ msgstr "" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "" @@ -4351,7 +4386,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "" @@ -4384,7 +4419,7 @@ msgstr "" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "" @@ -4392,9 +4427,9 @@ msgid "_Show" msgstr "" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "" @@ -4419,7 +4454,7 @@ msgid "Remove polynomial background from all curves" msgstr "" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "" @@ -4541,12 +4576,12 @@ msgid "Output images" msgstr "" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "" @@ -4579,14 +4614,15 @@ msgid "DMT fit" msgstr "" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "" @@ -4602,19 +4638,19 @@ msgid "Remove sine background from all curves" msgstr "" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 msgid "Remove Sine Background" msgstr "" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "" -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4640,52 +4676,52 @@ msgid "AIST-NT files (.aist)" msgstr "" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "" -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "" -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "" -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "" @@ -4763,16 +4799,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "" -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -4784,91 +4820,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "" -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "" -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "" -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "" -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "" -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "" @@ -4902,17 +4939,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "" -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "" -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "" @@ -4929,18 +4966,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "" -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "" -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" @@ -5074,29 +5111,29 @@ msgid "Scan size header field overlaps with data." msgstr "" -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "" -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "" -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " "format version." msgstr "" -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5104,60 +5141,64 @@ msgstr "" #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "" -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " "type." msgstr "" -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "" -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "" -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "" -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "" -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "" -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "" -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "" -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "" @@ -5181,7 +5222,7 @@ msgid "Garbage before first header section." msgstr "" -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "" @@ -5219,8 +5260,8 @@ msgid "FemtoScan SPM files" msgstr "" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "" @@ -5304,7 +5345,7 @@ msgid "Following features" msgstr "" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "" @@ -5334,15 +5375,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5354,14 +5395,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "" @@ -5378,24 +5420,24 @@ msgid "Z-range" msgstr "" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "" -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "" -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "" -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "" @@ -5426,75 +5468,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "" -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "" -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "" -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "" -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "" - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "" - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "" @@ -5503,6 +5525,11 @@ msgid "End of file" msgstr "" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "" @@ -5525,11 +5552,26 @@ msgstr "" #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "" +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "" + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "" + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "" + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "" @@ -5551,49 +5593,53 @@ msgid "Export GXYZF" msgstr "" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "" -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "" -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "" -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "" -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5616,22 +5662,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 msgid "Just use _pixels" msgstr "" @@ -5687,12 +5733,12 @@ msgstr "" #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "" @@ -5700,7 +5746,7 @@ msgid "Failed to read image data." msgstr "" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "" @@ -5709,11 +5755,11 @@ msgid "Pages" msgstr "" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 msgid "Value Mapping" msgstr "" @@ -5743,7 +5789,7 @@ msgstr "" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" @@ -5784,388 +5830,388 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." msgstr "" -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "" @@ -6183,88 +6229,88 @@ "Invalid data address 0x%0x found. File is in some unknown format version." msgstr "" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "" -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." msgstr "" -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "" -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "" -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "" -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" @@ -6292,38 +6338,38 @@ msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "" -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "" -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "" -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "" @@ -6341,11 +6387,11 @@ msgstr "" #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "" @@ -6475,7 +6521,7 @@ msgid "MetroPro files (.dat)" msgstr "" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "" @@ -6491,12 +6537,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "" @@ -6533,32 +6579,32 @@ msgid "Unique id record is too short." msgstr "" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "" -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "" -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "" @@ -6584,21 +6630,21 @@ msgid "Spectra data starts past the end of file." msgstr "" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "" @@ -6618,7 +6664,7 @@ msgid "Nanonics files (.nan)" msgstr "" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6629,7 +6675,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -6650,7 +6696,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "" @@ -6664,12 +6710,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "" -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "" -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "" @@ -6701,11 +6747,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "" -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "" @@ -6732,20 +6778,20 @@ "transfer that attempts to store text platform-independently." msgstr "" -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "" -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "" -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "" -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "" @@ -6765,55 +6811,55 @@ msgid "Nanotop files (.spm)" msgstr "" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "" -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "" -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "" -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "" -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "" -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "" -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "" @@ -6830,7 +6876,7 @@ msgstr "" #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "" @@ -6838,7 +6884,7 @@ msgid "Import NMM Profile Set" msgstr "" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "" @@ -6867,13 +6913,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "" @@ -6956,17 +7002,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "" -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "" @@ -7027,7 +7073,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "" -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "" @@ -7097,7 +7144,7 @@ msgid "Header line starts with a colon." msgstr "" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "" @@ -7131,46 +7178,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "" -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "" @@ -7194,7 +7241,7 @@ msgstr "" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "" @@ -7276,36 +7323,36 @@ "of available formats depends on available GDK pixbuf loaders." msgstr "" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "" -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "" -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "" -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7355,7 +7402,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "" -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "" @@ -7382,20 +7429,16 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 msgid "Reading frame table..." msgstr "" -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 msgid "Reading curve data..." msgstr "" @@ -7465,216 +7508,216 @@ msgid "Quesant files (.afm)" msgstr "" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." msgstr "" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 msgid "Data t_ype" msgstr "" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "" -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 msgid "Invalid preset name." msgstr "" -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -7682,45 +7725,45 @@ "`%s' is only %u bytes." msgstr "" -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" "The contents of `%s' does not match format: %s." msgstr "" -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -7737,8 +7780,8 @@ msgid "_Title" msgstr "" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "" @@ -7782,36 +7825,36 @@ msgid "Random points order unsupported" msgstr "" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "" -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "" -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "" -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "" -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "" -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "" @@ -7824,17 +7867,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "" @@ -7869,7 +7912,7 @@ msgid "data ranges" msgstr "" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "" @@ -7945,16 +7988,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "" @@ -7966,15 +8009,15 @@ msgid "Sensolytics text files (.dat)" msgstr "" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "" -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "" @@ -7995,31 +8038,31 @@ msgid "SIS files (.sis)" msgstr "" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "" @@ -8319,31 +8362,31 @@ msgid "Unknown data type `%s'." msgstr "" -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "" -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "" -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "" @@ -8376,12 +8419,12 @@ msgid "Data line %u does not contain four items." msgstr "" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "" -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "" @@ -8409,9 +8452,8 @@ msgid "Fit Graph" msgstr "" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "" @@ -8420,28 +8462,18 @@ msgid "F_unction:" msgstr "" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8493,24 +8525,24 @@ msgid "Results\n" msgstr "" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "" -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" +#: modules/graph/graph_cut.c:98 +msgid "Cut _all curves" msgstr "" -#: modules/graph/graph_cut.c:173 -msgid "Cut _all curves" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" msgstr "" #: modules/graph/graph_dos_spectrum.c:42 @@ -8568,6 +8600,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "" @@ -8592,7 +8625,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "" @@ -8777,8 +8810,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "" -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "" @@ -8790,8 +8823,8 @@ msgid "Zero position" msgstr "" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 msgid "FD curve" msgstr "" @@ -8883,6 +8916,85 @@ msgid "Logscale Transform" msgstr "" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +msgid "/Measure _Features/_Period..." +msgstr "" + +#: modules/graph/graph_measure_period.c:108 +msgid "Measure grating period" +msgstr "" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "" + +#: modules/graph/graph_measure_period.c:126 +msgid "_Subtract background" +msgstr "" + +#: modules/graph/graph_measure_period.c:127 +msgid "Show _leveled curve" +msgstr "" + +#: modules/graph/graph_measure_period.c:166 +msgid "Measure Period" +msgstr "" + +#: modules/graph/graph_measure_period.c:187 +msgid "Fourier Transform" +msgstr "" + +#: modules/graph/graph_measure_period.c:189 +msgid "Autocorrelation" +msgstr "" + +#: modules/graph/graph_measure_period.c:191 +msgid "Direct Methods" +msgstr "" + +#: modules/graph/graph_measure_period.c:237 +msgid "Grating Period" +msgstr "" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +msgid "Simple FFT" +msgstr "" + +#: modules/graph/graph_measure_period.c:251 +msgid "Refined FFT" +msgstr "" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +msgid "Gravity centers" +msgstr "" + +#: modules/graph/graph_measure_period.c:255 +msgid "Zero crossings" +msgstr "" + +#: modules/graph/graph_measure_period.c:1050 +msgid "Leveled profile" +msgstr "" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "" @@ -8900,7 +9012,7 @@ msgstr "" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "" @@ -8932,90 +9044,90 @@ msgid "Graph Peaks" msgstr "" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "" -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 msgid "Remove polynomial background from FZ curve" msgstr "" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 msgid "_Output" msgstr "" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 msgid "Fit results" msgstr "" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "" @@ -9029,7 +9141,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "" @@ -9040,14 +9152,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "" @@ -9067,110 +9179,99 @@ msgid "pick points" msgstr "" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 msgid "Remove sine background" msgstr "" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "" -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 msgid "/_Statistics/_Statistical Quantities..." msgstr "" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9179,202 +9280,194 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "" -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" msgstr "" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" msgstr "" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" msgstr "" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" msgstr "" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" +#: modules/graph/graph_terraces.c:268 +msgid "Minimum terrace _length" msgstr "" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" msgstr "" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 -#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 -#: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 -msgid "Output" +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" msgstr "" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" msgstr "" -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" msgstr "" -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 +#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 +#: modules/process/multiprofile.c:273 modules/process/pid.c:151 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 +msgid "Output" msgstr "" -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" msgstr "" -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" msgstr "" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" msgstr "" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" msgstr "" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" msgstr "" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" msgstr "" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" msgstr "" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "" - -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" msgstr "" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" msgstr "" -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" msgstr "" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" msgstr "" -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" msgstr "" -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." msgstr "" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 +msgid "No free parameters are selected." msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 #, c-format msgid "Number of combinations: %u." msgstr "" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 -msgid "No free parameters are selected." -msgstr "" - -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "" @@ -9501,7 +9594,7 @@ msgstr "" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "" @@ -9519,8 +9612,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "" @@ -9547,7 +9640,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "" @@ -9637,7 +9730,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "" @@ -9681,8 +9774,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "" @@ -9694,13 +9787,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "" @@ -9709,18 +9803,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "" @@ -9731,15 +9827,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "" @@ -9748,10 +9845,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -9762,8 +9860,9 @@ msgstr "" #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "" @@ -9793,7 +9892,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "" @@ -9833,64 +9932,80 @@ msgid "Arithmetic operations on data" msgstr "" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "" @@ -9924,7 +10039,7 @@ "of 90 degrees." msgstr "" -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "" @@ -9954,35 +10069,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "" @@ -10383,27 +10499,30 @@ msgid "Building mesh..." msgstr "" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "" @@ -10436,6 +10555,7 @@ msgstr "" #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "" @@ -10518,7 +10638,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "" @@ -10567,10 +10687,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "" @@ -10735,6 +10851,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 msgid "_Height scale" msgstr "" @@ -10884,14 +11001,14 @@ msgid "Convolution _kernel" msgstr "" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "" @@ -10923,13 +11040,13 @@ msgstr "" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "" @@ -11122,7 +11239,7 @@ msgstr "" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "" @@ -11206,13 +11323,13 @@ msgid "Curvature Sections" msgstr "" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "" @@ -11312,7 +11429,7 @@ msgid "Deconvolve" msgstr "" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "" @@ -11669,7 +11786,8 @@ msgid "drift" msgstr "" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "" @@ -11685,6 +11803,42 @@ msgid "rows" msgstr "" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "" + +#: modules/process/dune_synth.c:122 +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "" + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "" + +#: modules/process/dune_synth.c:145 +msgid "_Minimum step" +msgstr "" + +#: modules/process/dune_synth.c:146 +msgid "Step range" +msgstr "" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +msgid "Maximum s_lope" +msgstr "" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "" @@ -11987,7 +12141,7 @@ msgstr "" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "" @@ -12010,10 +12164,11 @@ msgstr "" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "" -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "" @@ -12034,11 +12189,11 @@ msgid "_Number points" msgstr "" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "" @@ -12110,7 +12265,7 @@ msgid "Create _Points" msgstr "" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "" @@ -12119,43 +12274,43 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." msgstr "" -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "" @@ -12391,7 +12546,7 @@ msgid "Clear the entire filter mask" msgstr "" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "" @@ -12411,7 +12566,7 @@ msgid "Zoom:" msgstr "" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "" @@ -12480,7 +12635,7 @@ msgid "Triangle" msgstr "" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "" @@ -12528,7 +12683,7 @@ msgstr "" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "" @@ -12559,7 +12714,7 @@ msgstr "" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "" @@ -12813,6 +12968,7 @@ msgstr "" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "" @@ -13786,7 +13942,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "" @@ -13802,31 +13958,31 @@ msgid "Mark lines with inverted sign" msgstr "" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "" @@ -13834,7 +13990,7 @@ msgid "Aligns rows by various methods." msgstr "" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "" @@ -13870,7 +14026,7 @@ msgid "Steps" msgstr "" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "" @@ -13879,7 +14035,7 @@ msgstr "" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "" @@ -14023,7 +14179,7 @@ msgid "_Hessian" msgstr "" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "" @@ -14048,10 +14204,12 @@ msgstr "" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "" @@ -14184,7 +14342,7 @@ msgid "Two-sided" msgstr "" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "" @@ -14308,115 +14466,131 @@ msgid "Shift Mask" msgstr "" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "" -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +msgid "Phase-only score" +msgstr "" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "" -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "" + +#: modules/process/maskops.c:85 +msgid "Extract grain numbers to a new image" +msgstr "" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "" +#: modules/process/maskops.c:193 +msgid "Grain Numbers" +msgstr "" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "" @@ -14561,7 +14735,7 @@ msgid "Second image" msgstr "" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "" @@ -14918,7 +15092,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "" @@ -15011,8 +15185,8 @@ msgid "Re_initialize" msgstr "" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "" @@ -15531,6 +15705,54 @@ msgid "Pile Up Shapes" msgstr "" +#: modules/process/plateau_synth.c:131 +msgid "Generates images with stacked plateau-like structures." +msgstr "" + +#: modules/process/plateau_synth.c:145 +msgid "/S_ynthetic/_Plateaus..." +msgstr "" + +#: modules/process/plateau_synth.c:149 +msgid "Generate image with random plateaus" +msgstr "" + +#: modules/process/plateau_synth.c:164 +msgid "Ma_ximum _size" +msgstr "" + +#: modules/process/plateau_synth.c:165 +msgid "M_inimum size" +msgstr "" + +#: modules/process/plateau_synth.c:166 +msgid "Size power _law" +msgstr "" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +msgid "O_verlap fraction" +msgstr "" + +#: modules/process/plateau_synth.c:170 +msgid "Scale with _power of size" +msgstr "" + +#: modules/process/plateau_synth.c:172 +msgid "Height _spread" +msgstr "" + +#: modules/process/plateau_synth.c:240 +msgid "Random Plateaus" +msgstr "" + +#: modules/process/plateau_synth.c:673 +msgid "Generating objects..." +msgstr "" + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "" @@ -15591,10 +15813,6 @@ msgid "_Vertical polynomial degree" msgstr "" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "" @@ -15611,6 +15829,10 @@ msgid "Copy table to clipboard" msgstr "" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "" @@ -15750,8 +15972,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "" @@ -15771,7 +15993,7 @@ msgid "Transfer function estimation" msgstr "" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "" @@ -15779,15 +16001,15 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "" @@ -15795,19 +16017,19 @@ msgid "_Border" msgstr "" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "" @@ -15823,23 +16045,23 @@ msgid "Transfer Function" msgstr "" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "" @@ -15960,7 +16182,7 @@ msgid "Proportion" msgstr "" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "" @@ -16174,7 +16396,7 @@ msgid "_Assume symmetry" msgstr "" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "" @@ -16250,23 +16472,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "" @@ -16514,14 +16736,6 @@ msgid "Marked terraces" msgstr "" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "" @@ -16530,22 +16744,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "" @@ -16590,7 +16788,7 @@ msgid "Limit Range" msgstr "" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "" @@ -17273,134 +17471,134 @@ msgid "Function written in Python" msgstr "" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "" -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "" +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -17454,7 +17652,7 @@ "Grain removal tool, removes continuous parts of mask and/or underlying data." msgstr "" -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "" @@ -17462,7 +17660,7 @@ msgid "Fractal correction" msgstr "" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -17470,7 +17668,7 @@ msgid "Remove" msgstr "" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "" @@ -17482,79 +17680,87 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." msgstr "" -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 msgid "_Start" msgstr "" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 msgid "Color Mapping" msgstr "" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 msgid "Data Range" msgstr "" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " "three selected points." msgstr "" -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "" @@ -17574,133 +17780,137 @@ msgid "Level data by fitting a plane through three points" msgstr "" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." msgstr "" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "" @@ -17716,103 +17926,107 @@ msgid "Level rows using intersections with given lines" msgstr "" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "" -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "" -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "" @@ -17820,16 +18034,16 @@ msgid "Calculate surface profile parameters." msgstr "" -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "" @@ -17841,7 +18055,7 @@ msgid "BRC" msgstr "" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "" @@ -17853,179 +18067,179 @@ msgid "Calculate roughness parameters" msgstr "" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 msgid "parameters|Functional" msgstr "" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 msgid "Swedish height" msgstr "" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "" @@ -18062,42 +18276,50 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." msgstr "" -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "" @@ -18125,160 +18347,193 @@ msgid "Spectroscopy" msgstr "" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." msgstr "" -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "" -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +#: modules/volume/volume_addframe.c:113 +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "" + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +#: modules/volume/volume_addframe.c:132 +msgid "Data to insert" +msgstr "" + +#: modules/volume/volume_addframe.c:170 +msgid "Frame added" +msgstr "" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +msgid "_Replace Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "" -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." +#: modules/volume/volume_arithmetic.c:159 +msgid "/_Basic Operations/_Arithmetic..." msgstr "" -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "" -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." +#: modules/volume/volume_asciiexport.c:86 +msgid "/_Basic Operations/Export _Text..." msgstr "" -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" msgstr "" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "" - #: modules/volume/volume_calibrate.c:170 msgid "Match voxel size" msgstr "" @@ -18308,7 +18563,7 @@ msgstr "" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "" @@ -18320,12 +18575,73 @@ msgid "Z Dimension" msgstr "" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +msgid "/_Correct Data/Estimate _Drift..." +msgstr "" + +#: modules/volume/volume_drift.c:160 +msgid "Estimates drift" +msgstr "" + +#: modules/volume/volume_drift.c:169 +msgid "_Extract drift" +msgstr "" + +#: modules/volume/volume_drift.c:170 +msgid "_Crop data" +msgstr "" + +#: modules/volume/volume_drift.c:175 +msgid "_Z" +msgstr "" + +#: modules/volume/volume_drift.c:185 +msgid "Show direction" +msgstr "" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +msgid "Lateral drift" +msgstr "" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "" + +#: modules/volume/volume_drift.c:279 +msgid "Drift corrected" +msgstr "" + +#: modules/volume/volume_drift.c:330 +msgid "Estimate drift" +msgstr "" + +#: modules/volume/volume_drift.c:449 +msgid "Updating z drift data..." +msgstr "" + +#: modules/volume/volume_drift.c:513 +msgid "Updating lateral drift data..." +msgstr "" + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "" #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." +msgid "/SPM M_odes/_Isosurface Image..." msgstr "" #: modules/volume/volume_equiplane.c:158 @@ -18353,80 +18669,92 @@ msgid "Isosurface z for %.*f %s" msgstr "" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." +#: modules/volume/volume_extract.c:197 +msgid "/_Basic Operations/3D View..." msgstr "" -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "" +#: modules/volume/volume_facetlevel.c:44 +msgid "Performs facet leveling on all XY planes" +msgstr "" + +#: modules/volume/volume_facetlevel.c:58 +msgid "/_Correct Data/_XY Facet Level" +msgstr "" + +#: modules/volume/volume_facetlevel.c:62 +msgid "Facet leveling of all XY planes" +msgstr "" + +#: modules/volume/volume_facetlevel.c:85 +msgid "Facet leveled" +msgstr "" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "" #: modules/volume/volume_fdfit.c:217 @@ -18449,10 +18777,6 @@ msgid "Inverts value in volume data" msgstr "" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "" @@ -18462,7 +18786,7 @@ msgstr "" #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." +msgid "/_Statistics/_K-Means Clustering..." msgstr "" #: modules/volume/volume_kmeans.c:113 @@ -18526,7 +18850,7 @@ msgstr "" #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." +msgid "/_Statistics/_K-Medians Clustering..." msgstr "" #: modules/volume/volume_kmedians.c:106 @@ -18561,7 +18885,7 @@ msgstr "" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." +msgid "/_Basic Operations/Convert to _Curve Map..." msgstr "" #: modules/volume/volume_lawnize.c:103 @@ -18588,12 +18912,28 @@ msgid "Z calibration" msgstr "" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +msgid "Line leveled" +msgstr "" + +#: modules/volume/volume_linelevel.c:265 +msgid "Line level" +msgstr "" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." +msgid "/_Statistics/Summarize _Profiles..." msgstr "" #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 @@ -18612,8 +18952,32 @@ msgid "Summarize Volume Profiles" msgstr "" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +msgid "/SPM M_odes/_Localization Merge..." +msgstr "" + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +msgid "_Peak width" +msgstr "" + +#: modules/volume/volume_localdetect.c:156 +msgid "Localization result" +msgstr "" + +#: modules/volume/volume_localdetect.c:191 +msgid "Localization Merge" +msgstr "" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." msgstr "" #: modules/volume/volume_mfmrecalc.c:233 @@ -18645,7 +19009,7 @@ msgstr "" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" +msgid "/_Correct Data/_XY Plane Outliers" msgstr "" #: modules/volume/volume_outliers.c:62 @@ -18657,19 +19021,23 @@ msgstr "" #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" +msgid "/_Correct Data/_XY Plane Level" msgstr "" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "" +#: modules/volume/volume_planelevel.c:85 +msgid "Leveled" +msgstr "" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "" #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." msgstr "" #: modules/volume/volume_planestat.c:249 @@ -18684,72 +19052,105 @@ msgid "Summarize Volume Planes" msgstr "" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "" -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "" - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "" + +#: modules/volume/volume_removeframe.c:105 +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "" + +#: modules/volume/volume_removeframe.c:109 +msgid "Remove single XY plane" +msgstr "" + +#: modules/volume/volume_removeframe.c:125 +msgid "_Extract the plane" +msgstr "" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +msgid "Remove XY Plane" +msgstr "" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." msgstr "" #: modules/volume/volume_rephase.c:168 @@ -18801,12 +19202,32 @@ msgid "Volume Z graphs" msgstr "" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +msgid "/_Correct Data/_Scars..." +msgstr "" + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "" + +#: modules/volume/volume_scars.c:181 +msgid "Scars corrected" +msgstr "" + +#: modules/volume/volume_scars.c:364 +msgid "Removing scars..." +msgstr "" + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." +msgid "/_Basic Operations/Cut and _Slice..." msgstr "" #: modules/volume/volume_slice.c:217 @@ -18871,6 +19292,22 @@ msgid "Volume Y graphs" msgstr "" +#: modules/volume/volume_stepline.c:50 +msgid "Performs step line correction" +msgstr "" + +#: modules/volume/volume_stepline.c:68 +msgid "Step line correction in all XY planes" +msgstr "" + +#: modules/volume/volume_stepline.c:87 +msgid "Step line correction..." +msgstr "" + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "" @@ -18884,7 +19321,7 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." +msgid "/SPM M_odes/_Stray Field Consistency..." msgstr "" #: modules/volume/volume_strayfield.c:254 @@ -18899,68 +19336,160 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "" -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." +#: modules/volume/volume_swaxes.c:96 +msgid "/_Basic Operations/S_wap Axes..." msgstr "" -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" msgstr "" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "" +#: modules/volume/volume_xyarithmetics.c:146 +msgid "Simple arithmetic operations with volume and plane data." +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:160 +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:164 +msgid "Arithmetic operations on volume and plane data" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +msgid "Volume data:" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:332 +msgid "Images:" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +msgid "Merges all XY planes into XYZ data" +msgstr "" + +#: modules/volume/volume_xystitch.c:110 +msgid "/SPM M_odes/_XY Stitch..." +msgstr "" + +#: modules/volume/volume_xystitch.c:114 +msgid "Merge all the XY planes to XYZ data" +msgstr "" + +#: modules/volume/volume_xystitch.c:129 +msgid "_X offsets graph" +msgstr "" + +#: modules/volume/volume_xystitch.c:130 +msgid "X _offsets curve" +msgstr "" + +#: modules/volume/volume_xystitch.c:131 +msgid "_Y offsets graph" +msgstr "" + +#: modules/volume/volume_xystitch.c:132 +msgid "Y o_ffsets curve" +msgstr "" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +msgid "_Adjust shifts" +msgstr "" + +#: modules/volume/volume_xystitch.c:136 +msgid "A_djust rotation" +msgstr "" + +#: modules/volume/volume_xystitch.c:137 +msgid "_Shift range" +msgstr "" + +#: modules/volume/volume_xystitch.c:138 +msgid "_Rotation range" +msgstr "" + +#: modules/volume/volume_xystitch.c:179 +msgid "Stitched" +msgstr "" + +#: modules/volume/volume_xystitch.c:212 +msgid "XY Stitch" +msgstr "" + +#: modules/volume/volume_xystitch.c:214 +msgid "verb|_Stitch" +msgstr "" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." +msgid "/_Basic Operations/_Z-Calibration..." msgstr "" #: modules/volume/volume_zcal.c:130 @@ -19027,7 +19556,7 @@ msgstr "" #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "" #: modules/volume/volume_zposlevel.c:166 @@ -19040,13 +19569,29 @@ msgstr "" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" +msgid "/_Basic Operations/Extract _Preview" msgstr "" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "" + +#: modules/xyz/xyz_autocrop.c:60 +msgid "/Crop Automatically" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +msgid "Cropped" +msgstr "" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "" @@ -19073,18 +19618,6 @@ msgid "Y drift" msgstr "" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/it.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/it.gmo differ diff -Nru gwyddion-2.62/po/it.po gwyddion-2.63/po/it.po --- gwyddion-2.62/po/it.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/it.po 2023-06-13 13:20:08.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2020-06-24 11:26+0200\n" "Last-Translator: Livia Della Seta \n" "Language-Team: Italian \n" @@ -154,9 +154,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -172,7 +172,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Senza titolo " @@ -301,39 +301,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Si" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "No" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "°gra" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -403,8 +403,8 @@ msgid "Maximum value" msgstr "Valore massimo" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Valore medio" @@ -430,11 +430,11 @@ msgid "Pixel area" msgstr "area Pixel:" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Area proiettata" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Area superficie" @@ -538,13 +538,13 @@ msgid "Direction of maximum Martin diameter" msgstr "" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Inclinazione θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Inclinazione φ" @@ -560,11 +560,11 @@ msgid "Curvature center z value" msgstr "Posizione z centro curvatura" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Curvatura 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Curvatura 2" @@ -597,14 +597,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Posizione" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Valore" @@ -614,7 +614,7 @@ msgstr "Area" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volume" @@ -627,7 +627,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Pendenza" @@ -684,12 +684,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Orizzontale" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Verticale" @@ -730,12 +730,12 @@ msgstr "Scala e spazio adattati" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Esatta" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Lineare" @@ -1353,7 +1353,7 @@ msgid "Hide full controls" msgstr "Nascondi comandi completi" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Basico" @@ -1405,12 +1405,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1419,7 +1419,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1429,20 +1429,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1494,11 +1495,11 @@ msgstr "L_uce θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1521,7 +1522,7 @@ msgid "Maximum z value" msgstr "Valore massimo z" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "_Etichetta:" @@ -1612,7 +1613,7 @@ msgstr "Nascosto" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Punti" @@ -1669,7 +1670,7 @@ msgid "_Line type:" msgstr "Tipo linea:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Spessore linea:" @@ -1690,7 +1691,7 @@ msgid "Diamond" msgstr "Rombo" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Croce" @@ -1764,7 +1765,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Modo " @@ -1801,8 +1802,8 @@ msgstr "Ascissa" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Grafico" @@ -1810,7 +1811,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Dati" @@ -1849,12 +1850,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Lunghezza" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1862,7 +1863,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Altezza" @@ -1889,8 +1890,8 @@ msgstr "Preferiti" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Nome" @@ -1927,12 +1928,12 @@ msgid "A_dd symbol" msgstr "A_ggiungi simbolo" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Anteprima" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Non è possibile aprire il documento in lettura: %s." @@ -2094,35 +2095,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Media" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Minimo" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Massimo" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Posizione Min." -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Posizione Max." @@ -2132,7 +2133,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2158,42 +2160,42 @@ msgid "Change Curve Map Preview" msgstr "Cambia Anteprima Dati Volume" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Canale sconosciuto %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Volume %d sconosciuto" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "XYZ %d sconosciuto" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "Volume %d sconosciuto" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Punti: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "Curve" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 #, fuzzy msgid "Segments:" msgstr "Segmentazione" @@ -2261,11 +2263,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "_Aggiorna" @@ -2323,7 +2325,7 @@ msgid "Open File" msgstr "Apri File" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2475,42 +2477,42 @@ msgid "Cannot preview" msgstr "Impossibile visualizzare anteprima" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "La sezione %s termina alla linea %u ma non ha inizio." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "La sezione %s termina alla linea %u invece di %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "La sezione %s inizia alla linea %u prima che %s finisca." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Nome sezione vuoto alla linea %u dell'intestazione" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "La linea %u dell'intestazione manca del prefisso %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "La linea di intestazione %u manca di separatore di valore chiave" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "La chiave alla linea %u dell'intestazione è vuota." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" @@ -2518,22 +2520,22 @@ "fine intestazione." #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Dimensione orizzontale" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Dimensione verticale" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "Immagine _quadrata" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2543,7 +2545,7 @@ msgstr "Larghezza" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2560,7 +2562,7 @@ msgstr "Altezza" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2568,14 +2570,14 @@ msgstr "Campioni quadrati" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "Unità _dimensioni:" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2592,21 +2594,22 @@ msgstr "Inizia dal canale corrente" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Risoluzione" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Dimensioni fisiche" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Unità" @@ -2627,30 +2630,30 @@ msgid "Generated" msgstr "Generato" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Impossibile scrivere su file: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" "%s: Le dimensioni laterali ed il valore devono rappresentare la stessa " "quantità fisica" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: I Dati devono essere quadrati" -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Mudulo di livello mancante" -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2659,31 +2662,31 @@ "Questo strumento necessita di un layer di tipo %s , che non sembra essere " "installato. Controllare l'installazione." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Cancella oggetti selezionati" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origine" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Dimensioni" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Larghezza" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 #, fuzzy msgid "Save Results to File" msgstr "Salva tabella in file" @@ -2748,7 +2751,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "it" @@ -2769,7 +2772,7 @@ msgid "_Close" msgstr "_Esci" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Tipo" @@ -2777,11 +2780,11 @@ msgid "Function" msgstr "Funzione" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parametri" @@ -2839,8 +2842,8 @@ msgid "_New" msgstr "Nuovo" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Elimina" @@ -2858,97 +2861,123 @@ msgid "Save Metadata" msgstr "Salva Metadata" -#: app/param-def.c:337 +#: app/param-def.c:338 #, fuzzy msgid "_Masking" msgstr "_Maschera" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "Tipo di interpolazione" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Direzione" -#: app/param-def.c:349 +#: app/param-def.c:350 #, fuzzy msgid "Combine with existing mask" msgstr "Unisci a maschera esistente" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "Tipo finestra" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "Tipo _Distanza" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "Stile grafico" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "_Aggiornamento immediato" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Randomi_zza" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "Colore _Maschera" -#: app/param-def.c:875 +#: app/param-def.c:876 #, fuzzy msgid "Target _graph" msgstr "Disegna grafici" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "Curva" -#: app/param-def.c:1138 +#: app/param-def.c:1139 #, fuzzy msgid "_Segment" msgstr "Segmentazione" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "Mostra selezione" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "_Max. iterazioni: " + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "Regola selezione" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "Seme casuale" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "Nuovo grafico" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "fino a" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Cambia" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_Nuovo" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Cambia unità" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2974,40 +3003,40 @@ msgid "Set selected item as default" msgstr "Salva oggetto selezionato come predefinito" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Il file non può essere aperto in scrittura:%s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Impossibile leggere il contenuto del file: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "File vuoto." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "Il file è corrotto, l'intestazione \"magic\" non corrisponde." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "File corrotto, deserializzazione fallita." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Impossibile creare cartella configurazione utente %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Impossibile creare cartella utente %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Impossibile creare cartella modulo utente %s: %s" @@ -3128,67 +3157,67 @@ "versione 2 o (a scelta) ogni versione successiva. Per il testo completo " "della licenza vedi il file COPYING incluso nel pacchetto sorgente" -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licenza" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Caratteristiche" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Altri sviluppatori" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Traduttori" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "" "Lo sviluppo del programma e' sostenuto dall'Istituto di Metrologia Ceco:" -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "Vista 3D Open GL" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "Protocollo X11\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Protocollo Win32\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Controllo Remoto" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Interfaccia di Scripting Python" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, fuzzy, c-format msgid "Released %s" msgstr "Rilasciato %s\n" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "" @@ -3829,7 +3858,7 @@ msgstr "_Modifica" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Rimuovi" @@ -3841,7 +3870,7 @@ msgid "Move _Down" msgstr "Muovi in basso" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "Larghezza:" @@ -3902,7 +3931,7 @@ msgid "XYZ Data" msgstr "Dati XYZ" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Strumento" @@ -4145,7 +4174,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Metodo" @@ -4159,7 +4188,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "Tipo Output" @@ -4259,31 +4288,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/Operazioni _Base/trasforma in _XYZ..." -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Taglia Dati" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "Mantieni offset laterali" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Dettaglio" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Taglia" @@ -4292,34 +4323,36 @@ msgid "New Dimensions" msgstr "Dimensioni" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Opzioni" @@ -4389,7 +4422,7 @@ msgstr "Curva" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Adattamento in progresso..." @@ -4508,7 +4541,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 #, fuzzy msgid "fit" msgstr "_fit" @@ -4588,49 +4621,54 @@ msgid "Convert FZ to FD Curve" msgstr "Fit Curva FD..." -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Mediana" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Intervallo" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Skew" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 #, fuzzy msgid "Excess kurtosis" @@ -4660,8 +4698,8 @@ msgstr "regolazione ante_prima" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Quantità" @@ -4669,7 +4707,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 #, fuzzy msgid "Output type" msgstr "Tipo Output: " @@ -4708,7 +4746,7 @@ msgstr "Differenza" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 #, fuzzy msgid "_Degree" msgstr "Gradi uguali" @@ -4718,9 +4756,9 @@ msgid "_Show" msgstr "Mostra maschera" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Ampiezza" @@ -4749,7 +4787,7 @@ msgid "Remove polynomial background from all curves" msgstr "Rimozione sottofondo polinomiale" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Rimuovi Sottofondo Polinomiale" @@ -4886,12 +4924,12 @@ msgid "Output images" msgstr "Dimensione output" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Mostra" @@ -4927,15 +4965,16 @@ msgid "DMT fit" msgstr "Filtro 1D FFT" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 #, fuzzy msgid "Fit Results" msgstr "Risultati del Fit" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Risultati" @@ -4954,20 +4993,20 @@ msgid "Remove sine background from all curves" msgstr "Rimuove rumore dalle curve del grafico" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "Rimuovi Sottofondo Polinomiale" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Importa file di testo Accurex II" -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "File testo Accurex II (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "L'intestazione del file non può essere convertita da ISO-8859-1: %s" @@ -4995,52 +5034,52 @@ msgid "AIST-NT files (.aist)" msgstr "file AIST-NT (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Importa file dati Alicona Imaging AL3D" -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "File Alicona Imaging AL3D (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Numero piano %u non valido in tag ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "Etichetta chiave intestazione non termina in modo nullo" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "Etichetta chiave intestazione vuota" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "Etichetta intestazione ‘%s’ mancante di terminatore CRLF" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "Valore etichetta intestazione ‘%s’ non termina in modo nullo" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "Il commento è mancante della termazione CRLF " -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "Il commento non termina con zero" @@ -5123,17 +5162,17 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "FileDescBegin manca del FileDescEnd corrispondente." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 #, fuzzy msgid "Wrong number of header rows or columns." msgstr "Numero colonne" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, fuzzy, c-format msgid "Cannot parse data values at line %d." msgstr "Impossibile analizzare valori dati dopo %d di %d" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 #, fuzzy msgid "Coordinates do not form a regular grid." msgstr "" @@ -5148,92 +5187,93 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "File A.P.E. Research DAX (.dax) e APDT File (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Importa file dati APE (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "File APE (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Esporta i dati come semplice matrice ASCII." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "Matrice dati ASCII (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Aggiungi _intestazione commento" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Utilizza il punto come separatore _decimale" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Precisione" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Esporta Testo" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Canale:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Larghezza:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Altezza:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "unità valore:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Importa file dati AFM Assing." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "File AFM Assing (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Importa file Attocube Systems ASC" -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "file ASCII Attocube (.asc) " -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Importa file dati BCR Image Metrology." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "File BCR (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 #, fuzzy msgid "Cannot convert string from UTF-16." msgstr "Impossibile convertire la stringa da UTF-16: %s" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Intestazione tipo file sconosciuta: `%s'." @@ -5267,17 +5307,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Dati esportati Burleigh (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "\":\" mancanti nel file intestazione." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Importa file Code V interferogram" -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "File Code V interferogram (.int)" @@ -5294,20 +5334,20 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Campi intestazione `%s' o `%s' non trovati." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" "Inizializzazione di zlib fallita con errore %d, impossibile decomprimere i " "dati." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "Decompressione fallita con errore %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "Impossibile decomprimere dati compressi. Supporto zlib non incluso" @@ -5445,22 +5485,22 @@ "Il campo di intestazione delle dimensioni della scansione si sovrappone ai " "dati" -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Impossibile leggere dal file: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "Nessun file dati corrispondente a `%s' trovato" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "Il file è troppo piccolo per essere un file di tipo dato" -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5469,7 +5509,7 @@ "Il file o non è di tipo %s o è danneggiato o è nel formato di una versione " "sconosciuta" -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5479,21 +5519,21 @@ "dimensione reale è %u bytes" #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, fuzzy, c-format msgid "File component/item ‘%s’ is truncated." msgstr "Intestazione del file tronca" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "Intestazione del file tronca" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Dimensione campo %d non valida." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5502,39 +5542,43 @@ "Il numero di bit per campione %d non è valido o non supportato per questo " "tipo di file." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Il tipo dati %d non è valido o non supportato." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Il campo intestazione `%s' è mancante." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "Il valore del parametro `%s' non è valido o non è supportato." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Il parametro `%s' è mancante o non valido." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "Il file non contiene dati (da importare)" -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "Il file non contiene un canale esportabile" -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "Importazione del file cancellata dall'utente." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "Intestazione mancante" @@ -5560,7 +5604,7 @@ msgid "Garbage before first header section." msgstr "Dati invalidi prima della prima sezione dell'intestazione." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Linea intestazione mal definita (mancante =)" @@ -5599,8 +5643,8 @@ msgid "FemtoScan SPM files" msgstr "file FemtoScan SPM" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Dati immagine esterni al file" @@ -5693,7 +5737,7 @@ msgid "Following features" msgstr "Caratteristiche" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Scala Z " @@ -5726,15 +5770,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Esporta %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5747,14 +5791,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Importazione %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Numero punti" @@ -5771,24 +5816,24 @@ msgid "Z-range" msgstr "Intervallo X" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Importa file dati DME GDEF" -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "File GDEF DME (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "Versione file %u. %u non supportata" -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "Il marcatore di controllo blocco non è CB, file danneggiato." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Variabile %u sconosciuta." @@ -5819,75 +5864,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "Deserializzazione dati riuscita, oggetto risultante %s inaspettato." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "Etichetta %u richiesta, non trovata." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "Cartella TIFF %lu terminata inaspettatamente" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "Tipo dati %u BigTIFF è stato trovato in un classico TIFF" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Trovate posizioni tag data non valide" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "I campi riservati per BigTIFF sono %u e %u invece di 8 e 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Compressione in formato %u non supportata" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "Bit per campione non uniformi non supportati" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "Configurazione planare %u non supportata." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Formato campione non supportato" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, fuzzy, c-format msgid "%s cannot open the file as a ZIP file." msgstr "Minizip non può aprire il file." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, fuzzy, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Errore Libzip durante la lettura del file zip: %s" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "Termine della lista dei file" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Impossibile ottenere le dimensioni del file non compresso" - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Impossibile leggere il contenuto del file." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -5896,6 +5921,11 @@ msgid "End of file" msgstr "Termine del file" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "Termine della lista dei file" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Parametro errato" @@ -5918,11 +5948,26 @@ msgstr "Errore Minizip durante la lettura del file zip: %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "file %s mancante nel file zip." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, fuzzy, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Errore Libzip durante la lettura del file zip: %s" + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Impossibile ottenere le dimensioni del file non compresso" + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Impossibile leggere il contenuto del file." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Importa file di campo Gwyddion XYZ" @@ -5944,50 +5989,54 @@ msgid "Export GXYZF" msgstr "Esporta GXYZF" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Canale" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "File dati XYZ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Importa file Hierarchical Data Format (HDF) ,versione 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "File Psi HDF4 (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "Intestazione binario PSI troppo corta." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "Dati HDF di tipo nativo non supportati." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 #, fuzzy msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Importa file Hierarchical Data Format (HDF) ,versione 4." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, fuzzy, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "L'entità dei dati %u non corrisponde alle dimensioni (%u×%u)." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -6012,22 +6061,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "Immagini TIFF e BigTIFF a alta profondità (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "Dimensione orizzontale" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "Dimensione verticale" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "_Scala Z (per unità di campione)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "Campioni quadrati" @@ -6089,12 +6138,12 @@ msgstr "Il tipo dati OpenEXR %u non è valido o non è supportato." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "errore inizializzazione libpng (in %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 #, fuzzy msgid "libpng error occurred" msgstr "Errore libpng" @@ -6104,7 +6153,7 @@ msgid "Failed to read image data." msgstr "tipo dati %d non valido per dati immagine" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Canali" @@ -6113,11 +6162,11 @@ msgid "Pages" msgstr "Pagine" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Informazioni immagine" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "Intervallo Valore" @@ -6148,7 +6197,7 @@ msgstr "File Hitachi SEM (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "File dati corrispondente al file intestazione non trovato." @@ -6192,106 +6241,106 @@ msgid "Cannot read channel labels." msgstr "Impossibile leggere le etichette dei canali" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows or OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Linee Orizz./Vert" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 #, fuzzy msgid "Crosses" msgstr "Croce" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Ellissi" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Linee" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Rettangoli" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Reticolo" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Percorso" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "_Nessuno" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "_Righelli" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "barra scala _incorporata" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "Righello _Falsi colori" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "Nessuno" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Lungo il lato destro" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6302,283 +6351,283 @@ "si basa su GDK e altre librerie per cui potrebbe dipendere dal tipo di " "installazione." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Selezione colore" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "Bianco" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Nero" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Dimensione Pi_xel:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "Pixels per _inch:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "Ingrandisci:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "Altezza:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "Carattere:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "_Dimensione carattere:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "Larghezza margine:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "Lunghezza _Tacca:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Lega dimensioni a pixel dati" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "Separatore decimale: virgola" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Colori" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "Colore _Linea e testo:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "Sfondo _Trasparente" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "Colore sfondo:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Posizionamento" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "Sinistra" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "Centro" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "Destra" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "Sopra" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "sotto" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "Scala Laterale:" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Lunghezza:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "Apertura Ori_zzontale:" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "Apertura _Verticale:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "Colo_re:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "Colore contorno:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "Spessore contorno:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "O_pacità" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Disegna tacche" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Disegna _etichette" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Immagine" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "Tipo di interpolazione:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Disegna cornice" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Disegna _Maschera" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Disegna _legenda Maschera" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Scala valore" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Precisione fissata:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Soglia _kilo fissata:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Titolo" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Posizione:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "Apertura:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Assegna _unità al titolo" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Disegna _selezione" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Oggetti " -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "Laterale" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "Carica" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "_Immagazzina " -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Rinomina" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "Nome predefinito:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Esporta come 1_6 bit grayscale" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "Scala laterale" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Valori" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Selezione" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Predefiniti" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Errore Cairo: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Salvataggio pixbuf fallito: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "Immagine troppo grande per essere salvata come TARGA." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Disegna _numeri" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "lunghezza segnale fine:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "Marcatore _raggio:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Maschera" @@ -6597,89 +6646,89 @@ msgstr "" "Indirizzo dati 0x%0x non valido trovato. Il file ha un formato sconosciuto" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Importa file dati Intermatix SDF" -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "file dati Intermatix SDF (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "Collezione etichette parametro incompleta" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "Profondità immagine" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "Importa ed esporta il formato trasferimento dati SPM ISO 28600:2011" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "File trasferimento dati SPM ISO 28600:2011 " -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, fuzzy, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." msgstr "Solo mappature regolari sono implementate. Il file ha mappatura ‘%s’." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" "La lista ‘%s’ ha %u termini che differiscono dal numero %u dato da ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, fuzzy, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Termine file raggiunto durante lettura campione #%d di %d" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, fuzzy, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "Dati corrotti trovati durante lettura campione #%d di %d" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Marker termine campo dati mancante." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "Termine file raggiunto durante lettura campione #%d di %d" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "Dati corrotti trovati durante lettura campione #%d di %d" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "La riga %u non contiene l'etichetta richiesta ‘%s’." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Importa file dati JEOL." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "File dati JEOL (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "Tipo di dati sconosciuto. Da segnalare agli sviluppatori." @@ -6709,39 +6758,39 @@ msgid "File does not contain grid dimensions." msgstr "Il file non contiene le dimensioni della griglia." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "" -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Lettura file..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 #, fuzzy msgid "Creating volume data..." msgstr "Carica dati volume" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Numerazione di punti e/o segmenti non uniformi non supportata." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Liste canali non uniformi non supportate" -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Trovato file dati %s al posto di previsto %s." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, fuzzy, c-format msgid "Header properties file for index %u is missing." msgstr "Il campo intestazione `%s' è mancante." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Impossibile trovare alcun canale altezza" @@ -6759,11 +6808,11 @@ msgstr "Blocco intestazione %u ha posizione o dimensione non valida." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Impossibile trovare blocco intestazione immagine" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Impossibile trovare blocco intestazione piezo" @@ -6902,7 +6951,7 @@ msgid "MetroPro files (.dat)" msgstr "File MetroPro (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "Intestazione del file maggiore del file" @@ -6918,12 +6967,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "File testo MicroProf FRT (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, fuzzy, c-format msgid "Duplicate block %02x." msgstr "Duplica" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "" "Il file contiene un numero di punti dati minore di dimensioneX*dimensioneY." @@ -6961,34 +7010,34 @@ msgid "Unique id record is too short." msgstr "Registro id unica troppo corto" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Importa file dati Molecular Imaging MI ." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "File Dati PicoView (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Grafico Spettroscopia" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Importa file dati Aarhus MUL ." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "File Aarhus MUL(.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" "Il numero dell'immagine nell'etichetta %u non corrisponde al numero %u " "nell'indice." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "Lunghezza stringa etichetta %u maggiore di 20." @@ -7014,21 +7063,21 @@ msgid "Spectra data starts past the end of file." msgstr "dati degli spettri iniziano oltre la fine del file" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, fuzzy, c-format msgid "Profile %u" msgstr "Profilo %d" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "Spettri F-D " -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "Spettri I-V" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "Spettri I-Z " @@ -7048,7 +7097,7 @@ msgid "Nanonics files (.nan)" msgstr "File Nanonics (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -7060,7 +7109,7 @@ msgstr "" "LunghezzaIntestazione %u differisce dalla reale lunghezza intestazione %u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "Marcatore inizio intestazione aspettato ‘%s’. Trovato ‘%s’." @@ -7083,7 +7132,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "File Nanonis SXM (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "Intestazione file terminata inaspettatamente." @@ -7097,12 +7146,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFO non contiene le colonne aspettate: %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "Linea DATA_INFO contenente meno di %d campi. " -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Indicatore inizio dati \\x1a\\x04 mancante " @@ -7136,11 +7185,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "Dati NanoScanTech (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Importa file dati Digital Instruments Nanoscope II " -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "File Nanoscope II" @@ -7178,21 +7227,21 @@ "versioni di MS Windows o ogni altro modo di trasferimento file che cerchi di " "salvare il testo indipendentemente dalla piattaforma." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 #, fuzzy msgid "Reading channels..." msgstr "Lettura file..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Parse impossibile delle dimensioni campo scansione." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Dati invalidi dopo dati campione #%u." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Linea intestazione troncata." @@ -7214,56 +7263,56 @@ msgid "Nanotop files (.spm)" msgstr "File Nanotop (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Importa network Common Data Form (netCDF) file creati da GXSM." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "File GSXM netCD (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "La variable `%s' si riferisce a dati non validi o inesistenti." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "Annotazioni NetCDF non supportate." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "La serie valori deve essere di tipo FLOAT" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "I valori tempo devono essere di tipo DOUBLE" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "La lettura dei file di scansione rapida non è ancora implementata." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "L'ordine delle serie tempo è errato." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "Il file è terminato inaspettatamente all'interno di`%s'." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" "L'array `%s' ha un numero non nullo di elementi invece di essere assente." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "Più di una dimensione della registrazione non trovata." @@ -7281,7 +7330,7 @@ "I dati Nano Measuring Machine devono essere importati in modo interattivo." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Rappresentazione superficie..." @@ -7289,7 +7338,7 @@ msgid "Import NMM Profile Set" msgstr "Importa NMM Profile Set" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Informazioni" @@ -7318,13 +7367,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "Dimensione orizzontale:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "Dimensione verticale:" @@ -7413,17 +7462,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "il campo byteskip indica piu'bytes di quelli presenti nel file." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "Il campo intestazione %s per asse contiene troppi elementi" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "Il campo intestazione %s per asse contiene troppo pochi elementi" @@ -7487,7 +7536,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Importa file dati MapVue (.map)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, fuzzy, c-format msgid "Chunk type %u occured multiple times." msgstr "Trovato file dati %s al posto di previsto %s." @@ -7560,7 +7610,7 @@ msgid "Header line starts with a colon." msgstr "Linea intestazione inizia con \":\"" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "Informazione di canale interrotta inaspettatamente." @@ -7594,46 +7644,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "File Omicron MATRIX (.mtrx & .mtrx) " -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Importa file Wyko OPD e ASC" -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "File OPD (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "File esportati Wyko ASCII (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "l'oggetto `%s' è oltre la fine del file" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Trovate cartelle annidate" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Legge file ISO 5436-2 OpenGPS .x3p" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "dati ISO 5436-2 OpenGPS (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "Troppi elementi DataList per una matrice delle dimensioni date." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "il file main.xml contiene elementi dati multipli" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "L'asse %s supporta solo il tipo %s." @@ -7657,7 +7707,7 @@ msgstr "Tag %u non valida o non supportata" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 #, fuzzy msgid "Data block is truncated." msgstr "Blocco dati troncato." @@ -7742,37 +7792,37 @@ "Importa dati da immagini pixmap (PNG, TIFF, JPEG, ...) a bassa profondità . " "I formati disponibili dipendono dai pixbuf loaders GDK disponibili" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Uso" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 #, fuzzy msgid "_Hue offset" msgstr "_X offset" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "Pixmap non ha un file tipo registrato `%s'." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Impossibile ottenere il caricatore pixbuf: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "il caricatore pixbuf ha rifiutato i dati: %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "come dati" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7824,7 +7874,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "Intestazione troppo corta (solo %lu bytes)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "Intestazione troppo corta (solo %lu bytes)." @@ -7853,21 +7903,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, fuzzy, c-format msgid "JSON parsing error: %s" msgstr "Parsing XML fallito: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "Lettura file..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "Carica dati volume" @@ -7938,59 +7984,59 @@ msgid "Quesant files (.afm)" msgstr "file Quesant (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "Specificato dall'utente" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Signed byte" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Unsigned byte" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "Signed 16bit word" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "Unsigned 16bit word" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "Signed 32bit word" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "Unsigned 32bit word" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "Signed 16bit word" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "Unsigned 16bit word" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE singolo" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE doppio" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "IEEE metà" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Pascal real" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7998,161 +8044,161 @@ "Importa file dati raw, ASCII o binari, secondo un formato specificato " "dall'utente" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "File dati Raw" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Ogni spazio bianco" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "TAB" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Altro carattere" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "Delimitatore campo" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "_Importa automaticamente dati raw di formati sconosciuti. " -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "_Dati testo" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "_Dati binari" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "Valore sostituto mancante" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "Inizia dalla _linea" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 #, fuzzy msgid "_Each row skip" msgstr "Salta ogni riga:" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "Altro delimitatore" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "Formato dati:" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "Schema di scambio Byte" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "Inizia con_offset" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "Dimensioni campione" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "Dopo ogni campione salta" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "Dopo ogni _riga salta" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "Trasforma bits in bytes" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Trasforma bi_ts in campioni" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "I campioni sono si_gned" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "I dati Raw devono essere importati in modo interattivo." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Leggi file Raw" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Formato dati" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "File" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "campi" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "bytes" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bits" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binari" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Testo" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Delimitatore: spazio" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Delimitatore: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Delimitatore: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "informazioni" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "Intestazione file non valida." -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, fuzzy, c-format msgid "" "Too short file\n" @@ -8163,7 +8209,7 @@ "Il formato richiederebbe un file lungo almeno %u bytes ma la lunghezza di " "%s'è solo %u bytes." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -8172,40 +8218,40 @@ "Parsing fallito\n" "Il contenuto di `%s'non corrisponde al formato: %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Non abbastanza linee (%d) per l'offset (%d)" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" "Mi aspettavo uno spazio per saltare più campi in fila %u, ottenuto `%.16s'" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "Mi aspettavo `%c' per saltare più campi in fila %u, ottenuto `%.16s'" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "Mi aspettavo `%s' per saltare più campi in fila %u, ottenuto `%.16s'" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Dati invalidi`%.16s' nella riga %u, colonna %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" "Delimitatore aspettato`%c' dopo dati in fila %u, colonna %u, ottenuto`%c'" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8223,8 +8269,8 @@ msgid "_Title" msgstr "_Titolo" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Curva" @@ -8269,36 +8315,36 @@ msgid "Random points order unsupported" msgstr "Ordine punti casuale non supportato" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Importa file dati SPM3 RHK Technology" -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "File RHK SPM3 (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "Termine file raggiunto nell'intestazione della pagina." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "intestazione magic page " -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "Termine file raggiunto nella stringa #%u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "Termine file raggiunto nell'intestazione dati colore." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "Termine file raggiunto nei dati colore." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Linea %d sconosciuta" @@ -8311,17 +8357,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "File RHK SM4 (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "Lista oggetti in %s troncata" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "Oggetto di tipo %s troncato" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Impossibile trovare oggetto %s in %s." @@ -8356,7 +8402,7 @@ msgid "data ranges" msgstr "Intervallo dati" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "offset dati" @@ -8433,16 +8479,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "File Sensofar PLu (.plu)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Profilo" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Legge file Sensofar PLux" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "File Sensofar PLux (.plux)" @@ -8454,15 +8500,15 @@ msgid "Sensolytics text files (.dat)" msgstr "file testo Sensolytics (.dat) " -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Importa file dati Shimadzu SPM" -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "File Shimadzu" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Impossibile analizzare valori dati dopo %d di %d" @@ -8483,31 +8529,31 @@ msgid "SIS files (.sis)" msgstr "file SIS (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Il blocco non è un blocco di documento." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Informazioni documento troppo brevi." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Informazioni parametro troppo brevi." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Blocco immagine inaspettato." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "Termine file raggiunto in blocco immagine." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "Termine file raggiunto in blocco canale." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "Termine canale raggiunto al posto di un altro canale aspettato." @@ -8817,31 +8863,31 @@ msgid "Unknown data type `%s'." msgstr "Tipo dati `%s' sconosciuto." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Esporta i dati come semplice file di testo XYZ" -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "Dati testo XYZ (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "File dati XYZ:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Unità laterali:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Esporta XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Importa immagini SEM Carl Zeiss" -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Scansioni SEM Carl Zeiss (.tif)" @@ -8878,12 +8924,12 @@ msgid "Data line %u does not contain four items." msgstr "La riga %u non contiene quattro elementi" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Codice unità %d non valido o non supportato" -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "La prima linea contiene troppi oggetti" @@ -8913,9 +8959,8 @@ msgid "Fit Graph" msgstr "Adatta Grafico" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "_Curva Grafico" @@ -8924,28 +8969,18 @@ msgid "F_unction:" msgstr "F_unzione:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Intervallo:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "fino a" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "_Disegna cerchio" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8999,27 +9034,27 @@ msgid "Results\n" msgstr "Risultati\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Taglia grafico" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 #, fuzzy msgid "/_Basic Operations/_Cut..." msgstr "/Operazioni _Base/Inclina..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Estrazione di parte del grafico in nuovo file" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Taglia Grafico" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Taglia tutte le curve" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Taglia Grafico" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Spettro DOS " @@ -9077,6 +9112,7 @@ msgstr "Igor Pro text wave" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 #, fuzzy msgid "Style" msgstr "Stile linea" @@ -9102,7 +9138,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Esporta come file di testo" @@ -9300,8 +9336,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/_Fit Curva FD..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 #, fuzzy msgid "_All curves" msgstr "Allineamento curve" @@ -9316,8 +9352,8 @@ msgid "Zero position" msgstr "Posizione Z" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "Fit Curva FD..." @@ -9423,6 +9459,101 @@ msgid "Logscale Transform" msgstr "Trasformata di Hough" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "Misura Reticolo" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "Misura reticolo" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +#, fuzzy +msgid "Save Parameters" +msgstr "Salva Parametri picco" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "E_strae Sottofondo" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "Allineamento curve" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "Segna Facce" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Trasformata di Fourier" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "lunghezza _Autocorrelazione:" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "Direzione" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "Inizio" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "FFT filtrata" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "_Raffina" + +#: modules/graph/graph_measure_period.c:252 +#, fuzzy +msgid "Simple ACF" +msgstr "ACF radiale" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Centro di indentazione a " + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Posizione Z" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "Dati livellati" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "Trova picchi su curve grafico" @@ -9441,7 +9572,7 @@ msgstr "Prominenza" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Zero" @@ -9473,96 +9604,96 @@ msgid "Graph Peaks" msgstr "Grafico Picchi" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 #, fuzzy msgid "Data + fit" msgstr "Formato dati:" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Dati livellati" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Rimozione sottofondo polinomiale" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 #, fuzzy msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/_Livella/Sottofondo polinomiale..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "Rimozione sottofondo polinomiale" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 #, fuzzy msgid "Curve to fit" msgstr "Posizione curva _X:" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "Output" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "Risultati del Fit" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Distribuzione Altezze" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Distribuzione altezze cum." -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Distribuzione angoli" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Distribuzione angoli cum" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF " -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9581,7 +9712,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "Funzioni Statistiche" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Calcolo funzioni statistiche1D " @@ -9593,15 +9724,15 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 #, fuzzy msgid "_Fixed resolution" msgstr "risoluzione _X" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Funzioni Statistiche" @@ -9624,128 +9755,116 @@ msgid "pick points" msgstr "Punti speciali" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "Rimozione sottofondo polinomiale" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 #, fuzzy msgid "Period" msgstr "_periodo X:" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 #, fuzzy msgid "Y offset" msgstr "_Y offset:" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 #, fuzzy msgid "Calculates simple graph curve statistics." msgstr "Calcola curvatura globale" -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "Salva Quantità Statistiche" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 #, fuzzy msgid "Calculate graph curve statistics" msgstr "Calcolo funzioni statistiche riga/colonna" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -#, fuzzy -msgid "Save Parameters" -msgstr "Salva Parametri picco" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Quantità statistiche" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 #, fuzzy msgid "Simple Parameters" msgstr "Parametri Simulazione" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 #, fuzzy msgid "Integrals" msgstr "_Integrale:" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 #, fuzzy msgid "Graph Statistics" msgstr "Statistiche Grani" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 #, fuzzy msgid "Rms (Rq)" msgstr "Rms (Sq):" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 #, fuzzy msgid "Projected length" msgstr "Lunghezza contorno proiettato" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 #, fuzzy msgid "Developed length" msgstr "Lunghezza profilo sviluppato" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variazione" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 #, fuzzy msgid "Area under curve" msgstr "_Curva Grafico" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 #, fuzzy msgid "Positive area" msgstr "Positivo" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 #, fuzzy msgid "Negative area" msgstr "Negativo" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 #, fuzzy msgid "Root mean square" msgstr "Radice quadratica media ondulazione" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 #, fuzzy msgid "Data + polynomials" msgstr "Distorsione polinomiale" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9754,226 +9873,217 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Differenza" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 #, fuzzy msgid "Leveled surface" msgstr "Dati livellati" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 #, fuzzy msgid "Polynomial background" msgstr "Rimozione sottofondo polinomiale" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 #, fuzzy msgid "Fits terraces with polynomial background." msgstr "Sottrae sottofondo polinomiale." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 #, fuzzy msgid "Fit terraces with polynomial background" msgstr "Sottrae sottofondo polinomiale." -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -#, fuzzy -msgid "Fitted step height" -msgstr "Figura adattata" - -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -#, fuzzy -msgid "Mean square difference" -msgstr "Differenza quadratica media" - -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "" - -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -#, fuzzy -msgid "Number of terraces" -msgstr "_Numero di iterazioni:" - -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 +#: modules/graph/graph_terraces.c:252 #, fuzzy -msgid "Fit Terraces" -msgstr "Adatta risultato" - -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "" - -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 -#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 -#: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 -msgid "Output" -msgstr "Output" - -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -#, fuzzy -msgid "Survey" -msgstr "Curva" +msgid "Step detection" +msgstr "Regola selezione" -#: modules/graph/graph_terraces.c:520 +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 #, fuzzy -msgid "_Step detection kernel:" -msgstr "_Seleziona modo:" +msgid "_Step detection kernel" +msgstr "_Seleziona modo" -#: modules/graph/graph_terraces.c:528 +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 #, fuzzy -msgid "Step detection _threshold:" +msgid "Step detection _threshold" msgstr "Specifica soglie" -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +#, fuzzy +msgid "Step _broadening" +msgstr "Regola selezione" -#: modules/graph/graph_terraces.c:546 +#: modules/graph/graph_terraces.c:268 #, fuzzy -msgid "Minimum terrace _length:" +msgid "Minimum terrace _length" msgstr "Lunghezza minima:" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "grado _polinomiale:" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "grado _polinomiale" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 #, fuzzy msgid "_Independent heights" msgstr "Gradi indipendenti" -#: modules/graph/graph_terraces.c:580 -#, fuzzy -msgid "Step detection" -msgstr "Regola selezione" - -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -#, fuzzy -msgid "_Display:" -msgstr "Mostra:" - -#: modules/graph/graph_terraces.c:587 +#: modules/graph/graph_terraces.c:274 #, fuzzy msgid "Select regions _manually" msgstr "Gestore Selezioni" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 -#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 -#: modules/process/mark_with.c:284 modules/process/neural.c:543 -#: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 -msgid "Result" -msgstr "Risultati" - -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 #, fuzzy msgid "Save Terrace Table" msgstr "Salva tavola" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "grado _polinomiale" +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 +#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 +#: modules/process/multiprofile.c:273 modules/process/pid.c:151 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 +msgid "Output" +msgstr "Output" -#: modules/graph/graph_terraces.c:889 +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 #, fuzzy -msgid "M_inimum polynomial degree:" -msgstr "Grado massimo polinomio:" +msgid "M_inimum polynomial degree" +msgstr "Grado massimo polinomio" -#: modules/graph/graph_terraces.c:899 +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 #, fuzzy -msgid "_Maximum polynomial degree:" -msgstr "Grado massimo polinomio:" - -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -#, fuzzy -msgid "Step _broadening" -msgstr "Regola selezione" +msgid "_Maximum polynomial degree" +msgstr "Grado massimo polinomio" -#: modules/graph/graph_terraces.c:921 +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 #, fuzzy -msgid "Minimum broadening:" -msgstr "_Minimo:" +msgid "Minimum broadening" +msgstr "_Minimo" -#: modules/graph/graph_terraces.c:932 +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 #, fuzzy -msgid "Maximum broadening:" +msgid "Maximum broadening" msgstr "Dimensione legame massimo" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +#, fuzzy +msgid "Fit Terraces" +msgstr "Adatta risultato" + +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, fuzzy, c-format -msgid "Number of combinations: %u." +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +#, fuzzy +msgid "Survey" +msgstr "Curva" + +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 +#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 +#: modules/process/mark_with.c:284 modules/process/neural.c:543 +#: modules/process/psf.c:354 modules/process/terracefit.c:572 +#: modules/volume/volume_psf.c:548 +msgid "Result" +msgstr "Risultati" + +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "" + +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +#, fuzzy +msgid "Fitted step height" +msgstr "Figura adattata" + +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +#, fuzzy +msgid "Mean square difference" +msgstr "Differenza quadratica media" + +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "" + +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +#, fuzzy +msgid "Number of terraces" msgstr "_Numero di iterazioni:" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "" + +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 #, fuzzy msgid "No free parameters are selected." msgstr "Nessuna area nello zoom selezionato" -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, fuzzy, c-format +msgid "Number of combinations: %u." +msgstr "_Numero di iterazioni:" + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, fuzzy, c-format msgid "Segment %u" msgstr "Segmentazione" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, fuzzy, c-format msgid "Level %d" msgstr "Dati livellati" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "Fit fallito" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 #, fuzzy msgid "No terraces were found" msgstr "Vicini non trovati" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Salva tavola" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 #, fuzzy msgid "Save Terrace Fit Survey" msgstr "Salva tavola" @@ -10110,7 +10220,7 @@ msgstr "Livella Piano" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Ingrandimento" @@ -10130,8 +10240,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "_Spessore" @@ -10160,7 +10270,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 #, fuzzy msgid "Mask in use" msgstr "Modalità Maschera" @@ -10263,7 +10373,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Numero di iterazioni" @@ -10312,8 +10422,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Anteprima progressiva" @@ -10325,13 +10435,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Dimensioni" @@ -10340,18 +10451,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Generatore" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Parametri Simulazione" @@ -10363,15 +10476,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 #, fuzzy msgid "_Like Current Image" @@ -10381,10 +10495,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10395,8 +10510,9 @@ msgstr "Inizializzazione...." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "computo..." @@ -10428,7 +10544,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Raggio" @@ -10468,64 +10584,80 @@ msgid "Arithmetic operations on data" msgstr "Operazioni aritmetiche sui dati" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Espressione" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Specifica un_ità" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Calcolato" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Aritmetica" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Espressione:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Operandi" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Prendi unità del risultato dai dati d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Specifica un_ità:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Specificare esplicitamente unità risultato" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "L'espressione contiene identificatori sconosciuti" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Le dimensioni in pixel differiscono" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "Le dimensioni laterali sono quantità fisiche differenti" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Le dimensioni fisiche differiscono" @@ -10561,7 +10693,7 @@ "Operazioni base quali, capovolgimento, inversione valori e rotazione per " "multipli di 90 gradi" -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/Operazioni _Base/_Inverti valore" @@ -10592,35 +10724,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "Co_pertura" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "" @@ -11030,27 +11163,30 @@ msgid "Building mesh..." msgstr "" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "correzione X:" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "correzione Y:" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "correzione Z:" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "Incertezza X" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Incertezza Y" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Incertezza Z" @@ -11084,6 +11220,7 @@ "Ricalibra le dimensioni o l'intervallo di valori delle scansioni laterali." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/Operazioni _Base/_Dimensioni e Unità.." @@ -11177,7 +11314,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 #, fuzzy msgid "Create new image" msgstr "Crea nuovo oggetto" @@ -11232,10 +11369,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - #: modules/process/classify.c:299 modules/process/classify.c:565 #, fuzzy msgid "Mask A" @@ -11416,6 +11549,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -11574,14 +11708,14 @@ msgid "Convolution _kernel" msgstr "Correlazione_Kernel" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 #, fuzzy msgid "Convolved" msgstr "_LoG convoluto" @@ -11617,13 +11751,13 @@ msgstr "Correzione affine" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "_Raffina" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Anteprima Opzioni" @@ -11823,7 +11957,7 @@ msgstr "Aggiungi maschera risultati a bassa incidenza" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "Soglia" @@ -11914,13 +12048,13 @@ msgid "Curvature Sections" msgstr "Sezioni Curvatura" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Profilo %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Tipo Output: " @@ -12030,7 +12164,7 @@ msgid "Deconvolve" msgstr "_LoG convoluto" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 #, fuzzy msgid "Sigma" msgstr "_Segnale" @@ -12422,7 +12556,8 @@ msgid "drift" msgstr "Deriva" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "Deriva sull'asse X" @@ -12438,6 +12573,48 @@ msgid "rows" msgstr "righe" +#: modules/process/dune_synth.c:108 +#, fuzzy +msgid "Generates images by simulating formation of sand dunes." +msgstr "Generazione immagini dominio usando modello ibrido Ising" + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/Sintetico/_Oggetti..." + +#: modules/process/dune_synth.c:126 +#, fuzzy +msgid "Generate image by transporting sand" +msgstr "Generazione immagini dominio usando modello ibrido Ising" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "_Minimo" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "Intervallo Ricerca" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "Valore massimo" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "DWT (Discrete Wavelet Transform) in due dimensioni." @@ -12750,7 +12927,7 @@ msgstr "Non vi è stata selezione percorso" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Distanza" @@ -12775,10 +12952,11 @@ msgstr "Facet Level" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Facet-leveling..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Visualizza, segna e misura orientazione facce." @@ -12802,12 +12980,12 @@ msgid "_Number points" msgstr "Numero punti:" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 #, fuzzy msgid "_Clear" msgstr "Pulisci" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 #, fuzzy msgid "_Mark" msgstr "Segnato" @@ -12892,7 +13070,7 @@ msgid "Create _Points" msgstr "_Punti" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 #, fuzzy msgid "Save Facet Vectors" msgstr "Vettori del reticolo" @@ -12902,50 +13080,50 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 #, fuzzy msgid "/Measure _Features/Facet _Measurement..." msgstr "/_Statistica/Facet _Analisi..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 #, fuzzy msgid "Measure facet angles" msgstr "Misura distanze" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 #, fuzzy msgid "_Facet plane size" msgstr "Dimensioni piano Facet" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Tolleranza" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 #, fuzzy msgid "Selected φ" msgstr "Selezione" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 #, fuzzy msgid "Selected ϑ" msgstr "Selezione" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 #, fuzzy msgid "Measure Facets" msgstr "Segna Facce" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 #, fuzzy msgid "Mea_sure" msgstr "Misura:" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 #, fuzzy msgid "points" msgstr "Punti" @@ -13183,7 +13361,7 @@ msgid "Clear the entire filter mask" msgstr "Azzera intera maschera filtro" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "_Riempimento" @@ -13203,7 +13381,7 @@ msgid "Zoom:" msgstr "Ingrandisci:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Opzioni Output" @@ -13277,7 +13455,7 @@ msgid "Triangle" msgstr "Triangolo vertice alto" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 #, fuzzy msgid "Rectangle" msgstr "Rettangoli" @@ -13330,7 +13508,7 @@ msgstr "lineare casuale" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Forma" @@ -13363,7 +13541,7 @@ msgstr "Figura adattata" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Entrambe" @@ -13638,6 +13816,7 @@ msgstr "Crea i_mmagini punta" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 #, fuzzy msgid "_Trim fraction" msgstr "_Direzione" @@ -14710,7 +14889,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Corregge i difetti lineari (per lo più algoritmi sperimentali)." -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/_Correzione Dati/ Correzione Ste_p Line " @@ -14728,32 +14907,32 @@ msgid "Mark lines with inverted sign" msgstr "Segna grani con regressione logistica" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Polinomiale" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Mediana delle differenze" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Modo" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Matching" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 #, fuzzy msgid "Trimmed mean of differences" msgstr "Mediana delle differenze" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 #, fuzzy msgid "Facet-level tilt" msgstr "Facet-leveling..." @@ -14762,7 +14941,7 @@ msgid "Aligns rows by various methods." msgstr "Allinea righe con vari metodi" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 #, fuzzy msgid "/_Correct Data/_Align Rows..." msgstr "/_Correzione Dati/_Allineamento righe..." @@ -14799,7 +14978,7 @@ msgid "Steps" msgstr "Steps" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Danni" @@ -14808,7 +14987,7 @@ msgstr "Creste" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Inclina" @@ -14955,7 +15134,7 @@ msgid "_Hessian" msgstr "_Hessiana" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 #, fuzzy msgid "_Regularization parameter" msgstr "Parametri Simulazione" @@ -14981,10 +15160,12 @@ msgstr "Segna dati non connessi con altri valori" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positivo" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negativo" @@ -15117,7 +15298,7 @@ msgid "Two-sided" msgstr "" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Rimpicciolisci dal margine" @@ -15253,126 +15434,146 @@ msgid "Shift Mask" msgstr "Maschera Filtro" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 #, fuzzy msgid "/M_ultidata/Correlation _Search..." msgstr "/Dati _Multipli/_Correlazione Incrociata..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 #, fuzzy msgid "Search for a detail using correlation" msgstr "Media strutture similari con autocorrelazione" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 #, fuzzy msgid "Correlation, raw" msgstr "Correlazione" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 #, fuzzy msgid "Correlation, leveled" msgstr "Correlazione_Kernel:" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Percentuale di Correlazione " -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 #, fuzzy msgid "Height difference, raw" msgstr "Crea grafico differenza" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 #, fuzzy msgid "Height difference, leveled" msgstr "Crea grafico differenza" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 #, fuzzy msgid "Height difference score" msgstr "Mediana delle differenze" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Solo Fase" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Oggetti segnati" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Correlazione massima" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "Metodo Correlazione" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Usa _maschera" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 #, fuzzy msgid "_Plot mask" msgstr "Assegna maschera" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 #, fuzzy msgid "_Detail to search" msgstr "_Dati da allegare" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 #, fuzzy msgid "Correlation Search" msgstr "Matrice di Correlazione" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Operazioni base con maschere: inversione, rimozione, estrazione" -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Maschere/_Rimuovi Maschera" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Rimozione maschera dai dati" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Maschere/_Inverti Maschera" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Inversione maschera" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Maschere/_Estrae Maschera" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 #, fuzzy msgid "Extract mask to a new image" msgstr "Estrazione maschera in nuovo canale" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +#, fuzzy +msgid "/_Grains/_Extract Numbers" +msgstr "/_Maschere/_Estrae Maschera" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "Estrazione maschera in nuovo canale" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Grani/_Rimozione contatto bordo..." -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Rimuovi grani a contatto con bordo immagine" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Maschera/Sottile" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Maschera sottile" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "Numero grani" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Taglia regioni non intersecanti di due immagini" @@ -15522,7 +15723,7 @@ msgid "Second image" msgstr "Unione due immagini" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Media" @@ -15928,7 +16129,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "_Modalità" @@ -16024,8 +16225,8 @@ msgid "Re_initialize" msgstr "Ri_Inizializzazione" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Modalità Maschera" @@ -16601,6 +16802,64 @@ msgid "Pile Up Shapes" msgstr "Adatta Figura" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Generazione superficie con schema" + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/Sintetico/Schema...." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Generazione immagini con domini" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Larghezza massima" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Minimo" + +#: modules/process/plateau_synth.c:166 +msgid "Size power _law" +msgstr "" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "_Direzione:" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Scala con dimensioni" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "Altezza:" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "lineare casuale" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Lettura file..." + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Applica distorsione polinomiale nel piano orizzontale." @@ -16663,11 +16922,6 @@ msgid "_Vertical polynomial degree" msgstr "Grado polinomio verticale" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -#, fuzzy -msgid "_Maximum polynomial degree" -msgstr "Grado massimo polinomio" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "Gradi uguali" @@ -16684,6 +16938,10 @@ msgid "Copy table to clipboard" msgstr "Copia tabella negli appunti" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Salva tavola" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Operazioni base di presentazione: estrazione, rimozione." @@ -16840,8 +17098,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 #, fuzzy msgid "Transfer function" msgstr "Funzione Delta" @@ -16864,7 +17122,7 @@ msgid "Transfer function estimation" msgstr "Stima cieca punta" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 #, fuzzy msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Statistica/Sezione _PSDF..." @@ -16873,17 +17131,17 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 #, fuzzy msgid "Regularized filter" msgstr "Sommario Profili" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 #, fuzzy msgid "Least squares" msgstr "Radice quadratica media ondulazione" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 #, fuzzy msgid "Wiener filter" msgstr "Fit lineare" @@ -16893,21 +17151,21 @@ msgid "_Border" msgstr "Margini" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 #, fuzzy msgid "Image is too small." msgstr "File dati troppo piccolo" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 #, fuzzy msgid "_Fit Sigma" msgstr "Adatta altezza" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 #, fuzzy msgid "Transfer Function Size" msgstr "Funzione Delta" @@ -16927,25 +17185,25 @@ msgid "Transfer Function" msgstr "Funzione Delta" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 #, fuzzy msgid "TF width" msgstr "Nuova Larghezza:" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 #, fuzzy msgid "TF height" msgstr "Nuova Altezza:" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 #, fuzzy msgid "Difference norm" msgstr "Differenza" @@ -17081,7 +17339,7 @@ msgid "Proportion" msgstr "_proporzionale:" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 #, fuzzy msgid "Offset" msgstr "_X offset:" @@ -17325,7 +17583,7 @@ msgid "_Assume symmetry" msgstr "Simmetrico" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Dati ruotati" @@ -17402,23 +17660,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Correzione danni orizzontali (strappi)" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Tipo danni" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "Soglia dura" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "Soglia morbida" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Lunghezza minima" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Larghezza massima" @@ -17681,16 +17939,6 @@ msgid "Marked terraces" msgstr "_Aree segnate:" -#: modules/process/terracefit.c:282 -#, fuzzy -msgid "_Step detection kernel" -msgstr "_Seleziona modo" - -#: modules/process/terracefit.c:284 -#, fuzzy -msgid "Step detection _threshold" -msgstr "Specifica soglie" - #: modules/process/terracefit.c:289 #, fuzzy msgid "Minimum terrace _area" @@ -17700,25 +17948,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -#, fuzzy -msgid "M_inimum polynomial degree" -msgstr "Grado massimo polinomio" - -#: modules/process/terracefit.c:308 -#, fuzzy -msgid "Minimum broadening" -msgstr "_Minimo" - -#: modules/process/terracefit.c:310 -#, fuzzy -msgid "Maximum broadening" -msgstr "Dimensione legame massimo" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Limita l'intervallo dati usando una soglia superiore/inferiore" @@ -17765,7 +17994,7 @@ msgid "Limit Range" msgstr "Intervallo Limite" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "Assegna Intervallo totale " @@ -18510,147 +18739,147 @@ msgid "Function written in Python" msgstr "Funzione scritta in Python" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 #, fuzzy msgid "Correlation length tool." msgstr "lunghezza Correlazione:" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 #, fuzzy msgid "line-leveling|None" msgstr "nessuno" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 #, fuzzy msgid "Line leveling" msgstr "Livella Piano" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Salva Quantità Statistiche" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 #, fuzzy msgid "Correlation Length" msgstr "lunghezza Correlazione:" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 #, fuzzy msgid "Correlation Length T" msgstr "lunghezza Correlazione:" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 #, fuzzy msgid "Relation to Image Size" msgstr "Rasterizza" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 #, fuzzy msgid "Selected area" msgstr "Area proiettata" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 #, fuzzy msgid "PSDF Gaussian fit" msgstr "Gaussiana" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 #, fuzzy msgid "PSDF exponential fit" msgstr "Esponenziale" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 #, fuzzy msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "Permette la selezione di linee orizzontali o verticali" -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 #, fuzzy msgid "Profiles Along Axes" msgstr "Rapporto lunghezza profilo" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 #, fuzzy msgid "Read horizontal and/or vertical profiles" msgstr "Ribalta dato orizzontalmente e verticalmente" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Profili" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Opzioni" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, fuzzy, c-format msgid "Vertical profile %d" msgstr "Posizione verticale" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, fuzzy, c-format msgid "Horizontal profile %d" msgstr "Dimensione orizzontale:" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Strumento taglierina, taglia i dati a dimensioni inferiori" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Strumento misura distanze, misura distanze ed angoli." +#: modules/tools/distance.c:123 +#, fuzzy +msgid "Save Distance Table" +msgstr "Salva tavola" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "_Numero linee" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Misura distanze e direzioni tra punti" -#: modules/tools/distance.c:227 -#, fuzzy -msgid "Save Distance Table" -msgstr "Salva tavola" - #: modules/tools/filter.c:117 #, fuzzy msgid "" @@ -18711,7 +18940,7 @@ "Strumento rimozione grani, rimuove parti continue di maschera e/o dati " "sottostanti." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Risolutore Laplaciano" @@ -18719,7 +18948,7 @@ msgid "Fractal correction" msgstr "Correzione frattale" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -18727,7 +18956,7 @@ msgid "Remove" msgstr "Rimuovi" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "_Metodo di interpolazione" @@ -18739,7 +18968,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Rimozione grani singoli (parti continue di maschera)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -18748,69 +18977,78 @@ "l'intervallo dati a cui deve riferirsi la scala cromatica di riferimento, " "per i dati o per l'altezza dell'istogramma di distribuzione." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "Stella" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +#, fuzzy +msgid "_Adapt color range to selection" +msgstr "Intervallo colore automatico con code tagliate" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Intervallo colore" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Adatta intervallo colore a parte dei dati" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Intervallo colore completo da minimo a massimo" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Intervallo colore fisso, esplicitamente assegnato" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Intervallo colore automatico con code tagliate" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Mappatura colore adattativa non-lineare" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "_predefinito" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Istogramma altezze" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "Intervallo colore" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Assegna a _Maschera" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "Assegna a senza maschera" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Inversione Mappatura" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "Intervallo dati" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -18819,7 +19057,7 @@ "Strumento livella su tre punti, livella i dati sottraendo un piano passante " "per tre punti dati." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "Media raggio" @@ -18839,7 +19077,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Livella dati adattando a piano passante per tre punti" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -18847,129 +19085,133 @@ "Strumento funzione statistica Riga/Colonna, valori medi, mediani, massimi, " "minimi, RMS,..., di righe e colonne" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tg β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Righe" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Colonne" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Statisctiche Riga/Colonna" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Calcolo funzioni statistiche riga/colonna" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "Strumento modifica maschere, permette la modifica interattiva di parti della " "maschera." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "Forme" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "Strumenti _Disegno:" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Seleziona Maschera" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Aggiungi selezione alla maschera" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Sottrai selezione alla maschera" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Interseca selezione e maschera" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Forme rettangolari" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Forme ellittiche" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Linee sottili" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Disegno maschera mano libera" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Cancellazione maschera mano libera" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Riempi le aree vuote continue con una maschera" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Rimozione parti continue di maschera" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "_Quantità" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "Evita il fondersi dei grani per crescita" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Modifica maschera" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Modifica maschera" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "_Modifica" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Azioni" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Ingrandisci/Rimpicciolisci" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_inverti" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "Riempi _Vuoti" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "_Ingrandisci" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "Rimpicciolisci" @@ -18987,105 +19229,110 @@ msgid "Level rows using intersections with given lines" msgstr "Livella righe dati usando intersezioni con linee assegnate" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Strumento profilo, crea grafico del profilo da linee selezionate." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "Nessuna" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "_Separa Profili" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "Mostra Profilo" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "Dati calibrazione" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 #, fuzzy msgid "Improve _Direction" msgstr "_Direzione:" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 #, fuzzy msgid "Improve _All" msgstr "_Migliora" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "errore X %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "errore Y %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "errore Z %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "Incertezza X %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Incertezza Y %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Incertezza Z %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Strumento puntatore, legge valore sotto il puntatore." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Mostra selezione" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +#, fuzzy +msgid "Adapt color range to detail" +msgstr "Intervallo colore automatico con code tagliate" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Leggi Valore" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Legge valore sotto il cursore del mouse" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Fissa _Zero" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Facet" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Curvature" @@ -19093,16 +19340,16 @@ msgid "Calculate surface profile parameters." msgstr "Calcolo parametri profilo superficie." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Struttura" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Ondulazione" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Rugosità" @@ -19114,7 +19361,7 @@ msgid "BRC" msgstr "BRC" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Conta picchi" @@ -19126,190 +19373,190 @@ msgid "Calculate roughness parameters" msgstr "Calcolo parametri rugosità." -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Parametri Rugosità" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 #, fuzzy msgid "Selected line" msgstr "Selezione" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 #, fuzzy msgid "Cut-off" msgstr "C_ut-off:" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Rugosità media" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Radice quadratica media rugosità" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Altezza massima rugosita'" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Massima profondità di valle rugosita'" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Altezza picco massima rugosità" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Media altezza massima rugosità" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Media profondità di valle massima della rugosità" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Altezza media picco massima rugosità" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "altezza media tra il terzo picco più alto e la terza valle più bassa" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Altezza massima media profilo" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 #, fuzzy msgid "Maximum peak to valley roughness" msgstr "Altezza massima rugosita'" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Skewness" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "curtosi" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Media ondulazione" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Radice quadratica media ondulazione" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Altezza massima ondulazione" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Altezza massima profilo" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Spaziale" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Lunghezza onda media profilo" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Radice quadratica media lunghezza onda profilo" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 #, fuzzy msgid "parameters|Hybrid" msgstr "Parametri" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Pendenza assoluta media" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Radice quadratica media pendenza" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Lunghezza profilo sviluppato" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Rapporto lunghezza profilo" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "Parametri" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "Nuova Altezza" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 #, fuzzy msgid "No profile in the image selected." msgstr "Nessun punto nella immagine selezionata" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Funzione Distribuzione Ampiezza (ADF)" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "Bearing Ratio Curve (BRC)" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Profili superficie" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 #, fuzzy msgid "Creates angularly averaged profile graphs." msgstr "Estrae profili" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 #, fuzzy msgid "Radial Profiles" msgstr "Profili _Radiali" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 #, fuzzy msgid "Extract angularly averaged profiles" msgstr "Estrae profili" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 #, fuzzy msgid "Radial profiles" msgstr "Profili _Radiali" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "Simmetrizzazione" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Simmetrizza tutto" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, fuzzy, c-format msgid "Radial profile %d" msgstr "Profili _Radiali" @@ -19347,7 +19594,7 @@ msgid "_Copy" msgstr "_Copia" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -19357,36 +19604,46 @@ "unidimensionali (distribuzione delle altezze, correlazioni, PSDF, funzioni " "di Minkowski) di una parte selezionata di dati." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "PSDF radiale" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 #, fuzzy msgid "Angular spectrum" msgstr "Spettro di potenza" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "ACF radiale" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Volume di Minkowski" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Confine di Minkowski" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Connettività di Minkowski" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +#, fuzzy +msgid "IDF" +msgstr "ADF" + +#: modules/tools/sfunctions.c:187 +#, fuzzy +msgid "Radial IDF" +msgstr "PSDF radiale" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "_Separa incertezze" @@ -19414,7 +19671,7 @@ msgid "Spectroscopy" msgstr "Spettroscopia" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -19422,171 +19679,209 @@ "Strumento rimozione macchie, interpola piccoli intervalli dati (mostrati in " "una vista ingrandita) utilizzando l'algoritmo selezionato." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Appiattisci iperbolico" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Pseudo-Laplace" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Interpolazione frattale" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 #, fuzzy msgid "Ellipse" msgstr "Ellissi" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Rimuovi macchie" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Interpolazione leggeri difetti selezionati manualmente" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "Nessun punto nella immagine selezionata" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "Nessuna area nello zoom selezionato" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Strumenti statistici" -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Quantità statistiche." -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 #, fuzzy msgid "Moment-Based" msgstr "Momento" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Ibrido" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 #, fuzzy msgid "Average value" msgstr "Valore medio:" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 #, fuzzy msgid "RMS roughness" msgstr "Rugosità" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 #, fuzzy msgid "RMS (grain-wise)" msgstr "Rms (grain-wise):" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 #, fuzzy msgid "Mean roughness" msgstr "Rugosità" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 #, fuzzy msgid "Maximum peak height" msgstr "Altezza picco massima rugosità" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 #, fuzzy msgid "Maximum pit depth" msgstr "Larghezza massima:" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 #, fuzzy msgid "Maximum height" msgstr "Massimo " -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 #, fuzzy msgid "Surface slope" msgstr "Area superficie" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 -#, fuzzy -msgid "Simple arithmetic operations with volume data." -msgstr "Semplici operazioni matematiche con campi dati " +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" -#: modules/volume/volume_arithmetic.c:156 +#: modules/volume/volume_addframe.c:113 #, fuzzy -msgid "/_Arithmetic..." -msgstr "Aritmetica" +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/Operazioni _Base/_Inverti valore" -#: modules/volume/volume_arithmetic.c:160 -#, fuzzy -msgid "Arithmetic operations on volume data" -msgstr "Operazioni aritmetiche sui dati" +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_addframe.c:132 #, fuzzy -msgid "Z-axis calibrations differ" -msgstr "Gestione calibrazione asse Z" +msgid "Data to insert" +msgstr "Navigatore dati" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_addframe.c:170 #, fuzzy -msgid "Exports volume data in simple ASCII formats." -msgstr "Esporta i dati come semplice matrice ASCII." +msgid "Frame added" +msgstr "Stessa superficie" -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Esporta _Testo..." +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" -#: modules/volume/volume_asciiexport.c:112 -#, fuzzy +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "Sostituisci il canale corrente" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 +#, fuzzy +msgid "Simple arithmetic operations with volume data." +msgstr "Semplici operazioni matematiche con campi dati " + +#: modules/volume/volume_arithmetic.c:159 +#, fuzzy +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/Operazioni _Base/Inclina..." + +#: modules/volume/volume_arithmetic.c:163 +#, fuzzy +msgid "Arithmetic operations on volume data" +msgstr "Operazioni aritmetiche sui dati" + +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 +#, fuzzy +msgid "Z-axis calibrations differ" +msgstr "Gestione calibrazione asse Z" + +#: modules/volume/volume_asciiexport.c:72 +#, fuzzy +msgid "Exports volume data in simple ASCII formats." +msgstr "Esporta i dati come semplice matrice ASCII." + +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." +msgstr "/Operazioni _Base/Estendi..." + +#: modules/volume/volume_asciiexport.c:90 +#, fuzzy msgid "Export volume data to a text file" msgstr "Esporta dati grafico in un file di testo" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 #, fuzzy msgid "VTK structured grid" msgstr "VTK structured grid (.vtk)" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Precisione:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Dati volume" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "Ricalibrazione dimensioni o intervallo valori, dati volume " -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Dimensioni e Unità..." - #: modules/volume/volume_calibrate.c:170 #, fuzzy msgid "Match voxel size" @@ -19621,7 +19916,7 @@ msgstr "Fattore di correzione _X" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 #, fuzzy msgid "Create new volume data" msgstr "Carica dati volume" @@ -19636,14 +19931,87 @@ msgid "Z Dimension" msgstr "Dimensioni" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Correzione Dati/Annulla rotazione..." + +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "Punta stimata" + +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "_Estrazione immagine" + +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "Taglia Dati" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "_Z:" + +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "Seconda direzione" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "Unità _Laterale" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "Deriva asse Y" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Deriva Z" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "Deriva asse X" + +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "Corretti per la deriva" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "Punta stimata" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "Carica dati volume" + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "Carica dati volume" + #: modules/volume/volume_equiplane.c:140 #, fuzzy msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "Estrazione piani immagine e grafici lineari da dati volume" #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/Punta e Indentazione/Ricostruzione _Superficie...." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -19673,89 +20041,105 @@ msgid "Isosurface z for %.*f %s" msgstr "non esiste una superficie %d per %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 #, fuzzy msgid "Shows 3D representations of volume data" msgstr "Mostra e/o estrae una sezione di dati volume" -#: modules/volume/volume_extract.c:200 +#: modules/volume/volume_extract.c:197 #, fuzzy -msgid "/3D View..." -msgstr "Visualizza registro..." +msgid "/_Basic Operations/3D View..." +msgstr "/Operazioni _Base/Inclina..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 #, fuzzy msgid "Show a 3D view for the volume data" msgstr "Inverte valore in dati volume" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Dati volume" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 #, fuzzy msgid "_Render" msgstr "_Rinomina" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 #, fuzzy msgid "_Save image" msgstr "Immagine _quadrata" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Scala di opacità" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 #, fuzzy msgid "Apply perspective" msgstr "Applica prospettiva" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 #, fuzzy msgid "Instant 3D render" msgstr "Rendering 3D istantaneo" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "Vista X" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Vista Y" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Vista Z" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 #, fuzzy msgid "Export 3D view" msgstr "Esporta vista 3D" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "" +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "Rimuove rumore dalle curve del grafico" + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/_Correzione Dati/Rimuovi danni" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "Livella grafico su linea" + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "Facet Level" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Valutazione dati volume forza-distanza" #: modules/volume/volume_fdfit.c:213 #, fuzzy -msgid "/_Evaluate FD Data..." +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/Valutazione dati FD " #: modules/volume/volume_fdfit.c:217 @@ -19778,11 +20162,6 @@ msgid "Inverts value in volume data" msgstr "Inverte valore in dati volume" -#: modules/volume/volume_invert.c:53 -#, fuzzy -msgid "/_Invert Value" -msgstr "/_inverti valore" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Inverti valore nei dati volume" @@ -19793,7 +20172,7 @@ #: modules/volume/volume_kmeans.c:109 #, fuzzy -msgid "/_K-Means Clustering..." +msgid "/_Statistics/_K-Means Clustering..." msgstr "/_K-means clustering..." #: modules/volume/volume_kmeans.c:113 @@ -19860,7 +20239,7 @@ #: modules/volume/volume_kmedians.c:102 #, fuzzy -msgid "/_K-Medians Clustering..." +msgid "/_Statistics/_K-Medians Clustering..." msgstr "/_K-medians clustering..." #: modules/volume/volume_kmedians.c:106 @@ -19896,8 +20275,9 @@ msgstr "Carica dati volume" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/Operazioni _Base/Inclina..." #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -19929,12 +20309,31 @@ msgid "Z calibration" msgstr "calibrazioni" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "Livella Piano" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "Livella Piano" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "Riassume profili di dati volume in un canale" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." msgstr "/Sommario _Profili..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 @@ -19954,10 +20353,39 @@ msgid "Summarize Volume Profiles" msgstr "Sommario Profili Volume" -#: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" msgstr "" +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/Punta e Indentazione/Stima Cieca..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "Nuova Larghezza" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Risultati del Fit" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Curva di calibrazione Z:" + +#: modules/volume/volume_mfmrecalc.c:116 +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/Punta e indentazione/Forza _Laterale..." + #: modules/volume/volume_mfmrecalc.c:233 #, fuzzy msgid "Recalculated Data" @@ -19995,8 +20423,8 @@ #: modules/volume/volume_outliers.c:58 #, fuzzy -msgid "/_XY Plane Outliers" -msgstr "Rimuovi macchie" +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/_Correzione Dati/Maschera di _Outliers" #: modules/volume/volume_outliers.c:62 #, fuzzy @@ -20010,14 +20438,19 @@ #: modules/volume/volume_planelevel.c:58 #, fuzzy -msgid "/_XY Plane Level" -msgstr "Livello Piano" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/_Correzione Dati/Rimuovi danni" #: modules/volume/volume_planelevel.c:62 #, fuzzy msgid "Level all XY planes" msgstr "Livella grafico su linea" +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "Dati livellati" + #: modules/volume/volume_planestat.c:231 #, fuzzy msgid "Summarizes volume data planes to a graph." @@ -20025,7 +20458,7 @@ #: modules/volume/volume_planestat.c:245 #, fuzzy -msgid "/Summarize P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." msgstr "/Sommario _Profili..." #: modules/volume/volume_planestat.c:249 @@ -20043,81 +20476,121 @@ msgid "Summarize Volume Planes" msgstr "Sommario Profili Volume" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 #, fuzzy msgid "Calculates the volume PSF." msgstr "Calcolo K-means clustering su dati volume" -#: modules/volume/volume_psf.c:267 -#, fuzzy -msgid "/_Transfer Function Guess..." -msgstr "/_Fit Funzione..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Metodo:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 #, fuzzy msgid "_Sigma:" msgstr "_Segnale" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "Tipo finestra:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 #, fuzzy msgid "_Z level:" msgstr "Livella Piano" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 #, fuzzy msgid "_Border:" msgstr "Margini" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +#, fuzzy +msgid "_Display:" +msgstr "Mostra:" + +#: modules/volume/volume_psf.c:1079 #, fuzzy msgid "Calculating volume transfer function..." msgstr "Calcolo funzioni statistiche riga/colonna" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 #, fuzzy msgid "Volume TF" msgstr "Volume" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 #, fuzzy msgid "z level" msgstr "Livella Piano" +#: modules/volume/volume_removeframe.c:91 +#, fuzzy +msgid "Remove one frame from volume data stack" +msgstr "Rimozione maschera dai dati" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/Operazioni _Base/Ridimensiona..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "Livella grafico su linea" + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "_Estrazione immagine" + +#: modules/volume/volume_removeframe.c:165 +#, fuzzy +msgid "Frame removed" +msgstr "Rimozione Grani" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "Livella grafico su linea" + +#: modules/volume/volume_removeframe.c:236 +#, fuzzy +msgid "_Remove Current Level" +msgstr "Canale Corrente" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 #, fuzzy -msgid "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/Adatta Figura.." #: modules/volume/volume_rephase.c:168 @@ -20171,13 +20644,38 @@ msgid "Volume Z graphs" msgstr "Grafici Volume Z" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "/_Correzione Dati/Segna danni" + +#: modules/volume/volume_scars.c:119 +#, fuzzy +msgid "Remove scars in all levels" +msgstr "Rimuovi grani a contatto con bordo immagine" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "Corretti per la deriva" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "Altezze rilassamento..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "Estrazione piani immagine e grafici lineari da dati volume" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Taglia e Affetta" +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/Operazioni _Base/Ridimensiona..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -20241,6 +20739,26 @@ msgid "Volume Y graphs" msgstr "Grafici Volume Y" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "Correzione affine" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Rimuove rumore dalle curve del grafico" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Correzione di Laplace" + +#: modules/volume/volume_stepline.c:91 +#, fuzzy +msgid "Step line corrected" +msgstr "Forza di _Adesione:" + #: modules/volume/volume_strayfield.c:132 #, fuzzy msgid "Single value evolution" @@ -20256,8 +20774,9 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/Punta e Indentazione/Ricostruzione _Superficie...." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -20271,77 +20790,189 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 #, fuzzy msgid "Swaps axes of volume data." msgstr "Inverte valore in dati volume" -#: modules/volume/volume_swaxes.c:118 +#: modules/volume/volume_swaxes.c:96 #, fuzzy -msgid "/S_wap Axes..." -msgstr "/Salva con nome..." +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/Operazioni _Base/Ridimensiona..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 #, fuzzy msgid "Swap axes" msgstr "Mostra _assi" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 #, fuzzy msgid "X" msgstr "_X:" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 #, fuzzy msgid "X, reversed" msgstr "Inverti" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 #, fuzzy msgid "Y" msgstr "_Y:" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 #, fuzzy msgid "Y, reversed" msgstr "Inverti" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 #, fuzzy msgid "Z, reversed" msgstr "Inverti" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" msgstr "" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "" +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Semplici operazioni matematiche con campi dati " + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/Operazioni _Base/Inclina..." + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "Operazioni aritmetiche sui dati" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "Dati volume" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "Immagine" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "Livella grafico su linea" + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/Punta e Indentazione/Stima Cieca..." + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "Converte campo dati in dati XYZ" + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "_X offset" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "_X offset:" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "_Y offset" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "_Y offset:" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/Adatta Figura.." + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "Correggi rotazione" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "Intervallo Ricerca" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "Rotazione" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "Ridimensiona dati" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "Ridimensiona dati" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "Adatta" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "Allega, estrae e rimuove volume dati calibrazione asse Z" #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/Calibrazione _Z" +#, fuzzy +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/Operazioni _Base/_Ricalibra..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -20415,7 +21046,7 @@ #: modules/volume/volume_zposlevel.c:162 #, fuzzy -msgid "/S_hift Value To Zero..." +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "Fissa valore medio dati pari a zero" #: modules/volume/volume_zposlevel.c:166 @@ -20430,14 +21061,33 @@ #: modules/volume/volumeops.c:53 #, fuzzy -msgid "/Extract _Preview" -msgstr "Estrae profili" +msgid "/_Basic Operations/Extract _Preview" +msgstr "/_Operazioni Base/Ruota orario" #: modules/volume/volumeops.c:57 #, fuzzy msgid "Extract volume data preview to an image" msgstr "Salva vista 3D come immagine" +#: modules/xyz/xyz_autocrop.c:46 +#, fuzzy +msgid "Simple XYZ automated crop." +msgstr "Semplice livellamento dati XYZ" + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "Ridimensiona _automaticamente" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "Taglia" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Analisi deriva in dati XYZ" @@ -20464,18 +21114,6 @@ msgid "Y drift" msgstr "Deriva Y" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "Deriva asse Y" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Deriva Z" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "Deriva asse X" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Analizza deriva XYZ" @@ -20726,6 +21364,92 @@ msgstr "Immagini unite" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Facet-leveling..." + +#, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/_Correzione Dati/_Allineamento righe..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/_Correzione Dati/ Correzione Ste_p Line " + +#, fuzzy +#~ msgid "_Step detection kernel:" +#~ msgstr "_Seleziona modo:" + +#, fuzzy +#~ msgid "Step detection _threshold:" +#~ msgstr "Specifica soglie" + +#~ msgid "_Polynomial degree:" +#~ msgstr "grado _polinomiale:" + +#, fuzzy +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "Grado massimo polinomio:" + +#, fuzzy +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "Grado massimo polinomio:" + +#, fuzzy +#~ msgid "Minimum broadening:" +#~ msgstr "_Minimo:" + +#, fuzzy +#~ msgid "Maximum broadening:" +#~ msgstr "Dimensione legame massimo" + +#, fuzzy +#~ msgid "/_Arithmetic..." +#~ msgstr "Aritmetica" + +#~ msgid "/Export _Text..." +#~ msgstr "/Esporta _Testo..." + +#~ msgid "_Precision:" +#~ msgstr "_Precisione:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Dimensioni e Unità..." + +#, fuzzy +#~ msgid "/3D View..." +#~ msgstr "Visualizza registro..." + +#, fuzzy +#~ msgid "/_Invert Value" +#~ msgstr "/_inverti valore" + +#, fuzzy +#~ msgid "/_XY Plane Outliers" +#~ msgstr "Rimuovi macchie" + +#, fuzzy +#~ msgid "/_XY Plane Level" +#~ msgstr "Livello Piano" + +#, fuzzy +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/_Fit Funzione..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Taglia e Affetta" + +#, fuzzy +#~ msgid "/S_wap Axes..." +#~ msgstr "/Salva con nome..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/Calibrazione _Z" + +#, fuzzy +#~ msgid "/Extract _Preview" +#~ msgstr "Estrae profili" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "Dimensione orizzontale" @@ -21738,9 +22462,6 @@ #~ msgid "pixels" #~ msgstr "pixel" -#~ msgid "Fast Fourier Transform" -#~ msgstr "Trasformata di Fourier" - #~ msgid "built-in SimpleFFT\n" #~ msgstr "Semplice FFT, incorporata\n" @@ -22058,9 +22779,6 @@ #~ msgid "Watershed" #~ msgstr "Watershed" -#~ msgid "Laplace correction" -#~ msgstr "Correzione di Laplace" - #~ msgid "" #~ "Facet level: Lateral dimensions and value must be the same physical " #~ "quantity." @@ -22232,9 +22950,6 @@ #~ msgid "Rms:" #~ msgstr "Rms:" -#~ msgid "/_Basic Operations/_Recalibrate..." -#~ msgstr "/Operazioni _Base/_Ricalibra..." - #, fuzzy #~ msgid "/_Basic Operations/Threshol_d..." #~ msgstr "/Operazioni _Base/Ridimensiona..." Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/ja.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/ja.gmo differ diff -Nru gwyddion-2.62/po/ja.po gwyddion-2.63/po/ja.po --- gwyddion-2.62/po/ja.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/ja.po 2023-06-13 13:20:08.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2021-06-11 15:48+0200\n" "Last-Translator: \n" "Language-Team: https://github.com/iobataya/gwyddion-ja-translation\n" @@ -149,9 +149,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -167,7 +167,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "無題" @@ -293,39 +293,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "はい" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "いいえ" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(固定)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "度" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -395,8 +395,8 @@ msgid "Maximum value" msgstr "最大値" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "平均値" @@ -421,11 +421,11 @@ msgid "Pixel area" msgstr "ピクセル領域" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "投影エリア" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "表面積" @@ -527,13 +527,13 @@ msgid "Direction of maximum Martin diameter" msgstr "最大マーティン径の方向" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "傾斜θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "傾斜φ" @@ -549,11 +549,11 @@ msgid "Curvature center z value" msgstr "曲率中心 Z 値" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "曲率 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "曲率 2" @@ -586,14 +586,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "位置" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "値" @@ -603,7 +603,7 @@ msgstr "エリア" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "体積" @@ -616,7 +616,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Slope" @@ -673,12 +673,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "水平" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "垂直" @@ -719,12 +719,12 @@ msgstr "スケール・スペースアダプティブ" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "まるめ" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "リニア" @@ -1337,7 +1337,7 @@ msgid "Hide full controls" msgstr "コントロールをすべて非表示" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "基本の" @@ -1388,12 +1388,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1402,7 +1402,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1412,20 +1412,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1477,11 +1478,11 @@ msgstr "光源 θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1504,7 +1505,7 @@ msgid "Maximum z value" msgstr "最大 z 値" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "ラベル:" @@ -1594,7 +1595,7 @@ msgstr "非表示" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "ポイント" @@ -1651,7 +1652,7 @@ msgid "_Line type:" msgstr "ラインタイプ:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "ライン幅:" @@ -1672,7 +1673,7 @@ msgid "Diamond" msgstr "ダイヤモンド" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "十字形" @@ -1746,7 +1747,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "モード" @@ -1782,8 +1783,8 @@ msgstr "横軸" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "グラフ" @@ -1791,7 +1792,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "データ" @@ -1830,12 +1831,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "長さ" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1843,7 +1844,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "高さ" @@ -1870,8 +1871,8 @@ msgstr "お好み" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "名前" @@ -1908,12 +1909,12 @@ msgid "A_dd symbol" msgstr "シンボルの追加" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "プレビュー" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "読み取り用のファイルを開くことができません: %s。" @@ -2072,35 +2073,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "平均" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "最小" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "最大" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "最小位置" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "最大位置" @@ -2110,7 +2111,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2136,42 +2138,42 @@ msgid "Change Curve Map Preview" msgstr "ボリュームデータプレビューの変更" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "不明なチャネル %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "不明なボリューム %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "不明 XYZ %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "不明なボリューム %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Zレベル:%d、Z単位:%s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "ポイント: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "曲線" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 #, fuzzy msgid "Segments:" msgstr "セグメント" @@ -2238,11 +2240,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "更新" @@ -2300,7 +2302,7 @@ msgid "Open File" msgstr "ファイルを開く" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2450,63 +2452,63 @@ msgid "Cannot preview" msgstr "プレビューできません" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "セクション%s行%uで終了しましたが、開始されたことはありません。" -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "Section %s ended at line %u instead of %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "Section %s started at line %u before %s ended." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "ヘッダー行の%uに空のセクション名。" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "ヘッダー行%uは、プレフィックス %sを欠いています。" -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "ヘッダー行%uキー値の区切り記号がありません。" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "ヘッダー行のキー%u空です。" -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "ヘッダーは突然行%uで終了しました。ヘッダー マーカーの末尾がありません" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "水平サイズ" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "垂直サイズ" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "Square画像" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2516,7 +2518,7 @@ msgstr "幅" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2533,7 +2535,7 @@ msgstr "高さ" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2541,14 +2543,14 @@ msgstr "正方形サンプル" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "次元単位:" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2563,21 +2565,22 @@ msgstr "現在のイメージから開始" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "解像度" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "物理寸法" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "単位" @@ -2596,28 +2599,28 @@ msgid "Generated" msgstr "生成画像" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "ファイルに書き込めません: %s。" -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "%s: 横寸法と値は、同じ現物数量である必要があります。" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: データは正方形である必要があります。" -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "レイヤーモジュールがありません。" -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2626,31 +2629,31 @@ "このツールは、インストールされていないように見える、動作する%sの種類のレイ" "ヤーを必要とします。 インストールを確認してください。" -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "選択したオブジェクトをクリア" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origin" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "サイズ" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "幅" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "結果をファイルに保存" @@ -2710,7 +2713,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "ja" @@ -2731,7 +2734,7 @@ msgid "_Close" msgstr "閉じる" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "タイプ" @@ -2739,11 +2742,11 @@ msgid "Function" msgstr "関数" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "パラメータ" @@ -2800,8 +2803,8 @@ msgid "_New" msgstr "新規" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "削除" @@ -2819,94 +2822,120 @@ msgid "Save Metadata" msgstr "メタデータを保存" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "マスク" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "内挿タイプ" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "方向" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "既存のマスクと組み合わせる" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "ウィンドウタイプ" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "距離タイプ" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "プロットスタイル" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "すぐに更新" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "乱数化" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "マスク色" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "ターゲットグラフ" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "カーブ" -#: app/param-def.c:1138 +#: app/param-def.c:1139 #, fuzzy msgid "_Segment" msgstr "セグメント" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "選択を表示する" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "平均一致ポイント" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "選択" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "乱数の根" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "新しいグラフ" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "終端" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "変更" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "新規" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "単位の変更" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2932,40 +2961,40 @@ msgid "Set selected item as default" msgstr "選択した項目を既定として設定" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "書き込み用のファイルを開くことができません: %s。" -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "ファイルの内容を読み取れません: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "ファイルが空です。" -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "ファイルが壊れている、マジックヘッダーが一致しません。" -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "ファイルが壊れています。" -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "ユーザー構成ディレクトリ%s作成できません: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "ユーザー UI ディレクトリ %sを作成できません: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "ユーザー モジュール ディレクトリ %sを作成できません: %s" @@ -3087,66 +3116,66 @@ "version. For full license text see file COPYING included in the source " "tarball." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "ライセンス" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "特徴" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "開発者" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "翻訳者" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "Development is supported by the Czech Metrology Institute: " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "OpenGL 3D View" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "OpenMP parallelization" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "X11 protocol\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Win32 protocol\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Remote Control" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Python Scripting Interface" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "リリース%s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "開発バージョン、ビルド%s" @@ -3767,7 +3796,7 @@ msgstr "編集" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "削除する" @@ -3779,7 +3808,7 @@ msgid "Move _Down" msgstr "下に移動" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "幅:" @@ -3840,7 +3869,7 @@ msgid "XYZ Data" msgstr "XYZ データ" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "ツール" @@ -4081,7 +4110,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "方式" @@ -4095,7 +4124,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "出力タイプ" @@ -4190,33 +4219,35 @@ msgid "/_Basic Operations/_Crop" msgstr "/基本操作/画像からXYZデータへ…" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "切り抜きデータ" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 #, fuzzy msgid "_X" msgstr "X：" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 #, fuzzy msgid "_Y" msgstr "Y：" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "横方向オフセットを保持する" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "詳細" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "切り抜き" @@ -4225,34 +4256,36 @@ msgid "New Dimensions" msgstr "新しい寸法" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "オプション" @@ -4322,7 +4355,7 @@ msgstr "L-curve" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "フィッティング進行中…" @@ -4441,7 +4474,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 #, fuzzy msgid "fit" msgstr "フィッティング" @@ -4520,49 +4553,54 @@ msgid "Convert FZ to FD Curve" msgstr "フォースカーブをフィッティング" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Median" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "範囲" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "傾斜" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "過剰な尖度" @@ -4591,8 +4629,8 @@ msgstr "プレビュー設定" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "量" @@ -4600,7 +4638,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "出力タイプ" @@ -4638,7 +4676,7 @@ msgstr "差" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 #, fuzzy msgid "_Degree" msgstr "同じ次数" @@ -4648,9 +4686,9 @@ msgid "_Show" msgstr "表示" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "振幅" @@ -4679,7 +4717,7 @@ msgid "Remove polynomial background from all curves" msgstr "多項式で背景を削除する" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "多項式背景を削除" @@ -4815,12 +4853,12 @@ msgid "Output images" msgstr "出力サイズ" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 #, fuzzy msgid "verb|Display" msgstr "表示" @@ -4857,14 +4895,15 @@ msgid "DMT fit" msgstr "1D FFT フィルタ" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "フィッティング結果" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "結果" @@ -4883,20 +4922,20 @@ msgid "Remove sine background from all curves" msgstr "グラフカーブからノイズを除去" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "多項式背景を削除" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Accurex II テキスト ファイルをインポートします。" -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Accurex II テキスト ファイル (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "ファイル ヘッダーは ISO-8859-1 文字セットから変換できません: %s" @@ -4922,52 +4961,52 @@ msgid "AIST-NT files (.aist)" msgstr "AIST-NT ファイル (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Alicona Imaging AL3D ファイルをインポートします。" -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Alicona Imaging AL3D files (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "不正な平面番号%uがタグ '%s' にあります。" -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "ヘッダー タグ キーは、nul 終端ではありません。" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "ヘッダー タグ キーが空です。" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "ヘッダータグ '%s' キーは、nul に埋め込まれません。" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "ヘッダー タグ '%s' には CRLF ターミネータがありません。" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "ヘッダータグ '%s' 値は nul で終了しません。" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "ヘッダー タグ '%s' の値は、nul に埋め込まれません。" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "コメントにCRLF の終了コードがありません。" -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "コメントは NUL で終了しません。" @@ -5045,16 +5084,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "FileDescBegin has no corresponding FileDescEnd." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, fuzzy, c-format msgid "Cannot parse data values at line %d." msgstr "%dの%d後にデータ値を解析できません。" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -5066,92 +5105,93 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "APE (Applied Physics and Engineering) データをインポートします。" -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "APE ファイル (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "データを単純な ASCII 行列としてエクスポートします。" -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "ASCII データ行列 (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "コメントヘッダーに情報追加" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "小数点記号としてピリオドを使用する" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "すべての画像をつなげてエクスポート" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "Precision" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "テキストのエクスポート" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "チャネル：" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "幅:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "高さ：" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "値の単位:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Assing AFM データファイルをインポートします。" -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Assing AFM ファイル (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Attocube Systems ASC ファイルをインポートします。files." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Attocube ASCII files (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Image Metrology BCR データファイルをインポートします。" -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "BCR files (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 #, fuzzy msgid "Cannot convert string from UTF-16." msgstr "文字列を UTF-16 から変換できません: %s" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "不明なファイルタイプヘッダー: ‘%s’。" @@ -5185,17 +5225,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Burleigh exported data (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "ヘッダー行にコロンがありません。" -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Code V interferogram ファイルをインポートします。" -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Code V interferogram files (.int)" @@ -5212,18 +5252,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "'%s' と '%s' のヘッダー フィールドが見つかりません。" -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "zlib初期化はエラー %dで失敗しました。" -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "圧縮データの解凍に失敗し、エラー%d。" -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" "圧縮データを解凍できません。 Zlib サポートは組み込まれていませんでした。" @@ -5358,22 +5398,22 @@ msgid "Scan size header field overlaps with data." msgstr "スキャン サイズ のヘッダー フィールドはデータと重複します。" -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "ファイルから読み取れません: %s。" -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "「%s」に対応するデータ ファイルが見つかりませんでした。" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "ファイルが短すぎるので、想定されるファイルの種類にできません。" -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5382,7 +5422,7 @@ "ファイルは%sファイルではない、深刻な破損している、または未知のフォーマットの" "バージョンです。" -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5392,21 +5432,21 @@ "際のサイズは %u バイトです。" #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "ファイルコンポーネント/アイテム '%s' が切り捨てられます。" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "ファイル ヘッダーが切り捨てられます。" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "無効なフィールド次元: %d。" -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5415,39 +5455,43 @@ "サンプルごとのビット数 %dは、このファイルの種類に対して無効またはサポートされ" "ていません。" -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "%dデータ型が無効か、サポートされていません。" -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "ヘッダー フィールド '%s' がありません。" -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "パラメータ '%s' の値が無効またはサポートされていません。" -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "パラメータ '%s' がないか、または無効です。" -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "ファイルに (インポート可能な) データが含まれています。" -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "ファイルにエクスポート可能なチャネルがありません。" -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "ユーザーがファイルのインポートをキャンセルしました。" -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "ヘッダーがありません。" @@ -5471,7 +5515,7 @@ msgid "Garbage before first header section." msgstr "最初のヘッダー部分より前は捨てる。" -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "ヘッダー行の形式が正しくありません (=)。" @@ -5509,8 +5553,8 @@ msgid "FemtoScan SPM files" msgstr "FemtoScan SPM files" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "画像データはファイルの外部にあります。" @@ -5596,7 +5640,7 @@ msgid "Following features" msgstr "以下の機能" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Zスケール" @@ -5626,15 +5670,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "%s をエクスポート" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5646,14 +5690,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "インポート %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "ポイントの数" @@ -5670,24 +5715,24 @@ msgid "Z-range" msgstr "Z範囲" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "DME GDEF データをインポートします。" -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "DME GDEF files (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "ファイル バージョン %u.%u はサポートされていません。" -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "制御ブロックマークがCBではない、ファイルが破損している。" -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "不明な変数型%u。" @@ -5720,75 +5765,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "データの逆シリアル化は成功しましたが、予期しないオブジェクト%s。" -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "必須のタグ %uが見つかりませんでした。" -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "TIFF ディレクトリ%luが予期せず終了しました。" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "BigTIFF データ型%uは、従来の TIFF で見つかりました。" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "無効なタグ データ位置が見つかりました。" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "BigTIFF 予約フィールドは、8 と 0 ではなく%uされ、%uされます。" -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "圧縮タイプ%uはサポートされていません。" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "サンプルごとの不均一ビットはサポートされていません。" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "平面構成%uはサポートされていません。" -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "サポートされていないサンプル形式" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, fuzzy, c-format msgid "%s cannot open the file as a ZIP file." msgstr "ファイルを ZIP ファイルとして開くことはできません。" -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, fuzzy, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Zipファイルの読み取り中に Libzip エラー: %s。" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "ファイルのリストの末尾" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "圧縮されていないファイル サイズを取得できません。" - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "ファイルの内容を読み取れません。" - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "不明なエラー" @@ -5797,6 +5822,11 @@ msgid "End of file" msgstr "ファイルの終わり" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "ファイルのリストの末尾" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "パラメータ エラー" @@ -5819,11 +5849,26 @@ msgstr "Zipファイルの読み取り中にミニ zip エラーが発生しました: %s (%d)。" #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "File %s is missing in the zip file." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, fuzzy, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Zipファイルの読み取り中に Libzip エラー: %s。" + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "圧縮されていないファイル サイズを取得できません。" + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "ファイルの内容を読み取れません。" + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Gwyddion XYZ フィールドファイルをインポートします。" @@ -5845,51 +5890,55 @@ msgid "Export GXYZF" msgstr "GXYZF のエクスポート" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 #, fuzzy msgid "Channel" msgstr "チャネル：" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "XYZ データ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "" "Hierarchical Data Format (HDF) files, version 4データをインポートします。" -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Psi HDF4 files (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "PSI バイナリ ヘッダーが短すぎます。" -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "ネイティブ型の HDF データはサポートされていません。" -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Hierarchical Data Format (HDF), version 5 データをインポートします。" -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "Asylum Research Ergo HDF5 files (.h5)" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." -msgstr "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" +msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "データセット %sには、画像解像度%d×%dと一致しない%dアイテムがあります。" +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "HDF5 library error %ld in function %s." + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5914,22 +5963,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "TIFF and BigTIFF images with high depth (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "水平サイズ" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "垂直サイズ" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "Zスケール(サンプルごと)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "正方形サンプル" @@ -5990,12 +6039,12 @@ msgstr "OpenEXR data type %u is invalid or unsupported." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "libpng 初期化エラー (%s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "libpng エラーが発生しました" @@ -6003,7 +6052,7 @@ msgid "Failed to read image data." msgstr "イメージ データの読み取りに失敗しました。" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "チャンネル" @@ -6012,11 +6061,11 @@ msgid "Pages" msgstr "ページ" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "画像情報" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "値の範囲" @@ -6047,7 +6096,7 @@ msgstr "Hitachi SEM files (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "ヘッダー ファイルに対応するデータ ファイルが見つかりませんでした。" @@ -6089,105 +6138,105 @@ msgid "Cannot read channel labels." msgstr "チャンネルラベルを読み取れません。" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows or OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "水平/垂直ライン" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "交差" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "楕円" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "直線" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "四角形" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Lattice" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "パス" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "なし" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "定規" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "内部スケールバー" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "カラーバー" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "なし" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "一番上" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "右端に沿って" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6198,283 +6247,283 @@ "は、GDK に依存しており、その他のライブラリはインストールに依存する場合があり" "ます。" -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "色を選択" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "白" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "黒" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "ピクセルサイズ:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "インチあたりのピクセル数:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "拡大:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "高さ:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "フォント:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "フォントサイズ:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "ボーダー幅:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "Tickの長さ:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "サイズをデータのピクセルサイズに合わせる" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "数値区切り記号はカンマです" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "色" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "ラインとテキストの色:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "透明背景" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "背景色:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "配置" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "左" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "中心" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "右" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "上" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "下" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "横目盛" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "長さ:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "自動" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "水平ギャップ:" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "垂直ギャップ:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "色:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "外枠色:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "外枠幅:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "透明度:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Tickを描画" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "ラベルを描画" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "文字をスケールバーの上に描画" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "画像" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "内挿タイプ:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "フレームを描画" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "マスクを描画" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "マスクのラベルを描画" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "値のスケール" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "固定精度:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "しきい値を1000倍に固定:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "タイトル" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "位置:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "ギャップ:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "タイトルに単位を追加" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "選択範囲を描画" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "オブジェクト" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "水平" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "読込" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "格納" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "名称変更" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "プリセット名:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "16 ビットのグレースケールとしてエクスポート" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "横目盛" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "値" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "選択" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "プリセット" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Cairoでエラーが発生しました: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Pixbuf 保存に失敗: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "イメージが大きすぎて TARGA として格納できません。" -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "数を描画" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "終了マーカーの長さ:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "マーカー半径:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "マスク" @@ -6494,31 +6543,31 @@ "無効なデータ アドレス 0x%0xが見つかりました。 ファイルは、いくつかの未知の形" "式のバージョンです。" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Intematix SDF データをインポートします。" -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Intematix SDF data files (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "パラメータタグセットが不完全です。" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "画像の深さ" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "ISO 28600:2011 SPM フォーマットのインポート・エクスポート。" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "ISO 28600:2011 SPM data transfer files (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6527,57 +6576,57 @@ "標準および不規則なマッピングのみが実装されますが、ファイルにはマッピングタイ" "プ '%s' があります。" -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "サンプル #%u の %u を読み取る際に、ファイルの終わりに達しました" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "サンプル #%u を読み取る際に不正な形式のデータが検出されました" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "データの終わりマーカーがありません。" -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "サンプル #%d の %d を読み取る際に、ファイルの終わりに達しました" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "サンプル #%d の %d を読み取る際に、不正な形式のデータが検出されました" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "行%uには、必須ラベル '%s' は含まれません。" -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "JEOL データファイルをインポート." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "JEOL data files (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "データの種類が不明です。 開発者に報告してください。" @@ -6607,38 +6656,38 @@ msgid "File does not contain grid dimensions." msgstr "ファイルにグリッド寸法が含まれていません。" -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "ファイルをスキャン (%uカーブ)." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "ファイルの読み取り中…" -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "ボリュームデータの作成…" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "不均等なポイントやセグメントの番号付けはサポートされていません。" -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "非一様チャネル リストはサポートされていません。" -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "予期される%sではなく、データ ファイル %sが見つかりました。" -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "インデックス%uのヘッダー プロパティ ファイルがありません。" -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "高さチャネルが見つかりません。" @@ -6656,11 +6705,11 @@ msgstr "ヘッダー ブロック%uの位置またはサイズが無効です。" #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "イメージ ヘッダー ブロックが見つかりません。" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "ピエゾヘッダーブロックが見つかりません。" @@ -6798,7 +6847,7 @@ msgid "MetroPro files (.dat)" msgstr "MetroPro files (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "ファイル ヘッダーがファイルより大きいです。" @@ -6814,12 +6863,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "MicroProf FRT text files (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "重複ブロック%02x。" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "ファイルに含まれるデータ ポイントが XSize*YSize 未満です。" @@ -6856,32 +6905,32 @@ msgid "Unique id record is too short." msgstr "一意の ID レコードが短すぎます。" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Molecular Imaging MI データをインポートします。" -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "PicoView Data Files (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "スペクトロスコピー" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Aarhus MUL データをインポートします。" -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Aarhus MUL files (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "ラベル%uの画像番号がインデックス内の%uの数と一致しません。" -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "ラベル文字列の長さは%u20より大きい。" @@ -6907,21 +6956,21 @@ msgid "Spectra data starts past the end of file." msgstr "スペクトルデータはファイルの終わりを越えて開始されます。" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "プロファイル%u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "F-Dスペクトル" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "I-Vスペクトル" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "I-Zスペクトル" @@ -6942,7 +6991,7 @@ msgid "Nanonics files (.nan)" msgstr "Nanonics files (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6953,7 +7002,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "ヘッダー長%u実際のヘッダー長%uとは異なります" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -6976,7 +7025,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Nanonis SXM files (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "ファイル ヘッダーが予期せず終了しました。" @@ -6990,12 +7039,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFOには、%s列が含まれていません。" -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "DATA_INFO行に含まれるフィールドは%d未満です。" -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "データ開始マーカー \\x1a\\x04 が見つかりません。" @@ -7027,11 +7076,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "NanoScanTech data (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Digital Instruments Nanoscope II データをインポートします。" -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Nanoscope II files" @@ -7068,20 +7117,20 @@ "格納しようとするその他のファイル転送によって、ファイルがテキストとして扱われ" "る場合に発生します。" -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "チャンネルを読む…" -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "'スキャンサイズ' フィールドを解析できません。" -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "データ サンプル #%u の後にガベージを実行します。" -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "切り捨てられたヘッダー行。" @@ -7101,56 +7150,56 @@ msgid "Nanotop files (.spm)" msgstr "Nanotop files (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "" "GXSMで作成された network Common Data Form (netCDF) データをインポートします。" -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "GSXM netCDF files (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "変数 '%s' は、無効なデータまたは存在しないデータを参照します。" -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "NetCDF レコードはサポートされていません。" -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "値系列値は、FLOAT タイプでなければなりません。" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "時間の値は、DOUBLE 型にする必要があります。" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "高速スキャンファイルの読み取りはまだ実装されていません。" -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "時系列の順序が間違っています。" -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "ファイルが予期せず '%s' の中で終了しました。" -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "予期される '%s' 配列または 'ABSENT' です。" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "配列 '%s' は、存在しないにもかかわらず、ゼロ以外の数の要素を持ちます。" -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "複数のレコード ディメンションが見つかりました。" @@ -7167,7 +7216,7 @@ msgstr "Nano Measuring Machine data import must be run as interactive." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "表面のレンダリング…" @@ -7175,7 +7224,7 @@ msgid "Import NMM Profile Set" msgstr "NMM Profile Setデータをインポートします" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "インフォメーション" @@ -7204,13 +7253,13 @@ msgstr "スキャン ラインを X 軸に合わせる" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "水平サイズ:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "垂直サイズ:" @@ -7304,17 +7353,17 @@ msgstr "" "フィールドバイトスキップは、ファイル内のバイト数よりも多くを指定します。" -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "軸ごとのヘッダー フィールド%sの項目は、引用符で囲まれません。" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "軸ごとのヘッダー フィールド%sに含まれる項目が多すぎます。" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "軸ごとのヘッダー フィールド%sに含まれる項目が少なすぎます。" @@ -7375,7 +7424,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Olympus packed OIR data files (.poir)" -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "チャンクタイプ%u複数回発生しました。" @@ -7448,7 +7498,7 @@ msgid "Header line starts with a colon." msgstr "ヘッダー行はコロンで始まります。" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "チャネル情報が予期せず終了しました。" @@ -7483,47 +7533,47 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Wyko OPD and ASC filesデータをインポートします。" -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Wyko OPD files (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Wyko ASCII export files (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "項目 '%s' がファイルの終わりを越えています。" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "ネストされたディレクトリが見つかりました" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "ISO 5436-2 OpenGPS .x3p データをインポートします。" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "ISO 5436-2 OpenGPS data (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" "指定されたマトリックス ディメンションの DataList アイテムが多すぎます。" -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "ファイルのメイン.xmlには複数のデータ要素が含まれています。" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "軸%sでは、タイプ %sのみがサポートされます。" @@ -7547,7 +7597,7 @@ msgstr "行%uでオブジェクトのネストが無効です。" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "データ ブロックは切り捨てられます。" @@ -7631,37 +7681,37 @@ "低深度のピクセルデータ (PNG, TIFF, JPEG, …)からインポートします。読込可能な形" "式はGDK pixbufに依存します。" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 #, fuzzy msgid "Use" msgstr "ユーザー" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "Hueオフセット" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "Pixmap はファイルタイプ '%s' を登録していません。" -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Cannot get pixbuf loader: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "Pixbuf ローダーはデータを拒否しました: %s。" -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "データとして" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7712,7 +7762,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "ヘッダーが短すぎます (%lu バイトのみ)。" -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "スペクトロスコピーのヘッダーが短すぎます (%lu バイトのみ)。" @@ -7741,21 +7791,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, fuzzy, c-format msgid "JSON parsing error: %s" msgstr "XML 解析に失敗しました: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "ファイルの読み取り中…" -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "L-curve データ計算中…" @@ -7827,59 +7873,59 @@ msgid "Quesant files (.afm)" msgstr "Quesant files (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "ユーザー指定" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "符号付きバイト" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "符号なしバイト" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "符号あり16 ビットワード" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "符号なし 16 ビットワード" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "符号あり32 ビット ワード" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "符号なし 32 ビットワード" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "符号あり64 ビット ワード" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "符号なし 64 ビットワード" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE single" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE double" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "IEEE half" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Pascal real" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7887,161 +7933,161 @@ "ユーザー指定の形式に従って、ASCII とバイナリの両方の生データ ファイルをイン" "ポートします。" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "生データ ファイル" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "任意の空白" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "TAB文字" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "その他の文字" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "フィールド区切り文字" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "自動的に未知のファイルの生データインポートを提供" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "テキストデータ" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "バイナリデータ" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "不明な値の代用" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "開始行" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 #, fuzzy msgid "_Each row skip" msgstr "スキップ行:" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "他の区切り文字" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "比較するデータ:" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "バイトスワップパターン" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "開始オフセット" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "サンプルサイズ" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "各サンプルスキップ後" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "各行スキップ後" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "バイト単位でビットを反転" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "サンプル内のビットを反転する" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Samples are signed" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "生データのインポートは対話形式で実行する必要があります。" -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "未加工ファイルの読み取り" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "データ形式" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "ファイル" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "フィールド" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "バイト" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "ビット" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "バイナリ" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "テキスト" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "区切り文字: 空白" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "区切り文字: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "区切り文字: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "情報" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "ファイル ヘッダーが無効です。" -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, fuzzy, c-format msgid "" "Too short file\n" @@ -8052,7 +8098,7 @@ "形式は %u バイト長のファイル (少なくとも) を必要としますが、 ' の長 %s さは " "%u バイトだけです。" -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -8061,42 +8107,42 @@ "解析に失敗しました\n" "' ' の内容 %s が形式と一致しません %s : 。" -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "オフセット (%d) に十分なライン (%d) がありません" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "Expected whitespace to skip more fields in row %u, got `%.16s'" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" "「%c」が行%uでより多くのフィールドをスキップすることが期待され、「%.16s」を得" "ました" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" "「%s」が行%uでより多くのフィールドをスキップすることが期待され、「%.16s」を得" "ました" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Garbage `%.16s' in row %u, column %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "Expected delimiter `%c' after data in row %u, column %u, got `%c'" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" @@ -8113,8 +8159,8 @@ msgid "_Title" msgstr "タイトル" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "カーブ" @@ -8159,36 +8205,36 @@ msgid "Random points order unsupported" msgstr "ランダムポイントの順序がサポートされていません" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "RHK Technology SM3 データをインポートします。" -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "RHK SM3 files (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "ページ ヘッダーでファイルの末尾に到達しました。" -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "マジックページヘッダー" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "文字列 #%u でファイルの末尾に達しました。" -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "カラー データ ヘッダーでファイルの末尾に到達しました。" -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "ファイルの終わりがカラー データに到達しました。" -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "不明な行%d" @@ -8201,17 +8247,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "RHK SM4 files (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "%sのオブジェクトリストは切り捨てられます。" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "%s型のオブジェクトは切り捨てられます。" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "%sにオブジェクト %sが見つかりません。" @@ -8246,7 +8292,7 @@ msgid "data ranges" msgstr "データ範囲" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "データ オフセット" @@ -8322,16 +8368,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Sensofar PLu files (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "プロフィール" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Sensofar PLUx データをインポートします。" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Sensofar PLUx files (.plux)" @@ -8343,15 +8389,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Sensolytics text files (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Shimadzu SPM データをインポートします。" -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Shimadzu files" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "%dの%d後にデータ値を解析できません。" @@ -8372,31 +8418,31 @@ msgid "SIS files (.sis)" msgstr "SIS files (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Block not a document block." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "ドキュメント情報が短すぎます。" -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "パラメーター情報が短すぎます。" -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "予期しないイメージ ブロック。" -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "ファイルの終わりがイメージ ブロックに到達しました。" -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "チャネル ブロックでファイルの終わりに達しました。" -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "別のチャネルが予期されたときにファイルの終わりに達しました。" @@ -8700,31 +8746,31 @@ msgid "Unknown data type `%s'." msgstr "不明なデータ型 '%s' です。" -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "データをシンプル XYZ テキスト ファイルとしてエクスポートします。" -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "XYZ text data (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "XYZ データ:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "水平単位:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "XYZ のエクスポート" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Carl Zeiss SEM データをインポートします。" -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Carl Zeiss SEM scans (.tif)" @@ -8759,12 +8805,12 @@ msgid "Data line %u does not contain four items." msgstr "データ行%uには 4 つの項目が含まれていません。" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "ユニット コード %dが無効か、サポートされていません。" -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "最初の行に含まれる項目が多すぎます。" @@ -8794,9 +8840,8 @@ msgid "Fit Graph" msgstr "グラフにフィッティング" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "曲線グラフ:" @@ -8805,28 +8850,18 @@ msgid "F_unction:" msgstr "関数:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "範囲:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "終端" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "円を描画" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8879,27 +8914,27 @@ msgid "Results\n" msgstr "結果\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "グラフの切り取り" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 #, fuzzy msgid "/_Basic Operations/_Cut..." msgstr "/基本操作/傾き…" -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "グラフの一部から新規に作成" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "グラフを切り取り" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "すべてのカーブを切り取り" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "グラフを切り取り" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "DOSスペクトル" @@ -8957,6 +8992,7 @@ msgstr "Igor Pro text wave" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 #, fuzzy msgid "Style" msgstr "ラインスタイル" @@ -8982,7 +9018,7 @@ msgstr "Single merged abscissa" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "テキストファイルエクスポート" @@ -9180,8 +9216,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/フォースカーブのフィッティング…" -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "すべてのカーブ" @@ -9195,8 +9231,8 @@ msgid "Zero position" msgstr "Z位置:" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "フォースカーブをフィッティング" @@ -9295,6 +9331,100 @@ msgid "Logscale Transform" msgstr "対数スケール変換" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "/特徴抽出/テラス…" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "格子を測定する" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "パラメータの保存" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "背景抽出" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "閉じたカーブ" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "面を測定する" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Hough変換" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "自己相関の長さ" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "方向" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "グレーティング画像" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "%{from}v から %{to}v" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "フィルタリングされた FFT" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "微調整" + +#: modules/graph/graph_measure_period.c:252 +#, fuzzy +msgid "Simple ACF" +msgstr "ラジアルACF" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "インデントの中心位置" + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Z位置:" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "表面のレベリング" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "グラフ曲線上のピークを検索します。" @@ -9313,7 +9443,7 @@ msgstr "隆起" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "ゼロ" @@ -9345,97 +9475,97 @@ msgid "Graph Peaks" msgstr "グラフピーク" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "データ + フィット" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "レベリングされたデータ" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "多項式で背景を削除する" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 #, fuzzy msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/レベリング/多項式…" -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "多項式で背景を削除する" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 #, fuzzy msgid "Curve to fit" msgstr "X位置:" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "出力" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "フィッティング結果" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 #, fuzzy msgid "P1" msgstr "1" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 #, fuzzy msgid "P2" msgstr "2" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "高さ分布" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "高さ分布" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "角度の分布" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "角度の累積分布" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9450,7 +9580,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/統計関数…" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "1D統計関数の計算" @@ -9461,14 +9591,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "固定解像度" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "統計関数" @@ -9491,114 +9621,103 @@ msgid "pick points" msgstr "Special points" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "多項式で背景を削除する" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 #, fuzzy msgid "Period" msgstr "X周期:" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 #, fuzzy msgid "Y offset" msgstr "Yオフセット" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "グラフ曲線の単純な統計情報。" -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "統計量の保存" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "グラフ曲線の統計情報を計算" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "パラメータの保存" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "統計量" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "単純なパラメータ" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "積分" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "グラフ統計" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "%{from}v から %{to}v" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "Rms (Rq)" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "予想長" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "Developed length" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variation" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "曲線下の領域" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "正領域" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "負領域" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "二乗平均平方根" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "データ + 多項式" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9607,202 +9726,196 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "差" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "テラス(理想的)" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "表面のレベリング" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "多項式バックグラウンド" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "多項式バックグラウンドを持つテラスにフィットします。" -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "/特徴抽出/テラス…" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "多項式バックグラウンドを持つテラスを合わせる" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "フィッテイングされたステップ高" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" +msgstr "ステップ検出" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "平均平方差" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" +msgstr "_Step検出カーネル" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "テラスの不一致" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" +msgstr "ステップ検出しきい値" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" -msgstr "テラスの数" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" +msgstr "ステップ拡大" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "フィットテラス" +#: modules/graph/graph_terraces.c:268 +#, fuzzy +msgid "Minimum terrace _length" +msgstr "最小テラス長さ:" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "テラスリスト" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "多項式の次数" + +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" +msgstr "高さ" + +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" +msgstr "領域の手動選択" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" +msgstr "テラステーブルを保存" + +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 msgid "Output" msgstr "出力" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" -msgstr "アンケート" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "ステップ検出カーネル:" - -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" -msgstr "ステップ検出しきい値:" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "ステップ拡大:" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" +msgstr "最小次数" -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "最小テラス長さ:" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" +msgstr "最大次数" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "多項式の次数:" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" +msgstr "最小拡大" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" -msgstr "高さ" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" +msgstr "最大拡大" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" -msgstr "ステップ検出" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "フィットテラス" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "表示:" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "テラスリスト" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "領域の手動選択" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" +msgstr "アンケート" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "結果" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "テラステーブルを保存" - -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "多項式の次数" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "実行" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" -msgstr "最小次数:" - -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" -msgstr "最大次数:" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "フィッテイングされたステップ高" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" -msgstr "ステップ拡大" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "平均平方差" -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" -msgstr "最小拡大:" - -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" -msgstr "最大拡大:" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "テラスの不一致" + +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" +msgstr "テラスの数" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +#, fuzzy +msgid "Survey cannot be run with independent heights." msgstr "独立度で測量を実行することはできません。" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 +msgid "No free parameters are selected." +msgstr "空きパラメータは選択されていません。" + +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 #, c-format msgid "Number of combinations: %u." msgstr "組み合わせの数: %u。" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 -msgid "No free parameters are selected." -msgstr "空きパラメータは選択されていません。" - -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "セグメント%u" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "レベル %d" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "フィッティングに失敗" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "適切なテラスステップが見つかりません" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "テラスが見つかりませんでした" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "テーブルの保存" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "テラスフィット調査を保存" @@ -9933,7 +10046,7 @@ msgstr "平面レベリング" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "ズーム" @@ -9951,8 +10064,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "厚み" @@ -9979,7 +10092,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "使用中のマスク" @@ -10072,7 +10185,7 @@ msgstr "格子ガスをアニーリングして画像を生成する" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "回数" @@ -10116,8 +10229,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Progressive preview" @@ -10129,13 +10242,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "大きさ" @@ -10144,18 +10258,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "ジェネレータ" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "シミュレーションパラメータ" @@ -10166,15 +10282,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "Like Current Image" @@ -10183,10 +10300,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10197,8 +10315,9 @@ msgstr "初期化しています…" #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "計算を実行しています…" @@ -10229,7 +10348,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "半径" @@ -10269,64 +10388,80 @@ msgid "Arithmetic operations on data" msgstr "データに対する算術演算" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "数式" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "単位を指定" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "固定フィラー値" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "計算" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "数学" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "数式:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "演算子" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "データ d から結果単位を取得します%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "単位を指定:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "結果単位を明示的に指定する" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "式に不明な識別子が含まれています" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "ピクセル寸法が異なる" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "水平の次元が物理量と異なります" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "物理的な寸法が異なる" @@ -10360,7 +10495,7 @@ "of 90 degrees." msgstr "反転、値反転、回転などの基本的な操作を 90 度の倍数で行います。" -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/基本操作/値反転" @@ -10390,35 +10525,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "被覆" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 #, fuzzy msgid "Spread" msgstr "Size spread:" @@ -10822,27 +10958,30 @@ msgid "Building mesh..." msgstr "メッシュを構築…" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "X補正" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Y補正" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Z補正" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "X不確実性" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Y不確実性" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Z不確実性" @@ -10875,6 +11014,7 @@ msgstr "スキャンの横軸または値の範囲を再調整します。" #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/基本操作/次元と単位…" @@ -10968,7 +11108,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "新しいイメージを作成する" @@ -11020,10 +11160,6 @@ msgid "Classify" msgstr "分類" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "実行" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "マスクA" @@ -11189,6 +11325,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -11341,14 +11478,14 @@ msgid "Convolution _kernel" msgstr "畳み込みカーネル" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Normalize as _integral" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "畳み込み" @@ -11380,13 +11517,13 @@ msgstr "アフィン補正" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "微調整" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "プレビューオプション" @@ -11580,7 +11717,7 @@ msgstr "低いスコアにマスクを追加" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "しきい値" @@ -11668,13 +11805,13 @@ msgid "Curvature Sections" msgstr "曲率断面" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "プロファイル%d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "出力タイプ:" @@ -11776,7 +11913,7 @@ msgid "Deconvolve" msgstr "デコンボリューション" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "シグマ" @@ -12145,7 +12282,8 @@ msgid "drift" msgstr "ドリフト" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "x 軸ドリフト" @@ -12161,6 +12299,48 @@ msgid "rows" msgstr "ライン" +#: modules/process/dune_synth.c:108 +#, fuzzy +msgid "Generates images by simulating formation of sand dunes." +msgstr "格子ガスモデルをアニーリングして画像を生成します。" + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/合成・生成/堆積/繊維状…" + +#: modules/process/dune_synth.c:126 +#, fuzzy +msgid "Generate image by transporting sand" +msgstr "格子ガスをアニーリングして画像を生成する" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "最小" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "検索範囲" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "最大値" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "2 次元 DWT (離散ウェーブレット変換)" @@ -12468,7 +12648,7 @@ msgstr "パス選択はありません。" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "距離" @@ -12491,10 +12671,11 @@ msgstr "多平面レベリング" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "多平面レベリング…" -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "面の向きを視覚化、マーク、測定します。" @@ -12515,11 +12696,11 @@ msgid "_Number points" msgstr "ポイント数" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "クリア" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "マーク" @@ -12591,7 +12772,7 @@ msgid "Create _Points" msgstr "ポイントの作成" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "面ベクトルを保存" @@ -12600,44 +12781,44 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f deg, φ = %.2f deg" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." msgstr "/特徴抽出/面の解析…" -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "面角度を測定する" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 #, fuzzy msgid "_Facet plane size" msgstr "面の平面サイズ:" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "許容範囲" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "選択したφ" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "選択されたθ" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "面を測定する" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "測定" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "ポイント" @@ -12873,7 +13054,7 @@ msgid "Clear the entire filter mask" msgstr "フィルタマスク全体をクリアする" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "フィル" @@ -12893,7 +13074,7 @@ msgid "Zoom:" msgstr "ズーム：" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "出力オプション" @@ -12962,7 +13143,7 @@ msgid "Triangle" msgstr "三角" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "四角" @@ -13010,7 +13191,7 @@ msgstr "ランダム繊維" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "形状" @@ -13041,7 +13222,7 @@ msgstr "フィット形状" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "どちらも" @@ -13300,6 +13481,7 @@ msgstr "マスクの作成" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "Trim fraction" @@ -14322,7 +14504,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "ライン欠陥(主に実験的アルゴリズム)を修正します。" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/データ補正/ステップライン補正" @@ -14338,31 +14520,31 @@ msgid "Mark lines with inverted sign" msgstr "線に反転記号を付けます" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "多項式" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "変位の中央値" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "モーダス" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "マッチング" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "トリム平均" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "範囲指定された変位平均" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "面レベルの傾き" @@ -14370,7 +14552,7 @@ msgid "Aligns rows by various methods." msgstr "さまざまな方法でスキャンラインをレベリングします。" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/データ補正/ラインレベリング…" @@ -14406,7 +14588,7 @@ msgid "Steps" msgstr "ステップ" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "傷跡" @@ -14415,7 +14597,7 @@ msgstr "尾根" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "チルト" @@ -14564,7 +14746,7 @@ msgid "_Hessian" msgstr "Hessian" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "正則化パラメータ" @@ -14589,10 +14771,12 @@ msgstr "他の部分と繋がっていない値の部分をマーク" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "正" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "ネガ反転" @@ -14726,7 +14910,7 @@ msgid "Two-sided" msgstr "両面" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "境界から縮小" @@ -14850,115 +15034,135 @@ msgid "Shift Mask" msgstr "マスク移動" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "相関関係を使用して、別の画像の詳細を検索します。" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/複数のデータ処理/相関探索…" -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "相関を使用した詳細の検索" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "相関、生" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "相関、平準化" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "相関スコア" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "高さ差、生" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "高さ差、平準化済み" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "高さ差スコア" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "位相のみ" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "マークされたオブジェクト" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "相関最大" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "相関メソッド" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "マスクを使用" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "マスクをプロット" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "検索の詳細" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "相関検索" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "マスクによる基本的な操作:反転、除去、抽出。" -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/マスク/マスクを削除" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "データからマスクを削除する" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/マスク/マスクを反転" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "マスクを反転" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/マスク/マスクを抽出" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "新しいイメージにマスクを抽出する" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +#, fuzzy +msgid "/_Grains/_Extract Numbers" +msgstr "/マスク/マスクを抽出" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "新しいイメージにマスクを抽出する" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/粒子/端にあるもの削除" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "画像の枠に接している粒子を削除する" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/マスク/細くする" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "マスクを細くする" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "粒子数" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "2つのイメージの交差する領域を切り取ります。" @@ -15103,7 +15307,7 @@ msgid "Second image" msgstr "2 番目の画像" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "平均" @@ -15464,7 +15668,7 @@ msgid "Use _first mask for all images" msgstr "すべての画像の1番目のマスクを使用" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "モード" @@ -15557,8 +15761,8 @@ msgid "Re_initialize" msgstr "再初期化" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "マスクモード" @@ -16108,6 +16312,65 @@ msgid "Pile Up Shapes" msgstr "図形を積み重ねる" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "位相分離構造を生成します。" + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/合成・生成/パターン…" + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "ドメインを含むイメージを生成する" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "最大幅" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "最小" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Size spread:" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "Top fraction:" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "サイズでスケーリング" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "高さ:" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "ランダム線形" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "線の生成中…" + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "水平面に多項式歪みを適用." @@ -16168,10 +16431,6 @@ msgid "_Vertical polynomial degree" msgstr "垂直方向の多項式次数" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "最大次数" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "同じ次数" @@ -16188,6 +16447,10 @@ msgid "Copy table to clipboard" msgstr "テーブルをクリップボードにコピー" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "テーブルの保存" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "画像処理との基本的な操作:抽出、除去。" @@ -16328,8 +16591,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "伝達関数" @@ -16349,7 +16612,7 @@ msgid "Transfer function estimation" msgstr "伝達関数推定" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/統計処理/伝達関数推定…" @@ -16357,15 +16620,15 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "既知のデータと理想的な画像から伝達関数を推定する" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "正規化されたフィルタ" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "最小二乗数" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "Wienerフィルター" @@ -16373,19 +16636,19 @@ msgid "_Border" msgstr "Border" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "イメージが小さすぎます。" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "伝達関数推定" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "Fit シグマ" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "伝達関数サイズ" @@ -16404,23 +16667,23 @@ msgid "Transfer Function" msgstr "伝達関数" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "TF幅" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "TFの高さ" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "TF norm" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "Difference norm" @@ -16543,7 +16806,7 @@ msgid "Proportion" msgstr "割合" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "オフセット" @@ -16762,7 +17025,7 @@ msgid "_Assume symmetry" msgstr "対称的なトリム" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "データの回転" @@ -16839,23 +17102,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "水平傷跡(ストローク)を修正する" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "傷跡の種類" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "Hardしきい値" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "Softしきい値" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "最小幅" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "最大幅" @@ -17109,14 +17372,6 @@ msgid "Marked terraces" msgstr "マーク付きテラス" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "_Step検出カーネル" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "ステップ検出しきい値" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "最小テラス面積" @@ -17125,23 +17380,6 @@ msgid "Do not _segment, use only mask" msgstr "分割せずマスクのみを使用する" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "最小次数" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "最小拡大" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "最大拡大" - -#: modules/process/terracefit.c:841 -#, fuzzy -msgid "Survey cannot be run with independent heights." -msgstr "独立度で測量を実行することはできません。" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "下限/上限しきい値を使用してデータ範囲を制限" @@ -17186,7 +17424,7 @@ msgid "Limit Range" msgstr "制限範囲" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "全範囲に設定" @@ -17887,134 +18125,134 @@ msgid "Function written in Python" msgstr "Pythonで書かれた関数" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "相関長ツール。" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "なし" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "ラインレベリング" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "統計量の保存" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "相関長" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "相関長 T" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "イメージ サイズとの関係" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "選択した領域" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i at (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v at (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "ナイーブ ACF は 1/e に減衰" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "外挿 ACF 減衰が 1/e" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "ACF がゼロに減衰" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "PSDF ガウシアン フィット" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "PSDF指数適合" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "比率α = T/L" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "Tで測定された画像サイズ" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "水平および/または垂直スキャンラインを読み取るプロファイルツール。" -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "ゼロで交差" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "軸に沿ったプロファイル" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "水平および垂直プロファイルの読み取り" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "プロファイル" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "オプション" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "垂直プロファイル%d" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "水平プロファイル%d" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "切り抜きツールは、データを小さいサイズに切り抜きます。" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "距離測定ツールは、距離と角度を測定します。" +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "距離テーブルの保存" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "行数" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "ポイント間の距離と方向を測定する" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "距離テーブルの保存" - #: modules/tools/filter.c:117 #, fuzzy msgid "" @@ -18071,7 +18309,7 @@ "Grain removal tool, removes continuous parts of mask and/or underlying data." msgstr "粒子除去ツールは、マスクや基礎データの連続部分を削除します。" -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "ラプラス ソルバー" @@ -18079,7 +18317,7 @@ msgid "Fractal correction" msgstr "フラクタル補正" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "フラクタル・ラプラスブレンド" @@ -18087,7 +18325,7 @@ msgid "Remove" msgstr "削除" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "内挿方法" @@ -18099,7 +18337,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "個々の粒を除去する(マスクの連続部分)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -18108,69 +18346,78 @@ "ずれかで、偽のカラースケールにマップする必要があるデータ範囲を選択することが" "できます。" -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "星" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +#, fuzzy +msgid "_Adapt color range to selection" +msgstr "自動色範囲（末尾カット）" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "カラー範囲" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "色範囲をデータの一部分に合わせる" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "最小値から最大値までの範囲で色をつける" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "指定範囲で色を設定" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "自動色範囲（末尾カット）" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "適応非線形カラーマッピング" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "デフォルト" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "高さヒストグラム" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "カラー範囲" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "マスク適用" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "マスク解除" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "反転マッピング" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "データ範囲:" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -18179,7 +18426,7 @@ "3つの選択した点を通して合った平面を差し引くことによってデータをレベリングしま" "す。" -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "平均半径" @@ -18199,134 +18446,138 @@ msgid "Level data by fitting a plane through three points" msgstr "平面を 3 つの点に合わせデータをレベリング" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." msgstr "行/列統計関数ツール、平均値、中央値、最大値、最小値、RMSなど" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "行" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "列" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "行/列統計" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "行/列統計関数の計算" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "マスクエディタツールは、マスクの部分のインタラクティブな変更を可能にします。" -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "形状" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "描画ツール" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "マスクを選択に設定する" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "マスクに選択範囲を追加する" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "マスクから選択範囲を引く" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "マスクと選択範囲を交差させる" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "長方形" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "楕円形状" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "細い線" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "フリーハンドでマスク描画" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "フリーハンドでマスク削除" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "連続した空の領域をマスクで塗りつぶす" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "マスクの連続部分を消去する" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "量" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "単純接続されていない部分を塗りつぶし" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "成長による粒子の融合を防ぐ" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "マスクエディタ" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "マスクの編集" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "エディタ" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "アクション" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "成長/縮小" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "反転" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "空白塗りつぶし" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "成長" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "縮小" @@ -18344,103 +18595,108 @@ msgid "Level rows using intersections with given lines" msgstr "指定された線と交差を使用して行をレベリング" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "プロファイルツールは、選択した線からプロファイルグラフを作成します。" -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "なし" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "プロファイルを分離" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "プロファイルを表示" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "キャリブレーションデータ" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "任意の線に沿ったプロファイルの抽出" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "方向を改善" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "すべて改善" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "X エラー %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Y エラー %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Z エラー %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "X不確実性 %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Y不確実性 %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Z不確実性 %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Zunc up bound %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Zunc low bound %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "ポインタツールは、ポインタの下の値を読み取ります。" -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "選択を表示する" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +#, fuzzy +msgid "Adapt color range to detail" +msgstr "自動色範囲（末尾カット）" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "値を読み取る" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "マウス カーソルの下の値を読み取る" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "ゼロ設定" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "面" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "曲率" @@ -18448,16 +18704,16 @@ msgid "Calculate surface profile parameters." msgstr "表面プロファイル パラメータを計算します。" -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "テクスチャ" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "うねり" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "粗さ" @@ -18469,7 +18725,7 @@ msgid "BRC" msgstr "BRC" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "ピーク数" @@ -18481,182 +18737,182 @@ msgid "Calculate roughness parameters" msgstr "粗さパラメータの計算" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "粗さパラメータ" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "選択されたライン" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "カットオフ" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "平均粗さ" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "RMS粗さ" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "粗さの最大高さ" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "粗さの最大谷深さ" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "粗さの最大ピーク高さ" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "粗さの平均最大高さ" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "粗さの平均最大谷深さ" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "粗さの平均最大ピーク高さ" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "3番目に低い谷と3番目に高い谷ピークの平均高さ" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "平均最大高さ" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "粗さのピークから谷までの最大高さ" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "歪み" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "尖度" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "うねり平均" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "RMSうねり" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "うねり最大高さ" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "プロファイルの最大高さ" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "空間" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "プロファイルの不規則性の平均間隔" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "プロファイルの平均波長" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "プロファイルの二乗平均平方根 (RMS) 波長" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "ハイブリッド" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "平均絶対傾斜角" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "ルート平均平方根 (RMS) 勾配" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "展開したプロファイル長さ" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "プロファイル長さ比" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "ハイブリッド" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "新しい高さ" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 #, fuzzy msgid "No profile in the image selected." msgstr "画像内のポイントが選択されていません。" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "振幅分布関数" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "ベアリング比曲線" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "表面プロファイル" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "角度平均プロファイル グラフを作成します。" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "放射状プロファイル" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "角度平均プロファイルを抽出する" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "放射状プロファイル" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "対称に" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "すべて対称に" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "放射状プロファイル %d" @@ -18693,7 +18949,7 @@ msgid "_Copy" msgstr "コピー" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -18702,35 +18958,45 @@ "統計関数ツールは、データの選択された部分の1次元統計関数(高さ分布、相関、" "PSDF、ミンコウスキー機能)を計算する。" -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "ラジアルPSDF" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "角度スペクトル" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "ラジアルACF" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Minkowski volume" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Minkowski boundary" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Minkowski connectivity" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "エリアスケールグラフ" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +#, fuzzy +msgid "IDF" +msgstr "ADF" + +#: modules/tools/sfunctions.c:187 +#, fuzzy +msgid "Radial IDF" +msgstr "ラジアルPSDF" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "Separate uncertainty" @@ -18758,7 +19024,7 @@ msgid "Spectroscopy" msgstr "スペクトロスコピー" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -18766,155 +19032,194 @@ "スポット削除ツールは、選択したアルゴリズムを使用して、データの小さな部分 " "(ズームされたビューに表示) を補間します。" -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "双曲線平坦化" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "擬似ラプラス" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "フラクタル補間" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "楕円" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "スポットを削除する" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "小さな欠陥を補間(手動で選択)" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "画像内のポイントが選択されていません。" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "ズーム領域が選択されていません。" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "統計ツール。" -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "統計量" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "モーメントベース" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "次数ベース" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "その他" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "平均値" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "RMS の粗さ" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "RMS(粒状)" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "平均粗さ" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "最大ピーク高さ" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "最大ピット深さ" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "高さ上限" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "表面勾配" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "スキャンラインの不一致" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +#: modules/volume/volume_addframe.c:113 +#, fuzzy +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/基本操作/値反転" + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +#: modules/volume/volume_addframe.c:132 +#, fuzzy +msgid "Data to insert" +msgstr "データ ブラウザ" + +#: modules/volume/volume_addframe.c:170 +#, fuzzy +msgid "Frame added" +msgstr "同じエリア" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "現在のイメージを置換" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "ボリュームデータを使用した単純な算術演算。" -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/数値計算…" +#: modules/volume/volume_arithmetic.c:159 +#, fuzzy +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/基本操作/傾き…" -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "ボリューム・データに対する算術演算" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "Z軸キャリブレーションが異なる" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "ボリューム データを単純な ASCII 形式でエクスポートします。" -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/テキストエクスポート…" +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." +msgstr "/基本操作/拡張…" -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "ボリューム データをテキスト ファイルにエクスポートする" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "VTK structured grid" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "1ラインに1つのZプロファイル" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "1ラインに1つのXYレイヤー" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "空白行で区切られた行列" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "Precision:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "ボリュームデータ" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" "ボリューム データのディメンションまたは値の範囲をキャリブレーションします。" -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/次元と単位…" - #: modules/volume/volume_calibrate.c:170 #, fuzzy msgid "Match voxel size" @@ -18949,7 +19254,7 @@ msgstr "X補正係数" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "新しいボリューム データの作成" @@ -18963,24 +19268,97 @@ msgid "Z Dimension" msgstr "大きさ" -#: modules/volume/volume_equiplane.c:140 -msgid "Extracts z-coordinates of isosurfaces from volume data to an image." -msgstr "ボリューム データからイメージに等値面の Z 座標を抽出します。" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" -#: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "/等値画像…" +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/データ補正/自動回転補正…" -#: modules/volume/volume_equiplane.c:158 -msgid "Extract z-coordinates of isosurface" -msgstr "等値面の Z 座標を抽出する" +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "推定シフト:" -#: modules/volume/volume_equiplane.c:206 modules/volume/volume_zposlevel.c:218 -msgid "_Result" -msgstr "結果" +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "画像抽出" -#: modules/volume/volume_equiplane.c:252 -msgid "Extract Z Isosurfaces" +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "切り抜きデータ" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "Z:" + +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "第二方向" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "水平単位" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "y 軸ドリフト" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Zドリフト" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "z 軸ドリフト" + +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "ドリフト補正" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "推定シフト:" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "L-curve データ計算中…" + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "ボリュームデータの作成…" + +#: modules/volume/volume_equiplane.c:140 +msgid "Extracts z-coordinates of isosurfaces from volume data to an image." +msgstr "ボリューム データからイメージに等値面の Z 座標を抽出します。" + +#: modules/volume/volume_equiplane.c:154 +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/等値画像…" + +#: modules/volume/volume_equiplane.c:158 +msgid "Extract z-coordinates of isosurface" +msgstr "等値面の Z 座標を抽出する" + +#: modules/volume/volume_equiplane.c:206 modules/volume/volume_zposlevel.c:218 +msgid "_Result" +msgstr "結果" + +#: modules/volume/volume_equiplane.c:252 +msgid "Extract Z Isosurfaces" msgstr "Z 等値面を抽出する" #: modules/volume/volume_equiplane.c:338 modules/volume/volume_zposlevel.c:349 @@ -18996,80 +19374,98 @@ msgid "Isosurface z for %.*f %s" msgstr "Isosurface z for %.*f %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "ボリューム データの 3D像を表示" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/3Dビュー…" +#: modules/volume/volume_extract.c:197 +#, fuzzy +msgid "/_Basic Operations/3D View..." +msgstr "/基本操作/傾き…" -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "ボリューム データの 3D ビューを表示する" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "ボリュームデータ" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "レンダリング" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "画像の保存" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "ワイヤフレームのしきい値" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "不透明度スケール" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "パースペクティブの適用" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "インスタント3Dレンダリング" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "X ビュー" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Y ビュー" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Z ビュー" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "レンダリングされたイメージはありません" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "3D ビューをエクスポート" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "画像の保存中にCairoからエラーが発生しました" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "ワイヤフレームモデルの構築…" +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "すべての XY 平面から外れ値を削除" + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/データ補正/スカーの削除" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "すべての XY 平面をレベリング" + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "多平面レベリング" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "フォースボリュームカーブの評価" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." +#, fuzzy +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/フォースカーブ評価…" #: modules/volume/volume_fdfit.c:217 @@ -19092,10 +19488,6 @@ msgid "Inverts value in volume data" msgstr "ボリュームデータの値を反転" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/反転値" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "ボリュームデータの値を反転する" @@ -19105,7 +19497,8 @@ msgstr "ボリューム データの K-平均法によるクラスタリングを計算します。" #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Means Clustering..." msgstr "/k平均法…" #: modules/volume/volume_kmeans.c:113 @@ -19169,7 +19562,8 @@ msgstr "ボリューム データの k中央値のクラスタリングを計算します。" #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Medians Clustering..." msgstr "/k中央値法…" #: modules/volume/volume_kmedians.c:106 @@ -19205,8 +19599,9 @@ msgstr "新しいボリューム データの作成" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/基本操作/傾き…" #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -19238,12 +19633,31 @@ msgid "Z calibration" msgstr "キャリブレーション" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "ラインレベリング" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "ラインレベリング" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "ボリューム データのプロファイルをチャネルに要約します。" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." msgstr "/プロファイルの要約…" #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 @@ -19263,8 +19677,37 @@ msgid "Summarize Volume Profiles" msgstr "ボリュームプロファイルの要約" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/SPMモード/ティップ/拡張…" + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "新しい幅" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "フィッティング結果" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Zキャリブレーション曲線" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." msgstr "/磁気力データを力勾配へ…" #: modules/volume/volume_mfmrecalc.c:233 @@ -19296,8 +19739,9 @@ msgstr "すべての XY 平面から外れ値を削除" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/XY平面の外れ値" +#, fuzzy +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/データ補正/はずれ値のマスク" #: modules/volume/volume_outliers.c:62 msgid "Remove outliers from XY planes" @@ -19308,19 +19752,26 @@ msgstr "すべての XY 平面をレベリングする" #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/XY平面レベリング" +#, fuzzy +msgid "/_Correct Data/_XY Plane Level" +msgstr "/データ補正/スカーの削除" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "すべての XY 平面をレベリング" +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "レベル %d" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "ボリュームデータ平面を プレーンをグラフにまとめます。" #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." +#, fuzzy +msgid "/_Statistics/Summarize P_lanes..." msgstr "/平面要約…" #: modules/volume/volume_planestat.c:249 @@ -19336,72 +19787,113 @@ msgid "Summarize Volume Planes" msgstr "ボリュームデータ平面の要約" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "ボリューム PSF を計算します。" -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/伝達関数推定…" - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "既知のデータと理想的な画像から伝達関数を推定する" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "理想的な応答:" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "方法:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "シグマ:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "各レベルのシグマを見積もり" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "各レベルの見積もりサイズ" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "ウィンドウタイプ:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "Zレベル:" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "Zレベルでシグマフィット:" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "Border:" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "表示:" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "伝達関数の計算中…" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "Volume TF" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "z レベル" +#: modules/volume/volume_removeframe.c:91 +#, fuzzy +msgid "Remove one frame from volume data stack" +msgstr "データからマスクを削除する" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/基本操作/リサンプリング…" + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "すべての XY 平面をレベリングする" + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "画像抽出" + +#: modules/volume/volume_removeframe.c:165 +#, fuzzy +msgid "Frame removed" +msgstr "粒子除去" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "すべての XY 平面をレベリング" + +#: modules/volume/volume_removeframe.c:236 +#, fuzzy +msgid "_Remove Current Level" +msgstr "Like Current Image" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "ユーザーの選択に基づいて連続データのフェーズを入れ替える" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." +#, fuzzy +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/位相の調整..." #: modules/volume/volume_rephase.c:168 @@ -19453,13 +19945,38 @@ msgid "Volume Z graphs" msgstr "ボリューム Z グラフ" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "/データ補正/スカー(傷跡)をマーク…" + +#: modules/volume/volume_scars.c:119 +#, fuzzy +msgid "Remove scars in all levels" +msgstr "画像の枠に接している粒子を削除する" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "ドリフト補正" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "球を回転中…" + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "ボリューム データからイメージ プレーンと線グラフを抽出します。" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/カットとスライス…" +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/基本操作/スケール…" #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19523,6 +20040,26 @@ msgid "Volume Y graphs" msgstr "ボリューム Y グラフ" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "射出補正" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "すべての XY 平面から外れ値を削除" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "アフィン補正" + +#: modules/volume/volume_stepline.c:91 +#, fuzzy +msgid "Step line corrected" +msgstr "接着力:" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "Single value evolution" @@ -19536,7 +20073,8 @@ msgstr "Checks the stray field dependence consistency." #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." msgstr "/_Stray Field Consistency..." #: modules/volume/volume_strayfield.c:254 @@ -19551,69 +20089,187 @@ msgid "Building stray field dependence..." msgstr "Building stray field dependence..." -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "ボリュームデータの軸を入れ替えます。" -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/軸の入れ替え…" +#: modules/volume/volume_swaxes.c:96 +#, fuzzy +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/基本操作/スケール…" -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "軸の入れ替え" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X(反転)" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y(反転)" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z(反転)" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" -msgstr "ボリューム軸の入れ替え" - -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:123 +#, fuzzy +msgid "Current _X axis will become" msgstr "現在のX軸は次のようになります:" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:125 +#, fuzzy +msgid "Current _Y axis will become" msgstr "現在のY軸は次のようになります:" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:127 +#, fuzzy +msgid "Current _Z axis will become" msgstr "現在のZ軸は次のようになります:" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" +msgstr "ボリューム軸の入れ替え" + +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "Z軸のキャリブレーションは失われます。" +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "ボリュームデータを使用した単純な算術演算。" + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/基本操作/傾き…" + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "ボリューム・データに対する算術演算" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "ボリュームデータ" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "画像" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "すべての XY 平面をレベリングする" + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/SPMモード/ティップ/拡張…" + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "3 つのチャネルを XYZ データに変換" + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "Xオフセット" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "閉じたカーブ" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "Yオフセット" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "Yオフセット" + +#: modules/volume/volume_xystitch.c:133 +#, fuzzy +msgid "_Flip X axis" +msgstr "Z 軸を反転" + +#: modules/volume/volume_xystitch.c:134 +#, fuzzy +msgid "_Flip Y axis" +msgstr "Z 軸を反転" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/位相の調整..." + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "回転をリセット" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "検索範囲" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "回転" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "スティッチング" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "スティッチング" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "フィッティング" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "ボリュームデータのZ軸キャリブレーションを付与、抽出、削除します。" #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/Zキャリブレーション…" +#, fuzzy +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/基本操作/傾き…" #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -19685,7 +20341,8 @@ msgstr "Z カーブの値を、定義された位置で 0 にシフトします。" #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." +#, fuzzy +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "/値をゼロにシフト…" #: modules/volume/volume_zposlevel.c:166 @@ -19698,13 +20355,33 @@ msgstr "Zレベル = %dの場合は 0 にシフト" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/抽出プレビュー" +#, fuzzy +msgid "/_Basic Operations/Extract _Preview" +msgstr "/基本操作/時計回りに回転" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "ボリュームデータプレビューをイメージに抽出する" +#: modules/xyz/xyz_autocrop.c:46 +#, fuzzy +msgid "Simple XYZ automated crop." +msgstr "シンプルなXYZデータレベリング…" + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "サイズを自動スケールする" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "切り抜き" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "XYZデータのドリフトを分析します。" @@ -19733,18 +20410,6 @@ msgid "Y drift" msgstr "Yドリフト" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "y 軸ドリフト" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Zドリフト" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "z 軸ドリフト" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "XYZドリフトの解析" @@ -19985,6 +20650,84 @@ msgstr "マージ" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "多平面レベリング…" + +#, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/データ補正/ラインレベリング…" + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/データ補正/ステップライン補正" + +#~ msgid "_Step detection kernel:" +#~ msgstr "ステップ検出カーネル:" + +#~ msgid "Step detection _threshold:" +#~ msgstr "ステップ検出しきい値:" + +#~ msgid "Step _broadening:" +#~ msgstr "ステップ拡大:" + +#~ msgid "_Polynomial degree:" +#~ msgstr "多項式の次数:" + +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "最小次数:" + +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "最大次数:" + +#~ msgid "Minimum broadening:" +#~ msgstr "最小拡大:" + +#~ msgid "Maximum broadening:" +#~ msgstr "最大拡大:" + +#~ msgid "Survey cannot be run with independent degrees." +#~ msgstr "独立度で測量を実行することはできません。" + +#~ msgid "/_Arithmetic..." +#~ msgstr "/数値計算…" + +#~ msgid "/Export _Text..." +#~ msgstr "/テキストエクスポート…" + +#~ msgid "_Precision:" +#~ msgstr "Precision:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/次元と単位…" + +#~ msgid "/3D View..." +#~ msgstr "/3Dビュー…" + +#~ msgid "/_Invert Value" +#~ msgstr "/反転値" + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/XY平面の外れ値" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/XY平面レベリング" + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/伝達関数推定…" + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/カットとスライス…" + +#~ msgid "/S_wap Axes..." +#~ msgstr "/軸の入れ替え…" + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/Zキャリブレーション…" + +#~ msgid "/Extract _Preview" +#~ msgstr "/抽出プレビュー" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "水平サイズ" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/ko.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/ko.gmo differ diff -Nru gwyddion-2.62/po/ko.po gwyddion-2.63/po/ko.po --- gwyddion-2.62/po/ko.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/ko.po 2023-06-13 13:20:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2021-06-11 15:48+0200\n" "Last-Translator: Jeong Jiseong \n" "Language-Team: Korean_gwyddion\n" @@ -148,9 +148,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -166,7 +166,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "제목 없음" @@ -298,39 +298,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "네" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "아니오" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -401,8 +401,8 @@ msgid "Maximum value" msgstr "최대 값" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "평균 값" @@ -428,11 +428,11 @@ msgid "Pixel area" msgstr "픽셀 면적" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "투영 면적" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "표면 면적" @@ -540,13 +540,13 @@ msgid "Direction of maximum Martin diameter" msgstr "" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "" @@ -562,11 +562,11 @@ msgid "Curvature center z value" msgstr "" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "" @@ -599,14 +599,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "위치" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "값" @@ -616,7 +616,7 @@ msgstr "면적" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "부피" @@ -629,7 +629,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "기울기" @@ -687,12 +687,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "수평의" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "수직의" @@ -733,13 +733,13 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 #, fuzzy msgid "Round" msgstr "둥근" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "선형적인" @@ -1348,7 +1348,7 @@ msgid "Hide full controls" msgstr "" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "" @@ -1401,12 +1401,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1415,7 +1415,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1425,20 +1425,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1491,11 +1492,11 @@ msgstr "조명(I) θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1518,7 +1519,7 @@ msgid "Maximum z value" msgstr "Z 최대값" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "라벨(L):" @@ -1611,7 +1612,7 @@ msgstr "숨김" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "점" @@ -1669,7 +1670,7 @@ msgid "_Line type:" msgstr "선 종류(L):" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "선 굵기(H):" @@ -1691,7 +1692,7 @@ msgid "Diamond" msgstr "다이아몬드" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "십자가" @@ -1765,7 +1766,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "모드" @@ -1802,8 +1803,8 @@ msgstr "" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "그래프" @@ -1811,7 +1812,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "데이터" @@ -1850,12 +1851,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "길이" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1863,7 +1864,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "높이" @@ -1890,8 +1891,8 @@ msgstr "선호 방법" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "이름" @@ -1928,12 +1929,12 @@ msgid "A_dd symbol" msgstr "기호 추가(D)" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "미리보기" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "%s 파일을 읽을수 없습니다. " @@ -2093,35 +2094,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "평균" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "최소" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "최대" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "최소 위치" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "최대 위치" @@ -2131,7 +2132,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "" @@ -2159,42 +2161,42 @@ msgid "Change Curve Map Preview" msgstr "볼륨 데이터 미로보기 바꾸기" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "알 수 없는 채널 %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "알 수 없는 볼륨 %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, fuzzy, c-format msgid "Unknown XYZ %d" msgstr "알 수 없는 볼륨 %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "알 수 없는 볼륨 %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, fuzzy, c-format msgid "Points: %d" msgstr "점" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "곡선" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "" @@ -2262,11 +2264,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "" @@ -2313,7 +2315,7 @@ msgid "Open File" msgstr "파일 열기" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2466,65 +2468,65 @@ msgid "Cannot preview" msgstr "미리보기가 불가능합니다. " -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "" -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "" -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "" -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "" -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "" -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "" -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "헤더 파일 %u에 키 값이 비어있습니다. " -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 #, fuzzy msgid "Horizontal size" msgstr "수평의" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 #, fuzzy msgid "Vertical size" msgstr "수직의" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2535,7 +2537,7 @@ msgstr "폭" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2553,7 +2555,7 @@ msgstr "높이" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2561,14 +2563,14 @@ msgstr "정사각형" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "면적 및 단위" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2583,21 +2585,22 @@ msgstr "" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "" @@ -2616,28 +2619,28 @@ msgid "Generated" msgstr "" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "%s 파일에 작성할 수 없습니다. " -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "" -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "레이어 모듈을 ." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2646,31 +2649,31 @@ "이 도구를 사용하기 위해서는 %s 종류의 레이어가 필요합니다만 현재 설치가 되어 " "있지 않은 것 같습니다. 설치환경을 다시 확인 바랍니다. " -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "선택된 대상 지우기" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "원점" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "크기" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "폭" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 #, fuzzy msgid "Save Results to File" msgstr "표를 파일로 저장" @@ -2730,7 +2733,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "ko" @@ -2751,7 +2754,7 @@ msgid "_Close" msgstr "닫기(C)" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "종류" @@ -2759,11 +2762,11 @@ msgid "Function" msgstr "기능" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "변수" @@ -2822,8 +2825,8 @@ msgid "_New" msgstr "새로 만들기(N)" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "삭제하기(D)" @@ -2841,100 +2844,126 @@ msgid "Save Metadata" msgstr "메타데이터 저장하기" -#: app/param-def.c:337 +#: app/param-def.c:338 #, fuzzy msgid "_Masking" msgstr "마스크(M)" -#: app/param-def.c:341 +#: app/param-def.c:342 #, fuzzy msgid "_Interpolation type" msgstr "교차점" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "방향(D)" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "" -#: app/param-def.c:353 +#: app/param-def.c:354 #, fuzzy msgid "_Windowing type" msgstr "선 종류(L):" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 #, fuzzy msgid "_Distance type" msgstr "선 종류(L)" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "그리기 스타일(S)" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "" -#: app/param-def.c:837 +#: app/param-def.c:838 #, fuzzy msgid "_Mask color" msgstr "마스크 색상(C)..." -#: app/param-def.c:875 +#: app/param-def.c:876 #, fuzzy msgid "Target _graph" msgstr "그래프 그리기(G)" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "곡선" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "부분:" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "켈리브레이션" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "부분:" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 #, fuzzy msgid "New graph" msgstr "그래프 자르기" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2960,40 +2989,40 @@ msgid "Set selected item as default" msgstr "선택된 아이템을 기본값으로 설정" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "작성하기 위해 파일 %s를 열수 없습니다. " -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "%s의 파일 내용을 읽을 수 없습니다. " -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "파일이 비어있습니다. " -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "" -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "" -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "" @@ -3110,66 +3139,66 @@ "tarball." msgstr "" -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "사용 허가" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "특징" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "개발자" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "번역가" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "본 개발은 Czech Metrology Institute의 지원을 : " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "OpenGL 3D 뷰" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "원격제어" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, fuzzy, c-format msgid "Released %s" msgstr "배포됨 %s\n" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "" @@ -3673,7 +3702,7 @@ msgstr "편집(E)" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "제거(R)" @@ -3685,7 +3714,7 @@ msgid "Move _Down" msgstr "" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "" @@ -3748,7 +3777,7 @@ msgid "XYZ Data" msgstr "데이터" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "도구" @@ -3996,7 +4025,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "방법" @@ -4010,7 +4039,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 #, fuzzy msgid "Output _type" @@ -4106,31 +4135,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/기본 기능(B)/기울이기(T)..." -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "데이터 잘라내기" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "X(X)" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "Y(Y)" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "잘라내기" @@ -4139,34 +4170,36 @@ msgid "New Dimensions" msgstr "면적 및 단위" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "옵션" @@ -4235,7 +4268,7 @@ msgstr "그래프 곡선의 높이 레벨 맞추기" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "" @@ -4350,7 +4383,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "" @@ -4426,49 +4459,54 @@ msgid "Convert FZ to FD Curve" msgstr "FD 곡선 맞춤" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "범위" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "" @@ -4498,8 +4536,8 @@ msgstr "미리보기가 불가능합니다. " #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 #, fuzzy msgid "_Quantity" @@ -4508,7 +4546,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 #, fuzzy msgid "Output type" msgstr "출력 종류" @@ -4547,7 +4585,7 @@ msgstr "차이" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 #, fuzzy msgid "_Degree" msgstr "같은 차수(S)" @@ -4557,9 +4595,9 @@ msgid "_Show" msgstr "마스크 보기(S)" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "크기" @@ -4588,7 +4626,7 @@ msgid "Remove polynomial background from all curves" msgstr "다항식 배경값 제거하기" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "다항식 배경값 제거하기" @@ -4722,12 +4760,12 @@ msgid "Output images" msgstr "출력 종류" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "" @@ -4762,15 +4800,16 @@ msgid "DMT fit" msgstr "1D FFT 필터" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 #, fuzzy msgid "Fit Results" msgstr "점 크기(P):" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "" @@ -4789,20 +4828,20 @@ msgid "Remove sine background from all curves" msgstr "그래프 곡선 내 노이즈 제거 " -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "다항식 배경값 제거하기" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "" -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4829,52 +4868,52 @@ msgid "AIST-NT files (.aist)" msgstr "" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "" -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "" -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "" -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "" -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "" -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "" -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "" -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "" -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "" -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "" @@ -4955,16 +4994,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "" -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "" -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -4976,91 +5015,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "" -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "" -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "점을 소수점으로 사용하기" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "정밀도(P)" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "텍스트 내보내기" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "채널:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "폭:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "높이:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "값 단위:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "" -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "" -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "" -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "" @@ -5094,17 +5134,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "" -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "" -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "" @@ -5121,18 +5161,18 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "" -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "" -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" @@ -5270,29 +5310,29 @@ msgid "Scan size header field overlaps with data." msgstr "" -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "" -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "" -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "" -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " "format version." msgstr "" -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5300,60 +5340,64 @@ msgstr "" #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "" -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "" -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "" -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " "type." msgstr "" -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "" -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "" -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "" -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "" -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "" -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "" -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "" -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "" @@ -5379,7 +5423,7 @@ msgid "Garbage before first header section." msgstr "" -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "" @@ -5417,8 +5461,8 @@ msgid "FemtoScan SPM files" msgstr "" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "" @@ -5510,7 +5554,7 @@ msgid "Following features" msgstr "특징" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Z축 크기" @@ -5545,15 +5589,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5565,14 +5609,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 #, fuzzy msgid "Number of points" @@ -5593,24 +5638,24 @@ msgid "Z-range" msgstr "범위" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "" -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "" -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "" -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "" @@ -5641,77 +5686,55 @@ "Data deserialization succeeded, but resulted in an unexpected object %s." msgstr "" -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "" -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "" -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "" -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "" -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "" -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "" -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "" -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "" -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "" - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -#, fuzzy -msgid "Cannot obtain the uncompressed file size." -msgstr "%s 파일에 작성할 수 없습니다. " - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -#, fuzzy -msgid "Cannot read file contents." -msgstr "%s의 파일 내용을 읽을 수 없습니다. " - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "" @@ -5720,6 +5743,11 @@ msgid "End of file" msgstr "" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "" @@ -5742,11 +5770,28 @@ msgstr "" #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "" +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "" + +#: modules/file/gwyzip.h:703 +#, fuzzy +msgid "Cannot obtain the uncompressed file size." +msgstr "%s 파일에 작성할 수 없습니다. " + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +#, fuzzy +msgid "Cannot read file contents." +msgstr "%s의 파일 내용을 읽을 수 없습니다. " + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "" @@ -5769,50 +5814,54 @@ msgid "Export GXYZF" msgstr "내보내기(E)" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "채널" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 #, fuzzy msgid "XYZ data" msgstr "데이터" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "" -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "" -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "" -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "" -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5835,24 +5884,24 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 #, fuzzy msgid "_Horizontal size" msgstr "수평의" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 #, fuzzy msgid "_Vertical size" msgstr "수직의" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "정사각형" @@ -5913,12 +5962,12 @@ msgstr "" #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "" @@ -5927,7 +5976,7 @@ msgid "Failed to read image data." msgstr "필터링된 이미지(l)" -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "채널" @@ -5937,11 +5986,11 @@ msgid "Pages" msgstr "이미지 차이점" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "값" @@ -5972,7 +6021,7 @@ msgstr "" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" @@ -6013,410 +6062,410 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 #, fuzzy msgid "Crosses" msgstr "십자가" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." msgstr "" -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 #, fuzzy msgid "Select Color" msgstr "곡선 색상 설정" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 #, fuzzy msgid "Pi_xel size:" msgstr "점 크기(P):" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 #, fuzzy msgid "_Border width:" msgstr "새 너비(W):" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 #, fuzzy msgid "_Tick length:" msgstr "최소 길이(L)" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 #, fuzzy msgid "Colors" msgstr "색상" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 #, fuzzy msgid "_Background color:" msgstr "그리기 색상(O):" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 #, fuzzy msgid "Lateral scale" msgstr "GL 재료" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 #, fuzzy msgid "Hori_zontal gap:" msgstr "수평의" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 #, fuzzy msgid "_Vertical gap:" msgstr "수직방향(V)" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 #, fuzzy msgid "Colo_r:" msgstr "색상" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 #, fuzzy msgid "O_utline thickness:" msgstr "선 굵기(H):" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 #, fuzzy msgid "Draw _frame" msgstr "Grain number" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 #, fuzzy msgid "Fi_xed precision:" msgstr "정밀도(P):" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 #, fuzzy msgid "Fixed _kilo threshold:" msgstr "Soft threshold(S):" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 #, fuzzy msgid "Title" msgstr "제목 없음" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 #, fuzzy msgid "Posi_tion:" msgstr "위치" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 #, fuzzy msgid "Lateral" msgstr "GL 재료" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 #, fuzzy msgid "Values" msgstr "값" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 #, fuzzy msgid "Selection" msgstr "부분:" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 #, fuzzy msgid "Draw _numbers" msgstr "Grain number" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 #, fuzzy msgid "Marker _radius:" msgstr "곡률 반경 1" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "" @@ -6434,88 +6483,88 @@ "Invalid data address 0x%0x found. File is in some unknown format version." msgstr "" -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "" -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "" -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " "type ‘%s’." msgstr "" -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "" -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "" -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "" -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" @@ -6544,40 +6593,40 @@ msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "" -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 #, fuzzy msgid "Reading files..." msgstr "마스킹 모드" -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 #, fuzzy msgid "Creating volume data..." msgstr "3차원 데이터 값 반전" -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "" -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 #, fuzzy msgid "Cannot find any height channel." msgstr "도움말을 표시할 수 없습니다. " @@ -6596,11 +6645,11 @@ msgstr "" #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "" -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "" @@ -6735,7 +6784,7 @@ msgid "MetroPro files (.dat)" msgstr "" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "" @@ -6751,12 +6800,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, fuzzy, c-format msgid "Duplicate block %02x." msgstr "사본 만들기" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "" @@ -6793,32 +6842,32 @@ msgid "Unique id record is too short." msgstr "" -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "" -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "" -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "" @@ -6844,21 +6893,21 @@ msgid "Spectra data starts past the end of file." msgstr "" -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "" @@ -6878,7 +6927,7 @@ msgid "Nanonics files (.nan)" msgstr "" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6889,7 +6938,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -6911,7 +6960,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "" @@ -6925,12 +6974,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "" -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "" -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "" @@ -6962,11 +7011,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "" -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "" @@ -6993,21 +7042,21 @@ "transfer that attempts to store text platform-independently." msgstr "" -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 #, fuzzy msgid "Reading channels..." msgstr "마스킹 모드" -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "" -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "" -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "" @@ -7029,55 +7078,55 @@ msgid "Nanotop files (.spm)" msgstr "" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "" -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "" -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "" -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "" -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "" -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "" -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "" -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "" -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "" -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "" @@ -7094,7 +7143,7 @@ msgstr "" #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "" @@ -7102,7 +7151,7 @@ msgid "Import NMM Profile Set" msgstr "" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "" @@ -7133,13 +7182,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "" @@ -7224,17 +7273,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "" -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "" -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "" -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "" @@ -7297,7 +7346,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "" -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "" @@ -7367,7 +7417,7 @@ msgid "Header line starts with a colon." msgstr "" -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "" @@ -7401,46 +7451,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "" -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "" -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "" -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "" #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "" @@ -7464,7 +7514,7 @@ msgstr "" #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "" @@ -7546,38 +7596,38 @@ "of available formats depends on available GDK pixbuf loaders." msgstr "" -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 #, fuzzy msgid "Use" msgstr "사용자" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 #, fuzzy msgid "_Hue offset" msgstr "로그 지우기" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "" -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "" -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "" -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7627,7 +7677,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "" -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "" @@ -7655,21 +7705,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "마스킹 모드" -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "3차원 데이터 값 반전" @@ -7740,220 +7786,220 @@ msgid "Quesant files (.afm)" msgstr "" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." msgstr "" -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "값" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 #, fuzzy msgid "Start at _offset" msgstr "로그 지우기" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 #, fuzzy msgid "_Sample size" msgstr "점 크기(P):" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "" -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "파일" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "%c는 허용되지 않는 연산자 입니다. " -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -7961,45 +8007,45 @@ "`%s' is only %u bytes." msgstr "" -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" "The contents of `%s' does not match format: %s." msgstr "" -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8017,8 +8063,8 @@ msgid "_Title" msgstr "제목 없음" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "" @@ -8066,36 +8112,36 @@ msgid "Random points order unsupported" msgstr "" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "" -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "" -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "" -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "" -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "" -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "" @@ -8108,17 +8154,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "" -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "" @@ -8153,7 +8199,7 @@ msgid "data ranges" msgstr "" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "" @@ -8229,16 +8275,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "" -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "" @@ -8250,15 +8296,15 @@ msgid "Sensolytics text files (.dat)" msgstr "" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "" -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "" @@ -8279,31 +8325,31 @@ msgid "SIS files (.sis)" msgstr "" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "" @@ -8606,34 +8652,34 @@ msgid "Unknown data type `%s'." msgstr "" -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 #, fuzzy msgid "Exports data as simple XYZ text file." msgstr "텍스트 파일로 그래프 데이터 내보내기" -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 #, fuzzy msgid "Lateral units:" msgstr "값 단위:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 #, fuzzy msgid "Export XYZ" msgstr "내보내기(E)" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "" -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "" @@ -8667,12 +8713,12 @@ msgid "Data line %u does not contain four items." msgstr "" -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "" -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "" @@ -8703,9 +8749,8 @@ msgid "Fit Graph" msgstr "" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "" @@ -8714,28 +8759,18 @@ msgid "F_unction:" msgstr "" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8787,27 +8822,27 @@ msgid "Results\n" msgstr "" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "그래프 자르기" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 #, fuzzy msgid "/_Basic Operations/_Cut..." msgstr "/기본 기능(B)/기울이기(T)..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "그래프 자르기" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "그래프 자르기" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "DOS 스펙트럼" @@ -8865,6 +8900,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 #, fuzzy msgid "Style" msgstr "선 종류" @@ -8890,7 +8926,7 @@ msgstr "" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 #, fuzzy msgid "Export to Text File" msgstr "텍스트 내보내기" @@ -9091,8 +9127,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/FD 곡선 맞춤(F)" -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 #, fuzzy msgid "_All curves" msgstr "그래프 곡선의 높이 레벨 맞추기" @@ -9107,8 +9143,8 @@ msgid "Zero position" msgstr "Z 위치" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "FD 곡선 맞춤" @@ -9208,6 +9244,99 @@ msgid "Logscale Transform" msgstr "" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "거리 측정" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "거리 측정" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +#, fuzzy +msgid "Save Parameters" +msgstr "변수" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "다항식 배경값 제거하기" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "파일 닫기" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "거리 측정" + +#: modules/graph/graph_measure_period.c:187 +msgid "Fourier Transform" +msgstr "" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "방향 1" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "방법" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "시작하는 중" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "필터링된 FFT" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "필터링된 FFT" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "K-평균 중심 %d" + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Z 위치" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "평평하게 맞춰진 데이터" + #: modules/graph/graph_peaks.c:105 #, fuzzy msgid "Finds peaks on graph curves." @@ -9228,7 +9357,7 @@ msgstr "" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 #, fuzzy msgid "Zero" msgstr "0값으로 설정" @@ -9265,94 +9394,94 @@ msgid "Graph Peaks" msgstr "그래프" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "평평하게 맞춰진 데이터" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 #, fuzzy msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/평평하게 만들기(L)/배경 다항식으로 맞추기(P)" -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "출력 종류" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "점 크기(P):" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "높이 분포" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9367,7 +9496,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/통계(S)/각도 분포(G)..." -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "" @@ -9379,15 +9508,15 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 #, fuzzy msgid "_Fixed resolution" msgstr "정밀도(P)" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "" @@ -9410,122 +9539,110 @@ msgid "pick points" msgstr "점" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 #, fuzzy msgid "Calculates simple graph curve statistics." msgstr "전체 곡률 계산하기." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "/통계(S)/각도 분포(G)..." -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 #, fuzzy msgid "Calculate graph curve statistics" msgstr "전체 곡률 계산하기" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -#, fuzzy -msgid "Save Parameters" -msgstr "변수" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 #, fuzzy msgid "Simple Parameters" msgstr "변수" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 #, fuzzy msgid "Integrals" msgstr "교차점" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 #, fuzzy msgid "Projected length" msgstr "투영된 경계의 길이 " -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 #, fuzzy msgid "Developed length" msgstr "개발자" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 #, fuzzy msgid "Area under curve" msgstr "평균 값" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 #, fuzzy msgid "Positive area" msgstr "양성의" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 #, fuzzy msgid "Negative area" msgstr "음성의" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9534,222 +9651,214 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "차이" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 #, fuzzy msgid "Leveled surface" msgstr "평평하게 맞춰진 데이터" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 #, fuzzy msgid "Polynomial background" msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 #, fuzzy msgid "Fits terraces with polynomial background." msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 #, fuzzy msgid "Fit terraces with polynomial background" msgstr "다항식 배경값 제거하기" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "" - -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -#, fuzzy -msgid "Mean square difference" -msgstr "이미지 차이점(G)" - -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "" - -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -#, fuzzy -msgid "Number of terraces" -msgstr "클러스터 개수" - -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "" - -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "" - -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 -#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 -#: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/graph/graph_terraces.c:252 #, fuzzy -msgid "Output" -msgstr "출력 종류" +msgid "Step detection" +msgstr "부분:" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 #, fuzzy -msgid "Survey" -msgstr "곡선" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "" +msgid "_Step detection kernel" +msgstr "부분:" -#: modules/graph/graph_terraces.c:528 +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 #, fuzzy -msgid "Step detection _threshold:" +msgid "Step detection _threshold" msgstr "역치값 설정(T)" -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +#, fuzzy +msgid "Step _broadening" +msgstr "부분:" -#: modules/graph/graph_terraces.c:546 +#: modules/graph/graph_terraces.c:268 #, fuzzy -msgid "Minimum terrace _length:" +msgid "Minimum terrace _length" msgstr "최소 길이(L)" -#: modules/graph/graph_terraces.c:554 +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 #, fuzzy -msgid "_Polynomial degree:" +msgid "_Polynomial degree" msgstr "다항식 (0차)" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 #, fuzzy msgid "_Independent heights" msgstr "독립 차수" -#: modules/graph/graph_terraces.c:580 -#, fuzzy -msgid "Step detection" -msgstr "부분:" - -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "" - -#: modules/graph/graph_terraces.c:587 +#: modules/graph/graph_terraces.c:274 msgid "Select regions _manually" msgstr "" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 -#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 -#: modules/process/mark_with.c:284 modules/process/neural.c:543 -#: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 -msgid "Result" -msgstr "" - -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 #, fuzzy msgid "Save Terrace Table" msgstr "표 저장하기" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 +#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 +#: modules/process/multiprofile.c:273 modules/process/pid.c:151 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 #, fuzzy -msgid "_Polynomial degree" -msgstr "다항식 (0차)" +msgid "Output" +msgstr "출력 종류" -#: modules/graph/graph_terraces.c:889 +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 #, fuzzy -msgid "M_inimum polynomial degree:" -msgstr "최대 다항식 차수(M):" +msgid "M_inimum polynomial degree" +msgstr "최대 다항식 차수(M)" -#: modules/graph/graph_terraces.c:899 +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 #, fuzzy -msgid "_Maximum polynomial degree:" -msgstr "최대 다항식 차수(M):" - -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -#, fuzzy -msgid "Step _broadening" -msgstr "부분:" +msgid "_Maximum polynomial degree" +msgstr "최대 다항식 차수(M)" -#: modules/graph/graph_terraces.c:921 +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 #, fuzzy -msgid "Minimum broadening:" +msgid "Minimum broadening" msgstr "최소 값" -#: modules/graph/graph_terraces.c:932 +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 #, fuzzy -msgid "Maximum broadening:" +msgid "Maximum broadening" msgstr "최대 경계의 크기" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "" + +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, fuzzy, c-format -msgid "Number of combinations: %u." +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +#, fuzzy +msgid "Survey" +msgstr "곡선" + +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 +#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 +#: modules/process/mark_with.c:284 modules/process/neural.c:543 +#: modules/process/psf.c:354 modules/process/terracefit.c:572 +#: modules/volume/volume_psf.c:548 +msgid "Result" +msgstr "" + +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "" + +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "" + +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +#, fuzzy +msgid "Mean square difference" +msgstr "이미지 차이점(G)" + +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "" + +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +#, fuzzy +msgid "Number of terraces" msgstr "클러스터 개수" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "" + +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 msgid "No free parameters are selected." msgstr "" -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, fuzzy, c-format +msgid "Number of combinations: %u." +msgstr "클러스터 개수" + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, fuzzy, c-format msgid "Level %d" msgstr "평평하게 맞춰진 데이터" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "표 저장하기" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 #, fuzzy msgid "Save Terrace Fit Survey" msgstr "표 저장하기" @@ -9880,7 +9989,7 @@ msgstr "평면으로 평평하게 만들기" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "확대 보기" @@ -9899,8 +10008,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 #, fuzzy msgid "_Thickness" msgstr "외곽선 두께:" @@ -9929,7 +10038,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 #, fuzzy msgid "Mask in use" msgstr "마스킹 모드" @@ -10028,7 +10137,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 #, fuzzy msgid "_Number of iterations" msgstr "클러스터 개수" @@ -10078,8 +10187,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "" @@ -10091,13 +10200,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "" @@ -10106,18 +10216,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "" @@ -10128,15 +10240,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "" @@ -10145,10 +10258,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10159,8 +10273,9 @@ msgstr "" #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "" @@ -10190,7 +10305,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 #, fuzzy msgid "_Radius" msgstr "교차점" @@ -10231,66 +10346,82 @@ msgid "Arithmetic operations on data" msgstr "" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 #, fuzzy msgid "_Expression" msgstr "필수 정보가 입력되지 않았습니다. " -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 #, fuzzy msgid "Specify un_its" msgstr "역치값 설정(T)" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "" @@ -10325,7 +10456,7 @@ "of 90 degrees." msgstr "" -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/기본 기능(B)/값 반전(I)" @@ -10355,36 +10486,37 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 #, fuzzy msgid "Co_verage" msgstr "평균:" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "" @@ -10794,27 +10926,30 @@ msgid "Building mesh..." msgstr "" -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "" @@ -10847,6 +10982,7 @@ msgstr "" #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/기본 기능(B)/크기 및 단위(D)..." @@ -10941,7 +11077,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 #, fuzzy msgid "Create new image" msgstr "새 아이템 생성" @@ -10994,10 +11130,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - #: modules/process/classify.c:299 modules/process/classify.c:565 #, fuzzy msgid "Mask A" @@ -11176,6 +11308,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -11332,14 +11465,14 @@ msgid "Convolution _kernel" msgstr "" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "" @@ -11371,13 +11504,13 @@ msgstr "" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "" @@ -11579,7 +11712,7 @@ msgstr "" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 #, fuzzy msgid "T_hreshold" msgstr "Hard threshold(H):" @@ -11669,13 +11802,13 @@ msgid "Curvature Sections" msgstr "" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "" @@ -11783,7 +11916,7 @@ msgid "Deconvolve" msgstr "" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "" @@ -12169,7 +12302,8 @@ msgid "drift" msgstr "" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "" @@ -12185,6 +12319,46 @@ msgid "rows" msgstr "" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "" + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/통계(S)/각도 분포(G)..." + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "" + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "최소(M)" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "변수" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "최대 값" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "" @@ -12498,7 +12672,7 @@ msgstr "" #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "" @@ -12521,10 +12695,11 @@ msgstr "" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "" -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "" @@ -12546,12 +12721,12 @@ msgid "_Number points" msgstr "클러스터 개수" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 #, fuzzy msgid "_Clear" msgstr "지우기(R)" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 #, fuzzy msgid "_Mark" msgstr "표시된" @@ -12629,7 +12804,7 @@ msgid "Create _Points" msgstr "점(P)" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 #, fuzzy msgid "Save Facet Vectors" msgstr "변수" @@ -12639,50 +12814,50 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 #, fuzzy msgid "/Measure _Features/Facet _Measurement..." msgstr "/통계(S)/각도 분포(G)..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 #, fuzzy msgid "Measure facet angles" msgstr "거리 측정" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 #, fuzzy msgid "_Facet plane size" msgstr "평면을 0으로 설정" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 #, fuzzy msgid "Selected φ" msgstr "부분" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 #, fuzzy msgid "Selected ϑ" msgstr "부분" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 #, fuzzy msgid "Measure Facets" msgstr "거리 측정" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 #, fuzzy msgid "Mea_sure" msgstr "거리 측정" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 #, fuzzy msgid "points" msgstr "점" @@ -12922,7 +13097,7 @@ msgid "Clear the entire filter mask" msgstr "" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "채우기(F)" @@ -12942,7 +13117,7 @@ msgid "Zoom:" msgstr "확대:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "" @@ -13014,7 +13189,7 @@ msgid "Triangle" msgstr "윗쪽 삼각형" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "" @@ -13066,7 +13241,7 @@ msgstr "" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "모양" @@ -13100,7 +13275,7 @@ msgstr "" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "모두" @@ -13372,6 +13547,7 @@ msgstr "점(P)" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 #, fuzzy msgid "_Trim fraction" msgstr "방향(D)" @@ -14412,7 +14588,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "" @@ -14429,34 +14605,34 @@ msgid "Mark lines with inverted sign" msgstr "" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 #, fuzzy msgid "Median of differences" msgstr "이미지 차이점(G)" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 #, fuzzy msgid "Modus" msgstr "모듈" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 #, fuzzy msgid "Trimmed mean of differences" msgstr "이미지 차이점(G)" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "" @@ -14464,7 +14640,7 @@ msgid "Aligns rows by various methods." msgstr "" -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 #, fuzzy msgid "/_Correct Data/_Align Rows..." msgstr "/데이터 교정(C)/Correlation averaging(C)..." @@ -14505,7 +14681,7 @@ msgid "Steps" msgstr "" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "" @@ -14514,7 +14690,7 @@ msgstr "" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "기울이기" @@ -14667,7 +14843,7 @@ msgid "_Hessian" msgstr "가우시안 타입" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 #, fuzzy msgid "_Regularization parameter" msgstr "변수" @@ -14694,10 +14870,12 @@ msgstr "" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "양성의" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "음성의" @@ -14840,7 +15018,7 @@ msgid "Two-sided" msgstr "" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "" @@ -14978,123 +15156,141 @@ msgid "Shift Mask" msgstr "필터 마스크" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "" -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 #, fuzzy msgid "/M_ultidata/Correlation _Search..." msgstr "/멀티데이터(M)/산술 연산(A)..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 #, fuzzy msgid "Height difference, raw" msgstr "이미지 차이점(G)" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 #, fuzzy msgid "Height difference, leveled" msgstr "이미지 차이점(G)" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 #, fuzzy msgid "Height difference score" msgstr "이미지 차이점(G)" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +msgid "Phase-only score" +msgstr "" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 #, fuzzy msgid "Correlation _method" msgstr "그리기 도구(D)" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 #, fuzzy msgid "_Plot mask" msgstr "마스크 보기(S)" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "" -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 #, fuzzy msgid "Extract mask to a new image" msgstr "새 파일로 확장" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "새 파일로 확장" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 #, fuzzy msgid "Thin mask" msgstr "마스크 보기(S)" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "Grain number" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "" @@ -15247,7 +15443,7 @@ msgid "Second image" msgstr "파일 저장" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "평균" @@ -15643,7 +15839,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 #, fuzzy msgid "_Mode" msgstr "모드" @@ -15739,8 +15935,8 @@ msgid "Re_initialize" msgstr "" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "마스킹 모드" @@ -16302,6 +16498,61 @@ msgid "Pile Up Shapes" msgstr "모양:" +#: modules/process/plateau_synth.c:131 +msgid "Generates images with stacked plateau-like structures." +msgstr "" + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/통계(S)/각도 분포(G)..." + +#: modules/process/plateau_synth.c:149 +msgid "Generate image with random plateaus" +msgstr "" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "최대 너비(W)" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "최소(M)" + +#: modules/process/plateau_synth.c:166 +msgid "Size power _law" +msgstr "" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "방향(D):" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "면적 및 단위" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "높이" + +#: modules/process/plateau_synth.c:240 +msgid "Random Plateaus" +msgstr "" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "마스킹 모드" + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "" @@ -16364,11 +16615,6 @@ msgid "_Vertical polynomial degree" msgstr "수직 다항식 차수(V)" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -#, fuzzy -msgid "_Maximum polynomial degree" -msgstr "최대 다항식 차수(M)" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "같은 차수(S)" @@ -16385,6 +16631,10 @@ msgid "Copy table to clipboard" msgstr "표를 클립보드로 복사" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "표 저장하기" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "" @@ -16533,8 +16783,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 #, fuzzy msgid "Transfer function" msgstr "등록된 기능:" @@ -16558,7 +16808,7 @@ msgid "Transfer function estimation" msgstr "팁 추정 효과 가리기" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 #, fuzzy msgid "/_Statistics/_Transfer Function Guess..." msgstr "/통계(S)/각도 분포(G)..." @@ -16567,16 +16817,16 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 #, fuzzy msgid "Regularized filter" msgstr "변수" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "" @@ -16585,20 +16835,20 @@ msgid "_Border" msgstr "새 너비(W)" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "" -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 #, fuzzy msgid "_Fit Sigma" msgstr "모양:" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 #, fuzzy msgid "Transfer Function Size" msgstr "등록된 기능:" @@ -16617,25 +16867,25 @@ msgid "Transfer Function" msgstr "등록된 기능:" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 #, fuzzy msgid "TF width" msgstr "새 너비(W):" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 #, fuzzy msgid "TF height" msgstr "새 높이(H)" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 #, fuzzy msgid "Difference norm" msgstr "차이" @@ -16765,7 +17015,7 @@ msgid "Proportion" msgstr "비례적으로(P)" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "" @@ -16997,7 +17247,7 @@ msgid "_Assume symmetry" msgstr "정사각형의" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "데이터 회전시키기" @@ -17078,27 +17328,27 @@ msgid "Correct horizontal scars (strokes)" msgstr "" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 #, fuzzy msgid "Scars type" msgstr "제거 방식(S):" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 #, fuzzy msgid "_Hard threshold" msgstr "Hard threshold(H)" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 #, fuzzy msgid "_Soft threshold" msgstr "Soft threshold(S)" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 #, fuzzy msgid "Minimum _length" msgstr "최소 길이(L)" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 #, fuzzy msgid "Maximum _width" msgstr "최대 너비(W)" @@ -17358,16 +17608,6 @@ msgid "Marked terraces" msgstr "곡률 반경 1" -#: modules/process/terracefit.c:282 -#, fuzzy -msgid "_Step detection kernel" -msgstr "부분:" - -#: modules/process/terracefit.c:284 -#, fuzzy -msgid "Step detection _threshold" -msgstr "역치값 설정(T)" - #: modules/process/terracefit.c:289 #, fuzzy msgid "Minimum terrace _area" @@ -17377,25 +17617,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -#, fuzzy -msgid "M_inimum polynomial degree" -msgstr "최대 다항식 차수(M)" - -#: modules/process/terracefit.c:308 -#, fuzzy -msgid "Minimum broadening" -msgstr "최소 값" - -#: modules/process/terracefit.c:310 -#, fuzzy -msgid "Maximum broadening" -msgstr "최대 경계의 크기" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "최대/최소 값을 이용한 데이터 범위 제한" @@ -17443,7 +17664,7 @@ msgid "Limit Range" msgstr "범위제한" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "전체 범위로 설정(F)" @@ -18176,144 +18397,144 @@ msgid "Function written in Python" msgstr "" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 #, fuzzy msgid "Correlation length tool." msgstr "그리기 도구(D)" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 #, fuzzy msgid "line-leveling|None" msgstr "평면으로 평평하게 만들기" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 #, fuzzy msgid "Line leveling" msgstr "평면으로 평평하게 만들기" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 #, fuzzy msgid "Relation to Image Size" msgstr "3D 뷰를 이미지로 저장" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 #, fuzzy msgid "Selected area" msgstr "투영 면적" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 #, fuzzy msgid "PSDF Gaussian fit" msgstr "가우시안 타입" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 #, fuzzy msgid "PSDF exponential fit" msgstr "지수타입" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "" -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 #, fuzzy msgid "Read horizontal and/or vertical profiles" msgstr "데이터 원점 대칭 변환시키기 " -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, fuzzy, c-format msgid "Vertical profile %d" msgstr "수직 방향(V)" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, fuzzy, c-format msgid "Horizontal profile %d" msgstr "수평 다항식 차수(H):" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "" -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "" +#: modules/tools/distance.c:123 +#, fuzzy +msgid "Save Distance Table" +msgstr "표 저장하기" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 #, fuzzy msgid "_Number lines" msgstr "클러스터 개수" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "" -#: modules/tools/distance.c:227 -#, fuzzy -msgid "Save Distance Table" -msgstr "표 저장하기" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -18368,7 +18589,7 @@ "Grain removal tool, removes continuous parts of mask and/or underlying data." msgstr "" -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "" @@ -18376,7 +18597,7 @@ msgid "Fractal correction" msgstr "" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -18384,7 +18605,7 @@ msgid "Remove" msgstr "제거" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 #, fuzzy msgid "_Interpolation method" msgstr "교차점" @@ -18397,83 +18618,91 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." msgstr "" -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "별" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "색상 범위" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "높이 히스토그램" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "색상 범위" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 #, fuzzy msgid "_Invert Mapping" msgstr "/값 반전(I)" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "값" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " "three selected points." msgstr "" -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 #, fuzzy msgid "_Averaging radius" msgstr "교차점" @@ -18494,133 +18723,137 @@ msgid "Level data by fitting a plane through three points" msgstr "" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." msgstr "" -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "그리기 도구(D)" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "타원 모양" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "편집기" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "" @@ -18636,105 +18869,109 @@ msgid "Level rows using intersections with given lines" msgstr "" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "" -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 #, fuzzy msgid "_Calibration data" msgstr "켈리브레이션" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 #, fuzzy msgid "Improve _Direction" msgstr "방향(D):" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "X 에러 %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Y 에러 %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Z 에러 %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "" -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "값 읽기" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "마우스 커서 아래 값 읽기" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "0값으로 설정" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "" @@ -18742,16 +18979,16 @@ msgid "Calculate surface profile parameters." msgstr "" -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "" @@ -18763,7 +19000,7 @@ msgid "BRC" msgstr "" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "" @@ -18775,185 +19012,185 @@ msgid "Calculate roughness parameters" msgstr "" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 #, fuzzy msgid "Selected line" msgstr "부분:" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 #, fuzzy msgid "parameters|Hybrid" msgstr "변수" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "변수" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "새 높이(H)" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 #, fuzzy msgid "Radial Profiles" msgstr "마스킹 모드" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 #, fuzzy msgid "Radial profiles" msgstr "마스킹 모드" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, fuzzy, c-format msgid "Radial profile %d" msgstr "마스킹 모드" @@ -18992,42 +19229,50 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." msgstr "" -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "" @@ -19055,171 +19300,209 @@ msgid "Spectroscopy" msgstr "분광학" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." msgstr "" -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 #, fuzzy msgid "Ellipse" msgstr "타원 모양" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "점 제거하기" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "" -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "" -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "" -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 #, fuzzy msgid "Moment-Based" msgstr "순간" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 #, fuzzy msgid "Average value" msgstr "평균:" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 #, fuzzy msgid "Maximum peak height" msgstr "최대 값" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 #, fuzzy msgid "Maximum pit depth" msgstr "최대 너비(W)" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 #, fuzzy msgid "Maximum height" msgstr "최대 너비(W)" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 #, fuzzy msgid "Surface slope" msgstr "표면 면적" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +#: modules/volume/volume_addframe.c:113 +#, fuzzy +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/기본 기능(B)/값 반전(I)" + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +#: modules/volume/volume_addframe.c:132 +#, fuzzy +msgid "Data to insert" +msgstr "데이터 탐색기" + +#: modules/volume/volume_addframe.c:170 +#, fuzzy +msgid "Frame added" +msgstr "표면 면적" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "/평평하게 만들기(L)/경계면 평평하게 만들기(F).." + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "" -#: modules/volume/volume_arithmetic.c:156 +#: modules/volume/volume_arithmetic.c:159 #, fuzzy -msgid "/_Arithmetic..." -msgstr "/멀티데이터(M)/산술 연산(A)..." +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/기본 기능(B)/기울이기(T)..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 #, fuzzy msgid "Arithmetic operations on volume data" msgstr "3차원 데이터 값 반전" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 #, fuzzy msgid "Z-axis calibrations differ" msgstr "켈리브레이션" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "" -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/텍스트로 내보내기(T)..." +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." +msgstr "/기본 기능(B)/확장(X)..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 #, fuzzy msgid "Export volume data to a text file" msgstr "텍스트 파일로 그래프 데이터 내보내기" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "정밀도(P):" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "3차원 데이터" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "" -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/면적 및 단위(D)..." - #: modules/volume/volume_calibrate.c:170 #, fuzzy msgid "Match voxel size" @@ -19256,7 +19539,7 @@ msgstr "방향 1" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 #, fuzzy msgid "Create new volume data" msgstr "3차원 데이터 값 반전" @@ -19271,13 +19554,85 @@ msgid "Z Dimension" msgstr "면적 및 단위" -#: modules/volume/volume_equiplane.c:140 -#, fuzzy +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/데이터 교정(C)/2D FFT 필터(2)..." + +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "추정된 팁" + +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "필터링된 이미지(l)" + +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "데이터 잘라내기" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "X(X):" + +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "X축 방향" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "값 단위:" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "" + +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "측정된" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "추정된 팁" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "3차원 데이터 값 반전" + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "3차원 데이터 값 반전" + +#: modules/volume/volume_equiplane.c:140 +#, fuzzy msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "3차원 데이터 K-평균 클러스터링 계산" #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." +msgid "/SPM M_odes/_Isosurface Image..." msgstr "" #: modules/volume/volume_equiplane.c:158 @@ -19308,86 +19663,102 @@ msgid "Isosurface z for %.*f %s" msgstr "" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 #, fuzzy msgid "Shows 3D representations of volume data" msgstr "3D데이터에서 한 부분을 보기 또는 추출하기 " -#: modules/volume/volume_extract.c:200 +#: modules/volume/volume_extract.c:197 #, fuzzy -msgid "/3D View..." -msgstr "로그 보기(L)..." +msgid "/_Basic Operations/3D View..." +msgstr "/기본 기능(B)/기울이기(T)..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 #, fuzzy msgid "Show a 3D view for the volume data" msgstr "3차원 데이터 값 반전" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "3차원 데이터" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 #, fuzzy msgid "_Save image" msgstr "파일 저장" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "X축 시점 보기" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Y축 시점 보기" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Z축 시점 보기" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 #, fuzzy msgid "Export 3D view" msgstr "3D 뷰 내보내기" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "" +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "그래프 곡선 내 노이즈 제거 " + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/데이터 교정(C)/Correlation averaging(C)..." + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "데이터" + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "평면으로 평평하게 만들기" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Volume force-distance 데이터 평가" #: modules/volume/volume_fdfit.c:213 #, fuzzy -msgid "/_Evaluate FD Data..." +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/FD 데이터 평가(E)..." #: modules/volume/volume_fdfit.c:217 @@ -19410,11 +19781,6 @@ msgid "Inverts value in volume data" msgstr "3차원 데이터 값 반전" -#: modules/volume/volume_invert.c:53 -#, fuzzy -msgid "/_Invert Value" -msgstr "/값 반전(I)" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "3차원 데이터 값 반전" @@ -19425,7 +19791,7 @@ #: modules/volume/volume_kmeans.c:109 #, fuzzy -msgid "/_K-Means Clustering..." +msgid "/_Statistics/_K-Means Clustering..." msgstr "/K-평균 클러스터링(K)..." #: modules/volume/volume_kmeans.c:113 @@ -19494,7 +19860,7 @@ #: modules/volume/volume_kmedians.c:102 #, fuzzy -msgid "/_K-Medians Clustering..." +msgid "/_Statistics/_K-Medians Clustering..." msgstr "/K-평균 클러스터링(K)..." #: modules/volume/volume_kmedians.c:106 @@ -19533,8 +19899,9 @@ msgstr "3차원 데이터 값 반전" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/기본 기능(B)/기울이기(T)..." #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -19565,13 +19932,32 @@ msgid "Z calibration" msgstr "켈리브레이션" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "평면으로 평평하게 만들기" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "평면으로 평평하게 만들기" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "" #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "" +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." +msgstr "/통계(S)/각도 분포(G)..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 msgid "Summarize profiles" @@ -19590,10 +19976,39 @@ msgid "Summarize Volume Profiles" msgstr "" -#: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" msgstr "" +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/팁(T)/추정효과 가리기(B)..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "새 너비(W)" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "점 크기(P):" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "켈리브레이션" + +#: modules/volume/volume_mfmrecalc.c:116 +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/팁(T)/추정효과 가리기(B)..." + #: modules/volume/volume_mfmrecalc.c:233 #, fuzzy msgid "Recalculated Data" @@ -19629,7 +20044,7 @@ #: modules/volume/volume_outliers.c:58 #, fuzzy -msgid "/_XY Plane Outliers" +msgid "/_Correct Data/_XY Plane Outliers" msgstr "점 제거하기" #: modules/volume/volume_outliers.c:62 @@ -19643,21 +20058,26 @@ #: modules/volume/volume_planelevel.c:58 #, fuzzy -msgid "/_XY Plane Level" -msgstr "평면으로 평평하게 만들기" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/데이터 교정(C)/Correlation averaging(C)..." #: modules/volume/volume_planelevel.c:62 #, fuzzy msgid "Level all XY planes" msgstr "데이터" +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "평평하게 맞춰진 데이터" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "" #: modules/volume/volume_planestat.c:245 #, fuzzy -msgid "/Summarize P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." msgstr "/다른 이름으로 저장(A)..." #: modules/volume/volume_planestat.c:249 @@ -19674,79 +20094,115 @@ msgid "Summarize Volume Planes" msgstr "3차원 데이터(V)" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 #, fuzzy msgid "Calculates the volume PSF." msgstr "3차원 데이터 K-평균 클러스터링 계산" -#: modules/volume/volume_psf.c:267 -#, fuzzy -msgid "/_Transfer Function Guess..." -msgstr "/함수에 맞추기(F)" - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 #, fuzzy msgid "_Z level:" msgstr "평면으로 평평하게 만들기" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 #, fuzzy msgid "_Border:" msgstr "새 너비(W):" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "" + +#: modules/volume/volume_psf.c:1079 #, fuzzy msgid "Calculating volume transfer function..." msgstr "3차원 데이터 값 반전" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 #, fuzzy msgid "Volume TF" msgstr "부피" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/기본 기능(B)/크기 변경(S)..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "그래프 곡선 내 노이즈 제거 " + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "필터링된 이미지(l)" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "데이터" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 #, fuzzy -msgid "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/평평하게 만들기(L)/구면 맞추기(F)" #: modules/volume/volume_rephase.c:168 @@ -19803,14 +20259,38 @@ msgid "Volume Z graphs" msgstr "3차원 데이터" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "/데이터 교정(C)/Correlation averaging(C)..." + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "제거 방식(S):" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "마스킹 모드" + #: modules/volume/volume_slice.c:199 #, fuzzy msgid "Extracts image planes and line graphs from volume data." msgstr "3차원 데이터 K-평균 클러스터링 계산" #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/기본 기능(B)/크기 변경(S)..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19880,6 +20360,25 @@ msgid "Volume Y graphs" msgstr "3차원 데이터" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "투영 면적" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "그래프 곡선 내 노이즈 제거 " + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "부분:" + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "" @@ -19894,8 +20393,9 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/팁(T)/추정효과 가리기(B)..." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -19909,75 +20409,185 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 #, fuzzy msgid "Swaps axes of volume data." msgstr "3차원 데이터 값 반전" -#: modules/volume/volume_swaxes.c:118 +#: modules/volume/volume_swaxes.c:96 #, fuzzy -msgid "/S_wap Axes..." -msgstr "/다른 이름으로 저장(A)..." +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/기본 기능(B)/크기 변경(S)..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 #, fuzzy msgid "Swap axes" msgstr "축 보기(A)" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 #, fuzzy msgid "X" msgstr "X(X):" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 #, fuzzy msgid "Y" msgstr "Y(Y):" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" msgstr "" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" msgstr "" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "" +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "3차원 데이터 값 반전" + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/기본 기능(B)/기울이기(T)..." + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "3차원 데이터 값 반전" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "3차원 데이터" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "이미지 차이점" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "데이터" + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/팁(T)/추정효과 가리기(B)..." + +#: modules/volume/volume_xystitch.c:114 +msgid "Merge all the XY planes to XYZ data" +msgstr "" + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "그래프 그리기(P)" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "파일 닫기" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "그래프 그리기(P)" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "파일 닫기" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/평평하게 만들기(L)/구면 맞추기(F)" + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "회전시키기" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "변수" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "회전시키기" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "데이터 크기변경" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "데이터 크기변경" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "크기변경" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" #: modules/volume/volume_zcal.c:126 #, fuzzy -msgid "/_Z-Calibration..." -msgstr "/켈리브레이션(I)/생성(C)" +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/기본 기능(B)/기울이기(T)..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -20049,8 +20659,9 @@ msgstr "" #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." -msgstr "" +#, fuzzy +msgid "/_Correct Data/S_hift Value To Zero..." +msgstr "/데이터 교정(C)/Correlation averaging(C)..." #: modules/volume/volume_zposlevel.c:166 #, fuzzy @@ -20064,14 +20675,32 @@ #: modules/volume/volumeops.c:53 #, fuzzy -msgid "/Extract _Preview" -msgstr "필터링된 이미지(l)" +msgid "/_Basic Operations/Extract _Preview" +msgstr "/기본 기능(B)/시계 방향 회전(L)" #: modules/volume/volumeops.c:57 #, fuzzy msgid "Extract volume data preview to an image" msgstr "3D 뷰를 이미지로 저장" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "" + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "크기 자동 조정(A)" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "잘라내기" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "" @@ -20098,18 +20727,6 @@ msgid "Y drift" msgstr "" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "" @@ -20367,6 +20984,79 @@ msgstr "파일 병합" #, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/데이터 교정(C)/Correlation averaging(C)..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/데이터 교정(C)/Correlation averaging(C)..." + +#, fuzzy +#~ msgid "Step detection _threshold:" +#~ msgstr "역치값 설정(T)" + +#, fuzzy +#~ msgid "_Polynomial degree:" +#~ msgstr "다항식 (0차)" + +#, fuzzy +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "최대 다항식 차수(M):" + +#, fuzzy +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "최대 다항식 차수(M):" + +#, fuzzy +#~ msgid "Minimum broadening:" +#~ msgstr "최소 값" + +#, fuzzy +#~ msgid "Maximum broadening:" +#~ msgstr "최대 경계의 크기" + +#, fuzzy +#~ msgid "/_Arithmetic..." +#~ msgstr "/멀티데이터(M)/산술 연산(A)..." + +#~ msgid "/Export _Text..." +#~ msgstr "/텍스트로 내보내기(T)..." + +#~ msgid "_Precision:" +#~ msgstr "정밀도(P):" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/면적 및 단위(D)..." + +#, fuzzy +#~ msgid "/3D View..." +#~ msgstr "로그 보기(L)..." + +#, fuzzy +#~ msgid "/_Invert Value" +#~ msgstr "/값 반전(I)" + +#, fuzzy +#~ msgid "/_XY Plane Level" +#~ msgstr "평면으로 평평하게 만들기" + +#, fuzzy +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/함수에 맞추기(F)" + +#, fuzzy +#~ msgid "/S_wap Axes..." +#~ msgstr "/다른 이름으로 저장(A)..." + +#, fuzzy +#~ msgid "/_Z-Calibration..." +#~ msgstr "/켈리브레이션(I)/생성(C)" + +#, fuzzy +#~ msgid "/Extract _Preview" +#~ msgstr "필터링된 이미지(l)" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "수평의" diff -Nru gwyddion-2.62/po/POTFILES.in gwyddion-2.63/po/POTFILES.in --- gwyddion-2.62/po/POTFILES.in 2022-11-03 09:56:35.000000000 +0000 +++ gwyddion-2.63/po/POTFILES.in 2023-06-13 13:22:34.000000000 +0000 @@ -136,7 +136,6 @@ modules/file/gsffile.c modules/file/gwyfile.c modules/file/gwytiff.h -modules/file/gwyzip-zziplib.h modules/file/gwyzip.h modules/file/gxyzffile.c modules/file/hdf4file.c @@ -258,6 +257,7 @@ modules/graph/graph_invert.c modules/graph/graph_level.c modules/graph/graph_logscale.c +modules/graph/graph_measure_period.c modules/graph/graph_peaks.c modules/graph/graph_polylevel.c modules/graph/graph_sfuncs.c @@ -309,6 +309,7 @@ modules/process/displfield.c modules/process/domain_synth.c modules/process/drift.c +modules/process/dune_synth.c modules/process/dwt.c modules/process/dwtanisotropy.c modules/process/edge.c @@ -384,6 +385,7 @@ modules/process/phase_synth.c modules/process/pid.c modules/process/pileup_synth.c +modules/process/plateau_synth.c modules/process/polydistort.c modules/process/polylevel.c modules/process/presentationops.c @@ -450,29 +452,40 @@ modules/tools/spectro.c modules/tools/spotremove.c modules/tools/stats.c +modules/volume/volume_addframe.c modules/volume/volume_arithmetic.c modules/volume/volume_asciiexport.c modules/volume/volume_calibrate.c +modules/volume/volume_drift.c modules/volume/volume_equiplane.c modules/volume/volume_extract.c +modules/volume/volume_facetlevel.c modules/volume/volume_fdfit.c modules/volume/volume_invert.c modules/volume/volume_kmeans.c modules/volume/volume_kmedians.c modules/volume/volume_lawnize.c +modules/volume/volume_linelevel.c modules/volume/volume_linestat.c +modules/volume/volume_localdetect.c modules/volume/volume_mfmrecalc.c modules/volume/volume_outliers.c modules/volume/volume_planelevel.c modules/volume/volume_planestat.c modules/volume/volume_psf.c +modules/volume/volume_removeframe.c modules/volume/volume_rephase.c +modules/volume/volume_scars.c modules/volume/volume_slice.c +modules/volume/volume_stepline.c modules/volume/volume_strayfield.c modules/volume/volume_swaxes.c +modules/volume/volume_xyarithmetics.c +modules/volume/volume_xystitch.c modules/volume/volume_zcal.c modules/volume/volume_zposlevel.c modules/volume/volumeops.c +modules/xyz/xyz_autocrop.c modules/xyz/xyz_drift.c modules/xyz/xyz_level.c modules/xyz/xyz_raster.c Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/pt_BR.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/pt_BR.gmo differ diff -Nru gwyddion-2.62/po/pt_BR.po gwyddion-2.63/po/pt_BR.po --- gwyddion-2.62/po/pt_BR.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/pt_BR.po 2023-06-13 13:20:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Gwyddion 2.46\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" "PO-Revision-Date: 2020-06-24 11:26+0200\n" "Last-Translator: Fellype do Nascimento \n" "Language-Team: Brazilian Portuguese \n" @@ -150,9 +150,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -168,7 +168,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Sem título" @@ -297,39 +297,39 @@ msgid "Resource directory cannot be created." msgstr "" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Sim" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "Não" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(fixo)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "grau" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -399,8 +399,8 @@ msgid "Maximum value" msgstr "Valor máximo" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Valor médio" @@ -426,11 +426,11 @@ msgid "Pixel area" msgstr "Área do pixel" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Área projetada" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Área da superfície" @@ -532,13 +532,13 @@ msgid "Direction of maximum Martin diameter" msgstr "Direção do diâmetro máximo de Martin" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Inclinação θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Inclinação φ" @@ -554,11 +554,11 @@ msgid "Curvature center z value" msgstr "Valor z do centro da curvatura" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Curvatura 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Curvatura 2" @@ -591,14 +591,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Posição" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Valor" @@ -608,7 +608,7 @@ msgstr "Área" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Volume" @@ -621,7 +621,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Inclinação" @@ -678,12 +678,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Horizontal" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Vertical" @@ -724,12 +724,12 @@ msgstr "Escala e espaço adaptáveis" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Arredondar" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Linear" @@ -1347,7 +1347,7 @@ msgid "Hide full controls" msgstr "Esconder todos os controles" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Básico" @@ -1398,12 +1398,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1412,7 +1412,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1422,20 +1422,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1487,11 +1488,11 @@ msgstr "L_uz θ:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1514,7 +1515,7 @@ msgid "Maximum z value" msgstr "Valor máximo de z" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "Rótu_lo:" @@ -1604,7 +1605,7 @@ msgstr "Escondido" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Pontos" @@ -1661,7 +1662,7 @@ msgid "_Line type:" msgstr "Tipo da _linha:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Espessura da lin_ha:" @@ -1682,7 +1683,7 @@ msgid "Diamond" msgstr "Diamante" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Cruz" @@ -1756,7 +1757,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Modo" @@ -1792,8 +1793,8 @@ msgstr "Abscissa" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "Gráfico" @@ -1801,7 +1802,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Dados" @@ -1840,12 +1841,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Comprimento" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1853,7 +1854,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Altura" @@ -1880,8 +1881,8 @@ msgstr "Preferido" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Nome" @@ -1918,12 +1919,12 @@ msgid "A_dd symbol" msgstr "A_dicionar símbolo" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Pré-visualizar" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Não foi possível abrir o arquivo para leitura: %s." @@ -2086,35 +2087,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Média" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Mínimo" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Máximo" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Posição min." -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Posição máx." @@ -2124,7 +2125,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "RMS" @@ -2150,42 +2152,42 @@ msgid "Change Curve Map Preview" msgstr "Modificar pré-visualização do volume de dados" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Canal %d desconhecido" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Volume %d desconhecido" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "%d XYZ desconhecido" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, fuzzy, c-format msgid "Unknown curve map %d" msgstr "Volume %d desconhecido" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Níveis Z: %d, unidade Z: %s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Pontos: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 #, fuzzy msgid "Curves:" msgstr "Curvas" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 #, fuzzy msgid "Segments:" msgstr "Segmentação" @@ -2252,11 +2254,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "_Atualizar" @@ -2314,7 +2316,7 @@ msgid "Open File" msgstr "Abrir arquivo" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2468,42 +2470,42 @@ msgid "Cannot preview" msgstr "Impossível pré-visualizar" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "A sessão %s terminou na linha %u, mas ela nunca foi iniciada." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "A sessão %s terminou na linha %u ao invés de %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "A sessão %s começou na linha %u antes de %s terminar." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Nome de seção vazia na linha %u do cabeçalho." -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "Cabeçalho da linha %u não tem o prefixo %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "Falta o valor-chave separador na linha %u do cabeçalho." -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "Chave na linha %u do cabeçalho está vazia." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" @@ -2511,22 +2513,22 @@ "está faltando" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Tamanho horizontal" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Tamanho vertical" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "Imagem _quadrada" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2536,7 +2538,7 @@ msgstr "_Largura" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2553,7 +2555,7 @@ msgstr "_Altura" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 #, fuzzy @@ -2561,14 +2563,14 @@ msgstr "Amostras quadradas" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 #, fuzzy msgid "_Dimensions unit" msgstr "Unidades de _dimensão:" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 #, fuzzy msgid "_Value unit" @@ -2583,21 +2585,22 @@ msgstr "Iniciar a partir da imagem atual" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Resolução" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Dimensões físicas " -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Unidades" @@ -2616,29 +2619,29 @@ msgid "Generated" msgstr "Gerado" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Não foi possível escrever para o arquivo: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" "%s: Dimensões laterais e valores devem ser as mesmas quantidades físicas." -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: Dados devem ser quadrados." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Faltando camada do módulo." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2647,31 +2650,31 @@ "Esta ferramenta requer uma camada do tipo %s para funcionar, mas ela não " "parece estar instalada. Por favor, verifique sua instalação." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Limpar objetos selecionados" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Origem" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Tamanho" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Largura" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "Salvar Resultados para um arquivo" @@ -2731,7 +2734,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "pt_BR" @@ -2752,7 +2755,7 @@ msgid "_Close" msgstr "_Fechar" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Tipo" @@ -2760,11 +2763,11 @@ msgid "Function" msgstr "Função" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Parâmetros" @@ -2821,8 +2824,8 @@ msgid "_New" msgstr "_Novo" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Apagar" @@ -2840,95 +2843,121 @@ msgid "Save Metadata" msgstr "Salvar metadados" -#: app/param-def.c:337 +#: app/param-def.c:338 #, fuzzy msgid "_Masking" msgstr "_Máscara" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "Tipo de _interpolação" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "_Direção" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "Combinar com máscara existente" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "Tipo de janelamento" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "Tipo de _distância" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "E_stilo do gráfico" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "Atualizações i_nstantâneas" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Tornar aleatório" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "Cor da _máscara" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "_Gráfico alvo" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 #, fuzzy msgid "C_urve" msgstr "Curva" -#: app/param-def.c:1138 +#: app/param-def.c:1139 #, fuzzy msgid "_Segment" msgstr "Segmentação" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +#, fuzzy +msgid "Hold selection" +msgstr "Mostrar _seleção" + +#: app/param-def.c:1212 +#, fuzzy +msgid "Replace existing selection" +msgstr "Máx. de interações:" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "" + +#: app/param-def.c:1217 +#, fuzzy +msgid "_Hold selection" +msgstr "Definir _seleção" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "Semente _aleatória" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "Novo gráfico" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "até" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Mudar" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "_Nova" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Modificar unidades" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2954,40 +2983,40 @@ msgid "Set selected item as default" msgstr "Definir item selecionado como padrão" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Não foi possível abrir o arquivo para escrita: %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Não foi possível ler o conteúdo do arquivo: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "O arquivo está vazio." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "O arquivo está corrompido, os cabeçalho mágico não corresponde." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "O arquivo está corrompido, a deserialização falhou." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Não foi possível criar o diretório de configuração do usuário %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Não foi possível criar o diretório ui do usuário %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Não foi possível criar o diretório de módulos do usuário %s: %s" @@ -3109,66 +3138,66 @@ "opção) qualquer versão posterior. Para o texto completo da Licença, veja o " "arquivo COPYING incluído no pacote do código fonte." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Licença" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Características" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Desenvolvedores" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Tradutores" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "O desenvolvimento é apoiado pelo Instituto Checo de Metrologia:" -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "Visão OpenGL 3D" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "Protocolo X11\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Protocolo Win32\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Controle remoto" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Interface de programação Python" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "Lançamento em %s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "Versão de desenvolvimento, compilada %s" @@ -3820,7 +3849,7 @@ msgstr "_Editar" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Remover" @@ -3832,7 +3861,7 @@ msgid "Move _Down" msgstr "_Descer" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "_Largura:" @@ -3893,7 +3922,7 @@ msgid "XYZ Data" msgstr "Dados XYZ" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Ferramenta" @@ -4133,7 +4162,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Método" @@ -4147,7 +4176,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "_Tipo de saída" @@ -4248,31 +4277,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/Operações básicas/Converter para _XYZ..." -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Cortar dados" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "Manter afastamentos laterais" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Detalhe" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Cortar" @@ -4281,34 +4312,36 @@ msgid "New Dimensions" msgstr "Dimensões" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Opções" @@ -4378,7 +4411,7 @@ msgstr "Curva" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Ajuste em progresso..." @@ -4497,7 +4530,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 #, fuzzy msgid "fit" msgstr "ajustar" @@ -4577,49 +4610,54 @@ msgid "Convert FZ to FD Curve" msgstr "Ajustar curva FD" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Mediana" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Intervalo" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (RMS)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Assimetria" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 #, fuzzy msgid "Excess kurtosis" @@ -4649,8 +4687,8 @@ msgstr "Definir previsão" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Quantidade" @@ -4658,7 +4696,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "Tipo de saída" @@ -4696,7 +4734,7 @@ msgstr "Diferença" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 #, fuzzy msgid "_Degree" msgstr "Mesmos graus" @@ -4706,9 +4744,9 @@ msgid "_Show" msgstr "_Mostrar máscara" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Amplitude" @@ -4737,7 +4775,7 @@ msgid "Remove polynomial background from all curves" msgstr "Remove fundo polinomial" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Remove fundo polinomial" @@ -4874,12 +4912,12 @@ msgid "Output images" msgstr "Tamanho da saída" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Exibir" @@ -4915,14 +4953,15 @@ msgid "DMT fit" msgstr "Filtro FFT 1D" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "Ajustar resultados" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Resultados" @@ -4941,20 +4980,20 @@ msgid "Remove sine background from all curves" msgstr "Remover ruído de curvas do gráfico" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 #, fuzzy msgid "Remove Sine Background" msgstr "Remove fundo polinomial" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Importa arquivos de texto Accurex II" -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Arquivos de texto Accurex II (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4984,54 +5023,54 @@ msgid "AIST-NT files (.aist)" msgstr "Arquivos AIST-NT (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Importa arquivos Alicona Imaging AL3D." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Arquivos Alicona Imaging AL3D (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Número de plano %u inválido na tag ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "Tag-chave do cabeçalho não tem final nula." -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "Tag-chave do cabeçalho está vazia." # What means nul-padded? # O que significa 'nul-padded'? -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "Tag-chave ‘%s’ do cabeçalho não tem preenchimento nulo." -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "Falta terminador CRLF na tag ‘%s’ do cabeçalho." -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "O valor da tag ‘%s’ do cabeçalho não tem final nulo." -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "O valor da tag ‘%s’ do cabeçalho não tem preenchimento nulo." -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "Falta o terminador CRLF no comentário." -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "O comentário não tem final nulo." @@ -5120,17 +5159,17 @@ "Inicio da descrição do arquivo (FileDescBegin) não tem o final da descrição " "do arquivo (FileDescEnd) correspondente." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 #, fuzzy msgid "Wrong number of header rows or columns." msgstr "número de colunas" -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, fuzzy, c-format msgid "Cannot parse data values at line %d." msgstr "Não foi possível analisar os valores de dados após %d de %d." -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "" @@ -5142,92 +5181,93 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "Arquivos A.P.E. Research DAX (.dax) e arquivo APDT (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Importa arquivos de dados APE (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "Arquivos APE (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Exporta dados como matriz ASCII simples." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "Matriz de dados ASCII (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Adiciona cabeçalho de comentário informal" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Use _ponto como separador decimal" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "Conca_tenar exportação de todas as imagens" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Precisão" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Exportar texto" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Canal:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Largura:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Altura:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Unidades de valor:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Importa arquivos de dados Assing AFM." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Arquivos Assing AFM (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Importa arquivos Attocube Systems ASC." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "Arquivos Attocube ASCII (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Importa arquivos de dados Image Metrology BCR." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "Arquivos BCR (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 #, fuzzy msgid "Cannot convert string from UTF-16." msgstr "Não foi possível converter string de UTF-16: %s" -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Cabeçalho de tipo de arquivo desconhecido: `%s'." @@ -5261,17 +5301,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Dados exportados Burleigh (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "Faltando dois pontos (:) na linha do cabeçalho." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Importa arquivos de interferograma Code V." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Arquivos de interferograma Code V (.int)" @@ -5288,19 +5328,19 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Nem o `%s' ou o `%s' campo do cabeçalho foi encontrado." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" "Inicialização de zlib falhou com erro %d, não é possível descompactar dados." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "Descompactação dos dados comprimidos falhou com erro %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "" "Não foi possível descompactar os dados compactados. O suporte à zlib não " @@ -5438,22 +5478,22 @@ msgid "Scan size header field overlaps with data." msgstr "Varredura do tamanho de um campo de cabeçalho sobrepõe com dados." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Não foi possível ler do arquivo: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "Nenhum arquivo de dados correspondendo a `%s' foi encontrado." -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "O arquivo é muito curto para ser do tipo de arquivo assumido." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5462,7 +5502,7 @@ "O arquivo não é um arquivo %s, ele está seriamente danificado, ou é de um " "formato de versão desconhecida." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5472,21 +5512,21 @@ "é de %u bytes, mas o tamanho real é de %u bytes." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "O componente/item ‘%s’ do arquivo está truncado." -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "O cabeçalho do arquivo está truncado." -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Dimensão do campo inválida: %d." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " @@ -5495,39 +5535,43 @@ "O número de %d bits por amostra é inválido ou não suportado por este tipo de " "arquivo." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "O tipo de dados %d é inválido ou não suportado." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "O campo do cabeçalho `%s' está faltando." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "O valor do parâmetro `%s' é inválido ou não suportado." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "O Parâmetro `%s' está faltando ou é inválido." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "O arquivo não contém dados (importáveis)." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "" + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "O arquivo não contém canais exportáveis." -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "A importação do arquivo foi cancelada pelo usuário." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "Faltando cabeçalho." @@ -5553,7 +5597,7 @@ msgid "Garbage before first header section." msgstr "Lixo antes da primeira sessão do cabeçalho." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Linha do cabeçalho mal formatada (faltando =)." @@ -5592,8 +5636,8 @@ msgid "FemtoScan SPM files" msgstr "Arquivos FemtoScan SPM" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Dados da imagem estão fora do arquivo." @@ -5686,7 +5730,7 @@ msgid "Following features" msgstr "Características" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Escala Z" @@ -5719,15 +5763,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Exportar %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5740,14 +5784,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Importar %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Número de pontos" @@ -5764,24 +5809,24 @@ msgid "Z-range" msgstr "Intervalo Z" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Importa arquivos de dados DME GDEF." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "Arquivos DME GDEF (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "Arquivo versão %u. %u não é suportada." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "Marca do bloco de controle não é CB, o arquivo está danificado." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Tipo de variável %u é desconhecida." @@ -5814,75 +5859,55 @@ msgstr "" "Deserialização de dados funcionou, mas resultou em um objeto inesperado %s." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "Tag %u requerida não foi encontrada." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "O diretório %lu TIFF terminou inesperadamente." -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "Tipo de dados %u BigTIFF foi encontrado em um TIFF clássico." -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Posições de dados de tag inválidos foram encontrados." -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "Campos reservados BigTIFF são %u e %u ao invés de 8 e 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Tipo %u de compressão não pe suportada." -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "Bits por amostra não uniformes não são suportados." -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "Configuração %u planar não é suportada." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Formato de amostra não suportada" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, fuzzy, c-format msgid "%s cannot open the file as a ZIP file." msgstr "O Minizip não pode abrir o arquivo como um arquivo ZIP." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, fuzzy, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Erro do libzip ao ler o arquivo zip: %s." - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "Final da lista de arquivos" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Não foi possível obter o tamanho do arquivo descompactado." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Não foi possível ler o conteúdo do arquivo." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Erro desconhecido" @@ -5891,6 +5916,11 @@ msgid "End of file" msgstr "Final do arquivo" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "Final da lista de arquivos" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Erro de parâmetro" @@ -5913,11 +5943,26 @@ msgstr "Erro do minizip ao ler o arquivo zip: %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "O arquivo %s está faltando no arquivo zip." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, fuzzy, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Erro do libzip ao ler o arquivo zip: %s." + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Não foi possível obter o tamanho do arquivo descompactado." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Não foi possível ler o conteúdo do arquivo." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Importa arquivos de campo Gwyddion XYZ." @@ -5939,50 +5984,54 @@ msgid "Export GXYZF" msgstr "Exportar GXYZF" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Canal" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "Dados XYZ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Importa arquivos Hierarchical Data Format (HDF), versão 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Arquivos Psi HDF4 (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "Cabeçalho do PSI binário é muito curto." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "Dados HDF com tipo 'nativo' não é suportado." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 #, fuzzy msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "Importa arquivos Hierarchical Data Format (HDF), versão 4." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" msgstr "" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, fuzzy, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "Tamanho dos dados %u não corresponde às dimensões dos dados (%u×%u)." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "" + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -6007,22 +6056,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "Imagens TIFF e BigTIFF com grande profundidade (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "Tamanho _horizontal" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "Tamanho _vertical" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "Escala _Z (por unidade de amostra)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 #, fuzzy msgid "Just use _pixels" msgstr "Amostras quadradas" @@ -6084,12 +6133,12 @@ msgstr "O tipo de dados %u OpenEXR é inválido ou não suportado." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "Erro na inicialização de libpng (em %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "um erro libpng ocorreu" @@ -6098,7 +6147,7 @@ msgid "Failed to read image data." msgstr "Tipo de dados %d inválidos para dados de imagem." -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Canais" @@ -6107,11 +6156,11 @@ msgid "Pages" msgstr "Páginas" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Informação da imagem" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 #, fuzzy msgid "Value Mapping" msgstr "Intervalo de valor" @@ -6142,7 +6191,7 @@ msgstr "Arquivos SEM Hitachi (.txt + imagem)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "" "Nenhum arquivo de dados correspondente foi encontrado para o cabeçalho do " @@ -6188,106 +6237,106 @@ msgid "Cannot read channel labels." msgstr "Não foi possível ler os rótulos dos canais." -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows ou OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Linhas horiz./vert." -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 #, fuzzy msgid "Crosses" msgstr "Cruz" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Elipses" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Linhas" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Retângulos" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Rede" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Caminho" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "_Nenhuma" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "_Réguas" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "_Inserir barra de escala" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "Régua de cores _falsa" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "Nenhum" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "No topo" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Ao longo da borda direita" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6297,285 +6346,285 @@ "TIFF, WebP, PPM, BMP, TARGA). Exportação para alguns formatos invoca GDK e " "outrasbibliotecas, deste modo, pode depender da instalação." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Selecionar cor" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "Branco " -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Preto" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Tamanho do pi_xel:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "Pixeis por polegada:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Zoom:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Altura:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "_Fonte:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "Tamanho da _fonte:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "Largura da _borda:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "Comprimento do _traço:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Associar tamanhos aos pixeis dos _dados" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "O separador _decimal é vírgula" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Cores" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "Cor da _linha e texto:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "Fundo _transparente" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "Cor do fundo:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Posicionamento" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "esquerda" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "centro" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "direita" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "topo" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "base" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "Escala lateral" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Comprimento:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Automático" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "Espaço hori_zontal" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "Espaço _vertical" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "Co_r:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "Cor do esboço:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "Espessura do esboço:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "O_pacidade:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Desenhar _traços" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Desenhar rótu_lo" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "Desenhar texto _acima da barra de escala" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Imagem" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "Tipo de _interpolação:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Desenhar quadro" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Desenhar _máscara" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Desenhar _legenda da máscara" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Escala de valor" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Precisão fi_xa:" # Is 'kilo threshold' an expression? # 'kilo threshold' é uma expressão? -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Limite fixo:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Título" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Posição:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "_Espaço:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Colocar _unidades para títu_lo" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Desenhar _seleção" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Objetos" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "Lateral" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "Carregar" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "Armazenar" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Renomear" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "Pré ajustar _nome:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Exportar como escala de cinza de 1_6 bits" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "Escala lateral" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Valores" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Seleção" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Pré ajustes" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Ocorreu um erro Cairo: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Falha ao salvar Pixbuf: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "A imagem é muito grande para ser armazenada como TARGA." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Desenhar _números" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "Comprimento do marcador de fim:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "_Raio do marcador:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Máscara" @@ -6595,32 +6644,32 @@ "Foi encontrado um endereço de dados inválido 0x%0x. O arquivo está em algum " "formato de versão desconhecida." -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Importa arquivos de dados Intematix SDF." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Arquivos de dados Intematix SDF (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "Conjunto de tags do parâmetro está incompleto." -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "Profundidade da imagem." -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "" "Importar e exportar formato de transferência de dados ISO 28600:2011 SPM." -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "Arquivos de transferência de dados ISO 28600:2011 SPM (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6629,57 +6678,57 @@ "Apenas mapeamentos regulares e irregulares estão implementados, mas o " "arquivo tem um mapeamento do tipo ‘%s’." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "A lista ‘%s’ possui %u itens que diferem do número %u dado por ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Fim de arquivo alcançado ao ler amostra #%u de %u" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "Dados mal formados foram encontrados ao ler amostra #%u" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Está faltando o marcador de fim de dados." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "Fim de arquivo alcançado ao ler amostra #%d de %d" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "Dados mal formados foram encontrados ao ler amostra #%d de %d" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "A linha %u não contém o rótulo obrigatório ‘%s’." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Importa arquivos de dados JEOL." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "Arquivos de dados JEOL (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "" "O tipo de dados é desconhecido. Por favor, reporte isto aos desenvolvedores." @@ -6710,39 +6759,39 @@ msgid "File does not contain grid dimensions." msgstr "O arquivo não contém dimensões da grade." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "Escaneando arquivo (curvas %u)..." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Lendo arquivos..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "Criando dados de volume..." -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Numeração não uniforme de ponto e/ou segmento não é suportada." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Listas de canais não uniformes não são suportadas." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "O arquivo de dados %s foi encontrado ao invés do esperados %s." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "" "O arquivo das propriedades do cabeçalho para o índice %u está faltando." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Não foi possível encontrar nenhum canal de altura." @@ -6760,11 +6809,11 @@ msgstr "Bloco %u do cabeçalho tem posição ou tamanho inválido." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Não foi possível encontrar bloco do cabeçalho da imagem." -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Não foi possível encontrar bloco do cabeçalho de piezo." @@ -6906,7 +6955,7 @@ msgid "MetroPro files (.dat)" msgstr "Arquivos MetroPro (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "Cabeçalho do arquivo é maior do que o arquivo." @@ -6922,12 +6971,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "Arquivos de texto MicroProf FRT (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, fuzzy, c-format msgid "Duplicate block %02x." msgstr "Duplicar" -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "O arquivo contém menos que XSize*YSize pontos de dados." @@ -6964,32 +7013,32 @@ msgid "Unique id record is too short." msgstr "Gravação de id único é muito curta." -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Importa arquivos de dados Molecular Imaging MI." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "Arquivos de dados PicoView (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "Gráfico de espectroscopia" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Importa arquivos Aarhus MUL." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Arquivos Aarhus MUL (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "Número da imagem no rótulo %u não corresponde ao número %u no índice." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "Comprimento %u da string do rótulo é maior que 20." @@ -7015,21 +7064,21 @@ msgid "Spectra data starts past the end of file." msgstr "Os dados de espectro começam após o final do arquivo." -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "Perfil %u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "Espectro F-D" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "Espectro I-V" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "Espectro I-Z" @@ -7049,7 +7098,7 @@ msgid "Nanonics files (.nan)" msgstr "Arquivos Nanonics (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -7062,7 +7111,7 @@ "Comprimento do cabeçalho (HeaderLength) %u difere do comprimento do " "cabeçalho verdadeiro %u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "" @@ -7084,7 +7133,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Arquivos Nanonis SXM (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "Cabeçalho do arquivo terminou inesperadamente." @@ -7098,12 +7147,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "A informação de dados (DATA_INFO) não contém as colunas esperadas: %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "A linha de informação de dados (DATA_INFO) contém menos que %d campos." -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Está faltando o marcador de início de dados \\x1a\\x04." @@ -7135,11 +7184,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "Dados NanoScanTech (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Importa arquivos de dados Digital Instruments Nanoscope II." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Arquivos Nanoscope II" @@ -7178,21 +7227,21 @@ "Windows, ou qualquer outra transferência de arquivos que tenta armazenar " "texto de modo independente da plataforma." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 #, fuzzy msgid "Reading channels..." msgstr "Lendo arquivos..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Não foi possível analisar o campo 'escanear tamanho'." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Lixo após amostra de dados #%u." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Linha de cabeçalho truncada." @@ -7214,58 +7263,58 @@ msgid "Nanotop files (.spm)" msgstr "Arquivos Nanotop (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Importa arquivos network Common Data Form (netCDF) criados por GXSM." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "Arquivos GSXM netCDF (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "A variável `%s' se refere a dados inválidos ou inexistentes." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "Gravações NetCDF não são suportadas." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "Valores da série valor deve ser do tipo FLOAT." -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "Valores de tempo devem ser do tipo DOUBLE." -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "" "A leitura de arquivos de escaneamento rápido não está implementada - ainda." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "Ordem das séries de tempo está errada." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "O arquivo terminou inesperadamente dentro de `%s'." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "Esperado arranjo `%s' ou `ABSENT'." -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" "O arranjo `%s' tem um número de elementos diferente de zero ao invés de ser " "ausente." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "Mais de uma dimensão gravada foi encontrada." @@ -7284,7 +7333,7 @@ "interativa." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Renderizando superfície..." @@ -7292,7 +7341,7 @@ msgid "Import NMM Profile Set" msgstr "Importar conjunto de perfis NMM" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Informação" @@ -7321,13 +7370,13 @@ msgstr "" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "Tamanho _horizontal:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "Tamanho _vertical:" @@ -7427,17 +7476,17 @@ "O campo 'desconsiderar linhas' especifica mais bytes do que existem no " "arquivo." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "Itens do campo do cabeçalho por-eixo %s são quotados." -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "O campo %s do cabeçalho por-eixo contém itens demais." -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "O campo %s do cabeçalho por-eixo contém muito poucos itens." @@ -7502,7 +7551,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Importa arquivos de dados MapVue (.map)." -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, fuzzy, c-format msgid "Chunk type %u occured multiple times." msgstr "O arquivo de dados %s foi encontrado ao invés do esperados %s." @@ -7576,7 +7626,7 @@ msgid "Header line starts with a colon." msgstr "Linha do cabeçalho começa com dois pontos (:)." -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "A informação do canal terminou inesperadamente." @@ -7612,48 +7662,48 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Importa arquivos Wyko OPD e ASC." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Arquivos Wyko OPD (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Arquivos de exportação Wyko ASCII (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "O item `%s' está além do final do arquivo." -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Diretórios aninhados encontrados" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Lê arquivos ISO 5436-2 OpenGPS .x3p." -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "Dados ISO 5436-2 OpenGPS (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "" "Há muitos itens da lista de dados (DataList) para as dimensões da matriz " "fornecida." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "O arquivo main.xml contém múltiplos elementos de dados." #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "Apenas o tipo %s é suportado para o eixo %s." @@ -7677,7 +7727,7 @@ msgstr "Tipo de tag %u inválida ou não suportada." #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "O bloco de dados está truncado." @@ -7762,38 +7812,38 @@ "JPEG, ...). O conjunto de formatos disponíveis depende dos carregadores GDK " "pixbuf disponíveis." -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 #, fuzzy msgid "Use" msgstr "Usuário" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 #, fuzzy msgid "_Hue offset" msgstr "Afastamento _X" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "O pixmap não tem o tipo de arquivo `%s' registrado." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Não foi possível obter o carregador de pixbuf: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "O carregador de pixbuf recusou os dados: %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "como dados" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7845,7 +7895,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "Cabeçalho é muito curto (somente %lu bytes)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "Cabeçalho de espectroscopia é muito curto (somente %lu bytes)." @@ -7874,21 +7924,17 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "" -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "" - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, fuzzy, c-format msgid "JSON parsing error: %s" msgstr "Análise de XML falhou: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 #, fuzzy msgid "Reading frame table..." msgstr "Lendo arquivos..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 #, fuzzy msgid "Reading curve data..." msgstr "Criando dados de volume..." @@ -7962,59 +8008,59 @@ msgid "Quesant files (.afm)" msgstr "Arquivos Quesant (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "Especificado pelo usuário" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Byte assinado" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Byte não assinado" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "Palavra assinada de 16bits" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "Palavra não assinada de 16bits" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "Palavra assinada de 32bits" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "Palavra não assinada de 32bits" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "Palavra assinada de 64bits" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "Palavra não assinada de 64bits" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE simples" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE duplo (double)" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "Meio IEEE" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Pascal real" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -8022,162 +8068,162 @@ "Importa arquivos de dados raw, tanto ASCII quanto binário, de acordo com o " "formato especificado pelo usuário." -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "Arquivos de dados raw" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Nenhum espaço em branco" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "Caractere TAB" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Outro caractere" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "Delimitador de campos" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" "Oferecer _automaticamente importação de dados raw para arquivos desconhecidos" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "Dados de _texto" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "Dados _binários" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "Está faltando valor substituto" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "Começar da _linha" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 #, fuzzy msgid "_Each row skip" msgstr "_A cada linha pular:" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "_Outro delimitador" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 #, fuzzy msgid "Data t_ype" msgstr "Dados para comparar:" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "Padrão de troca de byte" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "Iniciar no afastamento" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "Tamanho da amo_stra" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "Após cada amostra pular" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "Após cada linha pular" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "_Reverter bits em bytes" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Reverter bits em amostras" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Amostras estão assinadas" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "A importação de dados raw deve ser executada como interativa." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Lê arquivo raw" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Formato dos dados" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Arquivo" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "campos" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "bytes" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "bits" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Binário" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Text" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Delimitador: espaço em branco" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Delimitador: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Delimitador: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Info" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 #, fuzzy msgid "Invalid preset name." msgstr "Cabeçalho de arquivo inválido." -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, fuzzy, c-format msgid "" "Too short file\n" @@ -8188,7 +8234,7 @@ "O formato exigiria arquivo com (pelo menos) %u bytes de tamanho, mas o " "tamanho de `%s' é de apenas %u bytes." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -8197,44 +8243,44 @@ "Análise falhou\n" "O conteúdo de `%s' não confere com o formato: %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Não há linhas suficientes (%d) para o afastamento (%d)" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" "Espaço em branco esperado para pular mais campos na linha %u, `%.16s' foi " "obtido" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" "`%c' era esperado para pular mais campos na linha %u, `%.16s' foi obtido" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" "`%s' era esperado para pular mais campos na linha %u, `%.16s' foi obtido" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Lixo `%.16s' na linha %u, coluna %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" "Delimitador `%c' era esperado após os dados na linha %u, coluna %u, `%c' foi " "obtido" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8254,8 +8300,8 @@ msgid "_Title" msgstr "_Título" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Curva" @@ -8300,36 +8346,36 @@ msgid "Random points order unsupported" msgstr "Ordem de pontos aleatória não é suportada" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Importa arquivos de dados RHK Technology SM3." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "Arquivos RHK SM3 (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "Final do arquivo alcançado no cabeçalho da página." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "cabeçalho mágico da página" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "Final do arquivo alcançado na string #%u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "Final do arquivo alcançado no cabeçalho dos dados de cores." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "Final do arquivo alcançado nos dados de cores." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Linha %d desconhecida" @@ -8342,17 +8388,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "Arquivos RHK SM4 (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "A lista de objetos %s está truncada." -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "O objeto do tipo %s está truncado." -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Não foi possível encontrar o objeto %s em %s." @@ -8387,7 +8433,7 @@ msgid "data ranges" msgstr "Intervalos de dados" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "afastamento de dados" @@ -8463,16 +8509,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Arquivos Sensofar PLu (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Perfil" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Lê arquivos Sensofar PLUx." -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Arquivos Sensofar PLUx (.plux)" @@ -8484,15 +8530,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Arquivos de texto Sensolytics (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Importa arquivos de dados Shimadzu SPM." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Arquivos Shimadzu" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Não foi possível analisar os valores de dados após %d de %d." @@ -8513,31 +8559,31 @@ msgid "SIS files (.sis)" msgstr "Arquivos SIS (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "O bloco não é um bloco de documento." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Informação do documento é muito curta." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Informação do parâmetro é muito curta." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Bloco de imagem inesperado." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "Final do arquivo alcançado no bloco de imagem." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "Final do arquivo alcançado no bloco do canal." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "Fim de arquivo alcançado quando um outro canal era esperado." @@ -8848,31 +8894,31 @@ msgid "Unknown data type `%s'." msgstr "Tipo de dados desconhecido `%s'." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Exporta dados como arquivo de texto XYZ simples." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "Dados de texto XYZ (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "Dados XYZ:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Unidades de laterais:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Exporta XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Importa imagens SEM Carl Zeiss." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Escaneamentos SEM Carl Zeiss (.tif)" @@ -8907,12 +8953,12 @@ msgid "Data line %u does not contain four items." msgstr "Linha de dados %u não contém quatro itens." -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "O código de unidade %d é inválido ou não suportado." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "A primeira linha contém itens demais." @@ -8942,9 +8988,8 @@ msgid "Fit Graph" msgstr "Ajustar gráfico" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "Curva do _gráfico:" @@ -8953,28 +8998,18 @@ msgid "F_unction:" msgstr "F_unção:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Intervalo:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "até" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "_Desenhar círculo completo" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -9028,27 +9063,27 @@ msgid "Results\n" msgstr "Resultados\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Cortar gráfico" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 #, fuzzy msgid "/_Basic Operations/_Cut..." msgstr "/Operações básicas/Inclinar..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Extrair parte do gráfico para um novo" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Cortar gráfico" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Cortar tod_as as curvas" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Cortar gráfico" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Espectro DOS" @@ -9106,6 +9141,7 @@ msgstr "Onda de texto Igor Pro" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 #, fuzzy msgid "Style" msgstr "Estilo de linha" @@ -9131,7 +9167,7 @@ msgstr "Abcissa simples _mesclada" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Exportar para arquivo de texto" @@ -9329,8 +9365,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/Ajustar curva _FD..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 #, fuzzy msgid "_All curves" msgstr "Alinhar curvas" @@ -9345,8 +9381,8 @@ msgid "Zero position" msgstr "Posição Z" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 #, fuzzy msgid "FD curve" msgstr "Ajustar curva FD" @@ -9448,6 +9484,100 @@ msgid "Logscale Transform" msgstr "Transformada de escala logarítmica" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "" + +#: modules/graph/graph_measure_period.c:105 +#, fuzzy +msgid "/Measure _Features/_Period..." +msgstr "Medir rede" + +#: modules/graph/graph_measure_period.c:108 +#, fuzzy +msgid "Measure grating period" +msgstr "Medir rede" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "Salvar parâmetros" + +#: modules/graph/graph_measure_period.c:126 +#, fuzzy +msgid "_Subtract background" +msgstr "E_xtrair fundo" + +#: modules/graph/graph_measure_period.c:127 +#, fuzzy +msgid "Show _leveled curve" +msgstr "Curva fechada" + +#: modules/graph/graph_measure_period.c:166 +#, fuzzy +msgid "Measure Period" +msgstr "Marca de facetas" + +#: modules/graph/graph_measure_period.c:187 +#, fuzzy +msgid "Fourier Transform" +msgstr "Transformada de Fourier rápida" + +#: modules/graph/graph_measure_period.c:189 +#, fuzzy +msgid "Autocorrelation" +msgstr "Comprimento de autocorrelação" + +#: modules/graph/graph_measure_period.c:191 +#, fuzzy +msgid "Direct Methods" +msgstr "Direção" + +#: modules/graph/graph_measure_period.c:237 +#, fuzzy +msgid "Grating Period" +msgstr "Imagem da grade" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "" + +#: modules/graph/graph_measure_period.c:250 +#, fuzzy +msgid "Simple FFT" +msgstr "Filtrado por FFT" + +#: modules/graph/graph_measure_period.c:251 +#, fuzzy +msgid "Refined FFT" +msgstr "_Refinar" + +#: modules/graph/graph_measure_period.c:252 +#, fuzzy +msgid "Simple ACF" +msgstr "ACF radial" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Indentar centro em" + +#: modules/graph/graph_measure_period.c:255 +#, fuzzy +msgid "Zero crossings" +msgstr "Posição Z" + +#: modules/graph/graph_measure_period.c:1050 +#, fuzzy +msgid "Leveled profile" +msgstr "Dados nivelados" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "Encontrar picos nas curvas do gráfico." @@ -9466,7 +9596,7 @@ msgstr "Proeminência" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Zero" @@ -9498,97 +9628,97 @@ msgid "Graph Peaks" msgstr "Picos do gráfico" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 #, fuzzy msgid "Data + fit" msgstr "Formato dos dados:" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Dados nivelados" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Remove fundo polinomial" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 #, fuzzy msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/Nive_lar/Fundo _polinomial..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 #, fuzzy msgid "Remove polynomial background from FZ curve" msgstr "Remove fundo polinomial" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 #, fuzzy msgid "Curve to fit" msgstr "Posição _X da curva:" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 #, fuzzy msgid "_Output" msgstr "Saída" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 #, fuzzy msgid "Fit results" msgstr "Ajustar resultados" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 #, fuzzy msgid "P1" msgstr "10" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Distribuição de alturas" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Distribuição de alturas cumulativa" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Distribuição de ângulos" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Distribuição de ângulos cumulativa" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "ACF" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "HHCF" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "PSDF" @@ -9607,7 +9737,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "Funções estatísticas" -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Calcular funções estatísticas 1D" @@ -9619,14 +9749,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "Resolução fixa" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Funções estatísticas" @@ -9649,122 +9779,111 @@ msgid "pick points" msgstr "Pontos especiais" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 #, fuzzy msgid "Remove sine background" msgstr "Remove fundo polinomial" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "" -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 #, fuzzy msgid "Period" msgstr "_Período X:" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 #, fuzzy msgid "Y offset" msgstr "Afastamento _Y:" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "Calcula estatísticas simples de curva em gráfico." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 #, fuzzy msgid "/_Statistics/_Statistical Quantities..." msgstr "Salvar quantidades estatísticas" -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "Calcular estatísticas de curva em gráfico" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "Salvar parâmetros" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Quantidades estatísticas" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "Parâmetros de simples" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "Integrais" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "Estatísticas do gráfico" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 #, fuzzy msgid "Rms (Rq)" msgstr "Rms (Rq):" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 #, fuzzy msgid "Projected length" msgstr "Comprimento projetado:" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 #, fuzzy msgid "Developed length" msgstr "Comprimento desenvolvido:" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Variação" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 #, fuzzy msgid "Area under curve" msgstr "Área sobre a curva:" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 #, fuzzy msgid "Positive area" msgstr "Área positiva:" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 #, fuzzy msgid "Negative area" msgstr "Área negativa:" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 #, fuzzy msgid "Root mean square" msgstr "Raiz quadrática média:" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 #, fuzzy msgid "Data + polynomials" msgstr "Distorcer por polinomial" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9773,223 +9892,216 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Diferença" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 #, fuzzy msgid "Leveled surface" msgstr "Dados nivelados" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 #, fuzzy msgid "Polynomial background" msgstr "Remove fundo polinomial" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 #, fuzzy msgid "Fits terraces with polynomial background." msgstr "Subtrai fundo polinomial." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." msgstr "" -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 #, fuzzy msgid "Fit terraces with polynomial background" msgstr "Subtrai fundo polinomial." -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -#, fuzzy -msgid "Fitted step height" -msgstr "Forma ajustada" - -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "Diferença quadrática média" - -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "" - -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -#, fuzzy -msgid "Number of terraces" -msgstr "_Número de interações:" - -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 +#: modules/graph/graph_terraces.c:252 #, fuzzy -msgid "Fit Terraces" -msgstr "Ajustar área" - -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "" - -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 -#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 -#: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 -msgid "Output" -msgstr "Saída" +msgid "Step detection" +msgstr "Definir _seleção" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 #, fuzzy -msgid "Survey" -msgstr "Curva" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "" +msgid "_Step detection kernel" +msgstr "Definir _seleção" -#: modules/graph/graph_terraces.c:528 +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 #, fuzzy -msgid "Step detection _threshold:" +msgid "Step detection _threshold" msgstr "Especificar limites" -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +#, fuzzy +msgid "Step _broadening" +msgstr "Definir _seleção" -#: modules/graph/graph_terraces.c:546 +#: modules/graph/graph_terraces.c:268 #, fuzzy -msgid "Minimum terrace _length:" +msgid "Minimum terrace _length" msgstr "Comprimento mínimo:" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "Grau _polinomial:" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "Grau _polinomial" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 #, fuzzy msgid "_Independent heights" msgstr "Graus independentes" -#: modules/graph/graph_terraces.c:580 -#, fuzzy -msgid "Step detection" -msgstr "Definir _seleção" - -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "Exibir:" - -#: modules/graph/graph_terraces.c:587 +#: modules/graph/graph_terraces.c:274 #, fuzzy msgid "Select regions _manually" msgstr "Gerenciador de seleção" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 -#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 -#: modules/process/mark_with.c:284 modules/process/neural.c:543 -#: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 -msgid "Result" -msgstr "Resultado" - -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 #, fuzzy msgid "Save Terrace Table" msgstr "Salvar tabela de distância" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "Grau _polinomial" +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 +#: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 +#: modules/process/multiprofile.c:273 modules/process/pid.c:151 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 +msgid "Output" +msgstr "Saída" -#: modules/graph/graph_terraces.c:889 +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 #, fuzzy -msgid "M_inimum polynomial degree:" -msgstr "Grau _máximo do polinômio:" +msgid "M_inimum polynomial degree" +msgstr "Grau _máximo do polinômio" -#: modules/graph/graph_terraces.c:899 +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 #, fuzzy -msgid "_Maximum polynomial degree:" -msgstr "Grau _máximo do polinômio:" +msgid "_Maximum polynomial degree" +msgstr "Grau _máximo do polinômio" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 #, fuzzy -msgid "Step _broadening" -msgstr "Definir _seleção" - -#: modules/graph/graph_terraces.c:921 -#, fuzzy -msgid "Minimum broadening:" -msgstr "_Mínimo:" +msgid "Minimum broadening" +msgstr "_Mínimo" -#: modules/graph/graph_terraces.c:932 +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 #, fuzzy -msgid "Maximum broadening:" +msgid "Maximum broadening" msgstr "Tamanho máximo comprometido" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +#, fuzzy +msgid "Fit Terraces" +msgstr "Ajustar área" + +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" msgstr "" -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 -#, fuzzy, c-format -msgid "Number of combinations: %u." +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +#, fuzzy +msgid "Survey" +msgstr "Curva" + +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 +#: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 +#: modules/process/mark_with.c:284 modules/process/neural.c:543 +#: modules/process/psf.c:354 modules/process/terracefit.c:572 +#: modules/volume/volume_psf.c:548 +msgid "Result" +msgstr "Resultado" + +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "" + +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +#, fuzzy +msgid "Fitted step height" +msgstr "Forma ajustada" + +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "Diferença quadrática média" + +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "" + +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +#, fuzzy +msgid "Number of terraces" msgstr "_Número de interações:" -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." +msgstr "" + +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 #, fuzzy msgid "No free parameters are selected." msgstr "Sem área na seleção amplificada." -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 +#, fuzzy, c-format +msgid "Number of combinations: %u." +msgstr "_Número de interações:" + +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, fuzzy, c-format msgid "Segment %u" msgstr "Segmentação" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, fuzzy, c-format msgid "Level %d" msgstr "Dados nivelados" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "O ajuste falhou" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 #, fuzzy msgid "No terraces were found" msgstr "Nenhum vizinho encontrado" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Salvar tabela" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 #, fuzzy msgid "Save Terrace Fit Survey" msgstr "Salvar tabela de distância" @@ -10124,7 +10236,7 @@ msgstr "Nivelamento plano" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Zoom" @@ -10143,8 +10255,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "Espessura" @@ -10171,7 +10283,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "Máscara em uso" @@ -10268,7 +10380,7 @@ msgstr "" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Número de interações" @@ -10317,8 +10429,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Pré-visualização progressiva" @@ -10330,13 +10442,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Dimensões" @@ -10345,18 +10458,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Gerador" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Parâmetros de simulação" @@ -10368,15 +10483,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "Como a imagem atual" @@ -10385,10 +10501,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10399,8 +10516,9 @@ msgstr "Inicializando ..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "Executando cálculos..." @@ -10431,7 +10549,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "_Raio" @@ -10471,64 +10589,80 @@ msgid "Arithmetic operations on data" msgstr "Operações aritméticas em dados" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Expressão" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Especificar un_idades" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Calculado" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Aritmética" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Expressão:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Operandos" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Obter unidades do resultado a partir dos dados d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Especificar un_idades:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Especificar unidades do resultado explicitamente" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "Expressão contém identificadores desconhecidos" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Dimensões dos pixeis diferem" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "Dimensões laterais são diferentes das quantidades físicas" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Dimensões físicas diferem" @@ -10564,7 +10698,7 @@ "Operações básicas como espelhamento, inversão de valores e rotação por " "múltiplos de 90 graus." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/Operações básicas/_Inverter valor" @@ -10596,35 +10730,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "Cobertura" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 #, fuzzy msgid "Spread" msgstr "Tamanho estendido:" @@ -11028,27 +11163,30 @@ msgid "Building mesh..." msgstr "Construindo encaixe..." -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "Correção X" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Correção Y" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Correção Z" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "Incerteza em X" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Incerteza em Y" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Incerteza em Z" @@ -11083,6 +11221,7 @@ msgstr "Recalibra dimensões laterais de escaneamento ou intervalo de valor." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/Operações básicas/_Dimensões e unidades..." @@ -11176,7 +11315,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "Criar nova imagem" @@ -11229,10 +11368,6 @@ msgid "Classify" msgstr "" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "" - #: modules/process/classify.c:299 modules/process/classify.c:565 #, fuzzy msgid "Mask A" @@ -11412,6 +11547,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 #, fuzzy msgid "_Height scale" @@ -11564,14 +11700,14 @@ msgid "Convolution _kernel" msgstr "Núcleo da convolução" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Normalizar como _integral" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "Convolvido" @@ -11605,13 +11741,13 @@ msgstr "Correção afim" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "_Refinar" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Pré-visualizar opções" @@ -11810,7 +11946,7 @@ msgstr "Adicionar máscara de resultados de baixa pontuação" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "Limiar" @@ -11899,13 +12035,13 @@ msgid "Curvature Sections" msgstr "Secções de curvatura" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Perfil %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Tipo de saída:" @@ -12015,7 +12151,7 @@ msgid "Deconvolve" msgstr "Convolver" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 #, fuzzy msgid "Sigma" msgstr "_Sinal:" @@ -12403,7 +12539,8 @@ msgid "drift" msgstr "deriva" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "Deriva do eixo x" @@ -12419,6 +12556,48 @@ msgid "rows" msgstr "linhas" +#: modules/process/dune_synth.c:108 +#, fuzzy +msgid "Generates images by simulating formation of sand dunes." +msgstr "Gera imagens de domínio usando um modelo Ising híbrido." + +#: modules/process/dune_synth.c:122 +#, fuzzy +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/Sintético/_Deposição/_Fibras..." + +#: modules/process/dune_synth.c:126 +#, fuzzy +msgid "Generate image by transporting sand" +msgstr "Gera imagens de domínio usando um modelo Ising híbrido." + +#: modules/process/dune_synth.c:145 +#, fuzzy +msgid "_Minimum step" +msgstr "_Mínimo" + +#: modules/process/dune_synth.c:146 +#, fuzzy +msgid "Step range" +msgstr "Intervalo de busca" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "" + +#: modules/process/dune_synth.c:149 +#, fuzzy +msgid "Maximum s_lope" +msgstr "Valor máximo" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "DWT (Discrete Wavelet Transform) bidimensional." @@ -12726,7 +12905,7 @@ msgstr "Não existe caminho selecionado." #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Distância" @@ -12751,10 +12930,11 @@ msgstr "Nivelar faceta" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Nivelamento de faceta..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Visualiza, marca e mede orientação de faceta." @@ -12776,11 +12956,11 @@ msgid "_Number points" msgstr "_Número de pontos" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "Limpar" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "Marcar" @@ -12853,7 +13033,7 @@ msgid "Create _Points" msgstr "Criar _pontos" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "Salvar vetores da faceta" @@ -12862,50 +13042,50 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f graus, φ = %.2f graus" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 #, fuzzy msgid "/Measure _Features/Facet _Measurement..." msgstr "/E_statísticas/_Análise de faceta..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 #, fuzzy msgid "Measure facet angles" msgstr "Medir distâncias" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 #, fuzzy msgid "_Facet plane size" msgstr "Tamanho do plano da faceta:" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Tolerância" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 #, fuzzy msgid "Selected φ" msgstr "Linha selecionada" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 #, fuzzy msgid "Selected ϑ" msgstr "Linha selecionada" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 #, fuzzy msgid "Measure Facets" msgstr "Marca de facetas" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 #, fuzzy msgid "Mea_sure" msgstr "Medida de grão" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 #, fuzzy msgid "points" msgstr "Pontos" @@ -13143,7 +13323,7 @@ msgid "Clear the entire filter mask" msgstr "Limpar a máscara de filtro inteira" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "Preencher" @@ -13163,7 +13343,7 @@ msgid "Zoom:" msgstr "Zoom:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Opções de saída" @@ -13234,7 +13414,7 @@ msgid "Triangle" msgstr "Triângulo" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "Retângulo" @@ -13283,7 +13463,7 @@ msgstr "Fibras aleatórias" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Forma" @@ -13315,7 +13495,7 @@ msgstr "Forma ajustada" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Ambos" @@ -13590,6 +13770,7 @@ msgstr "Criar imagens da ponta" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "Fração de aparamento" @@ -14642,7 +14823,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Corrige defeitos de linha (algorítimos experimentais em sua maioria)." -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/_Corrigir dados/Correção de _passo de linha" @@ -14660,31 +14841,31 @@ msgid "Mark lines with inverted sign" msgstr "Marcar grãos com regressão logística" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Polinomial" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Mediana das diferenças" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Modo" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Correspondendo" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "Aparamento médio" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "Aparamento médio das diferenças" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 #, fuzzy msgid "Facet-level tilt" msgstr "Nivelamento de faceta..." @@ -14693,7 +14874,7 @@ msgid "Aligns rows by various methods." msgstr "Alinha linhas por vários métodos." -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/_Corrigir dados/_Alinhar linhas..." @@ -14729,7 +14910,7 @@ msgid "Steps" msgstr "Passos" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Ranhuras" @@ -14738,7 +14919,7 @@ msgstr "Cumes" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Inclinar" @@ -14886,7 +15067,7 @@ msgid "_Hessian" msgstr "_Hessiano" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "Parâmetro de _regularização" @@ -14911,10 +15092,12 @@ msgstr "Marcar dados desconectados de outros valores" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Positivo" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Negativo" @@ -15049,7 +15232,7 @@ msgid "Two-sided" msgstr "Em dois lados" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Reduzir a partir da _borda" @@ -15180,116 +15363,136 @@ msgid "Shift Mask" msgstr "Filtro de máscara" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "Procura por um detalhe em outra imagem usando correlação." -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/M_ultidados/Buscar correlação..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "Procura por um detalhe usando correlação" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "Correlação, crua" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "Correlação, nivelada" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Resultado da correlação" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "Diferença de altura, crua" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "Diferença de altura, nivelada" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "Índice da diferença de altura" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Apenas fase" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Objetos marcados" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Máximo da correlação" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "_Método da correlação" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Usar _máscara" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 #, fuzzy msgid "_Plot mask" msgstr "Definir máscara" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "_Detalhe a ser buscado" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "Busca de correlação" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Operações básicas com: inversão, remoção, extração." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Máscara/_Remover máscara" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Remover máscara a partir dos dados" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Máscara/_Inverter máscara" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Inverter máscara" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Máscara/_Extrair máscara" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "Extrair máscara para uma nova imagem" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +#, fuzzy +msgid "/_Grains/_Extract Numbers" +msgstr "/_Máscara/_Extrair máscara" + +#: modules/process/maskops.c:85 +#, fuzzy +msgid "Extract grain numbers to a new image" +msgstr "Extrair máscara para uma nova imagem" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/_Grãos/_Remover os que tocam na borda" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Remover grãos tocando bordas da imagem" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Máscara/Fi_na" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Máscara fina" +#: modules/process/maskops.c:193 +#, fuzzy +msgid "Grain Numbers" +msgstr "Número do grão" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Apara regiões sem intersecção de duas imagens." @@ -15437,7 +15640,7 @@ msgid "Second image" msgstr "Convolver duas imagens" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Média" @@ -15828,7 +16031,7 @@ msgid "Use _first mask for all images" msgstr "" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "_Modo" @@ -15924,8 +16127,8 @@ msgid "Re_initialize" msgstr "Re_inicializar" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Modo de mascaramento" @@ -16479,6 +16682,65 @@ msgid "Pile Up Shapes" msgstr "Empilhar formas" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Gera estruturas separadas por fase." + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/Sintético/_Padrão..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Gerar imagem com domínios" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Largura máxima" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Mínimo" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Tamanho estendido:" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "Fração de aparamento:" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "Dimensiona escala com tamanho" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "_Altura:" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Aleatório linear" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Gerando fibras..." + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Aplica distorção polinomial no plano horizontal." @@ -16541,11 +16803,6 @@ msgid "_Vertical polynomial degree" msgstr "Grau do polinômio _vertical" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -#, fuzzy -msgid "_Maximum polynomial degree" -msgstr "Grau _máximo do polinômio" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "Mesmos graus" @@ -16562,6 +16819,10 @@ msgid "Copy table to clipboard" msgstr "Copiar tabela para área de transferência" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Salvar tabela" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Operações básicas com apresentação: extração, remoção." @@ -16719,8 +16980,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 #, fuzzy msgid "Transfer function" msgstr "Função delta" @@ -16743,7 +17004,7 @@ msgid "Transfer function estimation" msgstr "Estimativa da função de difusão de pontos" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 #, fuzzy msgid "/_Statistics/_Transfer Function Guess..." msgstr "/E_statísticas/Tentativa PSF..." @@ -16753,17 +17014,17 @@ msgid "Estimate transfer function from known data and ideal image" msgstr "Estimar PSF a partir de dados e imagem conhecidos" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 #, fuzzy msgid "Regularized filter" msgstr "Compilar perfis" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 #, fuzzy msgid "Least squares" msgstr "Raiz quadrática média:" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 #, fuzzy msgid "Wiener filter" msgstr "Ajuste linear" @@ -16773,21 +17034,21 @@ msgid "_Border" msgstr "Bordas" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 #, fuzzy msgid "Image is too small." msgstr "Erro: partículas muito pequenas." -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 #, fuzzy msgid "_Fit Sigma" msgstr "_Sinal:" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 #, fuzzy msgid "Transfer Function Size" msgstr "Função delta" @@ -16807,25 +17068,25 @@ msgid "Transfer Function" msgstr "Função delta" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 #, fuzzy msgid "TF width" msgstr "Largura do achatamento:" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 #, fuzzy msgid "TF height" msgstr "Nova altura:" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 #, fuzzy msgid "Difference norm" msgstr "Diferença" @@ -16961,7 +17222,7 @@ msgid "Proportion" msgstr "_Proporcional:" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 #, fuzzy msgid "Offset" msgstr "Afastamentos:" @@ -17192,7 +17453,7 @@ msgid "_Assume symmetry" msgstr "Assimétrico" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Dados girados" @@ -17269,23 +17530,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Corrigir ranhuras horizontais (golpes)" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Tipo de ranhuras" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "Limiar rígido" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "Limiar suave" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Comprimento mínimo" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Largura máxima" @@ -17541,16 +17802,6 @@ msgid "Marked terraces" msgstr "Áreas marcadas:" -#: modules/process/terracefit.c:282 -#, fuzzy -msgid "_Step detection kernel" -msgstr "Definir _seleção" - -#: modules/process/terracefit.c:284 -#, fuzzy -msgid "Step detection _threshold" -msgstr "Especificar limites" - #: modules/process/terracefit.c:289 #, fuzzy msgid "Minimum terrace _area" @@ -17560,25 +17811,6 @@ msgid "Do not _segment, use only mask" msgstr "" -#: modules/process/terracefit.c:304 -#, fuzzy -msgid "M_inimum polynomial degree" -msgstr "Grau _máximo do polinômio" - -#: modules/process/terracefit.c:308 -#, fuzzy -msgid "Minimum broadening" -msgstr "_Mínimo" - -#: modules/process/terracefit.c:310 -#, fuzzy -msgid "Maximum broadening" -msgstr "Tamanho máximo comprometido" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "" - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Limitar o intervalo de dados usando um limite inferior/superior." @@ -17623,7 +17855,7 @@ msgid "Limit Range" msgstr "Limitar intervalo" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "Definir para escala completa" @@ -18364,145 +18596,145 @@ msgid "Function written in Python" msgstr "Função escrita em Python" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 #, fuzzy msgid "Correlation length tool." msgstr "Comprimento de autocorrelação" -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 #, fuzzy msgid "line-leveling|None" msgstr "_Nenhum" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 #, fuzzy msgid "Line leveling" msgstr "Nivelamento plano" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Salvar quantidades estatísticas" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 #, fuzzy msgid "Correlation Length" msgstr "Comprimento de autocorrelação" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 #, fuzzy msgid "Correlation Length T" msgstr "Comprimento de autocorrelação" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 #, fuzzy msgid "Relation to Image Size" msgstr "Rasterizar para imagem" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "Área selecionada" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i at (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v at (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 #, fuzzy msgid "PSDF Gaussian fit" msgstr "Gaussiana" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 #, fuzzy msgid "PSDF exponential fit" msgstr "Exponencial" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 #, fuzzy msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "Camada permitindo seleção de linhas horizontal ou vertical." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 #, fuzzy msgid "Profiles Along Axes" msgstr "Razão do comprimento do perfil" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 #, fuzzy msgid "Read horizontal and/or vertical profiles" msgstr "Espelhar dados horizontalmente e verticalmente" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Perfis" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Opções" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, fuzzy, c-format msgid "Vertical profile %d" msgstr "Posição vertical" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, fuzzy, c-format msgid "Horizontal profile %d" msgstr "Tamanho horizontal:" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Ferramenta de corte, corta dados para um tamanho menor." -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Ferramenta de medir distâncias, mede distâncias e ângulos." +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "Salvar tabela de distância" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "Enumerar linhas" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Medir distâncias e direções entre pontos" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "Salvar tabela de distância" - #: modules/tools/filter.c:117 #, fuzzy msgid "" @@ -18564,7 +18796,7 @@ "Ferramenta de remoção de grãos, remove partes contínuas da máscara e/ou " "dados subjacentes." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Solucionador de Laplace" @@ -18572,7 +18804,7 @@ msgid "Fractal correction" msgstr "Correção fractal" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "" @@ -18580,7 +18812,7 @@ msgid "Remove" msgstr "Remover" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "Método de _interpolação" @@ -18592,7 +18824,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Remover grãos individuais (partes contínuas da máscara)." -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -18601,69 +18833,78 @@ "de dados que a escala de cores falsas deve mapear, seja nos dados ou no " "histograma de distribuição de alturas." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 #, fuzzy msgid "_Start" msgstr "Estrela" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +#, fuzzy +msgid "_Adapt color range to selection" +msgstr "Intervalo de cores automático com extremidades cortadas" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Intervalo de cores" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Estender o intervalo de cores para parte dos dados" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Intervalo de cores completo do mínimo ao máximo" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Definir explicitamente um intervalo de cores fixo" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Intervalo de cores automático com extremidades cortadas" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Mapeamento de cores não-linear adaptativo" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "pa_drão" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Histograma de alturas" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 #, fuzzy msgid "Color Mapping" msgstr "Intervalo de cores" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Definir para mascarado" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "Definir para não-mascarado" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Inverter mapeamento" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 #, fuzzy msgid "Data Range" msgstr "Intervalos de dados" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -18672,7 +18913,7 @@ "Ferramenta de nível de três pontos, nivela os dados subtraindo um plano " "ajustado através de três pontos selecionados." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "Calculando raio médio" @@ -18692,7 +18933,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Nivelar dados por ajuste de um plano através de três pontos" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -18700,129 +18941,133 @@ "Ferramenta de função estatística de linha/coluna, valores médios, medianas, " "máximos, mínimos, RMS, ..., de linhas ou colunas." -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Linhas" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "Colunas" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Estatísticas de linha/coluna" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Calcular funções estatísticas de linha/coluna" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "" "Ferramenta de edição de máscara, permite a modificação interativa de partes " "da máscara." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "Forma_s" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "Ferramentas de _desenho" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Definir máscara para seleção" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Adicionar seleção para máscara" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Subtrair seleção da máscara" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Cruzar seleção com máscara" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Formas retangulares" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Formas elípticas" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Linhas finas" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Desenhar máscara à mão" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Apagar máscara à mão" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Preencher áreas contínuas vazias com máscara" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Apagar partes contínuas da máscara" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "Quantidade" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "Preencher conectado não-simples" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "Evitar a fusão de grãos durante o crescimento" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Editor de máscara" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Editar máscara" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Editor" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Ações" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Crescer/encolher" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Inverter" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "Preencher _vazios" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "Crescer" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "Encolher" @@ -18840,103 +19085,108 @@ msgid "Level rows using intersections with given lines" msgstr "Nivelar linhas usando intersecções com linhas fornecidas" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Ferramenta de perfil, cria gráficos de perfis de linhas selecionadas." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "Nenhum" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "_Separar perfis" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "Mostrar perfil" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "Dados de _calibração" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "Melhorar _direção" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "Melhorar tudo" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "Erro em X %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Erro em Y %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Erro em Z %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "Incerteza em X %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Incerteza em Y %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Incerteza em Z %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Limite superior de inc. Z %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Limite inferior de inc. Z %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Ferramenta indicadora, lê o valor sob o ponteiro do mouse." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Mostrar _seleção" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +#, fuzzy +msgid "Adapt color range to detail" +msgstr "Intervalo de cores automático com extremidades cortadas" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Ler valor" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Lê o valor sob o cursor do mouse" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Definir _zero" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Faceta" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Curvaturas" @@ -18944,16 +19194,16 @@ msgid "Calculate surface profile parameters." msgstr "Calcular parâmetros do perfil da superfície." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Textura" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Ondulação" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Rugosidade" @@ -18965,7 +19215,7 @@ msgid "BRC" msgstr "Curva da razão de comportamento (Bearing Ratio Curve)" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Contagem de picos" @@ -18977,186 +19227,186 @@ msgid "Calculate roughness parameters" msgstr "Calcular parâmetros de rugosidade" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Parâmetros de rugosidade" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "Linha selecionada" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "Corte" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Rugosidade média" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Raiz quadrática média da rugosidade" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Altura máxima da rugosidade" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Profundidade máxima do vale da rugosidade" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Altura máxima do pico da rugosidade" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Média máxima das alturas da rugosidade" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Média máxima das profundidades dos vales da rugosidade" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Média máxima das alturas dos picos da rugosidade" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" "Média da altura do terceiro pico mais alto para o terceiro vale mais baixo" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Média máxima das alturas do perfil" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "Máxima da rugosidade entre pico e vale" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Assimetria" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Curtose" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Ondulação média" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Raiz quadrática média da ondulação" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Altura máxima da ondulação" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Altura máxima do perfil" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Espacial" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "Espaçamento médio do perfil de irregularidades" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Comprimento de onda médio do perfil" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Raiz quadrática média (RMS) do comprimento de onda do perfil" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "híbrido" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Inclinação média absoluta" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Raiz quadrática média (RMS) da inclinação" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Comprimento do perfil desenvolvido" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Razão do comprimento do perfil" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 #, fuzzy msgid "parameters|Functional" msgstr "híbrido" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 #, fuzzy msgid "Swedish height" msgstr "Nova altura" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 #, fuzzy msgid "No profile in the image selected." msgstr "Nenhum ponto na imagem selecionada." -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Função de distribuição de amplitude" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "A curva da razão de comportamento" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Perfis de superfície" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 #, fuzzy msgid "Creates angularly averaged profile graphs." msgstr "Extrair perfis" -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 #, fuzzy msgid "Radial Profiles" msgstr "Perfis radiais" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 #, fuzzy msgid "Extract angularly averaged profiles" msgstr "Extrair perfis" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "Perfis radiais" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "Simetrizar" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Simetrizar todos" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, fuzzy, c-format msgid "Radial profile %d" msgstr "Perfis radiais" @@ -19194,7 +19444,7 @@ msgid "_Copy" msgstr "_Copiar" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -19204,36 +19454,46 @@ "unidimensionais (distribuição de altura, correlações, PSDF, funcionais de " "Minkowski) da parte selecionada dos dados." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "PSDF radial" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 #, fuzzy msgid "Angular spectrum" msgstr "Espectro de potência" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "ACF radial" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Volume de Minkowski" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Fronteira de Minkowski" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Conectividade de Minkowski" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "Gráfico de escala de área" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +#, fuzzy +msgid "IDF" +msgstr "Função de distribuição de amplitude" + +#: modules/tools/sfunctions.c:187 +#, fuzzy +msgid "Radial IDF" +msgstr "PSDF radial" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "_Separar incerteza" @@ -19261,7 +19521,7 @@ msgid "Spectroscopy" msgstr "Espectroscopia" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -19269,163 +19529,201 @@ "Ferramenta de remoção de pontos, interpola pequenas partes dos dados " "(exibidas em uma visão ampliada) usando o algoritmo selecionado." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Achatamento hiperbólico" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Pseudo-Laplace" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Interpolação fractal" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 #, fuzzy msgid "Ellipse" msgstr "Elipses" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Remover pontos" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Interpolar pequenos defeitos, selecionado manualmente" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "Nenhum ponto na imagem selecionada." -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "Sem área na seleção amplificada." -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Ferramenta de estatísticas." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Quantidades estatísticas" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "Baseada em momento" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "Baseada em ordem" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Híbrido" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "Outra" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "Valor médio" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "Rugosidade quadrática média (RMS)" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "RMS (em grão)" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "Rugosidade média" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "Altura máxima do pico" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "Profundidade máxima da cova" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "Altura máxima" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 #, fuzzy msgid "Surface slope" msgstr "Área da superfície" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "" + +#: modules/volume/volume_addframe.c:113 +#, fuzzy +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/Operações básicas/_Inverter valor" + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "" + +#: modules/volume/volume_addframe.c:132 +#, fuzzy +msgid "Data to insert" +msgstr "Navegador de dados" + +#: modules/volume/volume_addframe.c:170 +#, fuzzy +msgid "Frame added" +msgstr "Mesma área" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "" + +#: modules/volume/volume_addframe.c:224 +#, fuzzy +msgid "_Replace Current Level" +msgstr "Substituir a imagem atual" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "" + +#: modules/volume/volume_arithmetic.c:145 #, fuzzy msgid "Simple arithmetic operations with volume data." msgstr "Operações aritméticas simples com campos de dados." -#: modules/volume/volume_arithmetic.c:156 +#: modules/volume/volume_arithmetic.c:159 #, fuzzy -msgid "/_Arithmetic..." -msgstr "Aritmética" +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/Operações básicas/Inclinar..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 #, fuzzy msgid "Arithmetic operations on volume data" msgstr "Operações aritméticas em dados" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 #, fuzzy msgid "Z-axis calibrations differ" msgstr "A calibração do eixo Z será perdida." -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 #, fuzzy msgid "Exports volume data in simple ASCII formats." msgstr "Exporta dados como matriz ASCII simples." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Exportar _texto..." +#: modules/volume/volume_asciiexport.c:86 +#, fuzzy +msgid "/_Basic Operations/Export _Text..." +msgstr "/Operações básicas/Extender..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 #, fuzzy msgid "Export volume data to a text file" msgstr "Exportar dados de gráfico para um arquivo de texto" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 #, fuzzy msgid "VTK structured grid" msgstr "Grades estruturadas VTK (.vtk)" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Precisão:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Dados de volume" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "Recalibrar dimensões do volume de dados ou intervalo de valor." -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/_Dimensões e unidades..." - #: modules/volume/volume_calibrate.c:170 #, fuzzy msgid "Match voxel size" @@ -19460,7 +19758,7 @@ msgstr "Fator de correlação _X" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "Criar novos dados de volume" @@ -19474,6 +19772,78 @@ msgid "Z Dimension" msgstr "Dimensões" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "" + +#: modules/volume/volume_drift.c:156 +#, fuzzy +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Corrigir dados/Desfazer rotação..." + +#: modules/volume/volume_drift.c:160 +#, fuzzy +msgid "Estimates drift" +msgstr "Deslocamento estimado:" + +#: modules/volume/volume_drift.c:169 +#, fuzzy +msgid "_Extract drift" +msgstr "_Extrair imagem" + +#: modules/volume/volume_drift.c:170 +#, fuzzy +msgid "_Crop data" +msgstr "Cortar dados" + +#: modules/volume/volume_drift.c:175 +#, fuzzy +msgid "_Z" +msgstr "_Z:" + +#: modules/volume/volume_drift.c:185 +#, fuzzy +msgid "Show direction" +msgstr "Direção do corte exibida:" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +#, fuzzy +msgid "Lateral drift" +msgstr "Unidades _laterais" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "Deriva do eixo y" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Deriva Z" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "Deriva do eixo z" + +#: modules/volume/volume_drift.c:279 +#, fuzzy +msgid "Drift corrected" +msgstr "Com correção de deriva" + +#: modules/volume/volume_drift.c:330 +#, fuzzy +msgid "Estimate drift" +msgstr "Deslocamento estimado:" + +#: modules/volume/volume_drift.c:449 +#, fuzzy +msgid "Updating z drift data..." +msgstr "Criando dados de volume..." + +#: modules/volume/volume_drift.c:513 +#, fuzzy +msgid "Updating lateral drift data..." +msgstr "Criando dados de volume..." + #: modules/volume/volume_equiplane.c:140 #, fuzzy msgid "Extracts z-coordinates of isosurfaces from volume data to an image." @@ -19481,8 +19851,9 @@ "Extrai planos de imagem e gráficos de linhas a partir de dados de volume." #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/Indicação e indentação/Reconstrução da _superfície..." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -19512,86 +19883,103 @@ msgid "Isosurface z for %.*f %s" msgstr "não existe a superfície %d para %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 #, fuzzy msgid "Shows 3D representations of volume data" msgstr "Mostra e/ou extrai uma seção de volume de dados" -#: modules/volume/volume_extract.c:200 +#: modules/volume/volume_extract.c:197 #, fuzzy -msgid "/3D View..." -msgstr "Visualizar _registro..." +msgid "/_Basic Operations/3D View..." +msgstr "/Operações básicas/Inclinar..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 #, fuzzy msgid "Show a 3D view for the volume data" msgstr "Troca eixos do volume de dados." -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Dados de volume" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 #, fuzzy msgid "_Render" msgstr "_Renomear" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 #, fuzzy msgid "_Save image" msgstr "Imagem _quadrada" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "Limiar da estrutura tipo arame" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Escala de opacidade" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "Aplicar perspectiva" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "Renderização 3D instantânea" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "Visão X" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Visão Y" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Visão Z" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 #, fuzzy msgid "Export 3D view" msgstr "Exportar visão 3D" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "Construindo modelo de estrutura tipo arame..." +#: modules/volume/volume_facetlevel.c:44 +#, fuzzy +msgid "Performs facet leveling on all XY planes" +msgstr "Remover ruído de curvas do gráfico" + +#: modules/volume/volume_facetlevel.c:58 +#, fuzzy +msgid "/_Correct Data/_XY Facet Level" +msgstr "/_Corrigir dados/Remover ranhuras" + +#: modules/volume/volume_facetlevel.c:62 +#, fuzzy +msgid "Facet leveling of all XY planes" +msgstr "Nivelar gráfico por linha." + +#: modules/volume/volume_facetlevel.c:85 +#, fuzzy +msgid "Facet leveled" +msgstr "Nivelar faceta" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Avaliar volume de dados força-distância" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." +#, fuzzy +msgid "/SPM M_odes/_Evaluate FD Data..." msgstr "/Avaliar dados F-D..." #: modules/volume/volume_fdfit.c:217 @@ -19614,10 +20002,6 @@ msgid "Inverts value in volume data" msgstr "Inverte valor em volume de dados" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Inverter valor" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Inverter valor em volume de dados" @@ -19627,7 +20011,8 @@ msgstr "Calcula particionamento K-médios em dados de volume." #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Means Clustering..." msgstr "/Particionamento K-médios..." #: modules/volume/volume_kmeans.c:113 @@ -19691,7 +20076,8 @@ msgstr "Calcula particionamento K-medianos em dados de volume." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." +#, fuzzy +msgid "/_Statistics/_K-Medians Clustering..." msgstr "/Particionamento K-medianos..." #: modules/volume/volume_kmedians.c:106 @@ -19727,8 +20113,9 @@ msgstr "Criar novos dados de volume" #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "" +#, fuzzy +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/Operações básicas/Inclinar..." #: modules/volume/volume_lawnize.c:103 #, fuzzy @@ -19760,12 +20147,31 @@ msgid "Z calibration" msgstr "calibrações" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "" + +#: modules/volume/volume_linelevel.c:227 +#, fuzzy +msgid "Line leveled" +msgstr "Nivelamento plano" + +#: modules/volume/volume_linelevel.c:265 +#, fuzzy +msgid "Line level" +msgstr "Nivelamento plano" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "Compila perfis de volume de dados para um canal." #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." +#, fuzzy +msgid "/_Statistics/Summarize _Profiles..." msgstr "/Compilar _perfis..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 @@ -19785,10 +20191,39 @@ msgid "Summarize Volume Profiles" msgstr "Compilar perfis de volume" -#: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" msgstr "" +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/M_odos SPM/_MFM/Deslocamento de campo em Z..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "" + +#: modules/volume/volume_localdetect.c:119 +#, fuzzy +msgid "_Peak width" +msgstr "Nova largura" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Ajustar resultados" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Curva de calibração Z" + +#: modules/volume/volume_mfmrecalc.c:116 +#, fuzzy +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/M_odos SPM/_MFM/_Estimar deslocamento em Z..." + #: modules/volume/volume_mfmrecalc.c:233 #, fuzzy msgid "Recalculated Data" @@ -19826,8 +20261,8 @@ #: modules/volume/volume_outliers.c:58 #, fuzzy -msgid "/_XY Plane Outliers" -msgstr "_Remover isolados" +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/_Corrigir dados/Máscara de isolados" #: modules/volume/volume_outliers.c:62 #, fuzzy @@ -19841,14 +20276,19 @@ #: modules/volume/volume_planelevel.c:58 #, fuzzy -msgid "/_XY Plane Level" -msgstr "Nivelar plano" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/_Corrigir dados/Remover ranhuras" #: modules/volume/volume_planelevel.c:62 #, fuzzy msgid "Level all XY planes" msgstr "Nivelar gráfico por linha." +#: modules/volume/volume_planelevel.c:85 +#, fuzzy +msgid "Leveled" +msgstr "Dados nivelados" + #: modules/volume/volume_planestat.c:231 #, fuzzy msgid "Summarizes volume data planes to a graph." @@ -19856,7 +20296,7 @@ #: modules/volume/volume_planestat.c:245 #, fuzzy -msgid "/Summarize P_lanes..." +msgid "/_Statistics/Summarize P_lanes..." msgstr "/Compilar _perfis..." #: modules/volume/volume_planestat.c:249 @@ -19874,82 +20314,121 @@ msgid "Summarize Volume Planes" msgstr "Compilar perfis de volume" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 #, fuzzy msgid "Calculates the volume PSF." msgstr "Calcula particionamento K-médios em dados de volume." -#: modules/volume/volume_psf.c:267 -#, fuzzy -msgid "/_Transfer Function Guess..." -msgstr "/Ajustar _função..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 #, fuzzy msgid "Estimate transfer function from known data and ideal images" msgstr "Estimar PSF a partir de dados e imagem conhecidos" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "Resposta _ideal:" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Método:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 #, fuzzy msgid "_Sigma:" msgstr "_Sinal:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "Tipo de janelamento:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 #, fuzzy msgid "_Z level:" msgstr "Nível plano" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 #, fuzzy msgid "_Border:" msgstr "Bordas" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "Exibir:" + +#: modules/volume/volume_psf.c:1079 #, fuzzy msgid "Calculating volume transfer function..." msgstr "Calcular funções estatísticas de linha/coluna" -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 #, fuzzy msgid "Volume TF" msgstr "Volume" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 #, fuzzy msgid "z level" msgstr "Nível plano" +#: modules/volume/volume_removeframe.c:91 +#, fuzzy +msgid "Remove one frame from volume data stack" +msgstr "Remover máscara a partir dos dados" + +#: modules/volume/volume_removeframe.c:105 +#, fuzzy +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/Operações básicas/Escalar..." + +#: modules/volume/volume_removeframe.c:109 +#, fuzzy +msgid "Remove single XY plane" +msgstr "Nivelar gráfico por linha." + +#: modules/volume/volume_removeframe.c:125 +#, fuzzy +msgid "_Extract the plane" +msgstr "_Extrair imagem" + +#: modules/volume/volume_removeframe.c:165 +#, fuzzy +msgid "Frame removed" +msgstr "Remoção de grão" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "" + +#: modules/volume/volume_removeframe.c:223 +#, fuzzy +msgid "Remove XY Plane" +msgstr "Nivelar gráfico por linha." + +#: modules/volume/volume_removeframe.c:236 +#, fuzzy +msgid "_Remove Current Level" +msgstr "Como o canal atual" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "" #: modules/volume/volume_rephase.c:164 #, fuzzy -msgid "/_Adjust Phase..." +msgid "/SPM M_odes/_Adjust Phase..." msgstr "/Ajustar forma..." #: modules/volume/volume_rephase.c:168 @@ -20003,14 +20482,39 @@ msgid "Volume Z graphs" msgstr "Gráficos de volume Z" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "" + +#: modules/volume/volume_scars.c:115 +#, fuzzy +msgid "/_Correct Data/_Scars..." +msgstr "/_Corrigir dados/Marcar ranhuras..." + +#: modules/volume/volume_scars.c:119 +#, fuzzy +msgid "Remove scars in all levels" +msgstr "Remover grãos tocando bordas da imagem" + +#: modules/volume/volume_scars.c:181 +#, fuzzy +msgid "Scars corrected" +msgstr "Com correção de deriva" + +#: modules/volume/volume_scars.c:364 +#, fuzzy +msgid "Removing scars..." +msgstr "Revolvendo esferas..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "" "Extrai planos de imagem e gráficos de linhas a partir de dados de volume." #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Cortar e fatiar..." +#, fuzzy +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/Operações básicas/Escalar..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -20074,6 +20578,26 @@ msgid "Volume Y graphs" msgstr "Gráficos de volume Y" +#: modules/volume/volume_stepline.c:50 +#, fuzzy +msgid "Performs step line correction" +msgstr "Correção afim" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Remover ruído de curvas do gráfico" + +#: modules/volume/volume_stepline.c:87 +#, fuzzy +msgid "Step line correction..." +msgstr "Correção afim" + +#: modules/volume/volume_stepline.c:91 +#, fuzzy +msgid "Step line corrected" +msgstr "Força de _adesão:" + #: modules/volume/volume_strayfield.c:132 #, fuzzy msgid "Single value evolution" @@ -20089,8 +20613,9 @@ msgstr "" #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "" +#, fuzzy +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/M_odos SPM/_MFM/Deslocamento de campo em Z..." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -20104,69 +20629,185 @@ msgid "Building stray field dependence..." msgstr "" -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "Troca eixos do volume de dados." -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/Trocar eixos..." +#: modules/volume/volume_swaxes.c:96 +#, fuzzy +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/Operações básicas/Escalar..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "Trocar eixos" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X, reverso" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y, reverso" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z, reverso" -#: modules/volume/volume_swaxes.c:175 -msgid "Swap Volume Axes" -msgstr "Trocar eixos de volume" - -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" +#: modules/volume/volume_swaxes.c:123 +#, fuzzy +msgid "Current _X axis will become" msgstr "Eixo _X atual tornar se á:" -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" +#: modules/volume/volume_swaxes.c:125 +#, fuzzy +msgid "Current _Y axis will become" msgstr "Eixo _Y atual tornar se á:" -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" +#: modules/volume/volume_swaxes.c:127 +#, fuzzy +msgid "Current _Z axis will become" msgstr "Eixo _Z atual tornar se á:" -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:176 +msgid "Swap Volume Axes" +msgstr "Trocar eixos de volume" + +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "A calibração do eixo Z será perdida." +#: modules/volume/volume_xyarithmetics.c:146 +#, fuzzy +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Operações aritméticas simples com campos de dados." + +#: modules/volume/volume_xyarithmetics.c:160 +#, fuzzy +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/Operações básicas/Inclinar..." + +#: modules/volume/volume_xyarithmetics.c:164 +#, fuzzy +msgid "Arithmetic operations on volume and plane data" +msgstr "Operações aritméticas em dados" + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "" + +#: modules/volume/volume_xyarithmetics.c:323 +#, fuzzy +msgid "Volume data:" +msgstr "Dados de volume" + +#: modules/volume/volume_xyarithmetics.c:332 +#, fuzzy +msgid "Images:" +msgstr "Imagens" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "" + +#: modules/volume/volume_xystitch.c:96 +#, fuzzy +msgid "Merges all XY planes into XYZ data" +msgstr "Nivelar gráfico por linha." + +#: modules/volume/volume_xystitch.c:110 +#, fuzzy +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/M_odos SPM/_MFM/Deslocamento de campo em Z..." + +#: modules/volume/volume_xystitch.c:114 +#, fuzzy +msgid "Merge all the XY planes to XYZ data" +msgstr "Converte campo de dados para dados XYZ." + +#: modules/volume/volume_xystitch.c:129 +#, fuzzy +msgid "_X offsets graph" +msgstr "Afastamento _X" + +#: modules/volume/volume_xystitch.c:130 +#, fuzzy +msgid "X _offsets curve" +msgstr "Curva fechada" + +#: modules/volume/volume_xystitch.c:131 +#, fuzzy +msgid "_Y offsets graph" +msgstr "Afastamento _Y" + +#: modules/volume/volume_xystitch.c:132 +#, fuzzy +msgid "Y o_ffsets curve" +msgstr "Afastamento _Y:" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "" + +#: modules/volume/volume_xystitch.c:135 +#, fuzzy +msgid "_Adjust shifts" +msgstr "/Ajustar forma..." + +#: modules/volume/volume_xystitch.c:136 +#, fuzzy +msgid "A_djust rotation" +msgstr "Corrigir rotação" + +#: modules/volume/volume_xystitch.c:137 +#, fuzzy +msgid "_Shift range" +msgstr "Intervalo de busca" + +#: modules/volume/volume_xystitch.c:138 +#, fuzzy +msgid "_Rotation range" +msgstr "Rotação" + +#: modules/volume/volume_xystitch.c:179 +#, fuzzy +msgid "Stitched" +msgstr "Costurar" + +#: modules/volume/volume_xystitch.c:212 +#, fuzzy +msgid "XY Stitch" +msgstr "Costurar" + +#: modules/volume/volume_xystitch.c:214 +#, fuzzy +msgid "verb|_Stitch" +msgstr "Ajustar" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "Anexa, extrai e remove calibração do eixo z do volume de dados ." #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/Calibração _Z..." +#, fuzzy +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/Operações básicas/Inclinar..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -20240,7 +20881,7 @@ #: modules/volume/volume_zposlevel.c:162 #, fuzzy -msgid "/S_hift Value To Zero..." +msgid "/_Correct Data/S_hift Value To Zero..." msgstr "Deslocar valor médio dos dados para zero" #: modules/volume/volume_zposlevel.c:166 @@ -20254,13 +20895,33 @@ msgstr "" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Extrair previsão" +#, fuzzy +msgid "/_Basic Operations/Extract _Preview" +msgstr "/Operações básicas/Girar em sentido horário" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "Extrair previsão do volume de dados para uma imagem" +#: modules/xyz/xyz_autocrop.c:46 +#, fuzzy +msgid "Simple XYZ automated crop." +msgstr "Nivelamento simples de dados XYZ." + +#: modules/xyz/xyz_autocrop.c:60 +#, fuzzy +msgid "/Crop Automatically" +msgstr "Ajustar tamanho _automaticamente" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "" + +#: modules/xyz/xyz_autocrop.c:90 +#, fuzzy +msgid "Cropped" +msgstr "Cortar" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Analisa deriva em dados XYZ." @@ -20289,18 +20950,6 @@ msgid "Y drift" msgstr "Deriva Y" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "Deriva do eixo y" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Deriva Z" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "Deriva do eixo z" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Analisar deriva XYZ" @@ -20551,6 +21200,85 @@ msgstr "Imagens mescladas" #, fuzzy +#~ msgid "Facet leveling..." +#~ msgstr "Nivelamento de faceta..." + +#, fuzzy +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/_Corrigir dados/_Alinhar linhas..." + +#, fuzzy +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/_Corrigir dados/Correção de _passo de linha" + +#, fuzzy +#~ msgid "Step detection _threshold:" +#~ msgstr "Especificar limites" + +#~ msgid "_Polynomial degree:" +#~ msgstr "Grau _polinomial:" + +#, fuzzy +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "Grau _máximo do polinômio:" + +#, fuzzy +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "Grau _máximo do polinômio:" + +#, fuzzy +#~ msgid "Minimum broadening:" +#~ msgstr "_Mínimo:" + +#, fuzzy +#~ msgid "Maximum broadening:" +#~ msgstr "Tamanho máximo comprometido" + +#, fuzzy +#~ msgid "/_Arithmetic..." +#~ msgstr "Aritmética" + +#~ msgid "/Export _Text..." +#~ msgstr "/Exportar _texto..." + +#~ msgid "_Precision:" +#~ msgstr "_Precisão:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/_Dimensões e unidades..." + +#, fuzzy +#~ msgid "/3D View..." +#~ msgstr "Visualizar _registro..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Inverter valor" + +#, fuzzy +#~ msgid "/_XY Plane Outliers" +#~ msgstr "_Remover isolados" + +#, fuzzy +#~ msgid "/_XY Plane Level" +#~ msgstr "Nivelar plano" + +#, fuzzy +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/Ajustar _função..." + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Cortar e fatiar..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/Trocar eixos..." + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/Calibração _Z..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Extrair previsão" + +#, fuzzy #~ msgid "_Vorizontal size" #~ msgstr "Tamanho _horizontal" @@ -21427,9 +22155,6 @@ #~ msgid "Projections" #~ msgstr "Projeções" -#~ msgid "Shown cut direction:" -#~ msgstr "Direção do corte exibida:" - #~ msgid "Graph cut direction:" #~ msgstr "Direção de corte do gráfico:" @@ -21599,15 +22324,9 @@ #~ msgid "pixels" #~ msgstr "pixels " -#~ msgid "Fast Fourier Transform" -#~ msgstr "Transformada de Fourier rápida" - #~ msgid "built-in SimpleFFT\n" #~ msgstr "SimpleFFT embutida\n" -#~ msgid "_Like Current Channel" -#~ msgstr "Como o canal atual" - #~ msgid "Re_fine" #~ msgstr "Re_finar" Binary files /tmp/tmpiliduqrh/ukFZjhflWX/gwyddion-2.62/po/ru.gmo and /tmp/tmpiliduqrh/9zlBZuxLkq/gwyddion-2.63/po/ru.gmo differ diff -Nru gwyddion-2.62/po/ru.po gwyddion-2.63/po/ru.po --- gwyddion-2.62/po/ru.po 2022-11-03 09:50:22.000000000 +0000 +++ gwyddion-2.63/po/ru.po 2023-06-13 13:20:08.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2022-11-03 10:50+0100\n" -"PO-Revision-Date: 2022-10-18 08:49+0400\n" +"POT-Creation-Date: 2023-06-13 15:20+0200\n" +"PO-Revision-Date: 2023-06-03 18:55+0400\n" "Last-Translator: Daniil Bratashov \n" "Language-Team: russian \n" "Language: ru_RU\n" @@ -19,7 +19,7 @@ "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: .\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.3.1\n" "X-Poedit-SearchPath-0: /home/dan/.poedit\n" #: libgwyddion/gwyexpr.c:883 @@ -153,9 +153,9 @@ #: libgwyddion/gwyinventory.c:1309 libgwydgets/gwycombobox.c:466 #: libgwydgets/gwycombobox.c:527 libgwydgets/gwygraphwindow.c:723 -#: app/data-browser-aux.c:1371 app/data-browser-aux.c:1443 -#: app/data-browser-aux.c:1499 app/data-browser-aux.c:1555 -#: app/data-browser-aux.c:3154 app/data-browser-aux.c:3165 +#: app/data-browser-aux.c:1349 app/data-browser-aux.c:1421 +#: app/data-browser-aux.c:1477 app/data-browser-aux.c:1533 +#: app/data-browser-aux.c:3136 app/data-browser-aux.c:3147 #: app/data-browser.c:2344 app/data-browser.c:3044 app/data-browser.c:3798 #: app/data-browser.c:3900 app/data-browser.c:4128 app/data-browser.c:4444 #: app/data-browser.c:4565 app/data-browser.c:4935 app/data-browser.c:5002 @@ -171,7 +171,7 @@ #: modules/cmap/cmap_possearch.c:653 modules/cmap/cmap_possearch.c:654 #: modules/cmap/cmap_simplemech.c:1006 modules/cmap/cmap_simplemech.c:1007 #: modules/cmap/cmap_sinebg.c:605 modules/cmap/cmap_sinebg.c:606 -#: modules/file/formats3d.c:912 modules/file/xyzexport.c:193 +#: modules/file/formats3d.c:912 modules/file/xyzexport.c:181 #: modules/process/convolution_filter.c:659 msgid "Untitled" msgstr "Безымянный" @@ -297,39 +297,39 @@ msgid "Resource directory cannot be created." msgstr "Каталог ресурсов не может быть создан." -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "Yes" msgstr "Да" -#: libgwyddion/gwyresults.c:1674 +#: libgwyddion/gwyresults.c:1679 msgid "No" msgstr "Нет" -#: libgwyddion/gwyresults.c:1690 +#: libgwyddion/gwyresults.c:1695 msgid "(fixed)" msgstr "(фикс.)" -#: libgwyddion/gwyresults.c:1795 libgwydgets/gwy3dwindow.c:836 +#: libgwyddion/gwyresults.c:1801 libgwydgets/gwy3dwindow.c:836 #: libgwydgets/gwy3dwindow.c:841 libgwydgets/gwy3dwindow.c:1011 -#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:6787 +#: libgwydgets/gwy3dwindow.c:1018 app/param-table.c:7121 #: modules/process/correct_affine.c:460 modules/process/facet_analysis.c:652 #: modules/process/facet_analysis.c:713 modules/process/facet_analysis.c:721 #: modules/process/facet_analysis.c:729 modules/process/facet_analysis.c:766 #: modules/process/facet_analysis.c:914 modules/process/facet_analysis.c:916 #: modules/process/facet_analysis.c:1276 modules/process/facet_analysis.c:1278 -#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:373 -#: modules/process/facet_measure.c:377 modules/process/facet_measure.c:379 -#: modules/process/facet_measure.c:539 modules/process/facet_measure.c:540 -#: modules/process/facet_measure.c:541 modules/process/facet_measure.c:545 -#: modules/process/facet_measure.c:962 modules/process/facet_measure.c:964 -#: modules/process/facet_measure.c:966 modules/process/grain_stat.c:358 +#: modules/process/facet_analysis.c:1280 modules/process/facet_measure.c:369 +#: modules/process/facet_measure.c:373 modules/process/facet_measure.c:375 +#: modules/process/facet_measure.c:542 modules/process/facet_measure.c:543 +#: modules/process/facet_measure.c:544 modules/process/facet_measure.c:548 +#: modules/process/facet_measure.c:965 modules/process/facet_measure.c:967 +#: modules/process/facet_measure.c:969 modules/process/grain_stat.c:358 #: modules/process/grain_stat.c:622 modules/process/indent_analyze.c:346 #: modules/process/measure_lattice.c:269 modules/process/rotate.c:280 -#: modules/tools/distance.c:182 modules/tools/distance.c:499 +#: modules/tools/distance.c:180 modules/tools/distance.c:484 msgid "deg" msgstr "°" -#: libgwyddion/gwyresults.c:1966 modules/cmap/cmap_fdfit.c:521 +#: libgwyddion/gwyresults.c:1972 modules/cmap/cmap_fdfit.c:521 #: modules/cmap/cmap_fdfit.c:556 modules/cmap/cmap_fdfit.c:597 #: modules/graph/graph_cd.c:710 modules/graph/graph_fdfit.c:814 #: modules/graph/graph_fit.c:863 modules/process/grain_stat.c:261 @@ -399,8 +399,8 @@ msgid "Maximum value" msgstr "Максимальное значение" -#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:361 -#: modules/graph/graph_stats.c:373 modules/process/bdep_synth.c:110 +#: libprocess/gwygrainvalue.c:104 modules/graph/graph_stats.c:226 +#: modules/graph/graph_stats.c:238 modules/process/bdep_synth.c:110 #: modules/tools/filter.c:141 msgid "Mean value" msgstr "Среднее значение" @@ -425,11 +425,11 @@ msgid "Pixel area" msgstr "Площадь в пикселях" -#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:719 +#: libprocess/gwygrainvalue.c:158 modules/tools/stats.c:722 msgid "Projected area" msgstr "Площадь проекции" -#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:723 +#: libprocess/gwygrainvalue.c:167 modules/tools/stats.c:726 msgid "Surface area" msgstr "Площадь поверхности" @@ -531,13 +531,13 @@ msgid "Direction of maximum Martin diameter" msgstr "Направление максимального диаметра Мартина" -#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:243 -#: modules/tools/stats.c:740 +#: libprocess/gwygrainvalue.c:389 modules/tools/readvalue.c:246 +#: modules/tools/stats.c:743 msgid "Inclination θ" msgstr "Наклон θ" -#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:244 -#: modules/tools/stats.c:741 +#: libprocess/gwygrainvalue.c:398 modules/tools/readvalue.c:247 +#: modules/tools/stats.c:744 msgid "Inclination φ" msgstr "Наклон φ" @@ -553,11 +553,11 @@ msgid "Curvature center z value" msgstr "Значение центра кривизны по z" -#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:245 +#: libprocess/gwygrainvalue.c:434 modules/tools/readvalue.c:248 msgid "Curvature 1" msgstr "Кривизна 1" -#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:246 +#: libprocess/gwygrainvalue.c:443 modules/tools/readvalue.c:249 msgid "Curvature 2" msgstr "Кривизна 2" @@ -590,14 +590,14 @@ #: modules/graph/graph_peaks.c:131 modules/process/extract_path.c:345 #: modules/process/extract_path.c:350 modules/process/immerse.c:272 #: modules/process/pat_synth.c:1683 modules/process/wave_synth.c:350 -#: modules/tools/readvalue.c:317 +#: modules/tools/readvalue.c:320 msgid "Position" msgstr "Позиция" #: libprocess/gwygrainvalue.c:1169 app/meta.c:407 -#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4646 +#: modules/cmap/cmap_linestat.c:328 modules/file/imgexport.c:4649 #: modules/process/classify.c:549 modules/tools/level3.c:362 -#: modules/tools/readvalue.c:327 modules/volume/volume_linestat.c:337 +#: modules/tools/readvalue.c:330 modules/volume/volume_linestat.c:337 #: modules/volume/volume_planestat.c:394 msgid "Value" msgstr "Значение" @@ -607,7 +607,7 @@ msgstr "Площадь" #: libprocess/gwygrainvalue.c:1171 app/data-browser.c:5911 -#: gwyddion/toolbox.c:107 modules/tools/stats.c:732 +#: gwyddion/toolbox.c:107 modules/tools/stats.c:735 msgid "Volume" msgstr "Объём" @@ -620,7 +620,7 @@ #: modules/process/pat_synth.c:1730 modules/process/pat_synth.c:1928 #: modules/process/pat_synth.c:2041 modules/process/pat_synth.c:2161 #: modules/process/pat_synth.c:2476 modules/process/pat_synth.c:2619 -#: modules/tools/linestats.c:120 modules/volume/volume_linestat.c:148 +#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:148 msgid "Slope" msgstr "Уклон" @@ -677,12 +677,12 @@ #: libprocess/gwyprocessenums.c:119 #: libgwydgets/gwygraphwindowmeasuredialog.c:53 -#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:137 +#: modules/process/convolution_filter.c:411 modules/tools/cprofile.c:138 msgid "Horizontal" msgstr "Горизонтальное" #: libprocess/gwyprocessenums.c:120 modules/process/convolution_filter.c:427 -#: modules/tools/cprofile.c:138 +#: modules/tools/cprofile.c:139 msgid "Vertical" msgstr "Вертикальное" @@ -723,12 +723,12 @@ msgstr "Адаптивный по масштабу и пространству" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3826 +#: libprocess/gwyprocessenums.c:200 modules/file/imgexport.c:3829 #: modules/xyz/xyz_raster.c:628 msgid "Round" msgstr "Округлением" -#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3827 +#: libprocess/gwyprocessenums.c:201 modules/file/imgexport.c:3830 #: modules/process/relate.c:206 modules/xyz/xyz_raster.c:630 msgid "Linear" msgstr "Линейная" @@ -1304,7 +1304,7 @@ msgid "Hide full controls" msgstr "Скрыть все элементы управления" -#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4818 +#: libgwydgets/gwy3dwindow.c:705 modules/file/imgexport.c:4821 #: modules/process/fit-shape.c:510 msgid "adjective|Basic" msgstr "Основные" @@ -1355,12 +1355,12 @@ #: app/app.c:1593 app/filelist.c:454 app/gwyappfilechooser.c:1002 #: app/gwyappfilechooser.c:1128 app/gwyappfilechooser.c:1291 #: app/gwymoduleutils-synth.c:153 app/gwymoduleutils-synth.c:156 -#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:868 app/param-table.c:3090 -#: app/param-table.c:3118 app/param-table.c:3146 app/param-table.c:3174 -#: app/param-table.c:3205 app/param-table.c:3233 app/param-table.c:3261 -#: modules/file/rawfile.c:536 modules/file/rawfile.c:539 -#: modules/graph/graph_terraces.c:520 modules/graph/graph_terraces.c:537 -#: modules/graph/graph_terraces.c:921 modules/graph/graph_terraces.c:932 +#: app/gwymoduleutils-synth.c:373 app/gwyplaintool.c:984 app/param-table.c:3143 +#: app/param-table.c:3171 app/param-table.c:3199 app/param-table.c:3227 +#: app/param-table.c:3258 app/param-table.c:3286 app/param-table.c:3314 +#: modules/file/rawfile.c:535 modules/file/rawfile.c:538 +#: modules/graph/graph_terraces.c:446 modules/graph/graph_terraces.c:450 +#: modules/graph/graph_terraces.c:617 modules/graph/graph_terraces.c:619 #: modules/process/binning.c:234 modules/process/binning.c:238 #: modules/process/binning.c:240 modules/process/classify.c:594 #: modules/process/classify.c:596 modules/process/classify.c:598 @@ -1369,7 +1369,7 @@ #: modules/process/correct_perspective.c:358 modules/process/dimensions.h:89 #: modules/process/disc_synth.c:288 modules/process/entropy.c:186 #: modules/process/extend.c:316 modules/process/facet_analysis.c:643 -#: modules/process/facet_measure.c:369 modules/process/grain_wshed.c:198 +#: modules/process/facet_measure.c:365 modules/process/grain_wshed.c:198 #: modules/process/hough.c:174 modules/process/mark_disconn.c:207 #: modules/process/mask_morph.c:226 modules/process/multiprofile.c:261 #: modules/process/neural.c:603 modules/process/neural.c:611 @@ -1379,20 +1379,21 @@ #: modules/process/tip_blind.c:292 modules/process/tip_blind.c:294 #: modules/process/tip_model.c:258 modules/process/tip_model.c:259 #: modules/process/volumize_layers.c:201 modules/process/volumize_layers.c:203 -#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:762 -#: modules/tools/cprofile.c:214 modules/tools/cprofile.c:291 +#: modules/process/volumize_layers.c:205 modules/tools/corrlen.c:768 +#: modules/tools/cprofile.c:216 modules/tools/cprofile.c:294 #: modules/tools/filter.c:247 modules/tools/level3.c:211 -#: modules/tools/maskedit.c:311 modules/tools/maskedit.c:320 -#: modules/tools/pathlevel.c:227 modules/tools/profile.c:275 -#: modules/tools/profile.c:356 modules/tools/readvalue.c:266 -#: modules/tools/readvalue.c:339 modules/tools/roughness.c:311 -#: modules/tools/roughness.c:376 modules/tools/rprofile.c:227 -#: modules/tools/spotremove.c:264 modules/tools/stats.c:692 -#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:466 -#: modules/volume/volume_psf.c:497 modules/volume/volume_psf.c:504 -#: modules/volume/volume_psf.c:512 modules/volume/volume_psf.c:748 +#: modules/tools/maskedit.c:318 modules/tools/maskedit.c:327 +#: modules/tools/pathlevel.c:227 modules/tools/profile.c:277 +#: modules/tools/profile.c:359 modules/tools/readvalue.c:269 +#: modules/tools/readvalue.c:342 modules/tools/roughness.c:312 +#: modules/tools/roughness.c:377 modules/tools/rprofile.c:229 +#: modules/tools/spotremove.c:269 modules/tools/stats.c:695 +#: modules/volume/volume_planestat.c:450 modules/volume/volume_psf.c:467 +#: modules/volume/volume_psf.c:498 modules/volume/volume_psf.c:505 +#: modules/volume/volume_psf.c:513 modules/volume/volume_psf.c:749 #: modules/volume/volume_rephase.c:328 modules/volume/volume_rephase.c:351 -#: modules/volume/volume_rephase.c:374 modules/volume/volume_slice.c:449 +#: modules/volume/volume_rephase.c:374 modules/volume/volume_scars.c:232 +#: modules/volume/volume_scars.c:235 modules/volume/volume_slice.c:449 #: modules/volume/volume_slice.c:472 modules/volume/volume_slice.c:495 #: modules/xyz/xyz_drift.c:738 modules/xyz/xyz_drift.c:753 #: modules/xyz/xyz_raster.c:399 modules/xyz/xyz_raster.c:405 @@ -1444,11 +1445,11 @@ msgstr "Уг_ол θ света:" #: libgwydgets/gwy3dwindow.c:1050 libgwydgets/gwy3dwindow.c:1242 -#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4781 +#: app/dialog.c:215 gwyddion/toolbox-editor.c:209 modules/file/imgexport.c:4784 #: modules/process/calcoefs_new.c:372 modules/process/correct_affine.c:346 #: modules/process/fft_filter_2d.c:415 modules/process/polydistort.c:210 #: modules/process/roddeposit_synth.c:384 modules/process/straighten_path.c:282 -#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:282 +#: modules/volume/volume_equiplane.c:260 modules/volume/volume_extract.c:264 #: modules/volume/volume_kmeans.c:154 modules/volume/volume_kmedians.c:147 #: modules/volume/volume_rephase.c:229 modules/volume/volume_slice.c:297 #: modules/volume/volume_strayfield.c:262 modules/volume/volume_zposlevel.c:271 @@ -1471,7 +1472,7 @@ msgid "Maximum z value" msgstr "Максимальное значение z" -#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3876 +#: libgwydgets/gwy3dwindow.c:1165 modules/file/imgexport.c:3879 msgid "_Label:" msgstr "_Метка:" @@ -1561,7 +1562,7 @@ msgstr "Скрытый" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:614 -#: modules/file/imgexport.c:490 modules/tools/selectionmanager.c:265 +#: modules/file/imgexport.c:489 modules/tools/selectionmanager.c:265 msgid "Points" msgstr "Точки" @@ -1618,7 +1619,7 @@ msgid "_Line type:" msgstr "Тип _линии:" -#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3214 +#: libgwydgets/gwygraphareadialog.c:174 modules/file/imgexport.c:3217 msgid "Line t_hickness:" msgstr "Тол_щина линии:" @@ -1639,7 +1640,7 @@ msgid "Diamond" msgstr "Ромб" -#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:136 +#: libgwydgets/gwygraphareadialog.c:554 modules/tools/cprofile.c:137 msgid "Cross" msgstr "Крест" @@ -1713,7 +1714,7 @@ #: libgwydgets/gwygraphcurves.c:460 modules/cmap/cmap_cutter.c:194 #: modules/process/entropy.c:128 modules/process/good_profile.c:139 -#: modules/process/logistic.c:143 modules/tools/maskedit.c:223 +#: modules/process/logistic.c:143 modules/tools/maskedit.c:227 msgid "Mode" msgstr "Режим" @@ -1749,8 +1750,8 @@ msgstr "Абсцисса" #: libgwydgets/gwygraphwindow.c:161 gwyddion/toolbox-editor.c:931 -#: gwyddion/toolbox.c:107 modules/graph/graph_stats.c:348 -#: modules/graph/graph_terraces.c:360 +#: gwyddion/toolbox.c:107 modules/graph/graph_measure_period.c:239 +#: modules/graph/graph_stats.c:213 modules/graph/graph_terraces.c:639 msgid "Graph" msgstr "График" @@ -1758,7 +1759,7 @@ #: modules/process/deconvolve.c:187 modules/process/fit-shape.c:271 #: modules/process/freq_split.c:139 modules/process/good_profile.c:126 #: modules/process/psf.c:205 modules/process/relate.c:474 -#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:326 +#: modules/process/terracefit.c:263 modules/volume/volume_psf.c:327 msgid "Data" msgstr "Данные" @@ -1797,12 +1798,12 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:402 #: libgwydgets/gwygraphwindowmeasuredialog.c:622 #: modules/process/facet_analysis.c:823 modules/process/measure_lattice.c:339 -#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:470 +#: modules/process/measure_lattice.c:346 modules/tools/roughness.c:471 msgid "Length" msgstr "Длина" #: libgwydgets/gwygraphwindowmeasuredialog.c:406 -#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:943 +#: libgwydgets/gwygraphwindowmeasuredialog.c:630 app/gwyplaintool.c:1059 #: modules/cmap/cmap_fztofd.c:150 modules/graph/graph_fztofd.c:88 #: modules/process/disc_synth.c:290 modules/process/fibre_synth.c:337 #: modules/process/lat_synth.c:565 modules/process/obj_synth.c:412 @@ -1810,7 +1811,7 @@ #: modules/process/pat_synth.c:1936 modules/process/pat_synth.c:2046 #: modules/process/pat_synth.c:2169 modules/process/pat_synth.c:2280 #: modules/process/pat_synth.c:2486 modules/process/pat_synth.c:2628 -#: modules/tools/spotremove.c:372 +#: modules/tools/spotremove.c:377 msgid "Height" msgstr "Высота" @@ -1837,8 +1838,8 @@ msgstr "Предпочтительное" #: libgwydgets/gwyoptionmenus.c:469 app/meta.c:406 -#: modules/file/imgexport.c:4188 modules/file/imgexport.c:4628 -#: modules/file/rawfile.c:681 modules/process/convolution_filter.c:536 +#: modules/file/imgexport.c:4191 modules/file/imgexport.c:4631 +#: modules/file/rawfile.c:680 modules/process/convolution_filter.c:536 #: modules/process/neural.c:404 modules/tools/selectionmanager.c:329 msgid "Name" msgstr "Имя" @@ -1875,12 +1876,12 @@ msgid "A_dd symbol" msgstr "_Добавить символ" -#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:494 +#: libgwydgets/gwyscitext.c:274 modules/file/rawfile.c:493 #: modules/xyz/xyz_drift.c:580 modules/xyz/xyz_raster.c:436 msgid "Preview" msgstr "Предпросмотр" -#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:41 +#: libgwymodule/gwymodule-file.c:549 modules/file/err.h:38 #, c-format msgid "Cannot open file for reading: %s." msgstr "Невозможно открыть файл для чтения: %s." @@ -2039,35 +2040,35 @@ #: app/app.c:1563 app/app.c:2205 modules/cmap/cmap_linestat.c:123 #: modules/process/extend.c:111 modules/process/grain_stat.c:161 -#: modules/process/multiprofile.c:773 modules/tools/linestats.c:114 +#: modules/process/multiprofile.c:773 modules/tools/linestats.c:115 #: modules/volume/volume_linestat.c:141 modules/volume/volume_planestat.c:180 msgid "Mean" msgstr "Среднее" #: app/app.c:1564 app/app.c:2206 modules/cmap/cmap_align.c:150 -#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:359 +#: modules/cmap/cmap_linestat.c:125 modules/graph/graph_stats.c:224 #: modules/process/polydistort.c:258 modules/tools/filter.c:144 -#: modules/tools/icolorange.c:336 modules/tools/linestats.c:116 -#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:143 +#: modules/tools/icolorange.c:344 modules/tools/linestats.c:117 +#: modules/tools/stats.c:713 modules/volume/volume_linestat.c:143 #: modules/volume/volume_planestat.c:188 msgid "Minimum" msgstr "Минимум" #: app/app.c:1565 app/app.c:2207 modules/cmap/cmap_align.c:151 -#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:360 +#: modules/cmap/cmap_linestat.c:126 modules/graph/graph_stats.c:225 #: modules/process/col_synth.c:145 modules/process/indent_analyze.c:396 -#: modules/tools/filter.c:145 modules/tools/icolorange.c:337 -#: modules/tools/linestats.c:117 modules/tools/stats.c:711 +#: modules/tools/filter.c:145 modules/tools/icolorange.c:345 +#: modules/tools/linestats.c:118 modules/tools/stats.c:714 #: modules/volume/volume_linestat.c:144 modules/volume/volume_planestat.c:192 msgid "Maximum" msgstr "Максимум" -#: app/app.c:1566 modules/tools/linestats.c:129 +#: app/app.c:1566 modules/tools/linestats.c:130 #: modules/volume/volume_linestat.c:145 msgid "Min. position" msgstr "Положение минимума" -#: app/app.c:1567 modules/tools/linestats.c:130 +#: app/app.c:1567 modules/tools/linestats.c:131 #: modules/volume/volume_linestat.c:146 msgid "Max. position" msgstr "Положение максимума" @@ -2077,7 +2078,8 @@ #: modules/process/grain_stat.c:161 modules/process/indent_analyze.c:343 #: modules/process/scars.c:298 modules/process/scars.c:300 #: modules/process/threshold.c:259 modules/process/zero_crossing.c:201 -#: modules/volume/volume_planestat.c:184 +#: modules/volume/volume_planestat.c:184 modules/volume/volume_scars.c:238 +#: modules/volume/volume_scars.c:240 msgid "RMS" msgstr "Ср. квадр." @@ -2101,41 +2103,41 @@ msgid "Change Curve Map Preview" msgstr "Изменить изображение предпросмотра карты кривых" -#: app/data-browser-aux.c:1401 +#: app/data-browser-aux.c:1379 #, c-format msgid "Unknown channel %d" msgstr "Неизвестный канал %d" -#: app/data-browser-aux.c:1476 +#: app/data-browser-aux.c:1454 #, c-format msgid "Unknown volume %d" msgstr "Неизвестный объём %d" -#: app/data-browser-aux.c:1532 +#: app/data-browser-aux.c:1510 #, c-format msgid "Unknown XYZ %d" msgstr "Неизвестное XYZ %d" -#: app/data-browser-aux.c:1588 +#: app/data-browser-aux.c:1566 #, c-format msgid "Unknown curve map %d" msgstr "Неизвестная карта кривых %d" -#: app/data-browser-aux.c:3095 +#: app/data-browser-aux.c:3077 #, c-format msgid "Z levels: %d, Z unit: %s" msgstr "Уровней Z: %d, единицы измерения Z: %s" -#: app/data-browser-aux.c:3120 +#: app/data-browser-aux.c:3102 #, c-format msgid "Points: %d" msgstr "Точек: %d" -#: app/data-browser-aux.c:3146 +#: app/data-browser-aux.c:3128 msgid "Curves:" msgstr "Кривые:" -#: app/data-browser-aux.c:3159 +#: app/data-browser-aux.c:3141 msgid "Segments:" msgstr "Сегменты:" @@ -2200,11 +2202,11 @@ #: modules/process/convolution_filter.c:235 modules/process/grain_filter.c:311 #: modules/process/polydistort.c:205 modules/process/stitch.c:271 #: modules/process/synth.h:132 modules/process/synth.h:159 -#: modules/tools/corrlen.c:274 modules/tools/linestats.c:282 -#: modules/tools/sfunctions.c:347 modules/tools/stats.c:279 -#: modules/volume/volume_arithmetic.c:229 modules/volume/volume_equiplane.c:255 -#: modules/volume/volume_strayfield.c:257 modules/volume/volume_zposlevel.c:266 -#: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:474 +#: modules/tools/corrlen.c:279 modules/tools/linestats.c:286 +#: modules/tools/sfunctions.c:355 modules/tools/stats.c:284 +#: modules/volume/volume_equiplane.c:255 modules/volume/volume_strayfield.c:257 +#: modules/volume/volume_zposlevel.c:266 modules/xyz/xyz_drift.c:618 +#: modules/xyz/xyz_raster.c:474 msgid "_Update" msgstr "О_бновить" @@ -2262,7 +2264,7 @@ msgid "Open File" msgstr "Открыть файл" -#: app/file.c:487 app/gwymoduleutils.c:185 +#: app/file.c:487 app/gwymoduleutils.c:202 #: modules/graph/graph_export_bitmap.c:89 #, c-format msgid "Saving of `%s' failed" @@ -2414,42 +2416,42 @@ msgid "Cannot preview" msgstr "Нельзя просмотреть" -#: app/gwymoduleutils-file.c:534 +#: app/gwymoduleutils-file.c:502 #, c-format msgid "Section %s ended at line %u but it has never started." msgstr "Секция %s закончилась в строке %u, но никогда не начиналась." -#: app/gwymoduleutils-file.c:542 +#: app/gwymoduleutils-file.c:508 #, c-format msgid "Section %s ended at line %u instead of %s." msgstr "Секция %s закончилась в строке %u вместо %s." -#: app/gwymoduleutils-file.c:579 +#: app/gwymoduleutils-file.c:539 #, c-format msgid "Section %s started at line %u before %s ended." msgstr "Секция %s закончилась в строке %u до того, как %s закончилась." -#: app/gwymoduleutils-file.c:585 +#: app/gwymoduleutils-file.c:545 #, c-format msgid "Empty section name at header line %u." msgstr "Пустое название секции в строке заголовка %u." -#: app/gwymoduleutils-file.c:620 +#: app/gwymoduleutils-file.c:574 #, c-format msgid "Header line %u lacks prefix %s." msgstr "В строке заголовка %u отсутствует префикс %s." -#: app/gwymoduleutils-file.c:645 +#: app/gwymoduleutils-file.c:598 #, c-format msgid "Header line %u lacks key-value separator." msgstr "В строке заголовка %u отсутствует разделитель ключ-значение." -#: app/gwymoduleutils-file.c:653 +#: app/gwymoduleutils-file.c:605 #, c-format msgid "Key at header line %u is empty." msgstr "Ключ в строке заголовка %u пустой." -#: app/gwymoduleutils-file.c:680 +#: app/gwymoduleutils-file.c:630 #, c-format msgid "Header suddenly ended at line %u; end of header marker is missing" msgstr "" @@ -2457,22 +2459,22 @@ "заголовка" #: app/gwymoduleutils-synth.c:47 modules/file/hdrimage.cc:1879 -#: modules/file/pixmap.c:696 +#: modules/file/pixmap.c:697 msgid "Horizontal size" msgstr "Горизонтальный размер" #: app/gwymoduleutils-synth.c:48 modules/file/hdrimage.cc:1883 -#: modules/file/pixmap.c:700 +#: modules/file/pixmap.c:701 msgid "Vertical size" msgstr "Вертикальный размер" -#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:318 +#: app/gwymoduleutils-synth.c:50 modules/file/rawfile.c:317 #: modules/process/dimensions.h:465 msgid "S_quare image" msgstr "_Квадратное изображение" #: app/gwymoduleutils-synth.c:51 modules/cmap/cmap_crop.c:111 -#: modules/file/rawfile.c:342 modules/process/binning.c:112 +#: modules/file/rawfile.c:341 modules/process/binning.c:112 #: modules/process/calibrate.c:188 modules/process/crosscor.c:151 #: modules/process/crosscor.c:155 modules/process/fibre_synth.c:197 #: modules/process/pileup_synth.c:221 modules/process/tip_blind.c:154 @@ -2482,7 +2484,7 @@ msgstr "_Ширина" #: app/gwymoduleutils-synth.c:52 modules/cmap/cmap_crop.c:112 -#: modules/file/rawfile.c:343 modules/process/anneal_synth.c:151 +#: modules/file/rawfile.c:342 modules/process/anneal_synth.c:151 #: modules/process/bdep_synth.c:148 modules/process/binning.c:113 #: modules/process/calibrate.c:189 modules/process/crosscor.c:152 #: modules/process/crosscor.c:156 modules/process/disc_synth.c:156 @@ -2499,20 +2501,20 @@ msgstr "_Высота" #: app/gwymoduleutils-synth.c:54 modules/file/hdrimage.cc:308 -#: modules/file/pixmap.c:287 modules/file/rawfile.c:319 +#: modules/file/pixmap.c:288 modules/file/rawfile.c:318 #: modules/process/calibrate.c:194 modules/process/resample.c:119 #: modules/volume/volume_calibrate.c:201 msgid "_Square pixels" msgstr "_Квадратные пиксели" #: app/gwymoduleutils-synth.c:55 modules/file/hdrimage.cc:310 -#: modules/file/pixmap.c:289 modules/file/rawfile.c:344 +#: modules/file/pixmap.c:290 modules/file/rawfile.c:343 #: modules/process/calibrate.c:195 modules/volume/volume_calibrate.c:202 msgid "_Dimensions unit" msgstr "_Единица измерения горизонтальных размеров" #: app/gwymoduleutils-synth.c:56 modules/file/hdrimage.cc:311 -#: modules/file/pixmap.c:290 modules/file/rawfile.c:345 +#: modules/file/pixmap.c:291 modules/file/rawfile.c:344 #: modules/process/calibrate.c:227 modules/volume/volume_calibrate.c:227 msgid "_Value unit" msgstr "_Единица измерения значений" @@ -2526,21 +2528,22 @@ msgstr "Н_ачать с текущего изображения" #: app/gwymoduleutils-synth.c:150 modules/file/nmmxyz.c:575 -#: modules/file/rawfile.c:533 modules/process/dimensions.h:453 +#: modules/file/rawfile.c:532 modules/process/dimensions.h:453 #: modules/xyz/xyz_drift.c:725 modules/xyz/xyz_raster.c:393 msgid "Resolution" msgstr "Разрешение" #: app/gwymoduleutils-synth.c:159 modules/file/hdrimage.cc:1909 -#: modules/file/imgexport.c:3119 modules/file/pixmap.c:725 -#: modules/file/rawfile.c:542 modules/process/dimensions.h:475 +#: modules/file/imgexport.c:3122 modules/file/pixmap.c:726 +#: modules/file/rawfile.c:541 modules/process/dimensions.h:475 #: modules/xyz/xyz_drift.c:774 modules/xyz/xyz_raster.c:554 msgid "Physical Dimensions" msgstr "Физические размеры" -#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:554 +#: app/gwymoduleutils-synth.c:168 modules/file/rawfile.c:553 #: modules/process/arithmetic.c:331 modules/process/dimensions.h:491 -#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:301 +#: modules/process/grain_stat.c:161 modules/volume/volume_arithmetic.c:313 +#: modules/volume/volume_xyarithmetics.c:318 msgid "Units" msgstr "Единицы измерения" @@ -2559,30 +2562,30 @@ msgid "Generated" msgstr "Сгенерированное" -#: app/gwymoduleutils.c:189 app/settings.c:123 app/settings.c:133 -#: gwyddion/toolbox-spec.c:510 modules/file/err.h:70 +#: app/gwymoduleutils.c:206 app/settings.c:123 app/settings.c:133 +#: gwyddion/toolbox-spec.c:510 modules/file/err.h:67 #: modules/graph/graph_export_bitmap.c:91 modules/pygwy/pygwy-console.c:518 #, c-format msgid "Cannot write to file: %s." msgstr "Невозможно записать в файл: %s." -#: app/gwymoduleutils.c:918 +#: app/gwymoduleutils.c:935 #, c-format msgid "%s: Lateral dimensions and value must be the same physical quantity." msgstr "" "%s: горизонтальные размеры и значения данных должны быть одной физической " "величиной." -#: app/gwymoduleutils.c:957 +#: app/gwymoduleutils.c:974 #, c-format msgid "%s: Data must be square." msgstr "%s: Данные должны быть квадратом." -#: app/gwyplaintool.c:525 +#: app/gwyplaintool.c:563 msgid "Missing layer module." msgstr "Отсутствует модуль слоёв." -#: app/gwyplaintool.c:531 +#: app/gwyplaintool.c:569 #, c-format msgid "" "This tool requires layer of type %s to work, which does not seem to be " @@ -2591,31 +2594,31 @@ "Этот инструмент требует для работы слой типа %s, который вероятно не " "установлен. Проверьте целостность установки." -#: app/gwyplaintool.c:720 +#: app/gwyplaintool.c:758 msgid "Clear selected objects" msgstr "Очистить выбранные объекты" #. TRANSLATORS: Origin of the selected rectangle. -#: app/gwyplaintool.c:925 modules/tools/spotremove.c:353 +#: app/gwyplaintool.c:1041 modules/tools/spotremove.c:358 #: modules/volume/volume_planestat.c:471 msgid "Origin" msgstr "Начальная точка" -#: app/gwyplaintool.c:936 modules/file/rawfile.c:683 +#: app/gwyplaintool.c:1052 modules/file/rawfile.c:682 #: modules/process/convolution_filter.c:348 #: modules/process/convolution_filter.c:551 modules/process/fibre_synth.c:330 #: modules/process/lat_synth.c:498 modules/process/neural.c:405 #: modules/process/obj_synth.c:402 modules/process/pat_synth.c:2613 -#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:365 +#: modules/process/pileup_synth.c:342 modules/tools/spotremove.c:370 #: modules/volume/volume_planestat.c:476 msgid "Size" msgstr "Размер" -#: app/gwyplaintool.c:939 modules/tools/spotremove.c:368 +#: app/gwyplaintool.c:1055 modules/tools/spotremove.c:373 msgid "Width" msgstr "Ширина" -#: app/gwyresultsexport.c:255 app/param-table.c:6587 +#: app/gwyresultsexport.c:255 app/param-table.c:6881 msgid "Save Results to File" msgstr "Сохранить результаты в файл" @@ -2675,7 +2678,7 @@ #. TRANSLATORS: For user guide location. Translate this to fr, ru, cs, de, ... even if the corresponding guide #. * does not exist. -#: app/help.c:338 app/param-table.c:676 +#: app/help.c:338 app/param-table.c:700 msgid "current-language-code|en" msgstr "ru" @@ -2696,7 +2699,7 @@ msgid "_Close" msgstr "_Закрыть" -#: app/log.c:675 modules/file/imgexport.c:4196 modules/file/rawfile.c:682 +#: app/log.c:675 modules/file/imgexport.c:4199 modules/file/rawfile.c:681 msgid "Type" msgstr "Тип" @@ -2704,11 +2707,11 @@ msgid "Function" msgstr "Функция" -#: app/log.c:677 modules/file/imgexport.c:3188 -#: modules/graph/graph_terraces.c:394 modules/process/fit-shape.c:511 +#: app/log.c:677 modules/file/imgexport.c:3191 +#: modules/graph/graph_terraces.c:364 modules/process/fit-shape.c:511 #: modules/process/fit-shape.c:1652 modules/process/neural.c:594 #: modules/process/relate.c:675 modules/process/terracefit.c:461 -#: modules/volume/volume_psf.c:400 +#: modules/volume/volume_psf.c:401 msgid "Parameters" msgstr "Параметры" @@ -2764,8 +2767,8 @@ msgid "_New" msgstr "Новый _элемент" -#: app/meta.c:242 modules/file/imgexport.c:4693 modules/file/rawfile.c:677 -#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:453 +#: app/meta.c:242 modules/file/imgexport.c:4696 modules/file/rawfile.c:676 +#: modules/process/facet_analysis.c:481 modules/process/facet_measure.c:436 #: modules/process/neural.c:694 modules/tools/selectionmanager.c:374 msgid "_Delete" msgstr "_Удалить" @@ -2783,92 +2786,115 @@ msgid "Save Metadata" msgstr "Сохранить метаданные" -#: app/param-def.c:337 +#: app/param-def.c:338 msgid "_Masking" msgstr "Выделение _маской" -#: app/param-def.c:341 +#: app/param-def.c:342 msgid "_Interpolation type" msgstr "Тип _интерполяции" -#: app/param-def.c:345 modules/process/col_synth.c:198 +#: app/param-def.c:346 modules/process/col_synth.c:198 +#: modules/process/dune_synth.c:143 msgid "_Direction" msgstr "Направление" -#: app/param-def.c:349 +#: app/param-def.c:350 msgid "Combine with existing mask" msgstr "Объединить с имеющейся маской" -#: app/param-def.c:353 +#: app/param-def.c:354 msgid "_Windowing type" msgstr "Тип о_кна" -#: app/param-def.c:357 modules/process/mask_edt.c:112 -#: modules/tools/maskedit.c:221 +#: app/param-def.c:358 modules/process/mask_edt.c:112 +#: modules/tools/maskedit.c:225 msgid "_Distance type" msgstr "Тип _расстояния" -#: app/param-def.c:361 +#: app/param-def.c:362 msgid "Plot _style" msgstr "_Стиль графика" -#: app/param-def.c:608 modules/process/calcoefs_view.c:567 +#: app/param-def.c:609 modules/process/calcoefs_view.c:567 #: modules/process/grain_filter.c:345 modules/process/polydistort.c:319 #: modules/process/synth.h:136 modules/volume/volume_equiplane.c:384 #: modules/volume/volume_strayfield.c:396 modules/volume/volume_zposlevel.c:395 msgid "I_nstant updates" msgstr "Мгновенное об_новление" -#: app/param-def.c:656 modules/process/synth.h:213 +#: app/param-def.c:657 modules/process/synth.h:213 msgid "Randomi_ze" msgstr "Сделать случа_йным" -#: app/param-def.c:837 +#: app/param-def.c:838 msgid "_Mask color" msgstr "_Цвет маски" -#: app/param-def.c:875 +#: app/param-def.c:876 msgid "Target _graph" msgstr "Добавить к _графику" -#: app/param-def.c:1062 app/param-def.c:1100 +#: app/param-def.c:1063 app/param-def.c:1101 msgid "C_urve" msgstr "К_ривая" -#: app/param-def.c:1138 +#: app/param-def.c:1139 msgid "_Segment" msgstr "_Сегмент" -#: app/param-def.c:1219 +#: app/param-def.c:1211 +msgid "Hold selection" +msgstr "Оставить выбранное" + +#: app/param-def.c:1212 +msgid "Replace existing selection" +msgstr "Заменить существующее выбранное" + +#: app/param-def.c:1213 +msgid "Replace even with empty (clear selection)" +msgstr "Заменить даже пустым (чистым выбранным)" + +#: app/param-def.c:1217 +msgid "_Hold selection" +msgstr "_Оставить выбранное" + +#: app/param-def.c:1251 msgid "R_andom seed" msgstr "На_чальное число" -#: app/param-def.c:1392 +#: app/param-def.c:1424 msgid "Expanded groups" msgstr "Расширенные группы" -#: app/param-table.c:2140 modules/volume/volume_slice.c:411 +#: app/param-table.c:2192 modules/volume/volume_slice.c:411 msgid "New graph" msgstr "Новый график" -#: app/param-table.c:5710 modules/process/calcoefs_new.c:409 +#: app/param-table.c:5849 modules/graph/graph_cd.c:330 +#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 +#: modules/volume/volume_fdfit.c:487 modules/volume/volume_strayfield.c:374 +msgid "range|to" +msgstr "–" + +#: app/param-table.c:6005 modules/process/calcoefs_new.c:409 #: modules/process/calcoefs_new.c:476 modules/process/calcoefs_simple.c:393 #: modules/process/calcoefs_simple.c:460 modules/process/calcoefs_view.c:511 #: modules/process/calcoefs_view.c:549 modules/process/dimensions.h:145 msgid "verb|Change" msgstr "Изменить" -#: app/param-table.c:5756 modules/process/synth.h:201 +#: app/param-table.c:6050 modules/process/synth.h:201 msgid "seed|_New" msgstr "Ново_е" -#: app/param-table.c:6068 modules/process/calcoefs_new.c:820 +#: app/param-table.c:6362 modules/process/calcoefs_new.c:820 #: modules/process/calcoefs_simple.c:1204 modules/process/calcoefs_view.c:1380 #: modules/process/dimensions.h:179 msgid "Change Units" msgstr "Изменить единицы измерения" -#: app/param-table.c:6089 modules/process/calcoefs_new.c:833 +#: app/param-table.c:6383 modules/process/calcoefs_new.c:833 #: modules/process/calcoefs_simple.c:1217 modules/process/calcoefs_view.c:1393 #: modules/process/dimensions.h:192 msgid "New _units:" @@ -2894,41 +2920,41 @@ msgid "Set selected item as default" msgstr "Установить выбранный элемент по умолчанию" -#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:55 -#: modules/file/err.h:62 +#: app/settings.c:118 gwyddion/toolbox-spec.c:504 modules/file/err.h:52 +#: modules/file/err.h:59 #, c-format msgid "Cannot open file for writing: %s." msgstr "Не удаётся открыть файл для записи: %s." -#: app/settings.c:170 modules/file/err.h:33 modules/file/gwyzip.h:398 +#: app/settings.c:172 modules/file/err.h:30 modules/file/gwyzip.h:398 #, c-format msgid "Cannot read file contents: %s" msgstr "Невозможно прочесть содержимое файла: %s" -#: app/settings.c:177 +#: app/settings.c:178 msgid "File is empty." msgstr "Файл пуст." -#: app/settings.c:186 +#: app/settings.c:187 msgid "File is corrupted, magic header does not match." msgstr "" "Файл повреждён, ключевые значения заголовка не соответствуют друг другу." -#: app/settings.c:195 +#: app/settings.c:195 app/settings.c:248 msgid "File is corrupted, deserialization failed." msgstr "Файл повреждён, разбор завершился неудачно." -#: app/settings.c:247 +#: app/settings.c:294 #, c-format msgid "Cannot create user config directory %s: %s" msgstr "Не удаётся создать каталог настроек пользователя %s: %s" -#: app/settings.c:258 +#: app/settings.c:305 #, c-format msgid "Cannot create user ui directory %s: %s" msgstr "Не удаётся создать каталог интерфейса пользователя %s: %s" -#: app/settings.c:272 +#: app/settings.c:319 #, c-format msgid "Cannot create user module directory %s: %s" msgstr "Не удаётся создать каталог модулей пользователя %s: %s" @@ -3051,66 +3077,66 @@ "версии. Полный текст лицензии доступен в файле COPYING в архиве исходного " "кода программы." -#: gwyddion/about.c:131 +#: gwyddion/about.c:132 msgid "Or read the license at" msgstr "Или прочтите лицензию" -#: gwyddion/about.c:136 +#: gwyddion/about.c:137 msgid "License" msgstr "Лицензия" -#: gwyddion/about.c:143 modules/process/logistic.c:229 +#: gwyddion/about.c:144 modules/process/logistic.c:229 msgid "Features" msgstr "Возможности" -#: gwyddion/about.c:184 +#: gwyddion/about.c:185 msgid "Developers" msgstr "Разработчики" -#: gwyddion/about.c:185 +#: gwyddion/about.c:186 msgid "Translators" msgstr "Переводчики" -#: gwyddion/about.c:188 +#: gwyddion/about.c:189 msgid "Development is supported by the Czech Metrology Institute: " msgstr "Разработка поддерживается Чешским институтом метрологии: " -#: gwyddion/about.c:254 gwyddion/about.c:257 +#: gwyddion/about.c:255 gwyddion/about.c:258 msgid "OpenGL 3D View" msgstr "Трёхмерный вид OpenGL" -#: gwyddion/about.c:266 gwyddion/about.c:269 +#: gwyddion/about.c:267 gwyddion/about.c:270 msgid "OpenMP parallelization" msgstr "Параллельное выполнение с OpenMP" -#: gwyddion/about.c:277 +#: gwyddion/about.c:278 msgid "X11 protocol\n" msgstr "Протокол X11\n" -#: gwyddion/about.c:279 +#: gwyddion/about.c:280 msgid "Win32 protocol\n" msgstr "Протокол Win32\n" -#: gwyddion/about.c:281 +#: gwyddion/about.c:282 msgid "LibUnique\n" msgstr "LibUnique\n" -#: gwyddion/about.c:285 +#: gwyddion/about.c:286 msgid "Remote Control" msgstr "Дистанционное управление" -#: gwyddion/about.c:289 gwyddion/about.c:293 +#: gwyddion/about.c:290 gwyddion/about.c:294 msgid "Python Scripting Interface" msgstr "Скриптовый интерфейс Python" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:340 +#: gwyddion/about.c:341 #, c-format msgid "Released %s" msgstr "Дата выхода %s" #. TRANSLATORS: %s is replaced with date in ISO format YYYY-MM-DD. -#: gwyddion/about.c:344 +#: gwyddion/about.c:345 #, c-format msgid "Development version, built %s" msgstr "Версия в разработке, собрана %s" @@ -3768,7 +3794,7 @@ msgstr "_Правка" #: gwyddion/toolbox-editor.c:253 modules/process/fft_filter_2d.c:491 -#: modules/tools/maskedit.c:434 modules/volume/volume_zcal.c:181 +#: modules/tools/maskedit.c:441 modules/volume/volume_zcal.c:181 msgid "_Remove" msgstr "_Удалить" @@ -3780,7 +3806,7 @@ msgid "Move _Down" msgstr "Переместить в_низ" -#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3174 +#: gwyddion/toolbox-editor.c:268 modules/file/imgexport.c:3177 #: modules/process/dimensions.h:481 msgid "_Width:" msgstr "_Ширина:" @@ -3841,7 +3867,7 @@ msgid "XYZ Data" msgstr "Данные XYZ" -#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:226 +#: gwyddion/toolbox-editor.c:935 modules/tools/maskedit.c:230 msgid "Tool" msgstr "Инструмент" @@ -4077,7 +4103,7 @@ #: modules/cmap/cmap_align.c:167 modules/cmap/cmap_possearch.c:174 #: modules/process/linematch.c:173 modules/process/semsim.c:135 -#: modules/process/threshold.c:135 +#: modules/process/threshold.c:135 modules/volume/volume_linelevel.c:185 msgid "Method" msgstr "Метод" @@ -4090,7 +4116,7 @@ #: modules/cmap/cmap_align.c:175 modules/cmap/cmap_cutter.c:192 #: modules/cmap/cmap_lockin.c:192 modules/cmap/cmap_possearch.c:185 #: modules/process/fft.c:131 modules/process/fit-shape.c:293 -#: modules/process/maskcor.c:122 modules/process/mfm_current.c:158 +#: modules/process/maskcor.c:129 modules/process/mfm_current.c:158 #: modules/process/mfm_field.c:155 modules/process/mfm_parallel.c:164 msgid "Output _type" msgstr "Тип в_ывода" @@ -4182,31 +4208,33 @@ msgid "/_Basic Operations/_Crop" msgstr "/_Базовые действия/Об_резать" -#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:123 +#: modules/cmap/cmap_crop.c:94 modules/tools/crop.c:125 msgid "Crop data" msgstr "Кадрировать данные" #: modules/cmap/cmap_crop.c:109 modules/process/tilt.c:102 -#: modules/volume/volume_planestat.c:269 modules/volume/volume_planestat.c:472 +#: modules/volume/volume_drift.c:173 modules/volume/volume_planestat.c:269 +#: modules/volume/volume_planestat.c:472 msgid "_X" msgstr "_X" #: modules/cmap/cmap_crop.c:110 modules/process/tilt.c:103 -#: modules/volume/volume_planestat.c:270 modules/volume/volume_planestat.c:474 +#: modules/volume/volume_drift.c:174 modules/volume/volume_planestat.c:270 +#: modules/volume/volume_planestat.c:474 msgid "_Y" msgstr "_Y" #: modules/cmap/cmap_crop.c:113 modules/process/extend.c:132 -#: modules/tools/crop.c:106 +#: modules/tools/crop.c:107 msgid "Keep lateral offsets" msgstr "Сохранять пространственные смещения" #: modules/cmap/cmap_crop.c:156 modules/process/calcoefs_simple.c:352 -#: modules/tools/crop.c:288 +#: modules/tools/crop.c:293 msgid "Detail" msgstr "Часть" -#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:122 +#: modules/cmap/cmap_crop.c:192 modules/tools/crop.c:124 msgid "Crop" msgstr "Кадрировать" @@ -4214,34 +4242,36 @@ msgid "New Dimensions" msgstr "Новые горизонтальные размеры" -#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:209 -#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3591 -#: modules/file/imgexport.c:4240 modules/file/nmmxyz.c:456 -#: modules/file/rawfile.c:558 modules/file/xyzexport.c:276 +#: modules/cmap/cmap_crop.c:214 modules/file/asciiexport.c:198 +#: modules/file/gxyzffile.c:392 modules/file/imgexport.c:3594 +#: modules/file/imgexport.c:4243 modules/file/nmmxyz.c:456 +#: modules/file/rawfile.c:557 modules/file/xyzexport.c:267 #: modules/process/anneal_synth.c:301 modules/process/bdep_synth.c:337 #: modules/process/binning.c:242 modules/process/calibrate.c:486 #: modules/process/coerce.c:277 modules/process/col_synth.c:399 #: modules/process/correct_affine.c:519 modules/process/cpde_synth.c:291 #: modules/process/deposit_synth.c:283 modules/process/diff_synth.c:439 #: modules/process/disc_synth.c:299 modules/process/displfield.c:258 -#: modules/process/domain_synth.c:343 modules/process/extend.c:319 -#: modules/process/fbm_synth.c:274 modules/process/fft.c:318 -#: modules/process/fft_synth.c:284 modules/process/fibre_synth.c:380 -#: modules/process/good_profile.c:290 modules/process/grain_edge.c:183 -#: modules/process/grain_mark.c:209 modules/process/grain_wshed.c:208 -#: modules/process/lat_synth.c:517 modules/process/linematch.c:326 -#: modules/process/lno_synth.c:401 modules/process/mark_disconn.c:212 -#: modules/process/mfm_current.c:303 modules/process/mfm_parallel.c:312 -#: modules/process/noise_synth.c:306 modules/process/obj_synth.c:451 -#: modules/process/pat_synth.c:517 modules/process/phase_synth.c:251 -#: modules/process/pileup_synth.c:361 modules/process/rank-filter.c:231 +#: modules/process/domain_synth.c:343 modules/process/dune_synth.c:291 +#: modules/process/extend.c:319 modules/process/fbm_synth.c:274 +#: modules/process/fft.c:318 modules/process/fft_synth.c:284 +#: modules/process/fibre_synth.c:380 modules/process/good_profile.c:290 +#: modules/process/grain_edge.c:183 modules/process/grain_mark.c:209 +#: modules/process/grain_wshed.c:208 modules/process/lat_synth.c:517 +#: modules/process/linematch.c:326 modules/process/lno_synth.c:401 +#: modules/process/mark_disconn.c:212 modules/process/mfm_current.c:303 +#: modules/process/mfm_parallel.c:312 modules/process/noise_synth.c:306 +#: modules/process/obj_synth.c:451 modules/process/pat_synth.c:517 +#: modules/process/phase_synth.c:251 modules/process/pileup_synth.c:361 +#: modules/process/plateau_synth.c:307 modules/process/rank-filter.c:231 #: modules/process/rotate.c:288 modules/process/scars.c:305 #: modules/process/slope_dist.c:259 modules/process/tip_blind.c:297 #: modules/process/wave_synth.c:356 modules/process/wfr_synth.c:263 -#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:252 -#: modules/tools/spotremove.c:317 modules/tools/stats.c:251 -#: modules/volume/volume_asciiexport.c:187 -#: modules/volume/volume_calibrate.c:389 modules/xyz/xyz_raster.c:616 +#: modules/process/wpour_mark.c:259 modules/tools/corrlen.c:255 +#: modules/tools/spotremove.c:321 modules/tools/stats.c:254 +#: modules/volume/volume_asciiexport.c:163 +#: modules/volume/volume_calibrate.c:389 modules/volume/volume_scars.c:245 +#: modules/xyz/xyz_raster.c:616 msgid "Options" msgstr "Параметры" @@ -4304,7 +4334,7 @@ msgstr "Кривая Z" #: modules/cmap/cmap_cutter.c:453 modules/cmap/cmap_simplemech.c:904 -#: modules/graph/graph_terraces.c:2619 modules/process/terracefit.c:2248 +#: modules/graph/graph_terraces.c:2024 modules/process/terracefit.c:2241 #: modules/xyz/xyz_drift.c:1920 msgid "Fitting in progress..." msgstr "Идёт аппроксимация..." @@ -4404,7 +4434,7 @@ #: modules/cmap/cmap_fdfit.c:373 modules/cmap/cmap_lockin.c:344 #: modules/cmap/cmap_polylevel.c:263 modules/cmap/cmap_sinebg.c:268 -#: modules/graph/graph_polylevel.c:542 modules/graph/graph_sinebg.c:560 +#: modules/graph/graph_polylevel.c:400 modules/graph/graph_sinebg.c:401 msgid "fit" msgstr "апроксимация" @@ -4475,49 +4505,54 @@ msgid "Convert FZ to FD Curve" msgstr "Конвертировать кривую FZ в FD" -#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:362 +#: modules/cmap/cmap_linestat.c:124 modules/graph/graph_stats.c:227 #: modules/process/grain_stat.c:161 modules/process/linematch.c:128 -#: modules/tools/linestats.c:115 modules/tools/stats.c:712 -#: modules/volume/volume_linestat.c:142 modules/volume/volume_planestat.c:212 +#: modules/tools/linestats.c:116 modules/tools/stats.c:715 +#: modules/volume/volume_linelevel.c:135 modules/volume/volume_linestat.c:142 +#: modules/volume/volume_planestat.c:212 msgid "Median" msgstr "Срединное" -#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_stats.c:350 -#: modules/tools/linestats.c:118 modules/tools/sfunctions.c:181 -#: modules/volume/volume_linestat.c:147 modules/volume/volume_planestat.c:196 +#: modules/cmap/cmap_linestat.c:136 modules/graph/graph_cut.c:100 +#: modules/graph/graph_measure_period.c:129 +#: modules/graph/graph_measure_period.c:241 modules/graph/graph_polylevel.c:122 +#: modules/graph/graph_sinebg.c:121 modules/graph/graph_stats.c:112 +#: modules/graph/graph_stats.c:215 modules/tools/linestats.c:119 +#: modules/tools/sfunctions.c:184 modules/volume/volume_linestat.c:147 +#: modules/volume/volume_planestat.c:196 msgid "Range" msgstr "Диапазон" -#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:363 -#: modules/tools/linestats.c:123 modules/volume/volume_linestat.c:152 +#: modules/cmap/cmap_linestat.c:137 modules/graph/graph_stats.c:228 +#: modules/tools/linestats.c:124 modules/volume/volume_linestat.c:152 msgid "Ra" msgstr "Ra" -#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:124 +#: modules/cmap/cmap_linestat.c:138 modules/tools/linestats.c:125 #: modules/volume/volume_linestat.c:153 msgid "Rq (RMS)" msgstr "Rq (Ср. квадр.)" -#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:125 +#: modules/cmap/cmap_linestat.c:139 modules/tools/linestats.c:126 #: modules/volume/volume_linestat.c:154 msgid "Rz" msgstr "Rz" -#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:126 +#: modules/cmap/cmap_linestat.c:140 modules/tools/linestats.c:127 #: modules/volume/volume_linestat.c:155 msgid "Rt" msgstr "Rt" -#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:365 -#: modules/process/col_synth.c:148 modules/tools/linestats.c:127 -#: modules/tools/stats.c:706 modules/volume/volume_linestat.c:156 +#: modules/cmap/cmap_linestat.c:141 modules/graph/graph_stats.c:230 +#: modules/process/col_synth.c:148 modules/tools/linestats.c:128 +#: modules/tools/stats.c:709 modules/volume/volume_linestat.c:156 #: modules/volume/volume_planestat.c:200 msgid "Skew" msgstr "Асимметрия" -#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:366 -#: modules/process/col_synth.c:149 modules/tools/linestats.c:128 -#: modules/tools/stats.c:707 modules/volume/volume_linestat.c:157 +#: modules/cmap/cmap_linestat.c:142 modules/graph/graph_stats.c:231 +#: modules/process/col_synth.c:149 modules/tools/linestats.c:129 +#: modules/tools/stats.c:710 modules/volume/volume_linestat.c:157 #: modules/volume/volume_planestat.c:204 msgid "Excess kurtosis" msgstr "Избыточный эксцесс" @@ -4543,8 +4578,8 @@ msgstr "Установить изображение _предпросмотра" #: modules/cmap/cmap_linestat.c:190 modules/graph/graph_sfuncs.c:125 -#: modules/process/wave_synth.c:186 modules/tools/linestats.c:159 -#: modules/tools/sfunctions.c:207 modules/volume/volume_linestat.c:205 +#: modules/process/wave_synth.c:186 modules/tools/linestats.c:160 +#: modules/tools/sfunctions.c:212 modules/volume/volume_linestat.c:205 #: modules/volume/volume_planestat.c:275 msgid "_Quantity" msgstr "_Величина" @@ -4552,7 +4587,7 @@ #: modules/cmap/cmap_linestat.c:192 modules/process/crosscor.c:158 #: modules/process/domain_synth.c:188 modules/process/freq_split.c:158 #: modules/process/mask_edt.c:114 modules/process/slope_dist.c:147 -#: modules/volume/volume_linestat.c:207 +#: modules/volume/volume_drift.c:187 modules/volume/volume_linestat.c:207 msgid "Output type" msgstr "Тип вывода" @@ -4585,7 +4620,7 @@ msgstr "Эталон" #: modules/cmap/cmap_lockin.c:185 modules/cmap/cmap_polylevel.c:155 -#: modules/graph/graph_polylevel.c:136 +#: modules/graph/graph_polylevel.c:117 msgid "_Degree" msgstr "_Степень" @@ -4593,9 +4628,9 @@ msgid "_Show" msgstr "_Показать" -#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:580 +#: modules/cmap/cmap_lockin.c:259 modules/graph/graph_sinebg.c:419 #: modules/process/wave_synth.c:176 modules/process/wave_synth.c:319 -#: modules/tools/roughness.c:385 +#: modules/tools/roughness.c:386 msgid "Amplitude" msgstr "Амплитуда" @@ -4620,7 +4655,7 @@ msgid "Remove polynomial background from all curves" msgstr "Удалить полиномиальный фон со всех кривых" -#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:202 +#: modules/cmap/cmap_polylevel.c:230 modules/graph/graph_polylevel.c:176 #: modules/process/polylevel.c:319 msgid "Remove Polynomial Background" msgstr "Убрать полиномиальный фон" @@ -4742,12 +4777,12 @@ msgid "Output images" msgstr "Вывод изображений" -#: modules/cmap/cmap_simplemech.c:223 modules/process/correct_perspective.c:150 -#: modules/process/drift.c:165 modules/process/fit-shape.c:291 -#: modules/process/freq_split.c:160 modules/process/good_profile.c:137 -#: modules/process/hertz.c:126 modules/process/multiprofile.c:159 -#: modules/process/pid.c:149 modules/process/terracefit.c:296 -#: modules/process/zero_crossing.c:124 +#: modules/cmap/cmap_simplemech.c:223 modules/graph/graph_terraces.c:272 +#: modules/process/correct_perspective.c:150 modules/process/drift.c:165 +#: modules/process/fit-shape.c:291 modules/process/freq_split.c:160 +#: modules/process/good_profile.c:137 modules/process/hertz.c:126 +#: modules/process/multiprofile.c:159 modules/process/pid.c:149 +#: modules/process/terracefit.c:296 modules/process/zero_crossing.c:124 msgid "verb|Display" msgstr "Показать" @@ -4780,14 +4815,15 @@ msgid "DMT fit" msgstr "Аппроксимация DMT" -#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:358 +#: modules/cmap/cmap_simplemech.c:449 modules/graph/graph_terraces.c:637 #: modules/process/fit-shape.c:1639 modules/process/relate.c:363 #: modules/process/relate.c:665 modules/process/terracefit.c:495 msgid "Fit Results" msgstr "Результаты аппроксимации" -#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_simplemech.c:217 -#: modules/graph/graph_simplemech.c:567 modules/xyz/xyz_drift.c:1081 +#: modules/cmap/cmap_simplemech.c:477 modules/graph/graph_measure_period.c:249 +#: modules/graph/graph_simplemech.c:217 modules/graph/graph_simplemech.c:567 +#: modules/xyz/xyz_drift.c:1081 msgid "Results" msgstr "Результаты" @@ -4803,19 +4839,19 @@ msgid "Remove sine background from all curves" msgstr "Удалить синусоидальный фон со всех кривых" -#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:201 +#: modules/cmap/cmap_sinebg.c:235 modules/graph/graph_sinebg.c:173 msgid "Remove Sine Background" msgstr "Удалить синусоидальный фон" -#: modules/file/accurexii-txt.c:73 +#: modules/file/accurexii-txt.c:69 msgid "Imports Accurex II text files." msgstr "Импортирует текстовые файлы Accurex II." -#: modules/file/accurexii-txt.c:86 +#: modules/file/accurexii-txt.c:82 msgid "Accurex II text files (.txt)" msgstr "Текстовые файлы Accurex II (.txt)" -#: modules/file/accurexii-txt.c:153 +#: modules/file/accurexii-txt.c:146 #, c-format msgid "File header cannot be converted from ISO-8859-1 character set: %s" msgstr "" @@ -4843,52 +4879,52 @@ msgid "AIST-NT files (.aist)" msgstr "Файлы AIST-NT (.aist)" -#: modules/file/alicona.c:148 +#: modules/file/alicona.c:144 msgid "Imports Alicona Imaging AL3D files." msgstr "Импортирует файлы Alicona Imaging AL3D." -#: modules/file/alicona.c:161 +#: modules/file/alicona.c:157 msgid "Alicona Imaging AL3D files (.al3d)" msgstr "Файлы Alicona Imaging AL3D (.al3d)" -#: modules/file/alicona.c:516 +#: modules/file/alicona.c:489 #, c-format msgid "Invalid plane number %u in tag ‘%s’." msgstr "Неправильный номер плоскости %u в теге ‘%s’." -#: modules/file/alicona.c:603 +#: modules/file/alicona.c:568 msgid "Header tag key is not nul-terminated." msgstr "Ключ тега заголовка не заканчивается нулём." -#: modules/file/alicona.c:608 +#: modules/file/alicona.c:573 msgid "Header tag key is empty." msgstr "Ключ тега заголовка пуст." -#: modules/file/alicona.c:615 +#: modules/file/alicona.c:579 #, c-format msgid "Header tag ‘%s’ key is not nul-padded." msgstr "Ключ тега заголовка ‘%s’ не выровнен нулями." -#: modules/file/alicona.c:622 +#: modules/file/alicona.c:586 #, c-format msgid "Header tag ‘%s’ lacks CRLF terminator." msgstr "В теге заголовка ‘%s’ не завершающих CRLF." -#: modules/file/alicona.c:628 +#: modules/file/alicona.c:592 #, c-format msgid "Header tag ‘%s’ value is not nul-terminated." msgstr "Значение тега заголовка ‘%s’ не заканчивается нулём." -#: modules/file/alicona.c:638 +#: modules/file/alicona.c:601 #, c-format msgid "Header tag ‘%s’ value is not nul-padded." msgstr "Значение тега заголовка ‘%s’ не выровнено нулями." -#: modules/file/alicona.c:703 +#: modules/file/alicona.c:666 msgid "Comment lacks CRLF termination." msgstr "В комментарии отсутствуют завершающие строки CRLF." -#: modules/file/alicona.c:708 +#: modules/file/alicona.c:671 msgid "Comment is not nul-terminated." msgstr "Комментарий не завершается нулём." @@ -4966,16 +5002,16 @@ msgid "FileDescBegin has no corresponding FileDescEnd." msgstr "Для FileDescBegin не найден соответствующий FileDescEnd." -#: modules/file/anfatec.c:778 modules/file/anfatec.c:791 +#: modules/file/anfatec.c:770 modules/file/anfatec.c:783 msgid "Wrong number of header rows or columns." msgstr "Неправильное количество строк или столбцов заголовка." -#: modules/file/anfatec.c:821 +#: modules/file/anfatec.c:813 modules/file/mifile.c:461 #, c-format msgid "Cannot parse data values at line %d." msgstr "Невозможно распознать значения данных в строке %d." -#: modules/file/anfatec.c:844 +#: modules/file/anfatec.c:836 msgid "Coordinates do not form a regular grid." msgstr "Координаты не образуют правильную сетку." @@ -4987,91 +5023,92 @@ msgid "A.P.E. Research DAX Files (.dax) and APDT File (.apdt)" msgstr "Файлы A.P.E. Research DAX (.dax) и APDT (.apdt)" -#: modules/file/apefile.c:196 +#: modules/file/apefile.c:191 msgid "Imports APE (Applied Physics and Engineering) data files." msgstr "Импортирует файлы данных APE (Applied Physics and Engineering)." -#: modules/file/apefile.c:209 +#: modules/file/apefile.c:204 msgid "APE files (.dat)" msgstr "Файлы APE (.dat)" -#: modules/file/asciiexport.c:84 +#: modules/file/asciiexport.c:75 msgid "Exports data as simple ASCII matrix." msgstr "Экспортирует данные как простую матрицу символов ASCII." -#: modules/file/asciiexport.c:97 +#: modules/file/asciiexport.c:88 msgid "ASCII data matrix (.txt)" msgstr "Матрица данных ASCII (.txt)" -#: modules/file/asciiexport.c:116 modules/file/xyzexport.c:121 +#: modules/file/asciiexport.c:107 modules/file/xyzexport.c:112 #: modules/process/grain_dist.c:149 msgid "Add _informational comment header" msgstr "Добавить _информационный заголовок-комментарий" -#: modules/file/asciiexport.c:118 modules/file/xyzexport.c:123 -#: modules/volume/volume_asciiexport.c:195 +#: modules/file/asciiexport.c:109 modules/file/xyzexport.c:114 +#: modules/volume/volume_asciiexport.c:113 msgid "Use _dot as decimal separator" msgstr "Использовать точку как _десятичный разделитель" -#: modules/file/asciiexport.c:119 +#: modules/file/asciiexport.c:110 msgid "Conca_tenate exports of all images" msgstr "Объ_единить экспорт всех изображений" -#: modules/file/asciiexport.c:120 modules/file/xyzexport.c:124 +#: modules/file/asciiexport.c:111 modules/file/xyzexport.c:115 +#: modules/volume/volume_asciiexport.c:114 msgid "_Precision" msgstr "_Точность" -#: modules/file/asciiexport.c:205 modules/graph/graph_export_ascii.c:133 -#: modules/volume/volume_asciiexport.c:176 +#: modules/file/asciiexport.c:194 modules/graph/graph_export_ascii.c:133 +#: modules/volume/volume_asciiexport.c:159 msgid "Export Text" msgstr "Экспортировать текст" -#: modules/file/asciiexport.c:274 modules/file/xyzexport.c:214 +#: modules/file/asciiexport.c:236 modules/file/xyzexport.c:202 msgid "Channel:" msgstr "Канал:" -#: modules/file/asciiexport.c:279 modules/file/asciiexport.c:290 +#: modules/file/asciiexport.c:241 msgid "Width:" msgstr "Ширина:" -#: modules/file/asciiexport.c:284 modules/file/asciiexport.c:291 +#: modules/file/asciiexport.c:246 msgid "Height:" msgstr "Высота:" -#: modules/file/asciiexport.c:296 modules/file/xyzexport.c:229 +#: modules/file/asciiexport.c:253 modules/file/xyzexport.c:217 msgid "Value units:" msgstr "Единицы измерения:" -#: modules/file/assing-afm.c:69 +#: modules/file/assing-afm.c:65 msgid "Imports Assing AFM data files." msgstr "Импортирует файлы данных Assing AFM." -#: modules/file/assing-afm.c:82 +#: modules/file/assing-afm.c:78 msgid "Assing AFM files (.afm)" msgstr "Файлы Assing AFM (.afm)" -#: modules/file/attocube.c:84 +#: modules/file/attocube.c:80 msgid "Imports Attocube Systems ASC files." msgstr "Импортирует файлы Attocube Systems ASC." -#: modules/file/attocube.c:97 +#: modules/file/attocube.c:93 msgid "Attocube ASCII files (.asc)" msgstr "ASCII файлы Attocube (.asc)" -#: modules/file/bcrfile.c:141 +#: modules/file/bcrfile.c:127 msgid "Imports Image Metrology BCR data files." msgstr "Импортирует файлы данных Image Metrology BCR." -#: modules/file/bcrfile.c:154 +#: modules/file/bcrfile.c:140 msgid "BCR files (.bcr, .bcrf)" msgstr "Файлы BCR (.bcr, .bcrf)" -#: modules/file/bcrfile.c:224 modules/file/keyence.c:1102 +#: modules/file/bcrfile.c:207 modules/file/keyence.c:1102 #: modules/file/omicronflat.c:2511 msgid "Cannot convert string from UTF-16." msgstr "Не получается сконвертировать строку из UTF-16." -#: modules/file/bcrfile.c:335 +#: modules/file/bcrfile.c:314 #, c-format msgid "Unknown file type header: `%s'." msgstr "Неизвестный заголовок типа файла: `%s'." @@ -5105,17 +5142,17 @@ msgid "Burleigh exported data (.txt, .bin)" msgstr "Экспортированные данные Burleigh (.txt, .bin)" -#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:267 -#: modules/file/nanoscope.c:2381 modules/file/omicron.c:416 -#: modules/file/shimadzu.c:468 +#: modules/file/burleigh_exp.c:226 modules/file/burleigh_exp.c:263 +#: modules/file/nanoscope.c:2364 modules/file/omicron.c:416 +#: modules/file/shimadzu.c:446 msgid "Missing colon in header line." msgstr "Пропущено двоеточие в строке заголовка." -#: modules/file/codevfile.c:71 +#: modules/file/codevfile.c:67 msgid "Imports Code V interferogram files." msgstr "Импортирует файлы интерферограмм Code V." -#: modules/file/codevfile.c:84 +#: modules/file/codevfile.c:80 msgid "Code V interferogram files (.int)" msgstr "Файлы интерферограмм Code V (.int)" @@ -5132,19 +5169,19 @@ msgid "Neither `%s' nor `%s' header field found." msgstr "Не найдено ни `%s', ни `%s' поля заголовка." -#: modules/file/createc.c:771 modules/file/matfile.c:588 -#: modules/file/rhk-sm4.c:1615 +#: modules/file/createc.c:765 modules/file/matfile.c:588 +#: modules/file/rhk-sm4.c:1617 #, c-format msgid "zlib initialization failed with error %d, cannot decompress data." msgstr "" "Инициализация zlib закончилась с ошибкой %d, не удалось распаковать данные." -#: modules/file/createc.c:785 modules/file/rhk-sm4.c:1628 +#: modules/file/createc.c:779 modules/file/rhk-sm4.c:1630 #, c-format msgid "Decompression of compressed data failed with error %d." msgstr "Распаковка сжатых данных закончилась с ошибкой %d." -#: modules/file/createc.c:830 modules/file/rhk-sm4.c:1670 +#: modules/file/createc.c:824 modules/file/rhk-sm4.c:1672 msgid "Cannot decompress compressed data. Zlib support was not built in." msgstr "Не удаётся распаковать сжатые данные. Поддержка zlib не была встроена." @@ -5278,22 +5315,22 @@ msgid "Scan size header field overlaps with data." msgstr "Поле заголовка \"размер сканирования\" пересекается с данными." -#: modules/file/err.h:48 modules/file/nrrdfile.c:728 +#: modules/file/err.h:45 modules/file/nrrdfile.c:728 #: modules/file/nrrdfile.c:770 modules/pygwy/pygwy-console.c:494 #, c-format msgid "Cannot read from file: %s." msgstr "Невозможно прочесть из файла: %s." -#: modules/file/err.h:78 +#: modules/file/err.h:75 #, c-format msgid "No data file corresponding to `%s' was found." msgstr "Файл данных, соответствующий `%s', не был найден." -#: modules/file/err.h:86 +#: modules/file/err.h:83 msgid "File is too short to be of the assumed file type." msgstr "Файл слишком короткий, чтобы быть того типа, который предполагался." -#: modules/file/err.h:93 +#: modules/file/err.h:90 #, c-format msgid "" "File is not a %s file, it is seriously damaged, or it is of an unknown " @@ -5302,7 +5339,7 @@ "Файл не является %s файлом, значительно повреждён или записан в неизвестной " "версии формата." -#: modules/file/err.h:104 +#: modules/file/err.h:101 #, c-format msgid "" "Expected data size calculated from file headers is %u bytes, but the real " @@ -5312,60 +5349,64 @@ "байт, но реальный размер %u байт." #. TRANSLATORS: %s is replaced by some item, struct or file part id. -#: modules/file/err.h:115 +#: modules/file/err.h:111 #, c-format msgid "File component/item ‘%s’ is truncated." msgstr "Файл содержит неполный компонент/элемент ‘%s’." -#: modules/file/err.h:122 +#: modules/file/err.h:118 msgid "File header is truncated." msgstr "Заголовок файла усечён." -#: modules/file/err.h:132 modules/file/rhk-sm4.c:771 +#: modules/file/err.h:128 modules/file/rhk-sm4.c:772 #, c-format msgid "Invalid field dimension: %d." msgstr "Неверная размерность поля: %d." -#: modules/file/err.h:140 +#: modules/file/err.h:136 #, c-format msgid "" "The number of bits per sample %d is invalid or unsupported for this file " "type." msgstr "Число бит на сэмпл %d неверно или не поддерживается этим типом файлов." -#: modules/file/err.h:150 +#: modules/file/err.h:145 #, c-format msgid "Data type %d is invalid or unsupported." msgstr "Тип данных %d неправилен или не поддерживается." -#: modules/file/err.h:157 +#: modules/file/err.h:152 #, c-format msgid "Header field `%s' is missing." msgstr "Поле заголовка `%s' пропущено." -#: modules/file/err.h:165 +#: modules/file/err.h:160 #, c-format msgid "The value of parameter `%s' is invalid or unsupported." msgstr "Значение параметра `%s' неверно или не поддерживается." -#: modules/file/err.h:173 +#: modules/file/err.h:168 #, c-format msgid "Parameter `%s' is missing or invalid." msgstr "Параметр `%s' отсутствует или неверен." -#: modules/file/err.h:181 +#: modules/file/err.h:176 msgid "File contains no (importable) data." msgstr "Файл не содержит данных (которые можно импортировать)." -#: modules/file/err.h:188 +#: modules/file/err.h:183 +msgid "Inconsistent structure of individual spectra." +msgstr "Неправильная структура отдельных спектров." + +#: modules/file/err.h:191 msgid "File contains no exportable channel." msgstr "В файле отсутствует канал, который можно экспортировать." -#: modules/file/err.h:196 +#: modules/file/err.h:199 msgid "File import was canceled by user." msgstr "Импорт файла отменён пользователем." -#: modules/file/err.h:210 +#: modules/file/err.h:213 msgid "Missing header." msgstr "Отсутствует заголовок." @@ -5389,7 +5430,7 @@ msgid "Garbage before first header section." msgstr "Мусор перед первой частью заголовка." -#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:259 +#: modules/file/ezdfile.c:332 modules/file/nanoscope-ii.c:246 msgid "Malformed header line (missing =)." msgstr "Искаженная строка заголовка (отсутствует =)." @@ -5427,8 +5468,8 @@ msgid "FemtoScan SPM files" msgstr "Файлы FemtoScan SPM" -#: modules/file/femtoscan.c:285 modules/file/miffile.c:690 -#: modules/file/mulfile.c:304 +#: modules/file/femtoscan.c:285 modules/file/miffile.c:682 +#: modules/file/mulfile.c:294 msgid "Image data are outside the file." msgstr "Данные изображения не помещаются в файл." @@ -5514,7 +5555,7 @@ msgid "Following features" msgstr "В соответствии с особенностями рельефа" -#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:349 +#: modules/file/formats3d.c:337 modules/volume/volume_extract.c:331 msgid "Z scale" msgstr "Масштаб по Z" @@ -5544,15 +5585,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1162 modules/file/hdrimage.cc:432 -#: modules/file/imgexport.c:4778 +#: modules/file/imgexport.c:4781 #, c-format msgid "Export %s" msgstr "Экспорт %s" -#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:974 -#: modules/file/nanoscope.c:980 modules/file/nanoscope.c:2191 -#: modules/file/nanosystemz.c:256 modules/file/nanosystemz.c:270 -#: modules/file/nanosystemz.c:298 modules/file/phoenix.c:964 +#: modules/file/formats3d.c:1518 modules/file/nanoscope.c:961 +#: modules/file/nanoscope.c:967 modules/file/nanoscope.c:2174 +#: modules/file/nanosystemz.c:249 modules/file/nanosystemz.c:263 +#: modules/file/nanosystemz.c:291 modules/file/phoenix.c:964 #: modules/file/phoenix.c:977 modules/file/princetonspe.c:339 #: modules/file/psia.c:346 modules/file/wsxmfile.c:685 modules/file/zemax.c:168 msgid "File is truncated." @@ -5564,14 +5605,15 @@ #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/formats3d.c:1573 modules/file/hdrimage.cc:1866 -#: modules/file/pixmap.c:682 +#: modules/file/pixmap.c:683 #, c-format msgid "Import %s" msgstr "Импортировать %s" #. TRANSLATORS: %{n}i and %{total}i are ids, do NOT translate them. -#: modules/file/formats3d.c:1580 modules/graph/graph_stats.c:188 -#: modules/graph/graph_stats.c:355 modules/process/fit-shape.c:1645 +#: modules/file/formats3d.c:1580 modules/graph/graph_measure_period.c:185 +#: modules/graph/graph_measure_period.c:246 modules/graph/graph_stats.c:165 +#: modules/graph/graph_stats.c:220 modules/process/fit-shape.c:1645 #: modules/process/relate.c:670 msgid "Number of points" msgstr "Число точек" @@ -5588,24 +5630,24 @@ msgid "Z-range" msgstr "Диапазон Z" -#: modules/file/gdeffile.c:133 +#: modules/file/gdeffile.c:129 msgid "Imports DME GDEF data files." msgstr "Импортирует файлы данных DME GDEF." -#: modules/file/gdeffile.c:146 +#: modules/file/gdeffile.c:142 msgid "DME GDEF files (.gdf)" msgstr "Файлы DME GDEF (.gdf)" -#: modules/file/gdeffile.c:190 +#: modules/file/gdeffile.c:186 #, c-format msgid "File version %u.%u is not supported." msgstr "Версия файла %u.%u не поддерживается." -#: modules/file/gdeffile.c:226 +#: modules/file/gdeffile.c:222 msgid "Control block mark is not CB, file is damaged." msgstr "Метка блока управления не CB, файл повреждён." -#: modules/file/gdeffile.c:259 +#: modules/file/gdeffile.c:254 #, c-format msgid "Unknown variable type %u." msgstr "Неизвестный тип переменной %u." @@ -5641,75 +5683,55 @@ "Разбор данных завершился успешно, но в результате был получен неожиданный " "объект %s." -#: modules/file/gwytiff.h:295 +#: modules/file/gwytiff.h:297 #, c-format msgid "Required tag %u was not found." msgstr "Требуемый тег %u не был найден." -#: modules/file/gwytiff.h:369 modules/file/gwytiff.h:384 +#: modules/file/gwytiff.h:371 modules/file/gwytiff.h:386 #, c-format msgid "TIFF directory %lu ended unexpectedly." msgstr "Каталог TIFF %lu неожиданно завершился." -#: modules/file/gwytiff.h:419 +#: modules/file/gwytiff.h:421 #, c-format msgid "BigTIFF data type %u was found in a classic TIFF." msgstr "Тип данных BigTIFF %u был обнаружен в классическом TIFF." -#: modules/file/gwytiff.h:431 +#: modules/file/gwytiff.h:433 msgid "Invalid tag data positions were found." msgstr "Были найдены некорректные позиции тегов данных." -#: modules/file/gwytiff.h:520 +#: modules/file/gwytiff.h:521 #, c-format msgid "BigTIFF reserved fields are %u and %u instead of 8 and 0." msgstr "В BigTIFF зарезервированы поля %u и %u вместо 8 и 0." -#: modules/file/gwytiff.h:1260 modules/file/gwytiff.h:1318 -#: modules/file/gwytiff.h:1418 modules/file/zeisslsm.c:957 +#: modules/file/gwytiff.h:1261 modules/file/gwytiff.h:1319 +#: modules/file/gwytiff.h:1419 modules/file/zeisslsm.c:957 #, c-format msgid "Compression type %u is not supported." msgstr "Тип сжатия %u не поддерживается." -#: modules/file/gwytiff.h:1394 +#: modules/file/gwytiff.h:1395 msgid "Non-uniform bits per sample are unsupported." msgstr "Неодинаковое число бит на сэмпл не поддерживается." -#: modules/file/gwytiff.h:1424 +#: modules/file/gwytiff.h:1425 #, c-format msgid "Planar configuration %u is not supported." msgstr "Конфигурация плоскостей %u не поддерживается." -#: modules/file/gwytiff.h:1447 +#: modules/file/gwytiff.h:1448 msgid "Unsupported sample format" msgstr "Неподдерживаемый формат сэмпла" -#: modules/file/gwyzip-zziplib.h:27 modules/file/gwyzip.h:152 -#: modules/file/gwyzip.h:170 modules/file/gwyzip.h:591 +#: modules/file/gwyzip.h:152 modules/file/gwyzip.h:170 +#: modules/file/gwyzip.h:591 modules/file/gwyzip.h:759 #, c-format msgid "%s cannot open the file as a ZIP file." msgstr "%s не может открыть файл как файл ZIP." -#: modules/file/gwyzip-zziplib.h:49 modules/file/gwyzip-zziplib.h:58 -#: modules/file/gwyzip-zziplib.h:79 modules/file/gwyzip.h:380 -#: modules/file/gwyzip.h:615 modules/file/gwyzip.h:626 -#, c-format -msgid "%s error while reading the zip file: %s." -msgstr "Ошибка %s в процессе чтения zip-файла: %s." - -#: modules/file/gwyzip-zziplib.h:58 modules/file/gwyzip-zziplib.h:79 -#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 -msgid "End of list of files" -msgstr "Конец списка файлов" - -#: modules/file/gwyzip-zziplib.h:134 modules/file/gwyzip.h:703 -msgid "Cannot obtain the uncompressed file size." -msgstr "Не удаётся получить размер несжатого файла." - -#: modules/file/gwyzip-zziplib.h:148 modules/file/gwyzip.h:717 -msgid "Cannot read file contents." -msgstr "Не удаётся прочитать содержимое файла." - #: modules/file/gwyzip.h:184 msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -5718,6 +5740,11 @@ msgid "End of file" msgstr "Конец файла" +#: modules/file/gwyzip.h:191 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:789 +msgid "End of list of files" +msgstr "Конец списка файлов" + #: modules/file/gwyzip.h:193 msgid "Parameter error" msgstr "Ошибка параметра" @@ -5740,11 +5767,26 @@ msgstr "Ошибка %s в процессе чтения zip-файла: %s (%d)." #: modules/file/gwyzip.h:277 modules/file/gwyzip.h:507 -#: modules/file/jpkscan.c:2783 +#: modules/file/gwyzip.h:885 modules/file/jpkscan.c:2776 #, c-format msgid "File %s is missing in the zip file." msgstr "Файл %s отсутствует в zip-архиве." +#: modules/file/gwyzip.h:380 modules/file/gwyzip.h:615 +#: modules/file/gwyzip.h:626 modules/file/gwyzip.h:789 +#: modules/file/gwyzip.h:797 +#, c-format +msgid "%s error while reading the zip file: %s." +msgstr "Ошибка %s в процессе чтения zip-файла: %s." + +#: modules/file/gwyzip.h:703 +msgid "Cannot obtain the uncompressed file size." +msgstr "Не удаётся получить размер несжатого файла." + +#: modules/file/gwyzip.h:716 modules/file/gwyzip.h:922 +msgid "Cannot read file contents." +msgstr "Не удаётся прочитать содержимое файла." + #: modules/file/gxyzffile.c:112 msgid "Imports Gwyddion XYZ field files." msgstr "Импортирует файлы Gwyddion XYZ-полей." @@ -5766,52 +5808,56 @@ msgid "Export GXYZF" msgstr "Экспорт GXYZF" -#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:269 +#: modules/file/gxyzffile.c:385 modules/file/xyzexport.c:260 msgid "Channel" msgstr "Канал" -#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:271 +#: modules/file/gxyzffile.c:387 modules/file/xyzexport.c:262 #: modules/process/fit-shape.c:1642 msgid "XYZ data" msgstr "Данные XYZ" -#: modules/file/hdf4file.c:329 +#: modules/file/hdf4file.c:324 msgid "Imports Hierarchical Data Format (HDF) files, version 4." msgstr "Импортирует файлы Hierarchical Data Format (HDF) версии 4." -#: modules/file/hdf4file.c:350 +#: modules/file/hdf4file.c:337 msgid "Psi HDF4 files (.hdf)" msgstr "Файлы Psi HDF4 (.hdf)" -#: modules/file/hdf4file.c:531 +#: modules/file/hdf4file.c:512 msgid "PSI binary header is too short." msgstr "Двоичный заголовок PSI слишком короток." -#: modules/file/hdf4file.c:686 +#: modules/file/hdf4file.c:640 msgid "HDF data with `native' type is not supported." msgstr "Данные HDF с типом `native' не поддерживаются." -#: modules/file/hdf5file.c:148 +#: modules/file/hdf5file.c:201 msgid "Imports files based on Hierarchical Data Format (HDF), version 5." msgstr "" "Импортирует файлы основанные на Hierarchical Data Format (HDF) версии 5." -#: modules/file/hdf5file.c:175 +#: modules/file/hdf5file.c:222 msgid "Asylum Research Ergo HDF5 files (.h5)" msgstr "Файлы Asylum Research Ergo HDF5 (.h5)" -#: modules/file/hdf5file.c:218 -#, c-format -msgid "HDF5 library error %ld in function %s." -msgstr "Ошибка %ld библиотеки HDF5 в функции %s." +#: modules/file/hdf5file.c:229 +msgid "Shilps Sciences Lucent HDF5 files (.h5)" +msgstr "Файлы Shilps Sciences Lucent HDF5 (.h5)" -#: modules/file/hdf5file.c:393 +#: modules/file/hdf5file.c:424 modules/file/hdf5file.c:702 #, c-format msgid "Dataset %s has %d items, which does not match image resolution %d×%d." msgstr "" "Набор данных %s содержит %d элементов, что не соответствует разрешению " "изображения %d×%d." +#: modules/file/hdf5file.c:1183 +#, c-format +msgid "HDF5 library error %ld in function %s." +msgstr "Ошибка %ld библиотеки HDF5 в функции %s." + #: modules/file/hdrimage.cc:249 msgid "" "Imports 16bit grayscale PPM, PNG and TIFF images, imports and exports " @@ -5836,22 +5882,22 @@ msgid "TIFF and BigTIFF images with high depth (.tiff)" msgstr "Изображения TIFF и BigTIFF с большой глубиной цвета (.tiff)" -#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:283 -#: modules/file/rawfile.c:340 modules/process/psf.c:224 +#: modules/file/hdrimage.cc:304 modules/file/pixmap.c:284 +#: modules/file/rawfile.c:339 modules/process/psf.c:224 msgid "_Horizontal size" msgstr "_Горизонтальный размер" -#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:284 -#: modules/file/rawfile.c:341 modules/process/psf.c:225 +#: modules/file/hdrimage.cc:305 modules/file/pixmap.c:285 +#: modules/file/rawfile.c:340 modules/process/psf.c:225 msgid "_Vertical size" msgstr "_Вертикальный размер" -#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:285 -#: modules/file/rawfile.c:346 +#: modules/file/hdrimage.cc:306 modules/file/pixmap.c:286 +#: modules/file/rawfile.c:345 msgid "_Z-scale (per sample unit)" msgstr "Масштаб Z (на единицу _дискретизации)" -#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:288 +#: modules/file/hdrimage.cc:309 modules/file/pixmap.c:289 msgid "Just use _pixels" msgstr "Просто _пиксели" @@ -5907,12 +5953,12 @@ msgstr "Тип данных OpenEXR %u неправилен или не поддерживается." #: modules/file/hdrimage.cc:1162 modules/file/hdrimage.cc:1170 -#: modules/file/imgexport.c:5278 modules/file/imgexport.c:5289 +#: modules/file/imgexport.c:5277 modules/file/imgexport.c:5288 #, c-format msgid "libpng initialization error (in %s)" msgstr "ошибка инициализации libpng (в %s)" -#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5353 +#: modules/file/hdrimage.cc:1178 modules/file/imgexport.c:5352 msgid "libpng error occurred" msgstr "Произошла ошибка libpng" @@ -5920,7 +5966,7 @@ msgid "Failed to read image data." msgstr "Не удалось прочесть данные изображения." -#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:704 +#: modules/file/hdrimage.cc:1887 modules/file/pixmap.c:705 #: modules/process/stitch.c:311 msgid "Channels" msgstr "Каналы" @@ -5929,11 +5975,11 @@ msgid "Pages" msgstr "Страницы" -#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:708 +#: modules/file/hdrimage.cc:1893 modules/file/pixmap.c:709 msgid "Image Information" msgstr "Информация о изображении" -#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:736 +#: modules/file/hdrimage.cc:1919 modules/file/pixmap.c:737 msgid "Value Mapping" msgstr "Отображение значений" @@ -5963,7 +6009,7 @@ msgstr "Файлы Hitachi SEM (.txt + image)" #: modules/file/hitachi-sem.c:167 modules/file/oldmda.c:247 -#: modules/file/tescan.c:441 modules/file/unisoku.c:235 +#: modules/file/tescan.c:439 modules/file/unisoku.c:235 msgid "No corresponding data file was found for header file." msgstr "Не найден файл данных, соответствующий заголовочному файлу." @@ -6004,105 +6050,105 @@ msgid "Cannot read channel labels." msgstr "Не удаётся прочесть метки каналов." -#: modules/file/imgexport.c:401 modules/file/pixmap.c:187 +#: modules/file/imgexport.c:400 modules/file/pixmap.c:187 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:407 modules/file/pixmap.c:188 +#: modules/file/imgexport.c:406 modules/file/pixmap.c:188 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:413 modules/file/pixmap.c:192 +#: modules/file/imgexport.c:412 modules/file/pixmap.c:192 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:419 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:418 modules/file/pixmap.c:194 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:425 modules/file/pixmap.c:195 +#: modules/file/imgexport.c:424 modules/file/pixmap.c:195 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Bitmap из Windows или OS2 (.bmp)" -#: modules/file/imgexport.c:431 modules/file/pixmap.c:196 +#: modules/file/imgexport.c:430 modules/file/pixmap.c:196 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:438 modules/file/pixmap.c:203 +#: modules/file/imgexport.c:437 modules/file/pixmap.c:203 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:446 +#: modules/file/imgexport.c:445 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:454 +#: modules/file/imgexport.c:453 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:462 +#: modules/file/imgexport.c:461 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:472 modules/tools/selectionmanager.c:259 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:259 msgid "Horiz./vert. lines" msgstr "Гориз./Верт. линии" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:260 +#: modules/file/imgexport.c:477 modules/tools/selectionmanager.c:260 msgid "Crosses" msgstr "Кресты" -#: modules/file/imgexport.c:482 modules/tools/selectionmanager.c:261 +#: modules/file/imgexport.c:481 modules/tools/selectionmanager.c:261 msgid "Ellipses" msgstr "Эллипсы" -#: modules/file/imgexport.c:486 modules/tools/selectionmanager.c:263 +#: modules/file/imgexport.c:485 modules/tools/selectionmanager.c:263 msgid "Lines" msgstr "Линии" -#: modules/file/imgexport.c:494 modules/tools/selectionmanager.c:267 +#: modules/file/imgexport.c:493 modules/tools/selectionmanager.c:267 msgid "Rectangles" msgstr "Прямоугольники" -#: modules/file/imgexport.c:498 modules/process/facet_analysis.c:567 +#: modules/file/imgexport.c:497 modules/process/facet_analysis.c:567 #: modules/process/lat_synth.c:445 modules/process/lat_synth.c:459 #: modules/tools/selectionmanager.c:262 msgid "Lattice" msgstr "Решетка" -#: modules/file/imgexport.c:502 +#: modules/file/imgexport.c:501 msgid "Path" msgstr "Путь" -#: modules/file/imgexport.c:508 modules/file/imgexport.c:514 +#: modules/file/imgexport.c:507 modules/file/imgexport.c:513 msgid "ruler|_None" msgstr "_Нет" -#: modules/file/imgexport.c:509 +#: modules/file/imgexport.c:508 msgid "_Rulers" msgstr "Направл_яющие" -#: modules/file/imgexport.c:510 +#: modules/file/imgexport.c:509 msgid "_Inset scale bar" msgstr "В_ложенный масштабный отрезок" -#: modules/file/imgexport.c:515 +#: modules/file/imgexport.c:514 msgid "_False color ruler" msgstr "_Линейка псевдоцвета" -#: modules/file/imgexport.c:519 +#: modules/file/imgexport.c:518 msgid "title|None" msgstr "Нет" -#: modules/file/imgexport.c:520 +#: modules/file/imgexport.c:519 msgid "At the top" msgstr "Сверху" -#: modules/file/imgexport.c:521 +#: modules/file/imgexport.c:520 msgid "Along the right edge" msgstr "Вдоль правой стороны" -#: modules/file/imgexport.c:527 +#: modules/file/imgexport.c:526 msgid "" "Renders data into vector (SVG, PDF, EPS) and pixmap (PNG, JPEG, TIFF, WebP, " "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " @@ -6113,283 +6159,283 @@ "основан на GDK и других библиотеках, и, вследствие этого, может зависеть от " "варианта установки." -#: modules/file/imgexport.c:2974 +#: modules/file/imgexport.c:2977 msgid "Select Color" msgstr "Выбрать цвет" -#: modules/file/imgexport.c:3075 +#: modules/file/imgexport.c:3078 msgid "White" msgstr "Белый" -#: modules/file/imgexport.c:3079 +#: modules/file/imgexport.c:3082 msgid "Black" msgstr "Чёрный" -#: modules/file/imgexport.c:3129 +#: modules/file/imgexport.c:3132 msgid "Pi_xel size:" msgstr "Размер пи_кселя:" -#: modules/file/imgexport.c:3137 +#: modules/file/imgexport.c:3140 msgid "Pixels per _inch:" msgstr "Пикселей на _дюйм:" -#: modules/file/imgexport.c:3162 +#: modules/file/imgexport.c:3165 msgid "_Zoom:" msgstr "_Увеличение:" -#: modules/file/imgexport.c:3180 +#: modules/file/imgexport.c:3183 msgid "_Height:" msgstr "_Высота:" -#: modules/file/imgexport.c:3196 +#: modules/file/imgexport.c:3199 msgid "_Font:" msgstr "_Шрифт:" -#: modules/file/imgexport.c:3205 +#: modules/file/imgexport.c:3208 msgid "_Font size:" msgstr "_Размер шрифта:" -#: modules/file/imgexport.c:3223 +#: modules/file/imgexport.c:3226 msgid "_Border width:" msgstr "Ширина _границы:" -#: modules/file/imgexport.c:3232 +#: modules/file/imgexport.c:3235 msgid "_Tick length:" msgstr "Длина _засечек:" -#: modules/file/imgexport.c:3239 +#: modules/file/imgexport.c:3242 msgid "Tie sizes to _data pixels" msgstr "Привязать размеры к _пикселям данных" -#: modules/file/imgexport.c:3249 modules/file/rawfile.c:363 +#: modules/file/imgexport.c:3252 modules/file/rawfile.c:362 msgid "_Decimal separator is comma" msgstr "_Запятая как десятичный разделитель" -#: modules/file/imgexport.c:3261 +#: modules/file/imgexport.c:3264 msgid "Colors" msgstr "Цвета" -#: modules/file/imgexport.c:3266 +#: modules/file/imgexport.c:3269 msgid "_Line and text color:" msgstr "Цвет _линий и текста:" -#: modules/file/imgexport.c:3271 +#: modules/file/imgexport.c:3274 msgid "_Transparent background" msgstr "_Прозрачный фон" -#: modules/file/imgexport.c:3282 +#: modules/file/imgexport.c:3285 msgid "_Background color:" msgstr "Цвет _фона:" -#: modules/file/imgexport.c:3492 modules/process/fibre_synth.c:293 +#: modules/file/imgexport.c:3495 modules/process/fibre_synth.c:293 #: modules/process/obj_synth.c:365 modules/process/pat_synth.c:529 #: modules/process/pileup_synth.c:352 modules/process/wave_synth.c:281 msgid "Placement" msgstr "Положение" -#: modules/file/imgexport.c:3496 +#: modules/file/imgexport.c:3499 msgid "left" msgstr "слева" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3502 msgid "center" msgstr "по центру" -#: modules/file/imgexport.c:3502 +#: modules/file/imgexport.c:3505 msgid "right" msgstr "справа" -#: modules/file/imgexport.c:3507 +#: modules/file/imgexport.c:3510 msgid "top" msgstr "верх" -#: modules/file/imgexport.c:3515 +#: modules/file/imgexport.c:3518 msgid "bottom" msgstr "низ" -#: modules/file/imgexport.c:3538 +#: modules/file/imgexport.c:3541 msgid "Lateral scale" msgstr "Пространственный масштаб" -#: modules/file/imgexport.c:3555 +#: modules/file/imgexport.c:3558 msgid "_Length:" msgstr "_Длина:" -#: modules/file/imgexport.c:3561 +#: modules/file/imgexport.c:3564 msgid "_Auto" msgstr "_Авто" -#: modules/file/imgexport.c:3578 modules/file/imgexport.c:3902 +#: modules/file/imgexport.c:3581 modules/file/imgexport.c:3905 msgid "Hori_zontal gap:" msgstr "_Горизонтальный зазор:" -#: modules/file/imgexport.c:3585 modules/file/imgexport.c:3882 +#: modules/file/imgexport.c:3588 modules/file/imgexport.c:3885 msgid "_Vertical gap:" msgstr "В_ертикальный зазор:" -#: modules/file/imgexport.c:3597 modules/file/imgexport.c:4212 +#: modules/file/imgexport.c:3600 modules/file/imgexport.c:4215 msgid "Colo_r:" msgstr "Цве_т:" -#: modules/file/imgexport.c:3601 modules/file/imgexport.c:4216 +#: modules/file/imgexport.c:3604 modules/file/imgexport.c:4219 msgid "Out_line color:" msgstr "_Цвет контура:" -#: modules/file/imgexport.c:3608 modules/file/imgexport.c:4223 +#: modules/file/imgexport.c:3611 modules/file/imgexport.c:4226 msgid "O_utline thickness:" msgstr "То_лщина контура:" -#: modules/file/imgexport.c:3617 modules/file/imgexport.c:4232 +#: modules/file/imgexport.c:3620 modules/file/imgexport.c:4235 msgid "O_pacity:" msgstr "_Непрозрачность:" -#: modules/file/imgexport.c:3624 +#: modules/file/imgexport.c:3627 msgid "Draw _ticks" msgstr "Рисовать засе_чки" -#: modules/file/imgexport.c:3634 +#: modules/file/imgexport.c:3637 msgid "Draw _label" msgstr "Рисовать подпис_ь" -#: modules/file/imgexport.c:3644 +#: modules/file/imgexport.c:3647 msgid "Draw text _above scale bar" msgstr "Рисовать текст с_верху отрезка" -#: modules/file/imgexport.c:3808 modules/process/acf2d.c:410 +#: modules/file/imgexport.c:3811 modules/process/acf2d.c:410 #: modules/process/curvature.c:506 modules/process/fit-shape.c:1644 #: modules/process/fractal.c:299 modules/process/grain_summary.c:167 #: modules/process/indent_analyze.c:390 modules/process/measure_lattice.c:333 #: modules/process/psdf2d.c:383 modules/process/psf.c:389 -#: modules/process/terracefit.c:497 modules/tools/corrlen.c:759 -#: modules/tools/roughness.c:373 modules/tools/stats.c:689 +#: modules/process/terracefit.c:497 modules/tools/corrlen.c:765 +#: modules/tools/roughness.c:374 modules/tools/stats.c:692 msgid "Image" msgstr "Изображение" -#: modules/file/imgexport.c:3812 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3815 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:537 modules/process/polydistort.c:250 #: modules/xyz/xyz_raster.c:620 msgid "_Interpolation type:" msgstr "Тип _интерполяции:" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3845 msgid "Draw _frame" msgstr "Показывать _рамку" -#: modules/file/imgexport.c:3851 +#: modules/file/imgexport.c:3854 msgid "Draw _mask" msgstr "Рисовать _маску" -#: modules/file/imgexport.c:3861 +#: modules/file/imgexport.c:3864 msgid "Draw mask _legend" msgstr "Рисовать _легенду для маски" -#: modules/file/imgexport.c:3889 +#: modules/file/imgexport.c:3892 msgid "Value Scale" msgstr "Масштаб значений" -#: modules/file/imgexport.c:3910 +#: modules/file/imgexport.c:3913 msgid "Fi_xed precision:" msgstr "Фи_ксированная точность:" -#: modules/file/imgexport.c:3925 +#: modules/file/imgexport.c:3928 msgid "Fixed _kilo threshold:" msgstr "Фиксированный порог п_рефиксов:" -#: modules/file/imgexport.c:3939 modules/file/imgexport.c:4656 +#: modules/file/imgexport.c:3942 modules/file/imgexport.c:4659 msgid "Title" msgstr "Заголовок" -#: modules/file/imgexport.c:3947 +#: modules/file/imgexport.c:3950 msgid "Posi_tion:" msgstr "Располо_жение:" -#: modules/file/imgexport.c:3954 +#: modules/file/imgexport.c:3957 msgid "_Gap:" msgstr "_Зазор:" -#: modules/file/imgexport.c:3961 +#: modules/file/imgexport.c:3964 msgid "Put _units to title" msgstr "Поместить единицы измерения в _заголовок" -#: modules/file/imgexport.c:4153 +#: modules/file/imgexport.c:4156 msgid "Draw _selection" msgstr "Рисовать в_ыбранные объекты" -#: modules/file/imgexport.c:4204 modules/tools/selectionmanager.c:343 +#: modules/file/imgexport.c:4207 modules/tools/selectionmanager.c:343 msgid "Objects" msgstr "Объекты" -#: modules/file/imgexport.c:4636 +#: modules/file/imgexport.c:4639 msgid "Lateral" msgstr "Горизонтальные" -#: modules/file/imgexport.c:4675 modules/file/rawfile.c:674 +#: modules/file/imgexport.c:4678 modules/file/rawfile.c:673 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:676 msgid "verb|_Load" msgstr "_Загрузить" -#: modules/file/imgexport.c:4681 modules/file/rawfile.c:675 +#: modules/file/imgexport.c:4684 modules/file/rawfile.c:674 #: modules/process/neural.c:682 msgid "verb|_Store" msgstr "Со_хранить" -#: modules/file/imgexport.c:4687 modules/file/rawfile.c:676 +#: modules/file/imgexport.c:4690 modules/file/rawfile.c:675 #: modules/process/neural.c:688 msgid "_Rename" msgstr "_Переименовать" -#: modules/file/imgexport.c:4707 modules/file/rawfile.c:730 +#: modules/file/imgexport.c:4710 modules/file/rawfile.c:729 msgid "Preset _name:" msgstr "_Название набора настроек:" -#: modules/file/imgexport.c:4800 +#: modules/file/imgexport.c:4803 msgid "Export as 1_6 bit grayscale" msgstr "Экспортировать как 1_6битное серое" -#: modules/file/imgexport.c:4823 +#: modules/file/imgexport.c:4826 msgid "Lateral Scale" msgstr "Горизонтальный масштаб" -#: modules/file/imgexport.c:4828 +#: modules/file/imgexport.c:4831 msgid "Values" msgstr "Значения" -#: modules/file/imgexport.c:4833 +#: modules/file/imgexport.c:4836 msgid "Selection" msgstr "Выбранное" -#: modules/file/imgexport.c:4838 modules/file/rawfile.c:472 +#: modules/file/imgexport.c:4841 modules/file/rawfile.c:471 #: modules/process/convolution_filter.c:274 modules/process/domain_synth.c:286 msgid "Presets" msgstr "Предустановки" -#: modules/file/imgexport.c:5605 +#: modules/file/imgexport.c:5604 #, c-format msgid "Cairo error occurred: %s" msgstr "Произошла ошибка cairo: %s" -#: modules/file/imgexport.c:5629 +#: modules/file/imgexport.c:5628 #, c-format msgid "Pixbuf save failed: %s." msgstr "Сохранение pixbuf закончилось неудачно: %s." -#: modules/file/imgexport.c:5907 +#: modules/file/imgexport.c:5906 msgid "Image is too large to be stored as TARGA." msgstr "Изображение слишком велико чтобы сохранить его в формате TARGA." -#: modules/file/imgexport.c:6642 modules/file/imgexport.c:6671 +#: modules/file/imgexport.c:6641 modules/file/imgexport.c:6670 msgid "Draw _numbers" msgstr "Рисовать _номера" -#: modules/file/imgexport.c:6654 modules/file/imgexport.c:6702 +#: modules/file/imgexport.c:6653 modules/file/imgexport.c:6701 msgid "_End marker length:" msgstr "Длина _засечек:" -#: modules/file/imgexport.c:6683 +#: modules/file/imgexport.c:6682 msgid "Marker _radius:" msgstr "_Радиус маркера:" -#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:171 modules/process/maskops.c:159 msgid "Mask" msgstr "Маска" @@ -6409,31 +6455,31 @@ "Обнаружен неверный адрес данных 0x%0x. Файл записан в какой-то неизвестной " "версии формата." -#: modules/file/intematix.c:125 +#: modules/file/intematix.c:121 msgid "Imports Intematix SDF data files." msgstr "Импортирует файлы данных Intematix SDF." -#: modules/file/intematix.c:138 +#: modules/file/intematix.c:134 msgid "Intematix SDF data files (.sdf)" msgstr "Файлы данных Intematix SDF (.sdf)" -#: modules/file/intematix.c:306 modules/file/ttffile.c:323 +#: modules/file/intematix.c:278 modules/file/ttffile.c:323 msgid "Parameter tag set is incomplete." msgstr "Набор тегов параметров неполон." -#: modules/file/intematix.c:311 +#: modules/file/intematix.c:283 msgid "image depth" msgstr "глубина изображения" -#: modules/file/iso28600.c:543 +#: modules/file/iso28600.c:539 msgid "Imports and exports ISO 28600:2011 SPM data transfer format." msgstr "Импортирует и экспортирует формат передачи данных СЗМ ISO 28600:2011." -#: modules/file/iso28600.c:559 +#: modules/file/iso28600.c:555 msgid "ISO 28600:2011 SPM data transfer files (.spm)" msgstr "Файлы передачи данных СЗМ ISO 28600:2011 (.spm)" -#: modules/file/iso28600.c:658 +#: modules/file/iso28600.c:642 #, c-format msgid "" "Only regular and irregular mappings are implemented but the file has mapping " @@ -6442,58 +6488,58 @@ "Реализованы только правильные и неправильные отображения, а этот файл " "содержит тип отображения ‘%s’." -#: modules/file/iso28600.c:687 modules/file/iso28600.c:696 -#: modules/file/iso28600.c:705 +#: modules/file/iso28600.c:668 modules/file/iso28600.c:674 +#: modules/file/iso28600.c:680 #, c-format msgid "List ‘%s’ has %u items which differs from the number %u given by ‘%s’." msgstr "" "Список ‘%s’ содержит %u элементов, что отличается от числа %u заданного ‘%s’." -#: modules/file/iso28600.c:773 modules/file/spip-asc.c:387 +#: modules/file/iso28600.c:745 modules/file/spip-asc.c:380 #, c-format msgid "End of file reached when reading sample #%u of %u" msgstr "Достигнут конец файла при чтении замера #%u из %u" -#: modules/file/iso28600.c:782 modules/file/iso28600.c:871 -#: modules/file/spip-asc.c:375 +#: modules/file/iso28600.c:753 modules/file/iso28600.c:840 +#: modules/file/spip-asc.c:368 #, c-format msgid "Malformed data encountered when reading sample #%u" msgstr "При чтении замера #%u получены искаженные данные" -#: modules/file/iso28600.c:795 modules/file/iso28600.c:885 -#: modules/file/iso28600.c:1018 +#: modules/file/iso28600.c:765 modules/file/iso28600.c:853 +#: modules/file/iso28600.c:980 msgid "Missing end-of-data marker." msgstr "Отсутствует маркер конца данных end-of-data." -#: modules/file/iso28600.c:999 modules/file/nova-asc.c:238 +#: modules/file/iso28600.c:963 modules/file/nova-asc.c:231 #: modules/file/sdfile.c:862 modules/file/sdfile.c:879 -#: modules/file/spip-asc.c:255 modules/file/witec-asc.c:211 -#: modules/file/wrustfile.c:244 modules/file/wsffile.c:238 +#: modules/file/spip-asc.c:248 modules/file/witec-asc.c:204 +#: modules/file/wrustfile.c:237 modules/file/wsffile.c:231 #, c-format msgid "End of file reached when reading sample #%d of %d" msgstr "Достигнут конец файла при чтении значения #%d из %d" -#: modules/file/iso28600.c:1008 modules/file/nova-asc.c:244 -#: modules/file/spip-asc.c:261 modules/file/witec-asc.c:216 -#: modules/file/wrustfile.c:249 modules/file/wsffile.c:245 +#: modules/file/iso28600.c:971 modules/file/nova-asc.c:237 +#: modules/file/spip-asc.c:254 modules/file/witec-asc.c:209 +#: modules/file/wrustfile.c:242 modules/file/wsffile.c:238 #, c-format msgid "Malformed data encountered when reading sample #%d of %d" msgstr "При чтении значения #%d из %d получены искаженные данные" -#: modules/file/iso28600.c:1178 +#: modules/file/iso28600.c:1123 #, c-format msgid "Line %u does not contain mandatory label ‘%s’." msgstr "Строка %u не содержит обязательной метки ‘%s’." -#: modules/file/jeol.c:537 +#: modules/file/jeol.c:533 msgid "Imports JEOL data files." msgstr "Импортирует файлы данных JEOL." -#: modules/file/jeol.c:550 +#: modules/file/jeol.c:546 msgid "JEOL data files (.tif)" msgstr "Файлы данных JEOL (.tif)" -#: modules/file/jeol.c:678 +#: modules/file/jeol.c:666 msgid "The type of data is unknown. Please report it to the developers." msgstr "Тип данных неизвестен. Пожалуйста сообщите о нём разработчикам." @@ -6521,38 +6567,38 @@ msgid "File does not contain grid dimensions." msgstr "Файл не содержит размеров сетки." -#: modules/file/jpkscan.c:745 modules/file/jpkscan.c:2724 +#: modules/file/jpkscan.c:738 modules/file/jpkscan.c:2717 #, c-format msgid "Scanning file (%u curves)..." msgstr "Сканируем файл (%u кривых)..." -#: modules/file/jpkscan.c:785 modules/file/nmmxyz.c:309 +#: modules/file/jpkscan.c:778 modules/file/nmmxyz.c:309 msgid "Reading files..." msgstr "Считываются файлы..." -#: modules/file/jpkscan.c:803 +#: modules/file/jpkscan.c:796 msgid "Creating volume data..." msgstr "Создаём объёмные данные..." -#: modules/file/jpkscan.c:955 +#: modules/file/jpkscan.c:948 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Неупорядоченная нумерация точек и/или сегментов не поддерживается." -#: modules/file/jpkscan.c:964 +#: modules/file/jpkscan.c:957 msgid "Non-uniform channel lists are not supported." msgstr "Неупорядоченные списки каналов не поддерживаются." -#: modules/file/jpkscan.c:972 +#: modules/file/jpkscan.c:965 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Файл данных %s был найден вместо ожидаемого %s." -#: modules/file/jpkscan.c:1884 +#: modules/file/jpkscan.c:1877 #, c-format msgid "Header properties file for index %u is missing." msgstr "Заголовочный файл свойств для индекса %u отсутствует." -#: modules/file/jpkscan.c:2526 +#: modules/file/jpkscan.c:2519 msgid "Cannot find any height channel." msgstr "Не получается найти ни одного канала высот." @@ -6570,11 +6616,11 @@ msgstr "Блок %u заголовка содержит неправильное положение или размер." #: modules/file/jspmfile.c:362 modules/file/jspmfile.c:369 -#: modules/file/jspmfile.c:431 modules/file/jspmfile.c:438 +#: modules/file/jspmfile.c:424 modules/file/jspmfile.c:431 msgid "Cannot find image header block." msgstr "Не удаётся найти блок заголовка изображения." -#: modules/file/jspmfile.c:483 +#: modules/file/jspmfile.c:476 msgid "Cannot find piezo header block." msgstr "Не удаётся найти блок заголовка piezo." @@ -6708,7 +6754,7 @@ msgid "MetroPro files (.dat)" msgstr "Файлы MetroPro (.dat)" -#: modules/file/metropro.c:540 +#: modules/file/metropro.c:542 msgid "File header is larger than file." msgstr "Заголовок файла больше, чем сам файл." @@ -6724,12 +6770,12 @@ msgid "MicroProf FRT text files (.txt)" msgstr "Текстовые файлы MicroProf FRT (.txt)" -#: modules/file/microprof.c:1324 +#: modules/file/microprof.c:1318 #, c-format msgid "Duplicate block %02x." msgstr "Блок-дубликат %02x." -#: modules/file/microprof.c:2705 +#: modules/file/microprof.c:2699 msgid "File contains fewer than XSize*YSize data points." msgstr "Файл содержит меньше, чем XSize*YSize точек данных." @@ -6766,33 +6812,33 @@ msgid "Unique id record is too short." msgstr "Уникальный идентификатор слишком короткий." -#: modules/file/mifile.c:177 +#: modules/file/mifile.c:195 msgid "Imports Molecular Imaging MI data files." msgstr "Импортирует файлы данных Molecular Imaging MI." -#: modules/file/mifile.c:190 +#: modules/file/mifile.c:208 msgid "PicoView Data Files (.mi)" msgstr "Файлы данных PicoView (.mi)" -#: modules/file/mifile.c:366 modules/file/mifile.c:453 +#: modules/file/mifile.c:437 msgid "Spectroscopy Graph" msgstr "График спектроскопии" -#: modules/file/mulfile.c:160 +#: modules/file/mulfile.c:156 msgid "Imports Aarhus MUL files." msgstr "Импортирует файлы Aarhus MUL." -#: modules/file/mulfile.c:173 +#: modules/file/mulfile.c:169 msgid "Aarhus MUL files (.mul)" msgstr "Файлы Aarhus MUL (.mul)" -#: modules/file/mulfile.c:295 +#: modules/file/mulfile.c:286 #, c-format msgid "Image number in the label %u does not match the number %u in the index." msgstr "" "Номер изображения в названии %u не соответствует числу %u в оглавлении." -#: modules/file/mulfile.c:354 modules/file/mulfile.c:363 +#: modules/file/mulfile.c:333 modules/file/mulfile.c:342 #, c-format msgid "Label string length %u is larger than 20." msgstr "Длина строки названия %u больше, чем 20." @@ -6818,21 +6864,21 @@ msgid "Spectra data starts past the end of file." msgstr "Данные спектроскопии начинаются после конца файла." -#: modules/file/nanoeducator.c:930 modules/file/nanoscope.c:1003 -#: modules/file/opengps.c:332 modules/file/sensofar.c:1416 +#: modules/file/nanoeducator.c:912 modules/file/nanoscope.c:990 +#: modules/file/opengps.c:322 modules/file/sensofar.c:1396 #, c-format msgid "Profile %u" msgstr "Профиль %u" -#: modules/file/nanoeducator.c:1043 +#: modules/file/nanoeducator.c:1020 msgid "F-D spectra" msgstr "Спектры сила-расстояние" -#: modules/file/nanoeducator.c:1136 +#: modules/file/nanoeducator.c:1113 msgid "I-V spectra" msgstr "Спектры ВАХ" -#: modules/file/nanoeducator.c:1221 +#: modules/file/nanoeducator.c:1198 msgid "I-Z spectra" msgstr "Спектры I-Z" @@ -6852,7 +6898,7 @@ msgid "Nanonics files (.nan)" msgstr "Файлы Nanoniсs (.nan)" -#: modules/file/nanonics.c:173 modules/file/nanonics.c:420 +#: modules/file/nanonics.c:173 modules/file/nanonics.c:414 #: modules/file/wsxmfile.c:306 #, c-format msgid "Expected header end marker ‘%s’ was not found." @@ -6863,7 +6909,7 @@ msgid "HeaderLength %u differs from actual header length %u" msgstr "HeaderLength %u отличается от реальной длины заголовка %u" -#: modules/file/nanonics.c:348 modules/file/witec-asc.c:161 +#: modules/file/nanonics.c:342 modules/file/witec-asc.c:161 #, c-format msgid "Expected header start marker ‘%s’ but found ‘%s’." msgstr "Ожидался маркер начала заголовка ‘%s’, но был найден ‘%s’." @@ -6884,7 +6930,7 @@ msgid "Nanonis SXM files (.sxm)" msgstr "Файлы Nanonis SXM (.sxm)" -#: modules/file/nanonis.c:246 modules/file/omicron.c:520 +#: modules/file/nanonis.c:246 modules/file/omicron.c:513 #: modules/file/unisoku.c:278 msgid "File header ended unexpectedly." msgstr "Заголовок файла неожиданно завершился." @@ -6898,12 +6944,12 @@ msgid "DATA_INFO does not contain the expected columns: %s." msgstr "DATA_INFO не содержит ожидаемых столбцов: %s." -#: modules/file/nanonis.c:351 +#: modules/file/nanonis.c:353 #, c-format msgid "DATA_INFO line contains fewer than %d fields." msgstr "Строка DATA_INFO содержит менее, чем %d полей." -#: modules/file/nanonis.c:533 +#: modules/file/nanonis.c:535 msgid "Missing data start marker \\x1a\\x04." msgstr "Отсутствует маркер начала данных \\x1a\\x04." @@ -6935,11 +6981,11 @@ msgid "NanoScanTech data (.nstdat)" msgstr "Данные NanoScanTech (.nstdat)" -#: modules/file/nanoscope-ii.c:86 +#: modules/file/nanoscope-ii.c:82 msgid "Imports Digital Instruments Nanoscope II data files." msgstr "Импортирует файлы данных Digital Instruments Nanoscope II." -#: modules/file/nanoscope-ii.c:99 +#: modules/file/nanoscope-ii.c:95 msgid "Nanoscope II files" msgstr "Файлы Nanoscope II" @@ -6974,20 +7020,20 @@ "MS Windows, или при других способах передачи файла, которые используют " "платформо-независимое сохранение текста." -#: modules/file/nanoscope.c:443 +#: modules/file/nanoscope.c:444 msgid "Reading channels..." msgstr "Считываются каналы..." -#: modules/file/nanoscope.c:2256 modules/file/nanoscope.c:2271 +#: modules/file/nanoscope.c:2239 modules/file/nanoscope.c:2254 msgid "Cannot parse `Scan size' field." msgstr "Не удаётся распознать поле `Scan size'." -#: modules/file/nanoscope.c:2321 modules/file/nrrdfile.c:1039 +#: modules/file/nanoscope.c:2304 modules/file/nrrdfile.c:1039 #, c-format msgid "Garbage after data sample #%u." msgstr "Мусор после элемента данных #%u." -#: modules/file/nanoscope.c:2373 +#: modules/file/nanoscope.c:2356 msgid "Truncated header line." msgstr "Обрезанная строка заголовка." @@ -7007,57 +7053,57 @@ msgid "Nanotop files (.spm)" msgstr "Файлы Nanotop (.spm)" -#: modules/file/netcdf.c:178 +#: modules/file/netcdf.c:172 msgid "Imports network Common Data Form (netCDF) files created by GXSM." msgstr "Импортирует созданные GXSM файлы network Common Data Form (netCDF)." -#: modules/file/netcdf.c:191 +#: modules/file/netcdf.c:185 msgid "GSXM netCDF files (.nc)" msgstr "Файлы GSXM netCDF (.nc)" -#: modules/file/netcdf.c:237 +#: modules/file/netcdf.c:228 #, c-format msgid "Variable `%s' refers to invalid or nonexistent data." msgstr "Переменная `%s' ссылается на неверные или несуществующие данные." -#: modules/file/netcdf.c:276 +#: modules/file/netcdf.c:267 msgid "NetCDF records are not supported." msgstr "Записи NetCDF не поддерживаются." -#: modules/file/netcdf.c:327 +#: modules/file/netcdf.c:314 msgid "Value series values must be of type FLOAT." msgstr "Значения из серий значений должны быть типа FLOAT." -#: modules/file/netcdf.c:349 +#: modules/file/netcdf.c:335 msgid "Time values must be of type DOUBLE." msgstr "Значения времени должны быть типа DOUBLE." -#: modules/file/netcdf.c:370 +#: modules/file/netcdf.c:355 msgid "Reading of fast scan files is not implemented - yet." msgstr "Загрузка файлов быстрого сканирования не сделана — пока." -#: modules/file/netcdf.c:461 +#: modules/file/netcdf.c:428 msgid "Time series order is wrong." msgstr "Некорректный порядок временных рядов." -#: modules/file/netcdf.c:1152 +#: modules/file/netcdf.c:961 #, c-format msgid "File ended unexpectedly inside `%s'." msgstr "Файл неожиданно окончился внутри `%s'." -#: modules/file/netcdf.c:1161 +#: modules/file/netcdf.c:970 #, c-format msgid "Expected `%s' array or `ABSENT'." msgstr "Ожидался массив `%s' или `ABSENT'." -#: modules/file/netcdf.c:1169 +#: modules/file/netcdf.c:978 #, c-format msgid "Array `%s' has non-zero number of elements in spite of being absent." msgstr "" "Массив `%s' содержит ненулевое количество элементов вместо того, чтобы " "отсутствовать." -#: modules/file/netcdf.c:1228 +#: modules/file/netcdf.c:1034 msgid "More than one record dimension found." msgstr "Найдена больше, чем одна запись о размерности." @@ -7076,7 +7122,7 @@ "интерактивном режиме." #: modules/file/nmmxyz.c:316 modules/process/lat_synth.c:872 -#: modules/process/wave_synth.c:467 +#: modules/process/plateau_synth.c:756 modules/process/wave_synth.c:467 msgid "Rendering surface..." msgstr "Строится поверхность..." @@ -7084,7 +7130,7 @@ msgid "Import NMM Profile Set" msgstr "Импортировать набор профилей NMM" -#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:470 +#: modules/file/nmmxyz.c:421 modules/file/rawfile.c:469 msgid "Information" msgstr "Информация" @@ -7113,13 +7159,13 @@ msgstr "Выровнять линии сканирования вдоль оси X" #: modules/file/nmmxyz.c:579 modules/process/dimensions.h:459 -#: modules/volume/volume_psf.c:497 modules/xyz/xyz_drift.c:729 +#: modules/volume/volume_psf.c:498 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:399 msgid "_Horizontal size:" msgstr "_Горизонтальный размер:" #: modules/file/nmmxyz.c:595 modules/process/dimensions.h:462 -#: modules/volume/volume_psf.c:504 modules/xyz/xyz_drift.c:744 +#: modules/volume/volume_psf.c:505 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:405 msgid "_Vertical size:" msgstr "Вертика_льный размер:" @@ -7212,17 +7258,17 @@ msgid "Field byteskip specifies more bytes than there are in the file." msgstr "Число пропущенных байтов поля задаёт больше байтов, чем есть в файле." -#: modules/file/nrrdfile.c:1543 +#: modules/file/nrrdfile.c:1510 #, c-format msgid "Items of per-axis header field %s are not quoted." msgstr "Элементы поля %s заголовка оси не заключены в кавычки." -#: modules/file/nrrdfile.c:1552 +#: modules/file/nrrdfile.c:1519 #, c-format msgid "Per-axis header field %s contains too many items." msgstr "Поле %s заголовка оси содержит слишком много элементов." -#: modules/file/nrrdfile.c:1560 +#: modules/file/nrrdfile.c:1527 #, c-format msgid "Per-axis header field %s contains too few items." msgstr "Поле %s заголовка оси содержит слишком мало элементов." @@ -7283,7 +7329,8 @@ msgid "Olympus packed OIR data files (.poir)" msgstr "Файлы данных Olympus packed OIR (.poir)" -#: modules/file/oirfile.c:449 modules/file/oirfile.c:465 +#: modules/file/oirfile.c:443 modules/file/oirfile.c:456 +#: modules/file/oirfile.c:481 #, c-format msgid "Chunk type %u occured multiple times." msgstr "Тип фрагмента %u появился несколько раз." @@ -7355,7 +7402,7 @@ msgid "Header line starts with a colon." msgstr "Строка заголовка начинается с двоеточия." -#: modules/file/omicron.c:529 +#: modules/file/omicron.c:522 msgid "Channel information ended unexpectedly." msgstr "Информация о канале неожиданно закончилась." @@ -7389,46 +7436,46 @@ msgid "Omicron MATRIX (.mtrx & .mtrx)" msgstr "Omicron MATRIX (.mtrx & .mtrx)" -#: modules/file/opdfile.c:199 +#: modules/file/opdfile.c:194 msgid "Imports Wyko OPD and ASC files." msgstr "Импортирует файлы Wyko OPD и ASC." -#: modules/file/opdfile.c:212 +#: modules/file/opdfile.c:207 msgid "Wyko OPD files (.opd)" msgstr "Файлы Wyko OPD (.opd)" -#: modules/file/opdfile.c:219 +#: modules/file/opdfile.c:214 msgid "Wyko ASCII export files (.asc)" msgstr "Файлы экспорта в ASCII Wyko (.asc)" -#: modules/file/opdfile.c:309 +#: modules/file/opdfile.c:301 #, c-format msgid "Item `%s' is beyond the end of the file." msgstr "Элемент `%s' находится за концом файла." -#: modules/file/opdfile.c:635 +#: modules/file/opdfile.c:608 msgid "Nested directories found" msgstr "Найдены вложенные каталоги" -#: modules/file/opengps.c:134 +#: modules/file/opengps.c:130 msgid "Reads ISO 5436-2 OpenGPS .x3p files." msgstr "Читает файлы ISO 5436-2 OpenGPS .x3p." -#: modules/file/opengps.c:147 +#: modules/file/opengps.c:143 msgid "ISO 5436-2 OpenGPS data (.x3p)" msgstr "Данные ISO 5436-2 OpenGPS (.x3p)" -#: modules/file/opengps.c:416 modules/file/opengps.c:449 +#: modules/file/opengps.c:400 modules/file/opengps.c:431 msgid "Too many DataList items for given matrix dimensions." msgstr "Слишком много элементов DataList для заданных размеров матрицы." -#: modules/file/opengps.c:537 +#: modules/file/opengps.c:514 msgid "File main.xml contains multiple data elements." msgstr "Файл main.xml содержит несколько элементов данных." #. TRANSLATORS: type and axis are symbols such as I, CX, ... -#: modules/file/opengps.c:570 modules/file/opengps.c:578 -#: modules/file/opengps.c:586 +#: modules/file/opengps.c:543 modules/file/opengps.c:551 +#: modules/file/opengps.c:559 #, c-format msgid "Only type %s is supported for axis %s." msgstr "Только тип %s доступен для оси %s." @@ -7452,7 +7499,7 @@ msgstr "Неправильное наследование объектов в строке %u." #: modules/file/phoenix.c:703 modules/file/spmlab.c:283 -#: modules/file/ttffile.c:305 modules/file/ttffile.c:375 +#: modules/file/ttffile.c:305 modules/file/ttffile.c:372 msgid "Data block is truncated." msgstr "Блок данных обрезан." @@ -7537,37 +7584,37 @@ "TIFF, JPEG, ...). Выбор поддерживаемых форматов зависит от доступных " "загрузчиков в GDK pixbuf." -#: modules/file/pixmap.c:280 +#: modules/file/pixmap.c:281 msgid "Use" msgstr "Использовать" -#: modules/file/pixmap.c:282 +#: modules/file/pixmap.c:283 msgid "_Hue offset" msgstr "Сме_щение оттенка" -#: modules/file/pixmap.c:463 +#: modules/file/pixmap.c:464 #, c-format msgid "Pixmap has not registered file type `%s'." msgstr "" "Модуль импорта изображений не имеет зарегистрированного типа файла `%s'." -#: modules/file/pixmap.c:477 +#: modules/file/pixmap.c:478 #, c-format msgid "Cannot get pixbuf loader: %s." msgstr "Не удаётся получить загрузчик pixbuf: %s." -#: modules/file/pixmap.c:489 modules/file/pixmap.c:501 +#: modules/file/pixmap.c:490 modules/file/pixmap.c:502 #: modules/file/renishaw.c:578 modules/file/renishaw.c:588 -#: modules/file/tescan.c:447 +#: modules/file/tescan.c:445 #, c-format msgid "Pixbuf loader refused data: %s." msgstr "Загрузчик pixbuf не принял данные: %s." -#: modules/file/pixmap.c:740 +#: modules/file/pixmap.c:741 msgid "as data" msgstr "как данные" -#: modules/file/pixmap.c:748 +#: modules/file/pixmap.c:749 msgid "" "Warning: Colorful images cannot be reliably mapped to meaningful values." msgstr "" @@ -7619,7 +7666,7 @@ msgid "Header is too short (only %lu bytes)." msgstr "Заголовок слишком короткий (всего %lu байт)." -#: modules/file/psia.c:585 +#: modules/file/psia.c:578 #, c-format msgid "Spectroscopy header is too short (only %lu bytes)." msgstr "Заголовок спектроскопии слишком короткий (всего %lu байт)." @@ -7646,20 +7693,16 @@ msgid "Unexpected JSON structure: %s should be %s." msgstr "Неожиданная структура JSON: %s должно быть %s." -#: modules/file/psppt.c:298 -msgid "Inconsistent structure of individual spectra." -msgstr "Неправильная структура отдельных спектров." - -#: modules/file/psppt.c:343 +#: modules/file/psppt.c:335 #, c-format msgid "JSON parsing error: %s" msgstr "Разбор JSON окончился неудачно: %s" -#: modules/file/psppt.c:628 +#: modules/file/psppt.c:620 msgid "Reading frame table..." msgstr "Чтение таблицы фреймов..." -#: modules/file/psppt.c:635 +#: modules/file/psppt.c:627 msgid "Reading curve data..." msgstr "Чтение данных кривой..." @@ -7729,59 +7772,59 @@ msgid "Quesant files (.afm)" msgstr "Файлы Quesant (.afm)" -#: modules/file/rawfile.c:234 +#: modules/file/rawfile.c:233 msgid "User-specified" msgstr "Определённый пользователем" -#: modules/file/rawfile.c:235 +#: modules/file/rawfile.c:234 msgid "Signed byte" msgstr "Байт со знаком" -#: modules/file/rawfile.c:236 +#: modules/file/rawfile.c:235 msgid "Unsigned byte" msgstr "Байт без знака" -#: modules/file/rawfile.c:237 +#: modules/file/rawfile.c:236 msgid "Signed 16bit word" msgstr "16битное слово со знаком" -#: modules/file/rawfile.c:238 +#: modules/file/rawfile.c:237 msgid "Unsigned 16bit word" msgstr "16битное слово без знака" -#: modules/file/rawfile.c:239 +#: modules/file/rawfile.c:238 msgid "Signed 32bit word" msgstr "32битное слово со знаком" -#: modules/file/rawfile.c:240 +#: modules/file/rawfile.c:239 msgid "Unsigned 32bit word" msgstr "16битное слово без знака" -#: modules/file/rawfile.c:241 +#: modules/file/rawfile.c:240 msgid "Signed 64bit word" msgstr "64битное слово со знаком" -#: modules/file/rawfile.c:242 +#: modules/file/rawfile.c:241 msgid "Unsigned 64bit word" msgstr "64битное слово без знака" -#: modules/file/rawfile.c:243 +#: modules/file/rawfile.c:242 msgid "IEEE single" msgstr "IEEE single" -#: modules/file/rawfile.c:244 +#: modules/file/rawfile.c:243 msgid "IEEE double" msgstr "IEEE double" -#: modules/file/rawfile.c:245 +#: modules/file/rawfile.c:244 msgid "IEEE half" msgstr "IEEE половинной точности" -#: modules/file/rawfile.c:246 +#: modules/file/rawfile.c:245 msgid "Pascal real" msgstr "Pascal real" -#: modules/file/rawfile.c:256 +#: modules/file/rawfile.c:255 msgid "" "Imports raw data files, both ASCII and binary, according to user-specified " "format." @@ -7789,160 +7832,160 @@ "Импортирует неизвестные файлы данных, как текстовые. так и двоичные, в " "соответствии с форматом, указанным пользователем." -#: modules/file/rawfile.c:275 +#: modules/file/rawfile.c:274 msgid "Raw data files" msgstr "Импорт неизвестных файлов данных" -#: modules/file/rawfile.c:305 +#: modules/file/rawfile.c:304 msgid "Any whitespace" msgstr "Любой пробельный" -#: modules/file/rawfile.c:306 +#: modules/file/rawfile.c:305 msgid "TAB character" msgstr "Символ TAB" -#: modules/file/rawfile.c:307 +#: modules/file/rawfile.c:306 msgid "Other character" msgstr "Другой символ" -#: modules/file/rawfile.c:320 +#: modules/file/rawfile.c:319 msgid "_Field delimiter" msgstr "_Разделитель полей" -#: modules/file/rawfile.c:326 +#: modules/file/rawfile.c:325 msgid "_Automatically offer raw data import of unknown files" msgstr "" "_Автоматически предлагать импорт необработанных данных\n" "для файлов неизвестного типа" -#: modules/file/rawfile.c:335 +#: modules/file/rawfile.c:334 msgid "_Text data" msgstr "Т_екстовые данные" -#: modules/file/rawfile.c:336 +#: modules/file/rawfile.c:335 msgid "_Binary data" msgstr "_Двоичные данные" -#: modules/file/rawfile.c:347 modules/file/rawfile.c:348 +#: modules/file/rawfile.c:346 modules/file/rawfile.c:347 msgid "Missin_g value substitute" msgstr "Замена о_тсутствующих значений" -#: modules/file/rawfile.c:359 +#: modules/file/rawfile.c:358 msgid "Start from _line" msgstr "_Начать со строки" -#: modules/file/rawfile.c:360 +#: modules/file/rawfile.c:359 msgid "_Each row skip" msgstr "После ка_ждой строки пропустить" -#: modules/file/rawfile.c:361 +#: modules/file/rawfile.c:360 msgid "_Other delimiter" msgstr "Др_угой разделитель" -#: modules/file/rawfile.c:366 +#: modules/file/rawfile.c:365 msgid "Data t_ype" msgstr "Т_ип данных" -#: modules/file/rawfile.c:368 +#: modules/file/rawfile.c:367 msgid "Byte s_wap pattern" msgstr "_Шаблон перестановки байтов" -#: modules/file/rawfile.c:369 +#: modules/file/rawfile.c:368 msgid "Start at _offset" msgstr "Начать со сме_щения" -#: modules/file/rawfile.c:370 +#: modules/file/rawfile.c:369 msgid "_Sample size" msgstr "Р_азмер сэмпла" -#: modules/file/rawfile.c:371 +#: modules/file/rawfile.c:370 msgid "After each sample s_kip" msgstr "Пос_ле каждого сэмпла пропустить" -#: modules/file/rawfile.c:372 +#: modules/file/rawfile.c:371 msgid "After each _row skip" msgstr "После ка_ждой строки пропустить" -#: modules/file/rawfile.c:373 +#: modules/file/rawfile.c:372 msgid "_Reverse bits in bytes" msgstr "Обратить порядок битов в ба_йтах" -#: modules/file/rawfile.c:374 +#: modules/file/rawfile.c:373 msgid "Reverse bi_ts in samples" msgstr "Обратить порядок бит в с_эмплах" -#: modules/file/rawfile.c:375 +#: modules/file/rawfile.c:374 msgid "Samples are si_gned" msgstr "Сэмплы со _знаком" -#: modules/file/rawfile.c:403 +#: modules/file/rawfile.c:402 msgid "Raw data import must be run as interactive." msgstr "Импорт неизвестных данных должен быть запущен в интерактивном режиме." -#: modules/file/rawfile.c:456 +#: modules/file/rawfile.c:455 msgid "Read Raw File" msgstr "Прочитать неизвестный файл" -#: modules/file/rawfile.c:471 +#: modules/file/rawfile.c:470 msgid "Data Format" msgstr "Формат данных" -#: modules/file/rawfile.c:521 modules/graph/graph_stats.c:347 -#: modules/graph/graph_terraces.c:359 modules/process/acf2d.c:409 -#: modules/process/curvature.c:505 modules/process/fit-shape.c:1640 -#: modules/process/fractal.c:298 modules/process/grain_summary.c:166 -#: modules/process/indent_analyze.c:389 modules/process/measure_lattice.c:332 -#: modules/process/psdf2d.c:382 modules/process/psf.c:388 -#: modules/process/relate.c:666 modules/process/terracefit.c:496 -#: modules/tools/corrlen.c:758 modules/tools/roughness.c:372 -#: modules/tools/stats.c:688 +#: modules/file/rawfile.c:520 modules/graph/graph_measure_period.c:238 +#: modules/graph/graph_stats.c:212 modules/graph/graph_terraces.c:638 +#: modules/process/acf2d.c:409 modules/process/curvature.c:505 +#: modules/process/fit-shape.c:1640 modules/process/fractal.c:298 +#: modules/process/grain_summary.c:166 modules/process/indent_analyze.c:389 +#: modules/process/measure_lattice.c:332 modules/process/psdf2d.c:382 +#: modules/process/psf.c:388 modules/process/relate.c:666 +#: modules/process/terracefit.c:496 modules/tools/corrlen.c:764 +#: modules/tools/roughness.c:373 modules/tools/stats.c:691 msgid "File" msgstr "Файл" -#: modules/file/rawfile.c:580 +#: modules/file/rawfile.c:579 msgid "fields" msgstr "полей" -#: modules/file/rawfile.c:592 +#: modules/file/rawfile.c:591 msgid "bytes" msgstr "байт" -#: modules/file/rawfile.c:594 modules/file/rawfile.c:597 -#: modules/file/rawfile.c:600 +#: modules/file/rawfile.c:593 modules/file/rawfile.c:596 +#: modules/file/rawfile.c:599 msgid "bits" msgstr "бит" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Binary" msgstr "Двоичный" -#: modules/file/rawfile.c:629 +#: modules/file/rawfile.c:628 msgid "Text" msgstr "Текст" -#: modules/file/rawfile.c:650 +#: modules/file/rawfile.c:649 msgid "Delimiter: whitespace" msgstr "Разделитель: пробел" -#: modules/file/rawfile.c:653 +#: modules/file/rawfile.c:652 #, c-format msgid "Delimiter: 0x%02x" msgstr "Разделитель: 0x%02x" -#: modules/file/rawfile.c:655 +#: modules/file/rawfile.c:654 #, c-format msgid "Delimiter: %s" msgstr "Разделитель: %s" -#: modules/file/rawfile.c:684 +#: modules/file/rawfile.c:683 msgid "Info" msgstr "Информация" -#: modules/file/rawfile.c:1050 +#: modules/file/rawfile.c:1049 msgid "Invalid preset name." msgstr "Неправильное имя набора настроек." -#: modules/file/rawfile.c:1116 +#: modules/file/rawfile.c:1115 #, c-format msgid "" "Too short file\n" @@ -7953,7 +7996,7 @@ "Формат предполагает размер файла не менее %lu байт, но размер `%s' всего %u " "байт." -#: modules/file/rawfile.c:1147 +#: modules/file/rawfile.c:1146 #, c-format msgid "" "Parsing failed\n" @@ -7962,45 +8005,45 @@ "Разбор закончился неудачно\n" "Содержимое `%s' не соответствует формату: %s." -#: modules/file/rawfile.c:1512 +#: modules/file/rawfile.c:1509 #, c-format msgid "Not enough lines (%d) for offset (%d)" msgstr "Не хватает строк (%d) для смещения (%d)" -#: modules/file/rawfile.c:1537 +#: modules/file/rawfile.c:1534 #, c-format msgid "Expected whitespace to skip more fields in row %u, got `%.16s'" msgstr "" "Ожидался пробел чтобы пропустить ещё несколько полей в строке %u, получили " "`%.16s'" -#: modules/file/rawfile.c:1549 +#: modules/file/rawfile.c:1546 #, c-format msgid "Expected `%c' to skip more fields in row %u, got `%.16s'" msgstr "" "Ожидался `%c' чтобы пропустить ещё несколько полей в строке %u, получили " "`%.16s'" -#: modules/file/rawfile.c:1561 +#: modules/file/rawfile.c:1558 #, c-format msgid "Expected `%s' to skip more fields in row %u, got `%.16s'" msgstr "" "Ожидалось `%s' чтобы пропустить ещё несколько полей в строке %u, получили " "`%.16s'" -#: modules/file/rawfile.c:1575 modules/file/rawfile.c:1588 -#: modules/file/rawfile.c:1612 +#: modules/file/rawfile.c:1572 modules/file/rawfile.c:1585 +#: modules/file/rawfile.c:1609 #, c-format msgid "Garbage `%.16s' in row %u, column %u" msgstr "Мусор `%.16s' в строке %u, столбце %u" -#: modules/file/rawfile.c:1600 +#: modules/file/rawfile.c:1597 #, c-format msgid "Expected delimiter `%c' after data in row %u, column %u, got `%c'" msgstr "" "Ожидался разделитель `%c' после данных в строке %u, столбце %u, получили `%c'" -#: modules/file/rawfile.c:1624 +#: modules/file/rawfile.c:1621 #, c-format msgid "Expected delimiter `%s' after data in row %u, column %u, got `%.16s'" msgstr "" @@ -8019,8 +8062,8 @@ msgid "_Title" msgstr "_Заголовок" -#: modules/file/rawgraph.c:123 modules/graph/graph_stats.c:349 -#: modules/graph/graph_terraces.c:361 +#: modules/file/rawgraph.c:123 modules/graph/graph_measure_period.c:240 +#: modules/graph/graph_stats.c:214 modules/graph/graph_terraces.c:640 msgid "Curve" msgstr "Кривая" @@ -8064,36 +8107,36 @@ msgid "Random points order unsupported" msgstr "Случайный порядок точек не поддерживается" -#: modules/file/rhk-sm3.c:236 +#: modules/file/rhk-sm3.c:231 msgid "Imports RHK Technology SM3 data files." msgstr "Импортирует файлы данных RHK Technology SM3." -#: modules/file/rhk-sm3.c:256 +#: modules/file/rhk-sm3.c:251 msgid "RHK SM3 files (.sm3)" msgstr "Файлы RHK SM3 (.sm3)" -#: modules/file/rhk-sm3.c:329 modules/file/rhk-sm3.c:342 +#: modules/file/rhk-sm3.c:323 modules/file/rhk-sm3.c:336 msgid "End of file reached in page header." msgstr "Достигнут конец файла в заголовке страницы." -#: modules/file/rhk-sm3.c:333 +#: modules/file/rhk-sm3.c:327 msgid "magic page header" msgstr "магический заголовок страницы" -#: modules/file/rhk-sm3.c:414 +#: modules/file/rhk-sm3.c:397 #, c-format msgid "End of file reached in string #%u." msgstr "Конец файла достигнут в строке #%u." -#: modules/file/rhk-sm3.c:435 +#: modules/file/rhk-sm3.c:417 msgid "End of file reached in color data header." msgstr "Достигнут конец файла в заголовке цветовых данных." -#: modules/file/rhk-sm3.c:444 +#: modules/file/rhk-sm3.c:424 msgid "End of file reached in color data." msgstr "Достигнут конец файла в цветовых данных." -#: modules/file/rhk-sm3.c:713 +#: modules/file/rhk-sm3.c:673 #, c-format msgid "Unknown line %d" msgstr "Неизвестная строка %d" @@ -8106,17 +8149,17 @@ msgid "RHK SM4 files (.sm4)" msgstr "Файлы RHK SM4 (.sm4)" -#: modules/file/rhk-sm4.c:989 +#: modules/file/rhk-sm4.c:990 #, c-format msgid "Object list in %s is truncated." msgstr "Список объектов в %s усечён." -#: modules/file/rhk-sm4.c:1003 +#: modules/file/rhk-sm4.c:1004 #, c-format msgid "Object of type %s is truncated." msgstr "Объект типа %s усечён." -#: modules/file/rhk-sm4.c:1027 +#: modules/file/rhk-sm4.c:1028 #, c-format msgid "Cannot find object %s in %s." msgstr "Невозможно найти объект %s в %s." @@ -8151,7 +8194,7 @@ msgid "data ranges" msgstr "диапазоны данных" -#: modules/file/rhk-spm32.c:490 +#: modules/file/rhk-spm32.c:484 msgid "data offset" msgstr "смещение данных" @@ -8227,16 +8270,16 @@ msgid "Sensofar PLu files (.plu, .apx)" msgstr "Файлы Sensofar PLu (.plu, .apx)" -#: modules/file/sensofar.c:1384 modules/file/sensofar.c:1414 +#: modules/file/sensofar.c:1364 modules/file/sensofar.c:1394 #: modules/process/good_profile.c:127 modules/process/multiprofile.c:259 msgid "Profile" msgstr "Профиль" -#: modules/file/sensofarx.c:90 +#: modules/file/sensofarx.c:86 msgid "Reads Sensofar PLUx files." msgstr "Читает файлы Sensofar PLUx." -#: modules/file/sensofarx.c:103 +#: modules/file/sensofarx.c:99 msgid "Sensofar PLUx files (.plux)" msgstr "Файлы Sensofar PLUx (.plux)" @@ -8248,15 +8291,15 @@ msgid "Sensolytics text files (.dat)" msgstr "Текстовые файлы Sensolytics (.dat)" -#: modules/file/shimadzu.c:133 +#: modules/file/shimadzu.c:127 msgid "Imports Shimadzu SPM data files." msgstr "Импортирует файлы данных Shimadzu SPM." -#: modules/file/shimadzu.c:146 +#: modules/file/shimadzu.c:140 msgid "Shimadzu files" msgstr "Файлы Shimadzu" -#: modules/file/shimadzu.c:372 +#: modules/file/shimadzu.c:350 #, c-format msgid "Cannot parse data values after %d of %d." msgstr "Невозможно распознать значения данных после %d из %d." @@ -8277,31 +8320,31 @@ msgid "SIS files (.sis)" msgstr "Файлы SIS (.sis)" -#: modules/file/sis.c:814 +#: modules/file/sis.c:807 msgid "Block not a document block." msgstr "Блок не является блоком документа." -#: modules/file/sis.c:823 +#: modules/file/sis.c:816 msgid "Too short document info." msgstr "Слишком короткая информация о документе." -#: modules/file/sis.c:844 +#: modules/file/sis.c:837 msgid "Too short parameter info." msgstr "Слишком короткая информация о параметре." -#: modules/file/sis.c:946 +#: modules/file/sis.c:939 msgid "Unexpected image block." msgstr "Неожиданный блок изображения." -#: modules/file/sis.c:984 modules/file/sis.c:1015 +#: modules/file/sis.c:977 modules/file/sis.c:1008 msgid "End of file reached in image block." msgstr "Достигнут конец файла внутри блока изображения." -#: modules/file/sis.c:1029 +#: modules/file/sis.c:1022 msgid "End of file reached in channel block." msgstr "Достигнут конец файла внутри блока канала." -#: modules/file/sis.c:1053 +#: modules/file/sis.c:1046 msgid "End of file reached when another channel was expected." msgstr "Достигнут конец файла в то время, как ожидался другой канал." @@ -8604,31 +8647,31 @@ msgid "Unknown data type `%s'." msgstr "Неизвестный тип данных `%s'." -#: modules/file/xyzexport.c:89 +#: modules/file/xyzexport.c:80 msgid "Exports data as simple XYZ text file." msgstr "Экспортирует данные как простой текстовый файл XYZ." -#: modules/file/xyzexport.c:102 +#: modules/file/xyzexport.c:93 msgid "XYZ text data (.xyz)" msgstr "Текстовые данные XYZ (.xyz)" -#: modules/file/xyzexport.c:219 +#: modules/file/xyzexport.c:207 msgid "XYZ data:" msgstr "Данные XYZ:" -#: modules/file/xyzexport.c:225 +#: modules/file/xyzexport.c:213 msgid "Lateral units:" msgstr "Единицы горизонтальных размеров:" -#: modules/file/xyzexport.c:265 +#: modules/file/xyzexport.c:256 msgid "Export XYZ" msgstr "Экспорт XYZ" -#: modules/file/zeiss.c:66 +#: modules/file/zeiss.c:62 msgid "Imports Carl Zeiss SEM images." msgstr "Импортирует изображения Carl Zeiss SEM." -#: modules/file/zeiss.c:79 +#: modules/file/zeiss.c:75 msgid "Carl Zeiss SEM scans (.tif)" msgstr "Сканы Carl Zeiss SEM (.tif)" @@ -8661,12 +8704,12 @@ msgid "Data line %u does not contain four items." msgstr "Строка данных %u не содержит четыре элемента." -#: modules/file/zemax.c:327 +#: modules/file/zemax.c:319 #, c-format msgid "Unit code %d is invalid or unsupported." msgstr "Код единиц измерения %d неправилен или не поддерживается." -#: modules/file/zemax.c:351 +#: modules/file/zemax.c:343 msgid "The first line contains too many items." msgstr "Первая строка содержит слишком много элементов." @@ -8684,7 +8727,7 @@ #: modules/graph/graph_cd.c:150 msgid "/Measure _Features/_Critical Dimension..." -msgstr "/Измерение _особенностей/_Габаритный размер..." +msgstr "/Измерение _особенностей/Га_баритный размер..." #: modules/graph/graph_cd.c:153 msgid "Fit critical dimension" @@ -8694,9 +8737,8 @@ msgid "Fit Graph" msgstr "Аппроксимировать график" -#: modules/graph/graph_cd.c:262 modules/graph/graph_cut.c:168 -#: modules/graph/graph_fdfit.c:313 modules/graph/graph_fit.c:329 -#: modules/graph/graph_terraces.c:514 +#: modules/graph/graph_cd.c:262 modules/graph/graph_fdfit.c:313 +#: modules/graph/graph_fit.c:329 msgid "_Graph curve:" msgstr "График:" @@ -8705,28 +8747,18 @@ msgid "F_unction:" msgstr "_Функция:" -#: modules/graph/graph_cd.c:319 modules/graph/graph_cut.c:189 -#: modules/graph/graph_fdfit.c:422 modules/graph/graph_fit.c:435 -#: modules/graph/graph_polylevel.c:344 modules/graph/graph_sinebg.c:351 -#: modules/graph/graph_stats.c:267 modules/volume/volume_fdfit.c:476 +#: modules/graph/graph_cd.c:319 modules/graph/graph_fdfit.c:422 +#: modules/graph/graph_fit.c:435 modules/volume/volume_fdfit.c:476 #: modules/volume/volume_strayfield.c:363 msgid "Range:" msgstr "Диапазон:" -#: modules/graph/graph_cd.c:330 modules/graph/graph_cut.c:200 -#: modules/graph/graph_fdfit.c:433 modules/graph/graph_fit.c:446 -#: modules/graph/graph_polylevel.c:346 modules/graph/graph_sinebg.c:353 -#: modules/graph/graph_stats.c:269 modules/volume/volume_fdfit.c:487 -#: modules/volume/volume_strayfield.c:374 -msgid "range|to" -msgstr "–" - #: modules/graph/graph_cd.c:347 msgid "_Draw whole circle" msgstr "_Рисовать полный круг" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:498 -#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:626 +#: modules/graph/graph_fit.c:533 modules/graph/graph_terraces.c:275 #: modules/process/fit-shape.c:567 modules/process/roddeposit_synth.c:619 #: modules/process/terracefit.c:287 modules/volume/volume_fdfit.c:549 msgid "Save Fit Report" @@ -8780,33 +8812,33 @@ msgid "Results\n" msgstr "Результаты\n" -#: modules/graph/graph_cut.c:87 +#: modules/graph/graph_cut.c:65 msgid "Cut graph" msgstr "Обрезает график" -#: modules/graph/graph_cut.c:101 +#: modules/graph/graph_cut.c:79 msgid "/_Basic Operations/_Cut..." msgstr "/_Базовые действия/_Обрезать..." -#: modules/graph/graph_cut.c:104 +#: modules/graph/graph_cut.c:82 msgid "Extract part of graph into new one" msgstr "Извлечь часть старого графика в новый" -#: modules/graph/graph_cut.c:145 -msgid "Cut Graph" -msgstr "Обрезать график" - -#: modules/graph/graph_cut.c:173 +#: modules/graph/graph_cut.c:98 msgid "Cut _all curves" msgstr "Обрезать _все кривые" +#: modules/graph/graph_cut.c:138 +msgid "Cut Graph" +msgstr "Обрезать график" + #: modules/graph/graph_dos_spectrum.c:42 msgid "DOS Spectrum" msgstr "Спектр плотности состояний" #: modules/graph/graph_dos_spectrum.c:56 msgid "/Measure _Features/_DOS Spectrum" -msgstr "/Измерение _особенностей/Спектр _плотности состояний" +msgstr "/Измерение _особенностей/_Спектр плотности состояний" #: modules/graph/graph_dos_spectrum.c:59 msgid "Calculate DOS spectrum from I-V tunneling spectroscopy" @@ -8855,6 +8887,7 @@ msgstr "Igor Pro text wave" #: modules/graph/graph_export_ascii.c:96 +#: modules/volume/volume_asciiexport.c:111 msgid "Style" msgstr "Стиль" @@ -8879,7 +8912,7 @@ msgstr "Общая объ_единённая абсцисса" #: modules/graph/graph_export_ascii.c:170 -#: modules/volume/volume_asciiexport.c:153 +#: modules/volume/volume_asciiexport.c:144 msgid "Export to Text File" msgstr "Экспортировать в текстовый файл" @@ -9064,8 +9097,8 @@ msgid "/_Force Distance/_FZ to FD Curve..." msgstr "/Сила _расстояние/_Конвертировать кривую FZ в FD..." -#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:135 -#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:134 +#: modules/graph/graph_fztofd.c:136 modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_sfuncs.c:124 modules/graph/graph_sinebg.c:116 msgid "_All curves" msgstr "_Все кивые" @@ -9077,8 +9110,8 @@ msgid "Zero position" msgstr "Положение нуля" -#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:516 -#: modules/graph/graph_sinebg.c:536 +#: modules/graph/graph_fztofd.c:468 modules/graph/graph_polylevel.c:374 +#: modules/graph/graph_sinebg.c:377 msgid "FD curve" msgstr "Кривая сила-расстояние" @@ -9170,6 +9203,86 @@ msgid "Logscale Transform" msgstr "Логарифмический масштаб" +#: modules/graph/graph_measure_period.c:91 +msgid "Evaluates the period of a one-dimensional periodic structure." +msgstr "Определяет период одномерной периодической структуры." + +#: modules/graph/graph_measure_period.c:105 +msgid "/Measure _Features/_Period..." +msgstr "/Измерение _особенностей/_Период..." + +#: modules/graph/graph_measure_period.c:108 +msgid "Measure grating period" +msgstr "Измерить период решетки" + +#: modules/graph/graph_measure_period.c:124 modules/graph/graph_stats.c:109 +#: modules/process/acf2d.c:201 modules/process/measure_lattice.c:203 +#: modules/process/psdf2d.c:178 modules/process/relate.c:277 +msgid "Save Parameters" +msgstr "Сохранить параметры" + +#: modules/graph/graph_measure_period.c:126 +msgid "_Subtract background" +msgstr "_Вычесть фон" + +#: modules/graph/graph_measure_period.c:127 +msgid "Show _leveled curve" +msgstr "Показать _выровненную кривую" + +#: modules/graph/graph_measure_period.c:166 +msgid "Measure Period" +msgstr "Измерить период" + +#: modules/graph/graph_measure_period.c:187 +msgid "Fourier Transform" +msgstr "Преобразование Фурье" + +#: modules/graph/graph_measure_period.c:189 +msgid "Autocorrelation" +msgstr "Автокорреляция" + +#: modules/graph/graph_measure_period.c:191 +msgid "Direct Methods" +msgstr "Прямые методы" + +#: modules/graph/graph_measure_period.c:237 +msgid "Grating Period" +msgstr "Период решетки" + +#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. +#: modules/graph/graph_measure_period.c:243 modules/graph/graph_stats.c:217 +msgid "%{from}v to %{to}v" +msgstr "от %{from}v до %{to}v" + +#: modules/graph/graph_measure_period.c:250 +msgid "Simple FFT" +msgstr "Простое БПФ" + +#: modules/graph/graph_measure_period.c:251 +msgid "Refined FFT" +msgstr "Уточненное БПФ" + +#: modules/graph/graph_measure_period.c:252 +msgid "Simple ACF" +msgstr "Простая АКФ" + +#: modules/graph/graph_measure_period.c:253 +msgid "Multi-peak ACF" +msgstr "АКФ с множеством пиков" + +#: modules/graph/graph_measure_period.c:254 +#, fuzzy +msgid "Gravity centers" +msgstr "Центры притяжения" + +#: modules/graph/graph_measure_period.c:255 +msgid "Zero crossings" +msgstr "Пересечение нуля" + +#: modules/graph/graph_measure_period.c:1050 +msgid "Leveled profile" +msgstr "Выровненный профиль" + #: modules/graph/graph_peaks.c:105 msgid "Finds peaks on graph curves." msgstr "Находит пики на кривых графиков." @@ -9187,7 +9300,7 @@ msgstr "Выдающесть" #: modules/graph/graph_peaks.c:135 modules/process/convolve.c:99 -#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:193 +#: modules/tools/grainremover.c:121 modules/tools/spotremove.c:196 msgid "Zero" msgstr "Нуль" @@ -9219,90 +9332,90 @@ msgid "Graph Peaks" msgstr "Пики графика" -#: modules/graph/graph_polylevel.c:93 modules/graph/graph_sinebg.c:92 -#: modules/graph/graph_terraces.c:258 modules/graph/graph_terraces.c:574 +#: modules/graph/graph_polylevel.c:76 modules/graph/graph_sinebg.c:76 +#: modules/graph/graph_terraces.c:208 modules/graph/graph_terraces.c:246 msgid "Data + fit" msgstr "Данные + аппроксимация" -#: modules/graph/graph_polylevel.c:94 modules/graph/graph_sinebg.c:93 +#: modules/graph/graph_polylevel.c:77 modules/graph/graph_sinebg.c:77 #: modules/process/polylevel.c:346 msgid "Leveled data" msgstr "Выровненные данные" -#: modules/graph/graph_polylevel.c:102 modules/process/polylevel.c:126 +#: modules/graph/graph_polylevel.c:83 modules/process/polylevel.c:126 msgid "Remove polynomial background" msgstr "Убрать полиномиальный фон" -#: modules/graph/graph_polylevel.c:116 +#: modules/graph/graph_polylevel.c:97 msgid "/_Force Distance/Remove _Polynomial Background..." msgstr "/Сила _расстояние/Убрать _полиномиальный фон..." -#: modules/graph/graph_polylevel.c:119 +#: modules/graph/graph_polylevel.c:100 msgid "Remove polynomial background from FZ curve" msgstr "Удалить полиномиальный фон с кривых сила-расстояние" -#: modules/graph/graph_polylevel.c:134 modules/graph/graph_sinebg.c:133 +#: modules/graph/graph_polylevel.c:115 modules/graph/graph_sinebg.c:115 msgid "Curve to fit" msgstr "Кривая для аппроксимации" -#: modules/graph/graph_polylevel.c:137 modules/graph/graph_sinebg.c:135 +#: modules/graph/graph_polylevel.c:118 modules/graph/graph_sinebg.c:117 msgid "_Output" msgstr "Тип в_ывода" -#: modules/graph/graph_polylevel.c:229 modules/graph/graph_polylevel.c:557 -#: modules/graph/graph_sinebg.c:227 modules/graph/graph_sinebg.c:578 +#: modules/graph/graph_polylevel.c:198 modules/graph/graph_polylevel.c:413 +#: modules/graph/graph_sinebg.c:194 modules/graph/graph_sinebg.c:417 msgid "Fit results" msgstr "Результаты аппроксимации" -#: modules/graph/graph_polylevel.c:558 +#: modules/graph/graph_polylevel.c:414 msgid "P0" msgstr "P0" -#: modules/graph/graph_polylevel.c:559 +#: modules/graph/graph_polylevel.c:415 msgid "P1" msgstr "P1" -#: modules/graph/graph_polylevel.c:560 +#: modules/graph/graph_polylevel.c:416 msgid "P2" msgstr "P2" -#: modules/graph/graph_polylevel.c:561 +#: modules/graph/graph_polylevel.c:417 msgid "P3" msgstr "P3" -#: modules/graph/graph_polylevel.c:562 +#: modules/graph/graph_polylevel.c:418 msgid "P4" msgstr "P4" -#: modules/graph/graph_polylevel.c:563 +#: modules/graph/graph_polylevel.c:419 msgid "P5" msgstr "P5" -#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:168 +#: modules/graph/graph_sfuncs.c:79 modules/tools/sfunctions.c:171 msgid "Height distribution" msgstr "Распределение высоты" -#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:169 +#: modules/graph/graph_sfuncs.c:80 modules/tools/sfunctions.c:172 msgid "Cum. height distribution" msgstr "Интегр. распределение высоты" -#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:170 +#: modules/graph/graph_sfuncs.c:81 modules/tools/sfunctions.c:173 msgid "Distribution of angles" msgstr "Распределение углов" -#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:171 +#: modules/graph/graph_sfuncs.c:82 modules/tools/sfunctions.c:174 msgid "Cum. distribution of angles" msgstr "Интегр. распределение углов" -#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:172 +#: modules/graph/graph_sfuncs.c:83 modules/tools/sfunctions.c:175 msgid "ACF" msgstr "АКФ" -#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:173 +#: modules/graph/graph_sfuncs.c:84 modules/tools/sfunctions.c:176 msgid "HHCF" msgstr "ФКВВ" -#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:174 +#: modules/graph/graph_sfuncs.c:85 modules/tools/sfunctions.c:177 msgid "PSDF" msgstr "ФСПМ" @@ -9318,7 +9431,7 @@ msgid "/_Statistics/Statistical _Functions..." msgstr "/_Статистика/Статистические _функции..." -#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:237 +#: modules/graph/graph_sfuncs.c:108 modules/tools/sfunctions.c:243 msgid "Calculate 1D statistical functions" msgstr "Рассчитать одномерные статистические функции" @@ -9329,14 +9442,14 @@ #: modules/graph/graph_sfuncs.c:128 modules/process/acf2d.c:191 #: modules/process/acf2d.c:192 modules/process/grain_dist.c:146 #: modules/process/grain_dist.c:148 modules/process/psdf2d.c:170 -#: modules/process/psdf2d.c:171 modules/tools/profile.c:197 -#: modules/tools/profile.c:198 modules/tools/rprofile.c:161 -#: modules/tools/rprofile.c:162 modules/tools/sfunctions.c:216 -#: modules/tools/sfunctions.c:217 +#: modules/process/psdf2d.c:171 modules/tools/profile.c:198 +#: modules/tools/profile.c:199 modules/tools/rprofile.c:162 +#: modules/tools/rprofile.c:163 modules/tools/sfunctions.c:221 +#: modules/tools/sfunctions.c:222 msgid "_Fixed resolution" msgstr "_Фиксированное разрешение" -#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:236 +#: modules/graph/graph_sfuncs.c:180 modules/tools/sfunctions.c:242 msgid "Statistical Functions" msgstr "Статистические функции" @@ -9356,110 +9469,99 @@ msgid "pick points" msgstr "выбрать точки" -#: modules/graph/graph_sinebg.c:101 +#: modules/graph/graph_sinebg.c:83 msgid "Remove sine background" msgstr "Удалить синусоидальный фон" -#: modules/graph/graph_sinebg.c:115 +#: modules/graph/graph_sinebg.c:97 msgid "/_Force Distance/_Remove Sine Background..." msgstr "/Сила _расстояние/_Удалить синусоидальный фон..." -#: modules/graph/graph_sinebg.c:118 +#: modules/graph/graph_sinebg.c:100 msgid "Remove interference effects from FZ curve" msgstr "Удалить эффекты интерференции с кривой сила-расстояние" -#: modules/graph/graph_sinebg.c:579 modules/process/pat_synth.c:1915 +#: modules/graph/graph_sinebg.c:418 modules/process/pat_synth.c:1915 #: modules/process/pat_synth.c:2146 modules/process/pat_synth.c:2456 #: modules/process/pat_synth.c:2603 msgid "Period" msgstr "Период" -#: modules/graph/graph_sinebg.c:581 modules/process/calibrate.c:200 +#: modules/graph/graph_sinebg.c:420 modules/process/calibrate.c:200 #: modules/volume/volume_calibrate.c:214 msgid "Y offset" msgstr "Смещение по Y" -#: modules/graph/graph_stats.c:89 +#: modules/graph/graph_stats.c:76 msgid "Calculates simple graph curve statistics." msgstr "Рассчитывает простую статистику для кривых графиков." -#: modules/graph/graph_stats.c:103 +#: modules/graph/graph_stats.c:90 msgid "/_Statistics/_Statistical Quantities..." msgstr "/_Статистика/Статистические _величины..." -#: modules/graph/graph_stats.c:106 +#: modules/graph/graph_stats.c:93 msgid "Calculate graph curve statistics" msgstr "Рассчитать статистику для кривых графиков" -#: modules/graph/graph_stats.c:122 modules/process/acf2d.c:201 -#: modules/process/measure_lattice.c:203 modules/process/psdf2d.c:178 -#: modules/process/relate.c:277 -msgid "Save Parameters" -msgstr "Сохранить параметры" - -#: modules/graph/graph_stats.c:166 modules/tools/stats.c:176 -#: modules/tools/stats.c:687 +#: modules/graph/graph_stats.c:148 modules/tools/stats.c:178 +#: modules/tools/stats.c:690 msgid "Statistical Quantities" msgstr "Статистические величины" -#: modules/graph/graph_stats.c:190 modules/graph/graph_stats.c:358 +#: modules/graph/graph_stats.c:167 modules/graph/graph_stats.c:223 msgid "Simple Parameters" msgstr "Простые параметры" -#: modules/graph/graph_stats.c:193 modules/graph/graph_stats.c:369 +#: modules/graph/graph_stats.c:170 modules/graph/graph_stats.c:234 msgid "Integrals" msgstr "Интегралы" -#: modules/graph/graph_stats.c:346 +#: modules/graph/graph_stats.c:211 msgid "Graph Statistics" msgstr "Статистика графика" -#. TRANSLATORS: %{from}v and %{to}v are ids, do NOT translate them. -#: modules/graph/graph_stats.c:352 -msgid "%{from}v to %{to}v" -msgstr "от %{from}v до %{to}v" - -#: modules/graph/graph_stats.c:364 +#: modules/graph/graph_stats.c:229 msgid "Rms (Rq)" msgstr "Rms (Rq)" -#: modules/graph/graph_stats.c:370 +#: modules/graph/graph_stats.c:235 msgid "Projected length" msgstr "Длина проекции" -#: modules/graph/graph_stats.c:371 modules/tools/linestats.c:119 +#: modules/graph/graph_stats.c:236 modules/tools/linestats.c:120 #: modules/volume/volume_linestat.c:151 msgid "Developed length" msgstr "Длина полного профиля" -#: modules/graph/graph_stats.c:372 modules/process/diff_synth.c:197 -#: modules/process/good_profile.c:283 modules/tools/linestats.c:122 -#: modules/tools/stats.c:736 modules/volume/volume_linestat.c:150 +#: modules/graph/graph_stats.c:237 modules/process/diff_synth.c:197 +#: modules/process/good_profile.c:283 modules/tools/linestats.c:123 +#: modules/tools/stats.c:739 modules/volume/volume_linestat.c:150 #: modules/volume/volume_planestat.c:216 msgid "Variation" msgstr "Вариация" -#: modules/graph/graph_stats.c:374 +#: modules/graph/graph_stats.c:239 msgid "Area under curve" msgstr "Площадь под кривой" -#: modules/graph/graph_stats.c:378 +#: modules/graph/graph_stats.c:243 msgid "Positive area" msgstr "Положительная площадь" -#: modules/graph/graph_stats.c:382 +#: modules/graph/graph_stats.c:247 msgid "Negative area" msgstr "Отрицательная площадь" -#: modules/graph/graph_stats.c:386 +#: modules/graph/graph_stats.c:251 msgid "Root mean square" msgstr "Среднеквадратичное" -#: modules/graph/graph_terraces.c:259 modules/graph/graph_terraces.c:575 +#: modules/graph/graph_terraces.c:209 modules/graph/graph_terraces.c:247 msgid "Data + polynomials" msgstr "Данные + полиномы" -#: modules/graph/graph_terraces.c:260 modules/graph/graph_terraces.c:576 +#: modules/graph/graph_terraces.c:210 modules/graph/graph_terraces.c:248 #: modules/process/deconvolve.c:147 modules/process/deconvolve.c:184 #: modules/process/deconvolve.c:189 modules/process/deconvolve.c:245 #: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:273 @@ -9468,202 +9570,194 @@ #: modules/process/psf-fit.c:220 modules/process/psf-fit.c:286 #: modules/process/psf.c:197 modules/process/psf.c:208 #: modules/process/psf.c:284 modules/process/terracefit.c:227 -#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:329 +#: modules/process/terracefit.c:266 modules/volume/volume_psf.c:330 msgid "Difference" msgstr "Разница" -#: modules/graph/graph_terraces.c:261 modules/graph/graph_terraces.c:577 +#: modules/graph/graph_terraces.c:211 modules/graph/graph_terraces.c:249 #: modules/process/terracefit.c:228 modules/process/terracefit.c:267 msgid "Terraces (ideal)" msgstr "Террасы (идеальные)" -#: modules/graph/graph_terraces.c:262 modules/graph/graph_terraces.c:578 -#: modules/graph/graph_terraces.c:1432 modules/process/terracefit.c:229 +#: modules/graph/graph_terraces.c:212 modules/graph/graph_terraces.c:250 +#: modules/graph/graph_terraces.c:932 modules/process/terracefit.c:229 #: modules/process/terracefit.c:268 msgid "Leveled surface" msgstr "Выровненная поверхность" -#: modules/graph/graph_terraces.c:263 modules/graph/graph_terraces.c:579 -#: modules/graph/graph_terraces.c:1447 modules/process/terracefit.c:230 +#: modules/graph/graph_terraces.c:213 modules/graph/graph_terraces.c:251 +#: modules/graph/graph_terraces.c:941 modules/process/terracefit.c:230 #: modules/process/terracefit.c:269 msgid "Polynomial background" msgstr "Полиномиальный фон" -#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:236 +#: modules/graph/graph_terraces.c:220 modules/process/terracefit.c:236 msgid "Fits terraces with polynomial background." msgstr "Аппроксимирует террасы полиномиальным фоном." -#: modules/graph/graph_terraces.c:301 modules/process/terracefit.c:250 +#: modules/graph/graph_terraces.c:234 modules/process/terracefit.c:250 msgid "/Measure _Features/_Terraces..." -msgstr "/И_змерение/_Террасы..." +msgstr "/Измерение _особенностей/_Террасы..." -#: modules/graph/graph_terraces.c:304 modules/process/terracefit.c:254 +#: modules/graph/graph_terraces.c:237 modules/process/terracefit.c:254 msgid "Fit terraces with polynomial background" msgstr "Аппроксимировать террасы полиномиальным фоном" -#: modules/graph/graph_terraces.c:364 modules/process/terracefit.c:501 -msgid "Fitted step height" -msgstr "Аппроксимированная высота ступеньки" +#: modules/graph/graph_terraces.c:252 +msgid "Step detection" +msgstr "Детекция ступени" -#: modules/graph/graph_terraces.c:365 modules/process/fit-shape.c:1649 -#: modules/process/relate.c:366 modules/process/relate.c:672 -#: modules/process/terracefit.c:502 -msgid "Mean square difference" -msgstr "Среднеквадратичная разница" +#: modules/graph/graph_terraces.c:262 modules/process/terracefit.c:282 +msgid "_Step detection kernel" +msgstr "_Ядро для детекции ступени" -#: modules/graph/graph_terraces.c:366 modules/process/terracefit.c:503 -msgid "Terrace discrepancy" -msgstr "Расхождение террас" +#: modules/graph/graph_terraces.c:264 modules/process/terracefit.c:284 +msgid "Step detection _threshold" +msgstr "_Порог для детекции ступени" -#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:504 -msgid "Number of terraces" -msgstr "Количество террас" +#: modules/graph/graph_terraces.c:266 modules/graph/graph_terraces.c:282 +#: modules/process/terracefit.c:286 modules/process/terracefit.c:303 +msgid "Step _broadening" +msgstr "У_ширение ступени" -#: modules/graph/graph_terraces.c:373 modules/process/terracefit.c:450 -msgid "Fit Terraces" -msgstr "Аппроксимировать террасы" +#: modules/graph/graph_terraces.c:268 +msgid "Minimum terrace _length" +msgstr "Минимальная _длина террасы:" -#: modules/graph/graph_terraces.c:398 modules/process/terracefit.c:462 -msgid "Terrace List" -msgstr "Список террас" +#: modules/graph/graph_terraces.c:270 modules/graph/graph_terraces.c:281 +#: modules/process/linematch.c:178 modules/process/terracefit.c:281 +#: modules/process/terracefit.c:302 modules/volume/volume_linelevel.c:187 +msgid "_Polynomial degree" +msgstr "Степень _полинома" + +#: modules/graph/graph_terraces.c:271 modules/process/terracefit.c:291 +msgid "_Independent heights" +msgstr "_Независимые высоты" + +#: modules/graph/graph_terraces.c:274 +msgid "Select regions _manually" +msgstr "Выбрать области в_ручную" + +#: modules/graph/graph_terraces.c:277 modules/process/terracefit.c:298 +msgid "Save Terrace Table" +msgstr "Сохранить таблицу террас" -#: modules/graph/graph_terraces.c:402 modules/process/anneal_synth.c:293 -#: modules/process/cpde_synth.c:283 modules/process/crosscor.c:239 -#: modules/process/deconvolve.c:200 modules/process/domain_synth.c:334 -#: modules/process/drift.c:405 modules/process/fft.c:315 +#: modules/graph/graph_terraces.c:279 modules/graph/graph_terraces.c:366 +#: modules/process/anneal_synth.c:293 modules/process/cpde_synth.c:283 +#: modules/process/crosscor.c:239 modules/process/deconvolve.c:200 +#: modules/process/domain_synth.c:334 modules/process/drift.c:405 +#: modules/process/dune_synth.c:283 modules/process/fft.c:315 #: modules/process/good_profile.c:286 modules/process/indent_analyze.c:365 -#: modules/process/maskcor.c:202 modules/process/mfm_current.c:281 +#: modules/process/maskcor.c:222 modules/process/mfm_current.c:281 #: modules/process/multiprofile.c:273 modules/process/pid.c:151 -#: modules/process/pid.c:271 modules/process/psf-fit.c:237 -#: modules/process/psf.c:228 modules/process/terracefit.c:300 -#: modules/process/terracefit.c:463 modules/process/wfr_synth.c:255 +#: modules/process/pid.c:271 modules/process/plateau_synth.c:296 +#: modules/process/psf-fit.c:237 modules/process/psf.c:228 +#: modules/process/terracefit.c:300 modules/process/terracefit.c:463 +#: modules/process/wfr_synth.c:255 msgid "Output" msgstr "Вывод" -#: modules/graph/graph_terraces.c:406 modules/process/terracefit.c:464 -msgid "Survey" -msgstr "Обзор" - -#: modules/graph/graph_terraces.c:520 -msgid "_Step detection kernel:" -msgstr "_Ядро для детекции ступени:" - -#: modules/graph/graph_terraces.c:528 -msgid "Step detection _threshold:" -msgstr "_Порог для детекции ступени:" - -#: modules/graph/graph_terraces.c:537 -msgid "Step _broadening:" -msgstr "_Уширение ступени:" +#: modules/graph/graph_terraces.c:283 modules/process/terracefit.c:304 +msgid "M_inimum polynomial degree" +msgstr "М_инимальная степень полинома" -#: modules/graph/graph_terraces.c:546 -msgid "Minimum terrace _length:" -msgstr "Минимальная _длина террасы:" +#: modules/graph/graph_terraces.c:285 modules/process/polylevel.c:145 +#: modules/process/terracefit.c:306 +msgid "_Maximum polynomial degree" +msgstr "_Максимальная степень полинома" -#: modules/graph/graph_terraces.c:554 -msgid "_Polynomial degree:" -msgstr "Степень _полинома:" +#: modules/graph/graph_terraces.c:287 modules/process/terracefit.c:308 +msgid "Minimum broadening" +msgstr "Минимальное уширение" -#: modules/graph/graph_terraces.c:562 modules/process/terracefit.c:291 -msgid "_Independent heights" -msgstr "_Независимые высоты" +#: modules/graph/graph_terraces.c:289 modules/process/terracefit.c:310 +msgid "Maximum broadening" +msgstr "Максимальное уширение" -#: modules/graph/graph_terraces.c:580 -msgid "Step detection" -msgstr "Детекция ступени" +#: modules/graph/graph_terraces.c:353 modules/process/terracefit.c:450 +msgid "Fit Terraces" +msgstr "Аппроксимировать террасы" -#: modules/graph/graph_terraces.c:582 modules/volume/volume_psf.c:541 -msgid "_Display:" -msgstr "_Показать:" +#: modules/graph/graph_terraces.c:365 modules/process/terracefit.c:462 +msgid "Terrace List" +msgstr "Список террас" -#: modules/graph/graph_terraces.c:587 -msgid "Select regions _manually" -msgstr "Выбрать области в_ручную" +#: modules/graph/graph_terraces.c:367 modules/process/terracefit.c:464 +msgid "Survey" +msgstr "Обзор" -#: modules/graph/graph_terraces.c:598 modules/process/entropy.c:187 +#: modules/graph/graph_terraces.c:461 modules/process/entropy.c:187 #: modules/process/fractal.c:259 modules/process/indent_analyze.c:355 #: modules/process/mark_with.c:284 modules/process/neural.c:543 #: modules/process/psf.c:354 modules/process/terracefit.c:572 -#: modules/volume/volume_psf.c:547 +#: modules/volume/volume_psf.c:548 msgid "Result" msgstr "Результат" -#: modules/graph/graph_terraces.c:827 modules/process/terracefit.c:298 -msgid "Save Terrace Table" -msgstr "Сохранить таблицу террас" +#: modules/graph/graph_terraces.c:621 modules/process/classify.c:245 +#: modules/process/terracefit.c:751 +msgid "_Execute" +msgstr "_Выполнить" -#: modules/graph/graph_terraces.c:877 modules/process/linematch.c:178 -#: modules/process/terracefit.c:281 modules/process/terracefit.c:302 -msgid "_Polynomial degree" -msgstr "Степень _полинома" +#: modules/graph/graph_terraces.c:643 modules/process/terracefit.c:501 +msgid "Fitted step height" +msgstr "Аппроксимированная высота ступеньки" -#: modules/graph/graph_terraces.c:889 -msgid "M_inimum polynomial degree:" -msgstr "М_инимальная степень полинома:" - -#: modules/graph/graph_terraces.c:899 -msgid "_Maximum polynomial degree:" -msgstr "_Максимальная степень полинома:" +#: modules/graph/graph_terraces.c:644 modules/process/fit-shape.c:1649 +#: modules/process/relate.c:366 modules/process/relate.c:672 +#: modules/process/terracefit.c:502 +msgid "Mean square difference" +msgstr "Среднеквадратичная разница" -#: modules/graph/graph_terraces.c:908 modules/process/terracefit.c:286 -#: modules/process/terracefit.c:303 -msgid "Step _broadening" -msgstr "У_ширение ступени" +#: modules/graph/graph_terraces.c:645 modules/process/terracefit.c:503 +msgid "Terrace discrepancy" +msgstr "Расхождение террас" -#: modules/graph/graph_terraces.c:921 -msgid "Minimum broadening:" -msgstr "Минимальное уширение:" - -#: modules/graph/graph_terraces.c:932 -msgid "Maximum broadening:" -msgstr "Максимальное уширение:" +#: modules/graph/graph_terraces.c:646 modules/process/terracefit.c:504 +msgid "Number of terraces" +msgstr "Количество террас" -#: modules/graph/graph_terraces.c:1110 -msgid "Survey cannot be run with independent degrees." +#: modules/graph/graph_terraces.c:730 modules/process/terracefit.c:841 +msgid "Survey cannot be run with independent heights." msgstr "Обзор нельзя запускать с независимыми степенями." -#: modules/graph/graph_terraces.c:1117 modules/process/terracefit.c:845 +#: modules/graph/graph_terraces.c:732 modules/process/terracefit.c:843 +msgid "No free parameters are selected." +msgstr "Не выбраны свободные параметры." + +#: modules/graph/graph_terraces.c:734 modules/process/terracefit.c:845 #, c-format msgid "Number of combinations: %u." msgstr "Количество комбинаций: %u." -#: modules/graph/graph_terraces.c:1124 modules/process/terracefit.c:843 -msgid "No free parameters are selected." -msgstr "Не выбраны свободные параметры." - -#: modules/graph/graph_terraces.c:1266 modules/graph/graph_terraces.c:1359 +#: modules/graph/graph_terraces.c:787 modules/graph/graph_terraces.c:872 #, c-format msgid "Segment %u" msgstr "Сегмент %u" -#: modules/graph/graph_terraces.c:1386 +#: modules/graph/graph_terraces.c:894 #, c-format msgid "Level %d" msgstr "Уровень %d" -#: modules/graph/graph_terraces.c:2089 modules/graph/graph_terraces.c:2104 -#: modules/graph/graph_terraces.c:2240 modules/graph/graph_terraces.c:2255 -#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1318 -#: modules/process/terracefit.c:1334 modules/process/terracefit.c:1485 -#: modules/process/terracefit.c:1501 +#: modules/graph/graph_terraces.c:1552 modules/graph/graph_terraces.c:1566 +#: modules/graph/graph_terraces.c:1699 modules/graph/graph_terraces.c:1713 +#: modules/process/fit-shape.c:1494 modules/process/terracefit.c:1315 +#: modules/process/terracefit.c:1331 modules/process/terracefit.c:1482 +#: modules/process/terracefit.c:1498 msgid "Fit failed" msgstr "Аппроксимация закончилась ошибкой" -#: modules/graph/graph_terraces.c:2281 modules/process/terracefit.c:1532 +#: modules/graph/graph_terraces.c:1739 modules/process/terracefit.c:1529 msgid "No suitable terrace steps found" msgstr "Не найдено подходящих ступеней террасы" -#: modules/graph/graph_terraces.c:2364 modules/process/terracefit.c:1703 -#: modules/process/terracefit.c:2063 +#: modules/graph/graph_terraces.c:1819 modules/process/terracefit.c:1700 +#: modules/process/terracefit.c:2060 msgid "No terraces were found" msgstr "Террасы не найдены" -#: modules/graph/graph_terraces.c:2462 modules/process/polylevel.c:613 -#: modules/tools/selectionmanager.c:677 -msgid "Save Table" -msgstr "Сохранение таблицы" - -#: modules/graph/graph_terraces.c:2689 modules/process/terracefit.c:2318 +#: modules/graph/graph_terraces.c:2086 modules/process/terracefit.c:2311 msgid "Save Terrace Fit Survey" msgstr "Сохранить обзор аппроксимации террасами" @@ -9796,7 +9890,7 @@ msgstr "Выравнивание плоскости" #: modules/process/acf2d.c:185 modules/process/measure_lattice.c:194 -#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:335 +#: modules/process/psdf2d.c:164 modules/volume/volume_extract.c:317 msgid "Zoom" msgstr "Увеличение" @@ -9814,8 +9908,8 @@ #: modules/process/acf2d.c:194 modules/process/multiprofile.c:152 #: modules/process/psdf2d.c:173 modules/process/straighten_path.c:145 -#: modules/tools/cprofile.c:150 modules/tools/pathlevel.c:126 -#: modules/tools/profile.c:196 modules/tools/roughness.c:193 +#: modules/tools/cprofile.c:151 modules/tools/pathlevel.c:126 +#: modules/tools/profile.c:197 modules/tools/roughness.c:193 msgid "_Thickness" msgstr "_Толщина" @@ -9842,7 +9936,7 @@ #: modules/process/acf2d.c:411 modules/process/curvature.c:507 #: modules/process/psdf2d.c:384 modules/process/terracefit.c:498 -#: modules/tools/corrlen.c:768 modules/tools/stats.c:698 +#: modules/tools/corrlen.c:774 modules/tools/stats.c:701 msgid "Mask in use" msgstr "Используется маска" @@ -9934,7 +10028,7 @@ msgstr "Создать изображение отжигом решетчатого газа" #: modules/process/anneal_synth.c:142 modules/process/cpde_synth.c:152 -#: modules/process/domain_synth.c:181 +#: modules/process/domain_synth.c:181 modules/process/dune_synth.c:142 msgid "_Number of iterations" msgstr "_Число шагов" @@ -9978,8 +10072,8 @@ #: modules/process/anneal_synth.c:156 modules/process/bdep_synth.c:152 #: modules/process/col_synth.c:205 modules/process/cpde_synth.c:156 #: modules/process/deposit_synth.c:155 modules/process/diff_synth.c:246 -#: modules/process/domain_synth.c:194 modules/process/synth.h:162 -#: modules/process/wfr_synth.c:136 +#: modules/process/domain_synth.c:194 modules/process/dune_synth.c:153 +#: modules/process/synth.h:162 modules/process/wfr_synth.c:136 msgid "Progressive preview" msgstr "Прогрессивное обновление" @@ -9991,13 +10085,14 @@ #: modules/process/calibrate.c:542 modules/process/col_synth.c:344 #: modules/process/cpde_synth.c:236 modules/process/deposit_synth.c:237 #: modules/process/diff_synth.c:383 modules/process/disc_synth.c:233 -#: modules/process/domain_synth.c:284 modules/process/fbm_synth.c:225 -#: modules/process/fft_synth.c:214 modules/process/fibre_synth.c:291 -#: modules/process/lat_synth.c:458 modules/process/lno_synth.c:342 -#: modules/process/mfm_current.c:246 modules/process/mfm_parallel.c:254 -#: modules/process/noise_synth.c:259 modules/process/obj_synth.c:363 -#: modules/process/pat_synth.c:527 modules/process/phase_synth.c:205 -#: modules/process/pileup_synth.c:302 modules/process/roddeposit_synth.c:448 +#: modules/process/domain_synth.c:284 modules/process/dune_synth.c:230 +#: modules/process/fbm_synth.c:225 modules/process/fft_synth.c:214 +#: modules/process/fibre_synth.c:291 modules/process/lat_synth.c:458 +#: modules/process/lno_synth.c:342 modules/process/mfm_current.c:246 +#: modules/process/mfm_parallel.c:254 modules/process/noise_synth.c:259 +#: modules/process/obj_synth.c:363 modules/process/pat_synth.c:527 +#: modules/process/phase_synth.c:205 modules/process/pileup_synth.c:302 +#: modules/process/plateau_synth.c:250 modules/process/roddeposit_synth.c:448 #: modules/process/wave_synth.c:279 modules/process/wfr_synth.c:213 msgid "Dimensions" msgstr "Размеры" @@ -10006,18 +10101,20 @@ #: modules/process/col_synth.c:345 modules/process/cpde_synth.c:237 #: modules/process/deposit_synth.c:238 modules/process/diff_synth.c:384 #: modules/process/disc_synth.c:234 modules/process/domain_synth.c:285 -#: modules/process/fbm_synth.c:226 modules/process/fft_synth.c:215 -#: modules/process/lno_synth.c:343 modules/process/mfm_current.c:247 -#: modules/process/mfm_parallel.c:255 modules/process/noise_synth.c:260 -#: modules/process/pat_synth.c:528 modules/process/phase_synth.c:206 -#: modules/process/phase_synth.c:240 modules/process/pileup_synth.c:303 -#: modules/process/roddeposit_synth.c:470 modules/process/wave_synth.c:280 -#: modules/process/wfr_synth.c:214 +#: modules/process/dune_synth.c:231 modules/process/fbm_synth.c:226 +#: modules/process/fft_synth.c:215 modules/process/lno_synth.c:343 +#: modules/process/mfm_current.c:247 modules/process/mfm_parallel.c:255 +#: modules/process/noise_synth.c:260 modules/process/pat_synth.c:528 +#: modules/process/phase_synth.c:206 modules/process/phase_synth.c:240 +#: modules/process/pileup_synth.c:303 modules/process/plateau_synth.c:251 +#: modules/process/plateau_synth.c:285 modules/process/roddeposit_synth.c:470 +#: modules/process/wave_synth.c:280 modules/process/wfr_synth.c:214 msgid "Generator" msgstr "Генератор" #: modules/process/anneal_synth.c:270 modules/process/cpde_synth.c:273 -#: modules/process/domain_synth.c:324 modules/process/wfr_synth.c:248 +#: modules/process/domain_synth.c:324 modules/process/dune_synth.c:265 +#: modules/process/wfr_synth.c:248 msgid "Simulation Parameters" msgstr "Параметры модели" @@ -10028,15 +10125,16 @@ #: modules/process/anneal_synth.c:297 modules/process/bdep_synth.c:333 #: modules/process/col_synth.c:388 modules/process/cpde_synth.c:288 #: modules/process/diff_synth.c:428 modules/process/disc_synth.c:295 -#: modules/process/domain_synth.c:339 modules/process/fbm_synth.c:271 -#: modules/process/fft_synth.c:253 modules/process/fibre_synth.c:342 -#: modules/process/lat_synth.c:570 modules/process/lno_synth.c:399 -#: modules/process/noise_synth.c:303 modules/process/obj_synth.c:417 -#: modules/process/pat_synth.c:1740 modules/process/pat_synth.c:1834 -#: modules/process/pat_synth.c:1941 modules/process/pat_synth.c:2051 -#: modules/process/pat_synth.c:2174 modules/process/pat_synth.c:2285 -#: modules/process/pat_synth.c:2491 modules/process/pat_synth.c:2633 -#: modules/process/phase_synth.c:248 modules/process/wave_synth.c:325 +#: modules/process/domain_synth.c:339 modules/process/dune_synth.c:288 +#: modules/process/fbm_synth.c:271 modules/process/fft_synth.c:253 +#: modules/process/fibre_synth.c:342 modules/process/lat_synth.c:570 +#: modules/process/lno_synth.c:399 modules/process/noise_synth.c:303 +#: modules/process/obj_synth.c:417 modules/process/pat_synth.c:1740 +#: modules/process/pat_synth.c:1834 modules/process/pat_synth.c:1941 +#: modules/process/pat_synth.c:2051 modules/process/pat_synth.c:2174 +#: modules/process/pat_synth.c:2285 modules/process/pat_synth.c:2491 +#: modules/process/pat_synth.c:2633 modules/process/phase_synth.c:248 +#: modules/process/plateau_synth.c:302 modules/process/wave_synth.c:325 #: modules/process/wfr_synth.c:260 msgid "_Like Current Image" msgstr "_Как у текущего изображения" @@ -10045,10 +10143,11 @@ #: modules/process/calcoefs_simple.c:638 modules/process/col_synth.c:862 #: modules/process/cpde_synth.c:391 modules/process/crosscor.c:481 #: modules/process/deposit_synth.c:555 modules/process/diff_synth.c:598 -#: modules/process/domain_synth.c:613 modules/process/fibre_synth.c:729 -#: modules/process/grain_wshed.c:277 modules/process/lat_synth.c:837 -#: modules/process/mark_disconn.c:327 modules/process/neural.c:1214 -#: modules/process/pid.c:349 modules/process/roddeposit_synth.c:299 +#: modules/process/domain_synth.c:613 modules/process/dune_synth.c:528 +#: modules/process/fibre_synth.c:729 modules/process/grain_wshed.c:277 +#: modules/process/lat_synth.c:837 modules/process/mark_disconn.c:327 +#: modules/process/neural.c:1214 modules/process/pid.c:349 +#: modules/process/plateau_synth.c:654 modules/process/roddeposit_synth.c:299 #: modules/process/roddeposit_synth.c:993 modules/process/superresolution.c:415 #: modules/process/superresolution.c:504 modules/process/tip_blind.c:468 #: modules/process/tipops.c:269 modules/process/wave_synth.c:451 @@ -10059,8 +10158,9 @@ msgstr "Инициализация..." #: modules/process/anneal_synth.c:912 modules/process/cpde_synth.c:414 -#: modules/process/domain_synth.c:637 modules/process/roddeposit_synth.c:994 -#: modules/process/wfr_synth.c:490 modules/volume/volume_fdfit.c:906 +#: modules/process/domain_synth.c:637 modules/process/dune_synth.c:572 +#: modules/process/roddeposit_synth.c:994 modules/process/wfr_synth.c:490 +#: modules/volume/volume_fdfit.c:906 msgid "Running computation..." msgstr "Проведение вычислений..." @@ -10090,7 +10190,7 @@ #: modules/process/arc-revolve.c:120 modules/process/median-bg.c:102 #: modules/process/raveraging.c:103 modules/process/sphere-revolve.c:105 -#: modules/tools/maskedit.c:228 +#: modules/tools/maskedit.c:232 msgid "_Radius" msgstr "Ра_диус" @@ -10130,64 +10230,80 @@ msgid "Arithmetic operations on data" msgstr "Арифметические операции над данными" -#: modules/process/arithmetic.c:190 +#: modules/process/arithmetic.c:190 modules/volume/volume_arithmetic.c:179 +#: modules/volume/volume_xyarithmetics.c:180 msgid "_Expression" msgstr "_Выражение" -#: modules/process/arithmetic.c:193 +#: modules/process/arithmetic.c:193 modules/volume/volume_arithmetic.c:182 +#: modules/volume/volume_xyarithmetics.c:183 msgid "Specify un_its" msgstr "Задать _единицы" #: modules/process/arithmetic.c:194 modules/process/arithmetic.c:195 +#: modules/volume/volume_arithmetic.c:183 +#: modules/volume/volume_arithmetic.c:184 +#: modules/volume/volume_xyarithmetics.c:184 +#: modules/volume/volume_xyarithmetics.c:185 msgid "_Fixed filler value" msgstr "_Фикс. значение для заполнения" #: modules/process/arithmetic.c:249 modules/process/stitch.c:235 -#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:198 +#: modules/process/superresolution.c:348 modules/volume/volume_arithmetic.c:238 +#: modules/volume/volume_xyarithmetics.c:242 msgid "Calculated" msgstr "Посчитанное" -#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:226 +#: modules/process/arithmetic.c:293 modules/volume/volume_arithmetic.c:275 msgid "Arithmetic" msgstr "Арифметические операции" -#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:271 +#: modules/process/arithmetic.c:307 modules/volume/volume_arithmetic.c:289 +#: modules/volume/volume_xyarithmetics.c:294 msgid "_Expression:" msgstr "_Выражение:" -#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:296 +#: modules/process/arithmetic.c:327 modules/volume/volume_arithmetic.c:309 +#: modules/volume/volume_xyarithmetics.c:314 msgid "Operands" msgstr "Операнды" -#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:332 +#: modules/process/arithmetic.c:358 modules/volume/volume_arithmetic.c:340 +#: modules/volume/volume_xyarithmetics.c:362 #, c-format msgid "Take result units from data d%d" msgstr "Взять единицы измерения результата от данных d%d" #: modules/process/arithmetic.c:370 modules/volume/volume_arithmetic.c:352 +#: modules/volume/volume_xyarithmetics.c:375 msgid "Specify un_its:" msgstr "Задать _единицы:" -#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:370 +#: modules/process/arithmetic.c:385 modules/volume/volume_arithmetic.c:367 +#: modules/volume/volume_xyarithmetics.c:390 msgid "Specify result units explicitly" msgstr "Непосредственно указать единицы измерения результата" -#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:453 +#: modules/process/arithmetic.c:463 modules/volume/volume_arithmetic.c:445 +#: modules/volume/volume_xyarithmetics.c:471 msgid "Expression contains unknown identifiers" msgstr "Выражение содержит неизвестные идентификаторы" #: modules/process/arithmetic.c:569 modules/process/superresolution.c:299 -#: modules/volume/volume_arithmetic.c:565 +#: modules/volume/volume_arithmetic.c:552 +#: modules/volume/volume_xyarithmetics.c:585 msgid "Pixel dimensions differ" msgstr "Размеры в пикселях отличаются" #: modules/process/arithmetic.c:571 modules/process/superresolution.c:301 -#: modules/volume/volume_arithmetic.c:567 +#: modules/volume/volume_arithmetic.c:554 +#: modules/volume/volume_xyarithmetics.c:587 msgid "Lateral dimensions are different physical quantities" msgstr "Горизонтальные размеры являются разными физическими величинами" #: modules/process/arithmetic.c:573 modules/process/superresolution.c:304 -#: modules/volume/volume_arithmetic.c:570 +#: modules/volume/volume_arithmetic.c:556 +#: modules/volume/volume_xyarithmetics.c:589 msgid "Physical dimensions differ" msgstr "Физические размеры отличаются" @@ -10223,7 +10339,7 @@ "Базовые действия, такие, как отражение, изменение знака и поворот на угол, " "кратный прямому." -#: modules/process/basicops.c:65 +#: modules/process/basicops.c:65 modules/volume/volume_invert.c:53 msgid "/_Basic Operations/_Invert Value" msgstr "/_Базовые действия/_Инвертировать значение" @@ -10253,35 +10369,36 @@ #: modules/process/bdep_synth.c:147 modules/process/col_synth.c:193 #: modules/process/deposit_synth.c:149 modules/process/diff_synth.c:237 -#: modules/process/fibre_synth.c:206 modules/process/lno_synth.c:619 -#: modules/process/obj_synth.c:287 modules/process/pileup_synth.c:227 -#: modules/process/wfr_synth.c:131 +#: modules/process/dune_synth.c:141 modules/process/fibre_synth.c:206 +#: modules/process/lno_synth.c:619 modules/process/obj_synth.c:287 +#: modules/process/pileup_synth.c:227 modules/process/wfr_synth.c:131 msgid "Co_verage" msgstr "По_крытие" #: modules/process/bdep_synth.c:149 modules/process/col_synth.c:197 #: modules/process/col_synth.c:199 modules/process/disc_synth.c:149 -#: modules/process/disc_synth.c:157 modules/process/fibre_synth.c:198 -#: modules/process/fibre_synth.c:201 modules/process/fibre_synth.c:205 -#: modules/process/fibre_synth.c:208 modules/process/fibre_synth.c:212 -#: modules/process/fibre_synth.c:214 modules/process/lno_synth.c:621 -#: modules/process/obj_synth.c:277 modules/process/obj_synth.c:279 -#: modules/process/obj_synth.c:281 modules/process/obj_synth.c:284 -#: modules/process/obj_synth.c:286 modules/process/pat_synth.c:1708 -#: modules/process/pat_synth.c:1710 modules/process/pat_synth.c:1807 -#: modules/process/pat_synth.c:1896 modules/process/pat_synth.c:1900 -#: modules/process/pat_synth.c:1902 modules/process/pat_synth.c:2011 -#: modules/process/pat_synth.c:2013 modules/process/pat_synth.c:2118 -#: modules/process/pat_synth.c:2121 modules/process/pat_synth.c:2124 -#: modules/process/pat_synth.c:2249 modules/process/pat_synth.c:2434 -#: modules/process/pat_synth.c:2437 modules/process/pat_synth.c:2440 -#: modules/process/pat_synth.c:2442 modules/process/pat_synth.c:2445 -#: modules/process/pat_synth.c:2582 modules/process/pat_synth.c:2585 -#: modules/process/pat_synth.c:2587 modules/process/pat_synth.c:2590 -#: modules/process/pileup_synth.c:222 modules/process/pileup_synth.c:224 -#: modules/process/pileup_synth.c:226 modules/process/wave_synth.c:192 -#: modules/process/wave_synth.c:194 modules/process/wave_synth.c:196 -#: modules/process/wave_synth.c:198 modules/process/wave_synth.c:200 +#: modules/process/disc_synth.c:157 modules/process/dune_synth.c:144 +#: modules/process/fibre_synth.c:198 modules/process/fibre_synth.c:201 +#: modules/process/fibre_synth.c:205 modules/process/fibre_synth.c:208 +#: modules/process/fibre_synth.c:212 modules/process/fibre_synth.c:214 +#: modules/process/lno_synth.c:621 modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:284 modules/process/obj_synth.c:286 +#: modules/process/pat_synth.c:1708 modules/process/pat_synth.c:1710 +#: modules/process/pat_synth.c:1807 modules/process/pat_synth.c:1896 +#: modules/process/pat_synth.c:1900 modules/process/pat_synth.c:1902 +#: modules/process/pat_synth.c:2011 modules/process/pat_synth.c:2013 +#: modules/process/pat_synth.c:2118 modules/process/pat_synth.c:2121 +#: modules/process/pat_synth.c:2124 modules/process/pat_synth.c:2249 +#: modules/process/pat_synth.c:2434 modules/process/pat_synth.c:2437 +#: modules/process/pat_synth.c:2440 modules/process/pat_synth.c:2442 +#: modules/process/pat_synth.c:2445 modules/process/pat_synth.c:2582 +#: modules/process/pat_synth.c:2585 modules/process/pat_synth.c:2587 +#: modules/process/pat_synth.c:2590 modules/process/pileup_synth.c:222 +#: modules/process/pileup_synth.c:224 modules/process/pileup_synth.c:226 +#: modules/process/wave_synth.c:192 modules/process/wave_synth.c:194 +#: modules/process/wave_synth.c:196 modules/process/wave_synth.c:198 +#: modules/process/wave_synth.c:200 msgid "Spread" msgstr "Разброс" @@ -10683,27 +10800,30 @@ msgid "Building mesh..." msgstr "Строится сетка..." -#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:182 +#: modules/process/calcoefs_view.c:1120 modules/tools/profile.c:183 +#: modules/volume/volume_drift.c:372 msgid "X correction" msgstr "Поправка по X" -#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:183 +#: modules/process/calcoefs_view.c:1121 modules/tools/profile.c:184 +#: modules/volume/volume_drift.c:380 msgid "Y correction" msgstr "Поправка по Y" -#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:184 +#: modules/process/calcoefs_view.c:1122 modules/tools/profile.c:185 +#: modules/volume/volume_drift.c:388 msgid "Z correction" msgstr "Поправка по Z" -#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:185 +#: modules/process/calcoefs_view.c:1123 modules/tools/profile.c:186 msgid "X uncertainty" msgstr "Погрешность X" -#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:186 +#: modules/process/calcoefs_view.c:1124 modules/tools/profile.c:187 msgid "Y uncertainty" msgstr "Погрешность Y" -#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:187 +#: modules/process/calcoefs_view.c:1125 modules/tools/profile.c:188 msgid "Z uncertainty" msgstr "Погрешность Z" @@ -10737,6 +10857,7 @@ "Перекалибровывает горизонтальное разрешение скана или диапазон значений." #: modules/process/calibrate.c:154 modules/process/calibrate.c:161 +#: modules/volume/volume_calibrate.c:156 msgid "/_Basic Operations/_Dimensions and Units..." msgstr "/_Базовые действия/Размеры и _единицы измерения..." @@ -10820,7 +10941,7 @@ #: modules/process/calibrate.c:228 modules/process/correct_perspective.c:152 #: modules/process/drift.c:161 modules/process/extend.c:133 -#: modules/process/rank-filter.c:122 modules/tools/crop.c:107 +#: modules/process/rank-filter.c:122 modules/tools/crop.c:108 msgid "Create new image" msgstr "Создать новое изображение" @@ -10869,10 +10990,6 @@ msgid "Classify" msgstr "Классифицировать" -#: modules/process/classify.c:245 modules/process/terracefit.c:751 -msgid "_Execute" -msgstr "_Выполнить" - #: modules/process/classify.c:299 modules/process/classify.c:565 msgid "Mask A" msgstr "Маска A" @@ -11038,6 +11155,7 @@ #: modules/process/col_synth.c:194 modules/process/cpde_synth.c:153 #: modules/process/diff_synth.c:239 modules/process/domain_synth.c:187 +#: modules/process/dune_synth.c:150 modules/process/plateau_synth.c:169 #: modules/process/wfr_synth.c:133 msgid "_Height scale" msgstr "_Масштаб высот" @@ -11187,14 +11305,14 @@ msgid "Convolution _kernel" msgstr "_Ядро свёртки" -#: modules/process/convolve.c:122 modules/volume/volume_psf.c:595 +#: modules/process/convolve.c:122 modules/volume/volume_psf.c:596 msgid "Normalize as _integral" msgstr "Нормализовать как _интеграл" #: modules/process/convolve.c:153 modules/process/psf-fit.c:219 #: modules/process/psf-fit.c:282 modules/process/psf.c:196 #: modules/process/psf.c:207 modules/process/psf.c:282 -#: modules/volume/volume_psf.c:328 +#: modules/volume/volume_psf.c:329 msgid "Convolved" msgstr "После свёртки" @@ -11228,13 +11346,13 @@ msgstr "Аффинная коррекция" #: modules/process/correct_affine.c:349 modules/process/facet_analysis.c:487 -#: modules/process/facet_measure.c:382 modules/process/immerse.c:277 +#: modules/process/facet_measure.c:378 modules/process/immerse.c:277 #: modules/process/measure_lattice.c:285 msgid "_Refine" msgstr "_Уточнить" #: modules/process/correct_affine.c:398 modules/process/fft_filter_2d.c:518 -#: modules/process/psf.c:351 modules/volume/volume_psf.c:532 +#: modules/process/psf.c:351 modules/volume/volume_psf.c:533 msgid "Preview Options" msgstr "Параметры предпросмотра" @@ -11429,7 +11547,7 @@ msgstr "Добавить маску результатов с _низким весом" #: modules/process/crosscor.c:161 modules/process/grain_wshed.c:110 -#: modules/process/maskcor.c:124 +#: modules/process/maskcor.c:131 msgid "T_hreshold" msgstr "_Порог" @@ -11495,7 +11613,7 @@ #: modules/process/curvature.c:111 msgid "/Measure _Features/_Curvature..." -msgstr "/И_змерение/_Кривизна..." +msgstr "/Измерение _особенностей/_Кривизна..." #: modules/process/curvature.c:115 msgid "Calculate overall curvature" @@ -11513,13 +11631,13 @@ msgid "Curvature Sections" msgstr "Сечения кривизны" -#: modules/process/curvature.c:364 modules/tools/profile.c:782 +#: modules/process/curvature.c:364 modules/tools/profile.c:783 #, c-format msgid "Profile %d" msgstr "Профиль %d" #: modules/process/curvature.c:445 modules/process/fft_filter_2d.c:579 -#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:580 +#: modules/volume/volume_equiplane.c:394 modules/volume/volume_psf.c:581 #: modules/volume/volume_slice.c:389 modules/volume/volume_zposlevel.c:405 msgid "Output type:" msgstr "Тип вывода:" @@ -11619,7 +11737,7 @@ msgid "Deconvolve" msgstr "Деконволюция" -#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:233 +#: modules/process/deconvolve.c:298 modules/volume/volume_psf.c:234 msgid "Sigma" msgstr "Параметр регуляризации" @@ -11981,7 +12099,8 @@ msgid "drift" msgstr "дрейф" -#: modules/process/drift.c:228 modules/xyz/xyz_drift.c:402 +#: modules/process/drift.c:228 modules/volume/volume_drift.c:250 +#: modules/xyz/xyz_drift.c:402 msgid "x-axis drift" msgstr "дрейф оси x" @@ -11997,6 +12116,42 @@ msgid "rows" msgstr "строк(и)" +#: modules/process/dune_synth.c:108 +msgid "Generates images by simulating formation of sand dunes." +msgstr "Создает изображения моделируя формирование песчаных дюн." + +#: modules/process/dune_synth.c:122 +msgid "/S_ynthetic/_Deposition/_Dunes..." +msgstr "/Син_тез/_Осаждение/_Дюны..." + +#: modules/process/dune_synth.c:126 +msgid "Generate image by transporting sand" +msgstr "Создать изображение переносом песка" + +#: modules/process/dune_synth.c:145 +msgid "_Minimum step" +msgstr "_Минимальный шаг" + +#: modules/process/dune_synth.c:146 +msgid "Step range" +msgstr "Диапазон шагов" + +#: modules/process/dune_synth.c:147 +msgid "Sticking probability on _rock" +msgstr "Вероятность _застрять на скалах" + +#: modules/process/dune_synth.c:148 +msgid "Sticking _probability on sand" +msgstr "_Вероятность застрять на песке" + +#: modules/process/dune_synth.c:149 +msgid "Maximum s_lope" +msgstr "Максимальный _уклон" + +#: modules/process/dune_synth.c:220 +msgid "Dunes" +msgstr "Дюны" + #: modules/process/dwt.c:64 msgid "Two-dimensional DWT (Discrete Wavelet Transform)." msgstr "Двумерное DWT (дискретное вейвлет-преобразование)" @@ -12307,7 +12462,7 @@ msgstr "Выбранный путь отсутствует." #: modules/process/extract_path.c:345 modules/process/extract_path.c:350 -#: modules/tools/distance.c:144 +#: modules/tools/distance.c:142 msgid "Distance" msgstr "Расстояние" @@ -12332,16 +12487,17 @@ msgstr "Выравнивание граней" #: modules/process/facet-level.c:158 modules/process/flatten_base.c:251 +#: modules/volume/volume_facetlevel.c:81 msgid "Facet-leveling..." msgstr "Выравнивание граней..." -#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:213 +#: modules/process/facet_analysis.c:315 modules/process/facet_measure.c:215 msgid "Visualizes, marks and measures facet orientation." msgstr "Показывает, помечает и измеряет положение граней в пространстве." #: modules/process/facet_analysis.c:329 msgid "/Measure _Features/Facet _Analysis..." -msgstr "/И_змерение/_Анализ граней..." +msgstr "/Измерение _особенностей/Анализ _граней..." #: modules/process/facet_analysis.c:333 msgid "Mark areas by 2D slope" @@ -12356,11 +12512,11 @@ msgid "_Number points" msgstr "_Нумеровать точки" -#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:448 +#: modules/process/facet_analysis.c:475 modules/process/facet_measure.c:431 msgid "_Clear" msgstr "О_чистить" -#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:383 +#: modules/process/facet_analysis.c:493 modules/process/facet_measure.c:379 msgid "_Mark" msgstr "_Пометить" @@ -12432,7 +12588,7 @@ msgid "Create _Points" msgstr "Создать _точки" -#: modules/process/facet_analysis.c:1209 +#: modules/process/facet_analysis.c:1209 modules/process/facet_measure.c:254 msgid "Save Facet Vectors" msgstr "Сохранить вектора граней" @@ -12441,43 +12597,43 @@ msgid "θ = %.2f deg, φ = %.2f deg" msgstr "θ = %.2f град, φ = %.2f град" -#: modules/process/facet_measure.c:227 +#: modules/process/facet_measure.c:229 msgid "/Measure _Features/Facet _Measurement..." -msgstr "/И_змерение/_Измерение граней..." +msgstr "/Измерение _особенностей/_Измерение граней..." -#: modules/process/facet_measure.c:231 +#: modules/process/facet_measure.c:233 msgid "Measure facet angles" msgstr "Измерить углы грани" -#: modules/process/facet_measure.c:246 +#: modules/process/facet_measure.c:248 msgid "_Facet plane size" msgstr "Площадь поверхности грани" -#: modules/process/facet_measure.c:247 +#: modules/process/facet_measure.c:249 msgid "_Tolerance" msgstr "_Допуск" -#: modules/process/facet_measure.c:248 modules/process/facet_measure.c:378 +#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:374 msgid "Selected φ" msgstr "Выбранный φ" -#: modules/process/facet_measure.c:250 modules/process/facet_measure.c:376 +#: modules/process/facet_measure.c:252 modules/process/facet_measure.c:372 msgid "Selected ϑ" msgstr "Выбранный ϑ" -#: modules/process/facet_measure.c:251 +#: modules/process/facet_measure.c:253 msgid "I_nstant facet marking" msgstr "Мгновенное об_новление" -#: modules/process/facet_measure.c:279 modules/process/facet_measure.c:351 +#: modules/process/facet_measure.c:280 modules/process/facet_measure.c:347 msgid "Measure Facets" msgstr "Измерить грани" -#: modules/process/facet_measure.c:384 +#: modules/process/facet_measure.c:380 msgid "Mea_sure" msgstr "_Измерить" -#: modules/process/facet_measure.c:538 +#: modules/process/facet_measure.c:541 msgid "points" msgstr "точки" @@ -12714,7 +12870,7 @@ msgid "Clear the entire filter mask" msgstr "Очистить всю маску фильтра" -#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:435 +#: modules/process/fft_filter_2d.c:498 modules/tools/maskedit.c:442 msgid "_Fill" msgstr "_Заполнить" @@ -12734,7 +12890,7 @@ msgid "Zoom:" msgstr "Масштаб:" -#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:577 +#: modules/process/fft_filter_2d.c:574 modules/volume/volume_psf.c:578 #: modules/volume/volume_slice.c:369 msgid "Output Options" msgstr "Параметры вывода" @@ -12803,7 +12959,7 @@ msgid "Triangle" msgstr "Треугольник" -#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:196 +#: modules/process/fibre_synth.c:184 modules/tools/spotremove.c:199 msgid "Rectangle" msgstr "Прямоугольник" @@ -12851,7 +13007,7 @@ msgstr "Случайные волокна" #: modules/process/fibre_synth.c:292 modules/process/obj_synth.c:364 -#: modules/tools/maskedit.c:224 modules/tools/spotremove.c:208 +#: modules/tools/maskedit.c:228 modules/tools/spotremove.c:211 msgid "Shape" msgstr "Форма" @@ -12865,7 +13021,7 @@ #: modules/process/fit-shape.c:251 msgid "/Measure _Features/_Fit Shape..." -msgstr "/И_змерение/Аппроксимировать _форму..." +msgstr "/Измерение _особенностей/Аппроксимировать _форму..." #: modules/process/fit-shape.c:255 modules/process/fit-shape.c:262 msgid "Fit geometrical shapes" @@ -12882,7 +13038,7 @@ msgstr "Аппроксимирующая фигура" #: modules/process/fit-shape.c:278 modules/process/mark_disconn.c:111 -#: modules/process/scars.c:125 +#: modules/process/scars.c:125 modules/volume/volume_scars.c:130 msgid "Both" msgstr "Оба" @@ -13141,6 +13297,7 @@ msgstr "Создать _маску" #: modules/process/good_profile.c:142 modules/process/linematch.c:181 +#: modules/volume/volume_linelevel.c:188 msgid "_Trim fraction" msgstr "Степень о_брезки" @@ -14127,7 +14284,7 @@ msgid "Corrects line defects (mostly experimental algorithms)." msgstr "Исправление дефектов линий (большая часть алгоритмов экспериментальна)" -#: modules/process/linecorrect.c:68 +#: modules/process/linecorrect.c:68 modules/volume/volume_stepline.c:64 msgid "/_Correct Data/Ste_p Line Correction" msgstr "/Исправить _данные/Линейная коррекция с_тупенек" @@ -14143,31 +14300,31 @@ msgid "Mark lines with inverted sign" msgstr "Выделить строки с инвертированным знаком" -#: modules/process/linematch.c:127 +#: modules/process/linematch.c:127 modules/volume/volume_linelevel.c:134 msgid "linematch|Polynomial" msgstr "Полиномиальное" -#: modules/process/linematch.c:129 +#: modules/process/linematch.c:129 modules/volume/volume_linelevel.c:136 msgid "Median of differences" msgstr "Срединное разностей" -#: modules/process/linematch.c:130 +#: modules/process/linematch.c:130 modules/volume/volume_linelevel.c:137 msgid "Modus" msgstr "Мода высоты" -#: modules/process/linematch.c:131 +#: modules/process/linematch.c:131 modules/volume/volume_linelevel.c:138 msgid "linematch|Matching" msgstr "Соответствие" -#: modules/process/linematch.c:132 +#: modules/process/linematch.c:132 modules/volume/volume_linelevel.c:139 msgid "Trimmed mean" msgstr "Усечённое среднее" -#: modules/process/linematch.c:133 +#: modules/process/linematch.c:133 modules/volume/volume_linelevel.c:140 msgid "Trimmed mean of differences" msgstr "Усечённое среднее разностей" -#: modules/process/linematch.c:134 +#: modules/process/linematch.c:134 modules/volume/volume_linelevel.c:141 msgid "Facet-level tilt" msgstr "Наклон с выравниванием граней" @@ -14175,7 +14332,7 @@ msgid "Aligns rows by various methods." msgstr "Выравнивает строки различными методами." -#: modules/process/linematch.c:154 +#: modules/process/linematch.c:154 modules/volume/volume_linelevel.c:162 msgid "/_Correct Data/_Align Rows..." msgstr "/Исправить _данные/Выровнять _строки..." @@ -14211,7 +14368,7 @@ msgid "Steps" msgstr "Ступеньки" -#: modules/process/lno_synth.c:196 +#: modules/process/lno_synth.c:196 modules/volume/volume_scars.c:221 msgid "Scars" msgstr "Царапины" @@ -14220,7 +14377,7 @@ msgstr "Борозды" #: modules/process/lno_synth.c:198 modules/process/tilt.c:173 -#: modules/tools/corrlen.c:144 +#: modules/tools/corrlen.c:145 msgid "Tilt" msgstr "Наклон" @@ -14364,7 +14521,7 @@ msgid "_Hessian" msgstr "_Гессиан" -#: modules/process/logistic.c:150 modules/process/maskcor.c:125 +#: modules/process/logistic.c:150 modules/process/maskcor.c:132 msgid "_Regularization parameter" msgstr "Параметр _регуляризации" @@ -14389,10 +14546,12 @@ msgstr "Пометить данные, не связанные с другими значениями" #: modules/process/mark_disconn.c:109 modules/process/scars.c:123 +#: modules/volume/volume_scars.c:128 msgid "Positive" msgstr "Положительные" #: modules/process/mark_disconn.c:110 modules/process/scars.c:124 +#: modules/volume/volume_scars.c:129 msgid "Negative" msgstr "Отрицательные" @@ -14525,7 +14684,7 @@ msgid "Two-sided" msgstr "Двустороннее" -#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:231 +#: modules/process/mask_edt.c:116 modules/tools/maskedit.c:235 msgid "Shrink from _border" msgstr "Ужать от _границы" @@ -14649,115 +14808,132 @@ msgid "Shift Mask" msgstr "Сдвинуть маску" -#: modules/process/maskcor.c:76 +#: modules/process/maskcor.c:82 msgid "Searches for a detail in another image using correlation." msgstr "Ищет фрагмент в другом изображении используя корреляцию." -#: modules/process/maskcor.c:90 +#: modules/process/maskcor.c:96 msgid "/M_ultidata/Correlation _Search..." msgstr "/М_ножественные данные/_Поиск по корреляции..." -#: modules/process/maskcor.c:94 +#: modules/process/maskcor.c:100 msgid "Search for a detail using correlation" msgstr "Найти фрагмент используя корреляцию" -#: modules/process/maskcor.c:103 +#: modules/process/maskcor.c:109 msgid "Correlation, raw" msgstr "Корреляция, как есть" -#: modules/process/maskcor.c:104 +#: modules/process/maskcor.c:110 msgid "Correlation, leveled" msgstr "Корреляция, выровненных" -#: modules/process/maskcor.c:105 modules/process/maskcor.c:113 -#: modules/process/maskcor.c:165 +#: modules/process/maskcor.c:111 modules/process/maskcor.c:120 +#: modules/process/maskcor.c:172 msgid "Correlation score" msgstr "Степень корреляции" -#: modules/process/maskcor.c:106 +#: modules/process/maskcor.c:112 msgid "Height difference, raw" msgstr "Разница высоты, как есть" -#: modules/process/maskcor.c:107 +#: modules/process/maskcor.c:113 msgid "Height difference, leveled" msgstr "Разница высоты, выровненных" -#: modules/process/maskcor.c:108 +#: modules/process/maskcor.c:114 msgid "Height difference score" msgstr "Оценка разницы высоты" -#: modules/process/maskcor.c:111 +#: modules/process/maskcor.c:115 +#, fuzzy +msgid "Phase-only score" +msgstr "Только фаза" + +#: modules/process/maskcor.c:118 msgid "Objects marked" msgstr "Помеченные объекты" -#: modules/process/maskcor.c:112 +#: modules/process/maskcor.c:119 msgid "Correlation maxima" msgstr "Максимумы корреляции" -#: modules/process/maskcor.c:126 +#: modules/process/maskcor.c:133 msgid "Correlation _method" msgstr "_Метод корреляции" -#: modules/process/maskcor.c:128 +#: modules/process/maskcor.c:135 msgid "Use _mask" msgstr "Использовать _маску" -#: modules/process/maskcor.c:129 +#: modules/process/maskcor.c:136 msgid "_Plot mask" msgstr "_Рисовать маску" -#: modules/process/maskcor.c:130 +#: modules/process/maskcor.c:137 msgid "_Detail to search" msgstr "_Фрагмент который ищем" -#: modules/process/maskcor.c:188 modules/process/maskcor.c:196 +#: modules/process/maskcor.c:205 modules/process/maskcor.c:216 msgid "Correlation Search" msgstr "Поиск корреляцией" -#: modules/process/maskops.c:44 +#: modules/process/maskops.c:46 msgid "Basic operations with mask: inversion, removal, extraction." msgstr "Основные операции с маской: инверсия, удаление, извлечение." -#: modules/process/maskops.c:58 +#: modules/process/maskops.c:60 msgid "/_Mask/_Remove Mask" msgstr "/_Маска/_Удалить маску" -#: modules/process/maskops.c:62 +#: modules/process/maskops.c:64 msgid "Remove mask from data" msgstr "Удалить маску из данных" -#: modules/process/maskops.c:65 +#: modules/process/maskops.c:67 msgid "/_Mask/_Invert Mask" msgstr "/_Маска/_Инвертировать маску" -#: modules/process/maskops.c:69 +#: modules/process/maskops.c:71 msgid "Invert mask" msgstr "Инвертировать маску" -#: modules/process/maskops.c:72 +#: modules/process/maskops.c:74 msgid "/_Mask/_Extract Mask" msgstr "/_Маска/Из_влечь маску" -#: modules/process/maskops.c:76 +#: modules/process/maskops.c:78 msgid "Extract mask to a new image" msgstr "Извлечь маску в новое изображение" -#: modules/process/maskops.c:79 +#: modules/process/maskops.c:81 +msgid "/_Grains/_Extract Numbers" +msgstr "/Зёрн_а/_Извлечь номера" + +#: modules/process/maskops.c:85 +msgid "Extract grain numbers to a new image" +msgstr "Извлечь номера зёрен в новое изображение" + +#: modules/process/maskops.c:88 msgid "/_Grains/_Remove Edge-Touching" msgstr "/Зёрн_а/_Удалить у границы" -#: modules/process/maskops.c:83 +#: modules/process/maskops.c:92 msgid "Remove grains touching image edges" msgstr "Удалить зёрна, касающиеся границ изображения" -#: modules/process/maskops.c:86 +#: modules/process/maskops.c:95 msgid "/_Mask/Thi_n" msgstr "/_Маска/_Тоньше" -#: modules/process/maskops.c:90 +#: modules/process/maskops.c:99 msgid "Thin mask" msgstr "Сделать маску тоньше" +#: modules/process/maskops.c:193 +msgid "Grain Numbers" +msgstr "Номера зёрен" + #: modules/process/mcrop.c:66 msgid "Crops non-intersecting regions of two images." msgstr "Обрезает непересекающиеся области двух изображений." @@ -14780,7 +14956,7 @@ #: modules/process/measure_lattice.c:156 msgid "/Measure _Features/_Lattice..." -msgstr "/И_змерение/_Решетка..." +msgstr "/Измерение _особенностей/_Решетка..." #: modules/process/measure_lattice.c:160 msgid "Measure lattice" @@ -14902,7 +15078,7 @@ msgid "Second image" msgstr "Второе изображение" -#: modules/process/merge.c:194 modules/tools/linestats.c:261 +#: modules/process/merge.c:194 modules/tools/linestats.c:264 #: modules/xyz/xyz_raster.c:632 msgid "Average" msgstr "Среднее" @@ -15265,7 +15441,7 @@ msgid "Use _first mask for all images" msgstr "Использовать _первую маску на всех изображениях" -#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:147 +#: modules/process/multiprofile.c:156 modules/tools/cprofile.c:148 msgid "_Mode" msgstr "Режим" @@ -15358,8 +15534,8 @@ msgid "Re_initialize" msgstr "Пере_инициализация" -#: modules/process/neural.c:577 modules/tools/corrlen.c:248 -#: modules/tools/filter.c:249 modules/tools/stats.c:247 +#: modules/process/neural.c:577 modules/tools/corrlen.c:251 +#: modules/tools/filter.c:249 modules/tools/stats.c:250 msgid "Masking Mode" msgstr "Режим использования маски" @@ -15882,6 +16058,65 @@ msgid "Pile Up Shapes" msgstr "Нагромождение форм" +#: modules/process/plateau_synth.c:131 +#, fuzzy +msgid "Generates images with stacked plateau-like structures." +msgstr "Генерирует структуры с разделением фаз." + +#: modules/process/plateau_synth.c:145 +#, fuzzy +msgid "/S_ynthetic/_Plateaus..." +msgstr "/Син_тез/_Структура..." + +#: modules/process/plateau_synth.c:149 +#, fuzzy +msgid "Generate image with random plateaus" +msgstr "Создать изображение с доменами" + +#: modules/process/plateau_synth.c:164 +#, fuzzy +msgid "Ma_ximum _size" +msgstr "Максимальная _ширина" + +#: modules/process/plateau_synth.c:165 +#, fuzzy +msgid "M_inimum size" +msgstr "_Минимальный шаг" + +#: modules/process/plateau_synth.c:166 +#, fuzzy +msgid "Size power _law" +msgstr "Разброс размеров" + +#: modules/process/plateau_synth.c:167 +msgid "Shape _irregularity" +msgstr "" + +#: modules/process/plateau_synth.c:168 +#, fuzzy +msgid "O_verlap fraction" +msgstr "Доля _уклонов" + +#: modules/process/plateau_synth.c:170 +#, fuzzy +msgid "Scale with _power of size" +msgstr "_Масштабируется с размером" + +#: modules/process/plateau_synth.c:172 +#, fuzzy +msgid "Height _spread" +msgstr "_Масштаб высот" + +#: modules/process/plateau_synth.c:240 +#, fuzzy +msgid "Random Plateaus" +msgstr "Случаная линейная" + +#: modules/process/plateau_synth.c:673 +#, fuzzy +msgid "Generating objects..." +msgstr "Генерация волокон..." + #: modules/process/polydistort.c:134 msgid "Applies polynomial distortion in the horizontal plane." msgstr "Накладывает полиномиальное искривление в горизонтальной плоскости." @@ -15942,10 +16177,6 @@ msgid "_Vertical polynomial degree" msgstr "_Вертикальная степень полинома" -#: modules/process/polylevel.c:145 modules/process/terracefit.c:306 -msgid "_Maximum polynomial degree" -msgstr "_Максимальная степень полинома" - #: modules/process/polylevel.c:148 msgid "_Same degrees" msgstr "_Одинаковые степени" @@ -15962,6 +16193,10 @@ msgid "Copy table to clipboard" msgstr "Скопировать таблицу в буфер обмена" +#: modules/process/polylevel.c:613 modules/tools/selectionmanager.c:677 +msgid "Save Table" +msgstr "Сохранение таблицы" + #: modules/process/presentationops.c:58 msgid "Basic operations with presentation: extraction, removal." msgstr "Базовые операции с презентациями: извлечение, удаление." @@ -16107,8 +16342,8 @@ #: modules/process/psf-fit.c:218 modules/process/psf-fit.c:280 #: modules/process/psf.c:195 modules/process/psf.c:206 -#: modules/process/psf.c:280 modules/volume/volume_psf.c:228 -#: modules/volume/volume_psf.c:327 +#: modules/process/psf.c:280 modules/volume/volume_psf.c:229 +#: modules/volume/volume_psf.c:328 msgid "Transfer function" msgstr "Передаточная функция" @@ -16128,7 +16363,7 @@ msgid "Transfer function estimation" msgstr "Оценка передаточной функции" -#: modules/process/psf.c:182 +#: modules/process/psf.c:182 modules/volume/volume_psf.c:268 msgid "/_Statistics/_Transfer Function Guess..." msgstr "/_Статистика/О_ценка передаточной функции..." @@ -16137,15 +16372,15 @@ msgstr "" "Оценить передаточную функцию из известных данных и идеального изображения" -#: modules/process/psf.c:200 modules/volume/volume_psf.c:321 +#: modules/process/psf.c:200 modules/volume/volume_psf.c:322 msgid "Regularized filter" msgstr "Регуляризованный фильтр" -#: modules/process/psf.c:201 modules/volume/volume_psf.c:322 +#: modules/process/psf.c:201 modules/volume/volume_psf.c:323 msgid "Least squares" msgstr "Наименьших квадратов" -#: modules/process/psf.c:202 modules/volume/volume_psf.c:323 +#: modules/process/psf.c:202 modules/volume/volume_psf.c:324 msgid "Wiener filter" msgstr "Фильтр Винера" @@ -16153,19 +16388,19 @@ msgid "_Border" msgstr "_Граница" -#: modules/process/psf.c:255 modules/volume/volume_psf.c:304 +#: modules/process/psf.c:255 modules/volume/volume_psf.c:305 msgid "Image is too small." msgstr "Изображение слишком маленькое." -#: modules/process/psf.c:316 modules/volume/volume_psf.c:358 +#: modules/process/psf.c:316 modules/volume/volume_psf.c:359 msgid "Estimate Transfer Function" msgstr "Оценить передаточную функцию" -#: modules/process/psf.c:318 modules/volume/volume_psf.c:359 +#: modules/process/psf.c:318 modules/volume/volume_psf.c:360 msgid "_Fit Sigma" msgstr "_Аппрокс. параметр регуляризации" -#: modules/process/psf.c:336 modules/volume/volume_psf.c:491 +#: modules/process/psf.c:336 modules/volume/volume_psf.c:492 msgid "Transfer Function Size" msgstr "Размер передаточной функции" @@ -16181,23 +16416,23 @@ msgid "Transfer Function" msgstr "Передаточная функция" -#: modules/process/psf.c:392 modules/volume/volume_psf.c:229 -#: modules/volume/volume_psf.c:349 +#: modules/process/psf.c:392 modules/volume/volume_psf.c:230 +#: modules/volume/volume_psf.c:350 msgid "TF width" msgstr "Ширина ПФ" -#: modules/process/psf.c:393 modules/volume/volume_psf.c:230 -#: modules/volume/volume_psf.c:350 +#: modules/process/psf.c:393 modules/volume/volume_psf.c:231 +#: modules/volume/volume_psf.c:351 msgid "TF height" msgstr "Высота ПФ" -#: modules/process/psf.c:394 modules/volume/volume_psf.c:231 -#: modules/volume/volume_psf.c:351 +#: modules/process/psf.c:394 modules/volume/volume_psf.c:232 +#: modules/volume/volume_psf.c:352 msgid "TF norm" msgstr "Норма ПФ" -#: modules/process/psf.c:395 modules/volume/volume_psf.c:232 -#: modules/volume/volume_psf.c:354 +#: modules/process/psf.c:395 modules/volume/volume_psf.c:233 +#: modules/volume/volume_psf.c:355 msgid "Difference norm" msgstr "Норма разницы" @@ -16322,7 +16557,7 @@ msgid "Proportion" msgstr "Пропорция" -#: modules/process/relate.c:201 modules/tools/corrlen.c:143 +#: modules/process/relate.c:201 modules/tools/corrlen.c:144 msgid "Offset" msgstr "Смещение" @@ -16541,7 +16776,7 @@ msgid "_Assume symmetry" msgstr "Предпол_агаемая симметрия" -#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:448 +#: modules/process/rotate.c:238 modules/volume/volume_swaxes.c:348 msgid "Rotated Data" msgstr "Повёрнутые данные" @@ -16617,23 +16852,23 @@ msgid "Correct horizontal scars (strokes)" msgstr "Убрать горизонтальные царапины" -#: modules/process/scars.c:134 +#: modules/process/scars.c:134 modules/volume/volume_scars.c:140 msgid "Scars type" msgstr "Тип царапин" -#: modules/process/scars.c:136 +#: modules/process/scars.c:136 modules/volume/volume_scars.c:142 msgid "_Hard threshold" msgstr "_Жёсткий порог" -#: modules/process/scars.c:137 +#: modules/process/scars.c:137 modules/volume/volume_scars.c:143 msgid "_Soft threshold" msgstr "_Мягкий порог" -#: modules/process/scars.c:138 +#: modules/process/scars.c:138 modules/volume/volume_scars.c:144 msgid "Minimum _length" msgstr "Минимальная _длина" -#: modules/process/scars.c:139 +#: modules/process/scars.c:139 modules/volume/volume_scars.c:145 msgid "Maximum _width" msgstr "Максимальная _ширина" @@ -16887,14 +17122,6 @@ msgid "Marked terraces" msgstr "Выделенные террасы" -#: modules/process/terracefit.c:282 -msgid "_Step detection kernel" -msgstr "_Ядро для детекции ступени" - -#: modules/process/terracefit.c:284 -msgid "Step detection _threshold" -msgstr "_Порог для детекции ступени" - #: modules/process/terracefit.c:289 msgid "Minimum terrace _area" msgstr "Минимальная _площадь террасы" @@ -16903,22 +17130,6 @@ msgid "Do not _segment, use only mask" msgstr "Не _сегментировать, только использовать маску" -#: modules/process/terracefit.c:304 -msgid "M_inimum polynomial degree" -msgstr "М_инимальная степень полинома" - -#: modules/process/terracefit.c:308 -msgid "Minimum broadening" -msgstr "Минимальное уширение" - -#: modules/process/terracefit.c:310 -msgid "Maximum broadening" -msgstr "Максимальное уширение" - -#: modules/process/terracefit.c:841 -msgid "Survey cannot be run with independent heights." -msgstr "Обзор нельзя запускать с независимыми степенями." - #: modules/process/threshold.c:96 msgid "Limit the data range using a lower/upper threshold." msgstr "Ограничивает диапазон данных используя порог сверху и снизу." @@ -16963,7 +17174,7 @@ msgid "Limit Range" msgstr "Ограничить диапазон данных" -#: modules/process/threshold.c:242 modules/tools/icolorange.c:333 +#: modules/process/threshold.c:242 modules/tools/icolorange.c:339 msgid "Set to _Full Range" msgstr "_Полный диапазон" @@ -17655,136 +17866,136 @@ msgid "Function written in Python" msgstr "Функция написанная на Python" -#: modules/tools/corrlen.c:119 +#: modules/tools/corrlen.c:120 msgid "Correlation length tool." msgstr "Инструмент длины корреляции." -#: modules/tools/corrlen.c:142 +#: modules/tools/corrlen.c:143 msgid "line-leveling|None" msgstr "Нет" -#: modules/tools/corrlen.c:156 +#: modules/tools/corrlen.c:157 msgid "Line leveling" msgstr "Выравнивание линий" -#: modules/tools/corrlen.c:159 modules/tools/stats.c:160 +#: modules/tools/corrlen.c:160 modules/tools/stats.c:161 msgid "Save Statistical Quantities" msgstr "Сохранять статистические величины" -#: modules/tools/corrlen.c:175 modules/tools/corrlen.c:176 -#: modules/tools/corrlen.c:757 +#: modules/tools/corrlen.c:177 modules/tools/corrlen.c:178 +#: modules/tools/corrlen.c:763 msgid "Correlation Length" msgstr "Длина корреляции" -#: modules/tools/corrlen.c:261 modules/tools/corrlen.c:771 +#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:777 msgid "Correlation Length T" msgstr "Длина корреляции T" -#: modules/tools/corrlen.c:265 modules/tools/corrlen.c:780 +#: modules/tools/corrlen.c:269 modules/tools/corrlen.c:786 msgid "Relation to Image Size" msgstr "Отношение к размеру изображения" -#: modules/tools/corrlen.c:760 modules/tools/stats.c:690 +#: modules/tools/corrlen.c:766 modules/tools/stats.c:693 msgid "Selected area" msgstr "Выбранная область" -#: modules/tools/corrlen.c:761 modules/tools/stats.c:691 +#: modules/tools/corrlen.c:767 modules/tools/stats.c:694 msgid "%{w}i × %{h}i at (%{x}i, %{y}i)" msgstr "%{w}i × %{h}i начиная с (%{x}i, %{y}i)" -#: modules/tools/corrlen.c:765 modules/tools/stats.c:695 +#: modules/tools/corrlen.c:771 modules/tools/stats.c:698 msgid "%{w}v × %{h}v at (%{x}v, %{y}v)" msgstr "%{w}v × %{h}v начиная с (%{x}v, %{y}v)" -#: modules/tools/corrlen.c:772 +#: modules/tools/corrlen.c:778 msgid "Naïve ACF decay to 1/e" msgstr "Наивное затухание АКФ до 1/e" -#: modules/tools/corrlen.c:773 +#: modules/tools/corrlen.c:779 msgid "Extrapolated ACF decay to 1/e" msgstr "Экстраполированное затухание АКФ до 1/e" -#: modules/tools/corrlen.c:774 +#: modules/tools/corrlen.c:780 msgid "ACF decay to zero" msgstr "Затухание АКФ до нуля" -#: modules/tools/corrlen.c:775 +#: modules/tools/corrlen.c:781 msgid "PSDF Gaussian fit" msgstr "Аппроксимация ФСПМ гауссианой" -#: modules/tools/corrlen.c:776 +#: modules/tools/corrlen.c:782 msgid "PSDF exponential fit" msgstr "Аппроксимация ФСПМ экспонентой" -#: modules/tools/corrlen.c:781 +#: modules/tools/corrlen.c:787 msgid "Ratio α = T/L" msgstr "Отношение α = T/L" -#: modules/tools/corrlen.c:782 +#: modules/tools/corrlen.c:788 msgid "Image size measured in T" msgstr "Размер изображения измеренный в T" -#: modules/tools/cprofile.c:113 +#: modules/tools/cprofile.c:114 msgid "Profile tool which reads horizontal and/or vertical scan lines." msgstr "" "Инструмент извлечения профилей, который считывает горизонтальные и/или " "вертикальные линии скана." -#: modules/tools/cprofile.c:151 +#: modules/tools/cprofile.c:152 msgid "Cross at _zero" msgstr "Пересечение в _нуле" -#: modules/tools/cprofile.c:168 +#: modules/tools/cprofile.c:170 msgid "Profiles Along Axes" msgstr "Профили вдоль осей" -#: modules/tools/cprofile.c:169 +#: modules/tools/cprofile.c:171 msgid "Read horizontal and/or vertical profiles" msgstr "Получить горизонтальные и/или вертикальные профили" -#: modules/tools/cprofile.c:240 modules/tools/profile.c:224 -#: modules/tools/profile.c:302 +#: modules/tools/cprofile.c:243 modules/tools/profile.c:226 +#: modules/tools/profile.c:305 msgid "Profiles" msgstr "Профили" -#: modules/tools/cprofile.c:284 modules/tools/linestats.c:266 -#: modules/tools/profile.c:346 modules/tools/rprofile.c:298 -#: modules/tools/sfunctions.c:326 modules/tools/spectro.c:292 +#: modules/tools/cprofile.c:287 modules/tools/linestats.c:269 +#: modules/tools/profile.c:349 modules/tools/rprofile.c:301 +#: modules/tools/sfunctions.c:333 modules/tools/spectro.c:292 msgid "Options" msgstr "Параметры" -#: modules/tools/cprofile.c:747 +#: modules/tools/cprofile.c:752 #, c-format msgid "Vertical profile %d" msgstr "Вертикальный профиль %d" -#: modules/tools/cprofile.c:749 +#: modules/tools/cprofile.c:754 #, c-format msgid "Horizontal profile %d" msgstr "Горизонтальный профиль %d" -#: modules/tools/crop.c:77 +#: modules/tools/crop.c:78 msgid "Crop tool, crops data to smaller size." msgstr "Инструмент кадрирования, обрезает данные до меньшего размера." -#: modules/tools/distance.c:98 +#: modules/tools/distance.c:94 msgid "Distance measurement tool, measures distances and angles." msgstr "Инструмент измерения расстояний, измеряет расстояния и углы." +#: modules/tools/distance.c:123 +msgid "Save Distance Table" +msgstr "Сохранить таблицу расстояний" + #. TRANSLATORS: Number is verb here. -#: modules/tools/distance.c:129 modules/tools/distance.c:234 -#: modules/tools/profile.c:199 modules/tools/rprofile.c:163 +#: modules/tools/distance.c:126 modules/tools/profile.c:200 +#: modules/tools/rprofile.c:164 msgid "_Number lines" msgstr "_Нумеровать линии" -#: modules/tools/distance.c:145 +#: modules/tools/distance.c:143 msgid "Measure distances and directions between points" msgstr "Измерить расстояния и углы между точками" -#: modules/tools/distance.c:227 -msgid "Save Distance Table" -msgstr "Сохранить таблицу расстояний" - #: modules/tools/filter.c:117 msgid "" "Filter tool, processes selected part of data with a filter (conservative " @@ -17844,7 +18055,7 @@ "Инструмент удаления зёрен, удаляет непрерывные части маски и/или данные под " "ними." -#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:190 +#: modules/tools/grainremover.c:118 modules/tools/spotremove.c:193 msgid "Laplace solver" msgstr "Решение уравнения Лапласа" @@ -17852,7 +18063,7 @@ msgid "Fractal correction" msgstr "Фрактальная коррекция" -#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:192 +#: modules/tools/grainremover.c:120 modules/tools/spotremove.c:195 msgid "Fractal-Laplace blend" msgstr "Фрактально-лапласова смесь" @@ -17860,7 +18071,7 @@ msgid "Remove" msgstr "Удалить" -#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:206 +#: modules/tools/grainremover.c:132 modules/tools/spotremove.c:209 msgid "_Interpolation method" msgstr "Метод _интерполяции" @@ -17872,7 +18083,7 @@ msgid "Remove individual grains (continuous parts of mask)" msgstr "Убрать отдельные зёрна (непрерывные части маски)" -#: modules/tools/icolorange.c:140 +#: modules/tools/icolorange.c:144 msgid "" "Interactive color range tool, allows selecting the data range false color " "scale should map to, either on data or on height distribution histogram." @@ -17881,66 +18092,74 @@ "данных, которому будет соответствовать шкала псевдоцвета, как на наборе " "данных, так и на гистограмме распределения высот." -#: modules/tools/icolorange.c:170 +#: modules/tools/icolorange.c:174 msgid "_Start" msgstr "_Начало" -#: modules/tools/icolorange.c:171 +#: modules/tools/icolorange.c:175 msgid "_End" msgstr "_Конец" -#: modules/tools/icolorange.c:186 +#: modules/tools/icolorange.c:176 +msgid "_Adapt color range to selection" +msgstr "_Адаптировать диапазон цвета к фрагменту" + +#: modules/tools/icolorange.c:192 msgid "Color Range" msgstr "Диапазон цвета" -#: modules/tools/icolorange.c:187 +#: modules/tools/icolorange.c:193 msgid "Stretch color range to part of data" msgstr "Растянуть диапазон цветов по части данных" -#: modules/tools/icolorange.c:249 +#: modules/tools/icolorange.c:255 msgid "Full color range from minimum to maximum" msgstr "Полный цветовой диапазон от минимума до максимума" -#: modules/tools/icolorange.c:253 +#: modules/tools/icolorange.c:259 msgid "Explicitly set fixed color range" msgstr "Точно установить фиксированный диапазон цветов" -#: modules/tools/icolorange.c:257 +#: modules/tools/icolorange.c:263 msgid "Automatic color range with tails cut off" msgstr "Автоматический цветовой диапазон с обрезкой хвостов распределения" -#: modules/tools/icolorange.c:261 +#: modules/tools/icolorange.c:267 msgid "Adaptive nonlinear color mapping" msgstr "Адаптивная нелинейная установка цвета" -#: modules/tools/icolorange.c:294 +#: modules/tools/icolorange.c:300 msgid "_default" msgstr "по _умолчанию" -#: modules/tools/icolorange.c:301 +#: modules/tools/icolorange.c:307 msgid "Height histogram" msgstr "Гистограмма высот" -#: modules/tools/icolorange.c:325 +#: modules/tools/icolorange.c:331 msgid "Color Mapping" msgstr "Наложение псевдоцвета" -#: modules/tools/icolorange.c:330 +#: modules/tools/icolorange.c:336 msgid "Set to _Masked" msgstr "Под _маской" -#: modules/tools/icolorange.c:332 +#: modules/tools/icolorange.c:338 msgid "Set to _Unmasked" msgstr "_Не под маской" -#: modules/tools/icolorange.c:334 +#: modules/tools/icolorange.c:340 msgid "_Invert Mapping" msgstr "_Инвертировать шкалу" -#: modules/tools/icolorange.c:335 +#: modules/tools/icolorange.c:343 msgid "Data Range" msgstr "Диапазон данных" +#: modules/tools/icolorange.c:346 +msgid "Set Zero to Color Map Minimum" +msgstr "Установить нуль в минимум цветовой шкалы" + #: modules/tools/level3.c:91 msgid "" "Three-point level tool, levels data by subtracting a plane fitted through " @@ -17949,7 +18168,7 @@ "Инструмент выравнивания по трём точкам, выравнивает данные вычитанием " "плоскости, проходящей через три выбранные точки." -#: modules/tools/level3.c:120 modules/tools/readvalue.c:175 +#: modules/tools/level3.c:120 modules/tools/readvalue.c:178 msgid "_Averaging radius" msgstr "Радиус _усреднения" @@ -17969,7 +18188,7 @@ msgid "Level data by fitting a plane through three points" msgstr "Выровнять данные построив плоскость по трём точкам" -#: modules/tools/linestats.c:105 +#: modules/tools/linestats.c:106 msgid "" "Row/column statistical function tool, mean values, medians, maxima, minima, " "RMS, ..., of rows or columns." @@ -17977,127 +18196,131 @@ "Функция статистики по строке/столбцу, средние, срединные, максимумы, " "минимумы. среднеквадратичные, и т.п., строк и столбцов." -#: modules/tools/linestats.c:121 modules/volume/volume_linestat.c:149 +#: modules/tools/linestats.c:122 modules/volume/volume_linestat.c:149 msgid "tan β0" msgstr "tan β0" -#: modules/tools/linestats.c:149 +#: modules/tools/linestats.c:150 msgid "Ro_ws" msgstr "Стро_ки" -#: modules/tools/linestats.c:150 +#: modules/tools/linestats.c:151 msgid "Co_lumns" msgstr "С_толбцы" -#: modules/tools/linestats.c:181 +#: modules/tools/linestats.c:183 msgid "Row/Column Statistics" msgstr "Статистика по столбцам/строкам" -#: modules/tools/linestats.c:182 +#: modules/tools/linestats.c:184 msgid "Calculate row/column statistical functions" msgstr "Рассчитать статистические функции для строки/колонки" -#: modules/tools/maskedit.c:151 +#: modules/tools/maskedit.c:155 msgid "Mask editor tool, allows interactive modification of parts of the mask." msgstr "Редактор маски, позволяет интерактивно изменять части маски." -#: modules/tools/maskedit.c:192 +#: modules/tools/maskedit.c:196 msgid "_Shapes" msgstr "_Фигуры" -#: modules/tools/maskedit.c:193 +#: modules/tools/maskedit.c:197 msgid "_Drawing Tools" msgstr "И_нструменты рисования" -#: modules/tools/maskedit.c:196 +#: modules/tools/maskedit.c:200 msgid "Set mask to selection" msgstr "Установить маску равной выбранному" -#: modules/tools/maskedit.c:197 +#: modules/tools/maskedit.c:201 msgid "Add selection to mask" msgstr "Добавить выбранное к маске" -#: modules/tools/maskedit.c:198 +#: modules/tools/maskedit.c:202 msgid "Subtract selection from mask" msgstr "Вычесть выбранное из маски" -#: modules/tools/maskedit.c:199 +#: modules/tools/maskedit.c:203 msgid "Intersect selection with mask" msgstr "Пересечение выбранного и маски" -#: modules/tools/maskedit.c:202 +#: modules/tools/maskedit.c:206 msgid "Rectangular shapes" msgstr "Прямоугольные формы" -#: modules/tools/maskedit.c:203 +#: modules/tools/maskedit.c:207 msgid "Elliptic shapes" msgstr "Эллиптические формы" -#: modules/tools/maskedit.c:204 +#: modules/tools/maskedit.c:208 msgid "Thin lines" msgstr "Тонкие линии" -#: modules/tools/maskedit.c:207 +#: modules/tools/maskedit.c:211 msgid "Freehand mask drawing" msgstr "Свободное рисование маски" -#: modules/tools/maskedit.c:208 +#: modules/tools/maskedit.c:212 msgid "Freehand mask erasing" msgstr "Свободное стирание маски" -#: modules/tools/maskedit.c:209 +#: modules/tools/maskedit.c:213 msgid "Fill continuous empty areas with mask" msgstr "Заполнение непрерывных пустых областей маской" -#: modules/tools/maskedit.c:210 +#: modules/tools/maskedit.c:214 msgid "Erase continuous parts of mask" msgstr "Удаление непрерывных частей маски" -#: modules/tools/maskedit.c:229 +#: modules/tools/maskedit.c:233 msgid "_Amount" msgstr "_Количество" -#: modules/tools/maskedit.c:230 modules/tools/maskedit.c:449 +#: modules/tools/maskedit.c:234 modules/tools/maskedit.c:456 msgid "Fill non-simple-connected" msgstr "Заполнять неодносвязные" -#: modules/tools/maskedit.c:232 +#: modules/tools/maskedit.c:236 msgid "_Prevent grain merging by growing" msgstr "_Предотвращать слияние зёрен при растяжении" -#: modules/tools/maskedit.c:248 +#: modules/tools/maskedit.c:239 +msgid "Thin lines are 4-connected" +msgstr "4х-связные тонкие линии" + +#: modules/tools/maskedit.c:254 msgid "Mask Editor" msgstr "Редактор маски" -#: modules/tools/maskedit.c:249 +#: modules/tools/maskedit.c:255 msgid "Edit mask" msgstr "Редактировать маску" -#: modules/tools/maskedit.c:302 +#: modules/tools/maskedit.c:308 msgid "Editor" msgstr "Редактор" -#: modules/tools/maskedit.c:313 +#: modules/tools/maskedit.c:320 msgid "Actions" msgstr "Действия" -#: modules/tools/maskedit.c:317 +#: modules/tools/maskedit.c:324 msgid "Grow/Shrink" msgstr "Растянуть/Ужать" -#: modules/tools/maskedit.c:433 +#: modules/tools/maskedit.c:440 msgid "_Invert" msgstr "_Инвертировать" -#: modules/tools/maskedit.c:447 +#: modules/tools/maskedit.c:454 msgid "Fill _Voids" msgstr "З_аполнить Пустоты" -#: modules/tools/maskedit.c:464 +#: modules/tools/maskedit.c:471 msgid "_Grow" msgstr "_Растянуть" -#: modules/tools/maskedit.c:465 +#: modules/tools/maskedit.c:472 msgid "Shrin_k" msgstr "_Ужать" @@ -18115,103 +18338,107 @@ msgid "Level rows using intersections with given lines" msgstr "Выровнять строки используя пересечения с заданными линиями" -#: modules/tools/profile.c:158 +#: modules/tools/profile.c:159 msgid "Profile tool, creates profile graphs from selected lines." msgstr "Инструмент профиля, создает графики профилей вдоль выбранных линий." -#: modules/tools/profile.c:181 +#: modules/tools/profile.c:182 msgid "calib-data|None" msgstr "Нет" -#: modules/tools/profile.c:200 modules/tools/rprofile.c:164 +#: modules/tools/profile.c:201 modules/tools/rprofile.c:165 msgid "_Separate profiles" msgstr "_Разделить профили" -#: modules/tools/profile.c:207 +#: modules/tools/profile.c:209 msgid "_Show profile" msgstr "_Показать профиль" -#: modules/tools/profile.c:208 +#: modules/tools/profile.c:210 msgid "_Calibration data" msgstr "Данные _калибровки" -#: modules/tools/profile.c:225 +#: modules/tools/profile.c:227 msgid "Extract profiles along arbitrary lines" msgstr "Извлечь профили вдоль произвольных линий" -#: modules/tools/profile.c:353 +#: modules/tools/profile.c:356 msgid "Improve _Direction" msgstr "Улучшить _направление" -#: modules/tools/profile.c:354 +#: modules/tools/profile.c:357 msgid "Improve _All" msgstr "Улушить _всё" -#: modules/tools/profile.c:606 +#: modules/tools/profile.c:607 #, c-format msgid "X error %d" msgstr "Ошибка по X %d" -#: modules/tools/profile.c:610 +#: modules/tools/profile.c:611 #, c-format msgid "Y error %d" msgstr "Ошибка по Y %d" -#: modules/tools/profile.c:614 +#: modules/tools/profile.c:615 #, c-format msgid "Z error %d" msgstr "Ошибка по Z %d" -#: modules/tools/profile.c:618 +#: modules/tools/profile.c:619 #, c-format msgid "X uncertainty %d" msgstr "Погрешность по X %d" -#: modules/tools/profile.c:622 +#: modules/tools/profile.c:623 #, c-format msgid "Y uncertainty %d" msgstr "Погрешность по Y %d" -#: modules/tools/profile.c:626 +#: modules/tools/profile.c:627 #, c-format msgid "Z uncertainty %d" msgstr "Погрешность по Z %d" -#: modules/tools/profile.c:630 +#: modules/tools/profile.c:631 #, c-format msgid "Zunc up bound %d" msgstr "Верхняя граница погрешности Z %d" -#: modules/tools/profile.c:634 +#: modules/tools/profile.c:635 #, c-format msgid "Zunc low bound %d" msgstr "Нижняя граница погрешности Z %d" -#: modules/tools/readvalue.c:146 +#: modules/tools/readvalue.c:149 msgid "Pointer tool, reads value under pointer." msgstr "Инструмент указатель, считывает данные под указателем." -#: modules/tools/readvalue.c:176 +#: modules/tools/readvalue.c:179 msgid "Show _selection" msgstr "Показать _выбранное" -#: modules/tools/readvalue.c:191 +#: modules/tools/readvalue.c:181 modules/tools/spotremove.c:214 +msgid "Adapt color range to detail" +msgstr "Адаптировать диапазон цвета к фрагменту" + +#: modules/tools/readvalue.c:196 msgid "Read Value" msgstr "Считать значение" -#: modules/tools/readvalue.c:192 +#: modules/tools/readvalue.c:197 msgid "Read value under mouse cursor" msgstr "Считать значение под курсором мыши" -#: modules/tools/readvalue.c:329 +#: modules/tools/readvalue.c:332 msgid "Set _Zero" msgstr "Установить _нуль" -#: modules/tools/readvalue.c:333 +#: modules/tools/readvalue.c:336 msgid "Facet" msgstr "Грань" -#: modules/tools/readvalue.c:335 +#: modules/tools/readvalue.c:338 msgid "Curvatures" msgstr "Кривизна" @@ -18219,16 +18446,16 @@ msgid "Calculate surface profile parameters." msgstr "Рассчитывает параметры профиля поверхности." -#: modules/tools/roughness.c:173 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:173 modules/tools/roughness.c:1001 msgid "Texture" msgstr "Текстура" -#: modules/tools/roughness.c:174 modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:174 modules/tools/roughness.c:1001 msgid "Waviness" msgstr "Волнистость" #: modules/tools/roughness.c:175 modules/tools/roughness.c:211 -#: modules/tools/roughness.c:1000 +#: modules/tools/roughness.c:1001 msgid "Roughness" msgstr "Шероховатость" @@ -18240,7 +18467,7 @@ msgid "BRC" msgstr "ООК" -#: modules/tools/roughness.c:178 modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:178 modules/tools/roughness.c:1002 msgid "Peak Count" msgstr "Число пиков" @@ -18252,181 +18479,181 @@ msgid "Calculate roughness parameters" msgstr "Рассчитать параметры шероховатости" -#: modules/tools/roughness.c:371 +#: modules/tools/roughness.c:372 msgid "Roughness Parameters" msgstr "Параметры шероховатости" -#: modules/tools/roughness.c:374 +#: modules/tools/roughness.c:375 msgid "Selected line" msgstr "Выбранная линия" -#: modules/tools/roughness.c:375 +#: modules/tools/roughness.c:376 msgid "(%{x1}i, %{y1}i) to (%{x2}i, %{y2}i)" msgstr "от (%{x1}i, %{y1}i) до (%{x2}i, %{y2}i)" -#: modules/tools/roughness.c:379 +#: modules/tools/roughness.c:380 msgid "(%{x1}v, %{y1}v) to (%{x2}v, %{y2}v)" msgstr "от (%{x1}v, %{y1}v) до (%{x2}v, %{y2}v)" -#: modules/tools/roughness.c:382 +#: modules/tools/roughness.c:383 msgid "Cut-off" msgstr "Порог" -#: modules/tools/roughness.c:386 +#: modules/tools/roughness.c:387 msgid "Roughness average" msgstr "Средняя шероховатость" -#: modules/tools/roughness.c:389 +#: modules/tools/roughness.c:390 msgid "Root mean square roughness" msgstr "Среднеквадратичная шероховатость" -#: modules/tools/roughness.c:392 +#: modules/tools/roughness.c:393 msgid "Maximum height of the roughness" msgstr "Максимальная высота шероховатости" -#: modules/tools/roughness.c:395 +#: modules/tools/roughness.c:396 msgid "Maximum roughness valley depth" msgstr "Максимальная глубина впадины шероховатости" -#: modules/tools/roughness.c:398 +#: modules/tools/roughness.c:399 msgid "Maximum roughness peak height" msgstr "Максимальная высота пика шероховатости" -#: modules/tools/roughness.c:401 modules/tools/roughness.c:419 +#: modules/tools/roughness.c:402 modules/tools/roughness.c:420 msgid "Average maximum height of the roughness" msgstr "Средняя максимальная высота шероховатости" -#: modules/tools/roughness.c:404 +#: modules/tools/roughness.c:405 msgid "Average maximum roughness valley depth" msgstr "Средняя максимальная глубина долины шероховатости" -#: modules/tools/roughness.c:407 +#: modules/tools/roughness.c:408 msgid "Average maximum roughness peak height" msgstr "Средняя максимальная высота пика шероховатости" -#: modules/tools/roughness.c:410 modules/tools/roughness.c:413 +#: modules/tools/roughness.c:411 modules/tools/roughness.c:414 msgid "Average third highest peak to third lowest valley height" msgstr "" "Среднее отношение высоты третьего по высоте пика к глубине третьей по " "глубине впадины" -#: modules/tools/roughness.c:416 +#: modules/tools/roughness.c:417 msgid "Average maximum height of the profile" msgstr "Средняя максимальная высота профиля" -#: modules/tools/roughness.c:422 +#: modules/tools/roughness.c:423 msgid "Maximum peak to valley roughness" msgstr "Максимальная шероховатость от пика до впадины" -#: modules/tools/roughness.c:425 +#: modules/tools/roughness.c:426 msgid "Skewness" msgstr "Коэффициент асимметрии" -#: modules/tools/roughness.c:428 +#: modules/tools/roughness.c:429 msgid "Kurtosis" msgstr "Эксцесс" -#: modules/tools/roughness.c:431 +#: modules/tools/roughness.c:432 msgid "Waviness average" msgstr "Средняя волнистость" -#: modules/tools/roughness.c:434 +#: modules/tools/roughness.c:435 msgid "Root mean square waviness" msgstr "Среднеквадратичная волнистость" -#: modules/tools/roughness.c:437 +#: modules/tools/roughness.c:438 msgid "Waviness maximum height" msgstr "Максимальная высота волнистости" -#: modules/tools/roughness.c:440 +#: modules/tools/roughness.c:441 msgid "Maximum height of the profile" msgstr "Максимальная высота профиля" -#: modules/tools/roughness.c:445 +#: modules/tools/roughness.c:446 msgid "Spatial" msgstr "Пространственные" -#: modules/tools/roughness.c:452 +#: modules/tools/roughness.c:453 msgid "Mean spacing of profile irregularities" msgstr "Среднее расстояние между неровностями профиля" -#: modules/tools/roughness.c:455 +#: modules/tools/roughness.c:456 msgid "Average wavelength of the profile" msgstr "Средняя длина волны профиля" -#: modules/tools/roughness.c:458 +#: modules/tools/roughness.c:459 msgid "Root mean square (RMS) wavelength of the profile" msgstr "Среднеквадратичная длина волны профиля" -#: modules/tools/roughness.c:463 +#: modules/tools/roughness.c:464 msgid "parameters|Hybrid" msgstr "Гибридные" -#: modules/tools/roughness.c:464 +#: modules/tools/roughness.c:465 msgid "Average absolute slope" msgstr "Средний по модулю наклон" -#: modules/tools/roughness.c:467 +#: modules/tools/roughness.c:468 msgid "Root mean square (RMS) slope" msgstr "Среднеквадратичный наклон" -#: modules/tools/roughness.c:473 +#: modules/tools/roughness.c:474 msgid "Developed profile length" msgstr "Длина растянутого профиля" -#: modules/tools/roughness.c:476 +#: modules/tools/roughness.c:477 msgid "Profile length ratio" msgstr "Относительная длина профиля" -#: modules/tools/roughness.c:481 +#: modules/tools/roughness.c:482 msgid "parameters|Functional" msgstr "Функциональные" -#: modules/tools/roughness.c:482 +#: modules/tools/roughness.c:483 msgid "Swedish height" msgstr "Шведская высота" -#: modules/tools/roughness.c:824 +#: modules/tools/roughness.c:825 msgid "No profile in the image selected." msgstr "На изображении не выбрано профилей." -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "Amplitude Distribution Function" msgstr "Функция распределения амплитуды" -#: modules/tools/roughness.c:1001 +#: modules/tools/roughness.c:1002 msgid "The Bearing Ratio Curve" msgstr "Относительная опорная кривая" -#: modules/tools/roughness.c:1031 +#: modules/tools/roughness.c:1032 msgid "Surface Profiles" msgstr "Профили поверхности" -#: modules/tools/rprofile.c:132 +#: modules/tools/rprofile.c:133 msgid "Creates angularly averaged profile graphs." msgstr "Создаёт графики усреднённых по углу профилей." -#: modules/tools/rprofile.c:182 +#: modules/tools/rprofile.c:184 msgid "Radial Profiles" msgstr "Радиальные профили" -#: modules/tools/rprofile.c:183 +#: modules/tools/rprofile.c:185 msgid "Extract angularly averaged profiles" msgstr "Извлечь профили, усреднённые по углу" -#: modules/tools/rprofile.c:254 +#: modules/tools/rprofile.c:257 msgid "Radial profiles" msgstr "Радиальные профили" -#: modules/tools/rprofile.c:302 +#: modules/tools/rprofile.c:305 msgid "S_ymmetrize" msgstr "Сделать с_имметричным" -#: modules/tools/rprofile.c:304 +#: modules/tools/rprofile.c:307 msgid "Symmetrize _All" msgstr "Сделать симметричным вс_е" -#: modules/tools/rprofile.c:520 +#: modules/tools/rprofile.c:525 #, c-format msgid "Radial profile %d" msgstr "Радиальный профиль %d" @@ -18463,7 +18690,7 @@ msgid "_Copy" msgstr "_Копировать" -#: modules/tools/sfunctions.c:159 +#: modules/tools/sfunctions.c:162 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -18473,35 +18700,43 @@ "(распределение высоты, корреляции, функция спектральной плотности мощности " "(ФСПМ, PSDF), функционалы Минковского) выбранной части данных." -#: modules/tools/sfunctions.c:175 +#: modules/tools/sfunctions.c:178 msgid "Radial PSDF" msgstr "Радиальная ФСПМ" -#: modules/tools/sfunctions.c:176 +#: modules/tools/sfunctions.c:179 msgid "Angular spectrum" msgstr "Уголовой спектр" -#: modules/tools/sfunctions.c:177 +#: modules/tools/sfunctions.c:180 msgid "Radial ACF" msgstr "Радиальная АКФ" -#: modules/tools/sfunctions.c:178 +#: modules/tools/sfunctions.c:181 msgid "Minkowski volume" msgstr "Объём Минковского" -#: modules/tools/sfunctions.c:179 +#: modules/tools/sfunctions.c:182 msgid "Minkowski boundary" msgstr "Граница Минковского" -#: modules/tools/sfunctions.c:180 +#: modules/tools/sfunctions.c:183 msgid "Minkowski connectivity" msgstr "Связность Минковского" -#: modules/tools/sfunctions.c:182 +#: modules/tools/sfunctions.c:185 msgid "Area scale graph" msgstr "График функции относительной площади" -#: modules/tools/sfunctions.c:219 +#: modules/tools/sfunctions.c:186 +msgid "IDF" +msgstr "ФРГ" + +#: modules/tools/sfunctions.c:187 +msgid "Radial IDF" +msgstr "Радиальная ФРГ" + +#: modules/tools/sfunctions.c:224 msgid "_Separate uncertainty" msgstr "_Разделить погрешность" @@ -18529,7 +18764,7 @@ msgid "Spectroscopy" msgstr "Спектроскопия" -#: modules/tools/spotremove.c:165 +#: modules/tools/spotremove.c:168 msgid "" "Spot removal tool, interpolates small parts of data (displayed on a zoomed " "view) using selected algorithm." @@ -18537,154 +18772,187 @@ "Инструмент удаления пятен, интерполирует небольшие области данных " "(отображаемые в масштабированном виде) используя выбранный алгоритм." -#: modules/tools/spotremove.c:188 +#: modules/tools/spotremove.c:191 msgid "Hyperbolic flatten" msgstr "Выравнивание гиперболами" -#: modules/tools/spotremove.c:189 +#: modules/tools/spotremove.c:192 msgid "Pseudo-Laplace" msgstr "Псевдо-лапласов" -#: modules/tools/spotremove.c:191 +#: modules/tools/spotremove.c:194 msgid "Fractal interpolation" msgstr "Фрактальная интерполяция" -#: modules/tools/spotremove.c:197 +#: modules/tools/spotremove.c:200 msgid "Ellipse" msgstr "Эллипс" -#: modules/tools/spotremove.c:224 +#: modules/tools/spotremove.c:229 msgid "Remove Spots" msgstr "Убрать пятна" -#: modules/tools/spotremove.c:225 +#: modules/tools/spotremove.c:230 msgid "Interpolate small defects, manually selected" msgstr "Интерполировать небольшие дефекты, выбранные вручную" -#: modules/tools/spotremove.c:701 +#: modules/tools/spotremove.c:751 msgid "No point in the image selected." msgstr "Не выбраны точки на изображении." -#: modules/tools/spotremove.c:702 +#: modules/tools/spotremove.c:752 msgid "No area in the zoom selected." msgstr "Не выбрана область на увеличенном изображении." -#: modules/tools/stats.c:129 +#: modules/tools/stats.c:130 msgid "Statistics tool." msgstr "Инструмент статистики." -#: modules/tools/stats.c:177 +#: modules/tools/stats.c:179 msgid "Statistical quantities" msgstr "Статистические величины" -#: modules/tools/stats.c:258 +#: modules/tools/stats.c:262 msgid "Moment-Based" msgstr "Основанные на моментах" -#: modules/tools/stats.c:262 +#: modules/tools/stats.c:266 msgid "Order-Based" msgstr "Порядковые" -#: modules/tools/stats.c:266 +#: modules/tools/stats.c:270 msgid "Hybrid" msgstr "Гибридные" -#: modules/tools/stats.c:270 +#: modules/tools/stats.c:274 msgid "Other" msgstr "Прочие" -#: modules/tools/stats.c:701 +#: modules/tools/stats.c:704 msgid "Average value" msgstr "Среднее значение" -#: modules/tools/stats.c:702 +#: modules/tools/stats.c:705 msgid "RMS roughness" msgstr "Среднеквадратичная шероховатость" -#: modules/tools/stats.c:703 +#: modules/tools/stats.c:706 msgid "RMS (grain-wise)" msgstr "Ср. квадр. зёрен" -#: modules/tools/stats.c:704 modules/volume/volume_planestat.c:208 +#: modules/tools/stats.c:707 modules/volume/volume_planestat.c:208 msgid "Mean roughness" msgstr "Средняя шероховатость" -#: modules/tools/stats.c:713 +#: modules/tools/stats.c:716 msgid "Maximum peak height" msgstr "Максимальная высота пика" -#: modules/tools/stats.c:714 +#: modules/tools/stats.c:717 msgid "Maximum pit depth" msgstr "Максимальная глубина впадины" -#: modules/tools/stats.c:715 +#: modules/tools/stats.c:718 msgid "Maximum height" msgstr "Максимальная высота" -#: modules/tools/stats.c:727 +#: modules/tools/stats.c:730 msgid "Surface slope" msgstr "Наклон поверхности" -#: modules/tools/stats.c:744 +#: modules/tools/stats.c:747 msgid "Scan line discrepancy" msgstr "Расхождение линий сканирования" -#: modules/volume/volume_arithmetic.c:136 +#: modules/volume/volume_addframe.c:99 +msgid "Add one frame to volume data stack" +msgstr "Добавить один фрейм к стеку объёмных данных" + +#: modules/volume/volume_addframe.c:113 +msgid "/_Basic Operations/I_nsert XY Plane..." +msgstr "/_Базовые действия/Вставит_ь плоскость XY..." + +#: modules/volume/volume_addframe.c:117 +msgid "Insert single XY plane to some level." +msgstr "Вставить отдельную плоскость XY на некотором уровне." + +#: modules/volume/volume_addframe.c:132 +msgid "Data to insert" +msgstr "Данные для вставки" + +#: modules/volume/volume_addframe.c:170 +msgid "Frame added" +msgstr "Добавлен фрейм" + +#: modules/volume/volume_addframe.c:208 +msgid "Add XY Plane" +msgstr "Добавить плоскость XY" + +#: modules/volume/volume_addframe.c:222 +msgid "Insert _Before Current Level" +msgstr "Вставить _перед текущим уровнем" + +#: modules/volume/volume_addframe.c:224 +msgid "_Replace Current Level" +msgstr "_Заменить текущий уровень" + +#: modules/volume/volume_addframe.c:226 +msgid "Insert _After Current Level" +msgstr "Вставить п_осле текущего уровня" + +#: modules/volume/volume_arithmetic.c:145 msgid "Simple arithmetic operations with volume data." msgstr "Просты арифметические операции над объёмными данными." -#: modules/volume/volume_arithmetic.c:156 -msgid "/_Arithmetic..." -msgstr "/_Арифметические операции..." +#: modules/volume/volume_arithmetic.c:159 +msgid "/_Basic Operations/_Arithmetic..." +msgstr "/_Базовые действия/_Арифметика..." -#: modules/volume/volume_arithmetic.c:160 +#: modules/volume/volume_arithmetic.c:163 msgid "Arithmetic operations on volume data" msgstr "Арифметические операции над объёмными данными" -#: modules/volume/volume_arithmetic.c:572 +#: modules/volume/volume_arithmetic.c:558 +#: modules/volume/volume_xyarithmetics.c:591 msgid "Z-axis calibrations differ" msgstr "Калибровки оси Z различаются" -#: modules/volume/volume_asciiexport.c:94 +#: modules/volume/volume_asciiexport.c:72 msgid "Exports volume data in simple ASCII formats." msgstr "Экспортирует объёмные данные в простые форматы ASCII." -#: modules/volume/volume_asciiexport.c:108 -msgid "/Export _Text..." -msgstr "/Экспортировать _текст..." +#: modules/volume/volume_asciiexport.c:86 +msgid "/_Basic Operations/Export _Text..." +msgstr "/_Базовые действия/Экспортировать _текст..." -#: modules/volume/volume_asciiexport.c:112 +#: modules/volume/volume_asciiexport.c:90 msgid "Export volume data to a text file" msgstr "Экспортировать объёмные данные в текстовый файл" -#: modules/volume/volume_asciiexport.c:166 +#: modules/volume/volume_asciiexport.c:99 msgid "VTK structured grid" msgstr "Структурная сетка VTK" -#: modules/volume/volume_asciiexport.c:167 +#: modules/volume/volume_asciiexport.c:100 msgid "One Z-profile per line" msgstr "Один профиль вдоль Z на линию" -#: modules/volume/volume_asciiexport.c:168 +#: modules/volume/volume_asciiexport.c:101 msgid "One XY-layer per line" msgstr "Один слой XY на линию" -#: modules/volume/volume_asciiexport.c:169 +#: modules/volume/volume_asciiexport.c:102 msgid "Blank-line separated matrices" msgstr "Матрицы. разделённые пустыми строками" -#: modules/volume/volume_asciiexport.c:208 -msgid "_Precision:" -msgstr "_Точность:" +#: modules/volume/volume_asciiexport.c:142 modules/volume/volume_extract.c:256 +msgid "Volume data" +msgstr "Объёмные данные" #: modules/volume/volume_calibrate.c:142 msgid "Recalibrate volume data dimensions or value range." msgstr "Перекалибровывать разрешения объёмных данных или диапазон значений." -#: modules/volume/volume_calibrate.c:156 -msgid "/_Dimensions and Units..." -msgstr "/Р_азмеры и единицы измерения..." - #: modules/volume/volume_calibrate.c:170 msgid "Match voxel size" msgstr "Выровнять с размером вокселя" @@ -18714,7 +18982,7 @@ msgstr "Множитель калибровки зн_ачений" #: modules/volume/volume_calibrate.c:228 modules/volume/volume_mfmrecalc.c:332 -#: modules/volume/volume_swaxes.c:219 +#: modules/volume/volume_swaxes.c:129 msgid "Create new volume data" msgstr "Создать новый блок объёмных данных" @@ -18726,14 +18994,75 @@ msgid "Z Dimension" msgstr "Размеры по Z" +#: modules/volume/volume_drift.c:142 +msgid "Estimates drift across stacked high-speed SPM frames." +msgstr "Оценивает дрейф между последовательными фреймами высокоскоростной СЗМ." + +#: modules/volume/volume_drift.c:156 +msgid "/_Correct Data/Estimate _Drift..." +msgstr "/_Исправить данные/Оценить _дрейф..." + +#: modules/volume/volume_drift.c:160 +msgid "Estimates drift" +msgstr "Оценивает дрейф" + +#: modules/volume/volume_drift.c:169 +msgid "_Extract drift" +msgstr "_Извлечь дрейф" + +#: modules/volume/volume_drift.c:170 +msgid "_Crop data" +msgstr "_Кадрировать данные" + +#: modules/volume/volume_drift.c:175 +msgid "_Z" +msgstr "_Z" + +#: modules/volume/volume_drift.c:185 +msgid "Show direction" +msgstr "Показать направление" + +#: modules/volume/volume_drift.c:244 modules/volume/volume_drift.c:245 +msgid "Lateral drift" +msgstr "Горизонтальный дрейф" + +#: modules/volume/volume_drift.c:255 modules/xyz/xyz_drift.c:421 +msgid "y-axis drift" +msgstr "дрейф оси y" + +#: modules/volume/volume_drift.c:264 modules/volume/volume_drift.c:265 +#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 +msgid "Z drift" +msgstr "Дрейф Z" + +#: modules/volume/volume_drift.c:270 modules/xyz/xyz_drift.c:440 +msgid "z-axis drift" +msgstr "дрейф оси z" + +#: modules/volume/volume_drift.c:279 +msgid "Drift corrected" +msgstr "Дрейф исправлен" + +#: modules/volume/volume_drift.c:330 +msgid "Estimate drift" +msgstr "Оценить дрейф" + +#: modules/volume/volume_drift.c:449 +msgid "Updating z drift data..." +msgstr "Обновление данных о дрейфе по z..." + +#: modules/volume/volume_drift.c:513 +msgid "Updating lateral drift data..." +msgstr "Обновление данных о горизонтальном дрейфе..." + #: modules/volume/volume_equiplane.c:140 msgid "Extracts z-coordinates of isosurfaces from volume data to an image." msgstr "" "Извлекает z-координаты изоповерхностей из объёмных данных в изображение." #: modules/volume/volume_equiplane.c:154 -msgid "/_Isosurface Image..." -msgstr "/Изображение изоповер_хности..." +msgid "/SPM M_odes/_Isosurface Image..." +msgstr "/_Режимы СЗМ/_Изображение изоповерхности..." #: modules/volume/volume_equiplane.c:158 msgid "Extract z-coordinates of isosurface" @@ -18760,81 +19089,93 @@ msgid "Isosurface z for %.*f %s" msgstr "Изоповерхность z для %.*f %s" -#: modules/volume/volume_extract.c:186 +#: modules/volume/volume_extract.c:183 msgid "Shows 3D representations of volume data" msgstr "Показывает трёхмерное представление объёмных данных" -#: modules/volume/volume_extract.c:200 -msgid "/3D View..." -msgstr "/Трёхмерный вид..." +#: modules/volume/volume_extract.c:197 +msgid "/_Basic Operations/3D View..." +msgstr "/_Базовые действия/Просмотр 3D..." -#: modules/volume/volume_extract.c:204 +#: modules/volume/volume_extract.c:201 msgid "Show a 3D view for the volume data" msgstr "Показать трёхмерный вид объёмных данных" -#: modules/volume/volume_extract.c:274 -msgid "Volume data" -msgstr "Объёмные данные" - -#: modules/volume/volume_extract.c:277 +#: modules/volume/volume_extract.c:259 msgid "_Render" msgstr "От_рисовать" -#: modules/volume/volume_extract.c:287 +#: modules/volume/volume_extract.c:269 msgid "_Save image" msgstr "_Сохранить изображение" -#: modules/volume/volume_extract.c:342 +#: modules/volume/volume_extract.c:324 msgid "Wireframe threshold" msgstr "Порог сетки" -#: modules/volume/volume_extract.c:356 +#: modules/volume/volume_extract.c:338 msgid "Opacity scale" msgstr "Значение прозрачности" -#: modules/volume/volume_extract.c:362 +#: modules/volume/volume_extract.c:344 msgid "Apply perspective" msgstr "Применить перспективу" -#: modules/volume/volume_extract.c:371 +#: modules/volume/volume_extract.c:353 msgid "Instant 3D render" msgstr "Мгновенная отрисовка 3D" -#: modules/volume/volume_extract.c:425 +#: modules/volume/volume_extract.c:407 msgid "X view" msgstr "Вид X" -#: modules/volume/volume_extract.c:430 +#: modules/volume/volume_extract.c:412 msgid "Y view" msgstr "Вид Y" -#: modules/volume/volume_extract.c:435 +#: modules/volume/volume_extract.c:417 msgid "Z view" msgstr "Вид Z" -#: modules/volume/volume_extract.c:616 +#: modules/volume/volume_extract.c:605 msgid "No image was rendered so far" msgstr "Изображение ещё не отрисовывалось" -#: modules/volume/volume_extract.c:621 +#: modules/volume/volume_extract.c:610 msgid "Export 3D view" msgstr "Экспортировать трёхмерный вид" -#: modules/volume/volume_extract.c:638 +#: modules/volume/volume_extract.c:627 msgid "Cairo error while saving image" msgstr "Ошибка cairo при сохранении изображения" -#: modules/volume/volume_extract.c:1454 +#: modules/volume/volume_extract.c:1424 msgid "Building wireframe model..." msgstr "Строится каркасная модель..." +#: modules/volume/volume_facetlevel.c:44 +msgid "Performs facet leveling on all XY planes" +msgstr "Выполняет выравнивание граней на всех плоскостях XY" + +#: modules/volume/volume_facetlevel.c:58 +msgid "/_Correct Data/_XY Facet Level" +msgstr "/Исправить _данные/_Выравнивание граней XY" + +#: modules/volume/volume_facetlevel.c:62 +msgid "Facet leveling of all XY planes" +msgstr "Выравнивание граней всех плоскостей XY" + +#: modules/volume/volume_facetlevel.c:85 +msgid "Facet leveled" +msgstr "Грани выровнены" + #: modules/volume/volume_fdfit.c:199 msgid "Evaluate volume force-distance data" msgstr "Рассчитать объёмные данные сила-расстояние" #: modules/volume/volume_fdfit.c:213 -msgid "/_Evaluate FD Data..." -msgstr "/Расс_читать данные сила-расстояние..." +msgid "/SPM M_odes/_Evaluate FD Data..." +msgstr "/_Режимы СЗМ/_Оценка данных FD..." #: modules/volume/volume_fdfit.c:217 msgid "Evaluate force-distance volume data" @@ -18856,10 +19197,6 @@ msgid "Inverts value in volume data" msgstr "Инвертирует значения в объёмных данных" -#: modules/volume/volume_invert.c:53 -msgid "/_Invert Value" -msgstr "/_Инвертировать значение" - #: modules/volume/volume_invert.c:57 msgid "Invert value in volume data" msgstr "Инвертирует значения в объёмных данных" @@ -18869,8 +19206,8 @@ msgstr "Рассчитывает кластеризацию K-средних для объёмных данных." #: modules/volume/volume_kmeans.c:109 -msgid "/_K-Means Clustering..." -msgstr "/_Кластеризация K-средних..." +msgid "/_Statistics/_K-Means Clustering..." +msgstr "/_Статистика/_Кластеризация K-средних..." #: modules/volume/volume_kmeans.c:113 msgid "Calculate K-means clustering on volume data" @@ -18933,8 +19270,8 @@ msgstr "Рассчитывает кластеризацию K-срединных для объёмных данных." #: modules/volume/volume_kmedians.c:102 -msgid "/_K-Medians Clustering..." -msgstr "/Кластеризация K-сре_динных..." +msgid "/_Statistics/_K-Medians Clustering..." +msgstr "/_Статистика/_Кластеризация K-срединных..." #: modules/volume/volume_kmedians.c:106 msgid "Calculate K-medians clustering on volume data" @@ -18968,8 +19305,8 @@ msgstr "Создаёт карту кривых из объёмных данных." #: modules/volume/volume_lawnize.c:99 -msgid "/Convert to _Curve Map..." -msgstr "/Конвертировать в карту крив_ых..." +msgid "/_Basic Operations/Convert to _Curve Map..." +msgstr "/_Basic Operations/Преобразовать в _Карту кривых..." #: modules/volume/volume_lawnize.c:103 msgid "Convert to curve map" @@ -18995,6 +19332,23 @@ msgid "Z calibration" msgstr "Калибровка оси Z" +#: modules/volume/volume_linelevel.c:148 +msgid "Performe line leveling for all the volume data levels." +msgstr "" +"Выполняет выравнивание строк для всех уровней данных в объемном изображении." + +#: modules/volume/volume_linelevel.c:166 +msgid "Performs line leveling of all levels" +msgstr "Выполнить выравнивание строк на всех уровнях" + +#: modules/volume/volume_linelevel.c:227 +msgid "Line leveled" +msgstr "Выровненные строки" + +#: modules/volume/volume_linelevel.c:265 +msgid "Line level" +msgstr "Выравнивание строк" + #: modules/volume/volume_linestat.c:163 msgid "Summarizes profiles of volume data to a channel." msgstr "" @@ -19002,8 +19356,8 @@ "канале." #: modules/volume/volume_linestat.c:177 -msgid "/Summarize _Profiles..." -msgstr "/Характеризоват_ь профили..." +msgid "/_Statistics/Summarize _Profiles..." +msgstr "/_Статистика/Характеризоват_ь профили..." #: modules/volume/volume_linestat.c:181 modules/volume/volume_strayfield.c:165 msgid "Summarize profiles" @@ -19021,9 +19375,36 @@ msgid "Summarize Volume Profiles" msgstr "Характеризовать профили объёмных данных" +#: modules/volume/volume_localdetect.c:86 +msgid "Perform localization merge" +msgstr "Объединить с лучшей локализацией" + +#: modules/volume/volume_localdetect.c:100 +#, fuzzy +msgid "/SPM M_odes/_Localization Merge..." +msgstr "/_Режимы СЗМ/Объединение с локализацией..." + +#: modules/volume/volume_localdetect.c:104 +msgid "Performs localization merge of all the levels" +msgstr "Объединяет все уровни выбирая лучшую локализацию особенностей" + +#: modules/volume/volume_localdetect.c:119 +msgid "_Peak width" +msgstr "_Ширина пика" + +#: modules/volume/volume_localdetect.c:156 +#, fuzzy +msgid "Localization result" +msgstr "Результат локализации" + +#: modules/volume/volume_localdetect.c:191 +#, fuzzy +msgid "Localization Merge" +msgstr "Объединение с локализацией" + #: modules/volume/volume_mfmrecalc.c:116 -msgid "/_Magnetic Data to Force Gradient..." -msgstr "/_Магнитные данные в градиент силы..." +msgid "/SPM M_odes/_Magnetic Data to Force Gradient..." +msgstr "/_Режимы СЗМ/_Магнитные данные в градиент силы..." #: modules/volume/volume_mfmrecalc.c:233 msgid "Recalculated Data" @@ -19054,8 +19435,8 @@ msgstr "Удаляет выпадающие на всех плоскостях XY" #: modules/volume/volume_outliers.c:58 -msgid "/_XY Plane Outliers" -msgstr "/_Выпадающие на плоскостях XY" +msgid "/_Correct Data/_XY Plane Outliers" +msgstr "/Исправить _данные/_Выпадающие плоскости XY" #: modules/volume/volume_outliers.c:62 msgid "Remove outliers from XY planes" @@ -19066,20 +19447,24 @@ msgstr "Выравнивает все плоскости XY" #: modules/volume/volume_planelevel.c:58 -msgid "/_XY Plane Level" -msgstr "/Вы_равнивание плоскостей XY" +msgid "/_Correct Data/_XY Plane Level" +msgstr "/Исправить _данные/_Выровнять плоскость XY" #: modules/volume/volume_planelevel.c:62 msgid "Level all XY planes" msgstr "Выровнять все плоскости XY" +#: modules/volume/volume_planelevel.c:85 +msgid "Leveled" +msgstr "Выровненные" + #: modules/volume/volume_planestat.c:231 msgid "Summarizes volume data planes to a graph." msgstr "Сводит плоскости объёмных данных в график." #: modules/volume/volume_planestat.c:245 -msgid "/Summarize P_lanes..." -msgstr "/Характеризовать _плоскости..." +msgid "/_Statistics/Summarize P_lanes..." +msgstr "/_Статистика/Характеризовать _плоскости..." #: modules/volume/volume_planestat.c:249 msgid "Summarize planes" @@ -19093,74 +19478,107 @@ msgid "Summarize Volume Planes" msgstr "Характеризовать плоскости объёмных данных" -#: modules/volume/volume_psf.c:253 +#: modules/volume/volume_psf.c:254 msgid "Calculates the volume PSF." msgstr "Расчитывает объёмную PSF." -#: modules/volume/volume_psf.c:267 -msgid "/_Transfer Function Guess..." -msgstr "/О_ценка передаточной функции..." - -#: modules/volume/volume_psf.c:271 +#: modules/volume/volume_psf.c:272 msgid "Estimate transfer function from known data and ideal images" msgstr "" "Оценить передаточную функцию из известных данных и идеальных изображений" -#: modules/volume/volume_psf.c:409 +#: modules/volume/volume_psf.c:410 msgid "_Ideal response:" msgstr "Идеальный отклик:" -#: modules/volume/volume_psf.c:418 +#: modules/volume/volume_psf.c:419 msgid "_Method:" msgstr "_Метод:" -#: modules/volume/volume_psf.c:425 +#: modules/volume/volume_psf.c:426 msgid "_Sigma:" msgstr "Параметр _регуляризации:" -#: modules/volume/volume_psf.c:433 +#: modules/volume/volume_psf.c:434 msgid "_Estimate sigma for each level" msgstr "Оц_енить параметр регуляризации для каждого уровня" -#: modules/volume/volume_psf.c:444 +#: modules/volume/volume_psf.c:445 msgid "_Estimate size for each level" msgstr "О_ценить размер для каждого уровня" -#: modules/volume/volume_psf.c:459 +#: modules/volume/volume_psf.c:460 msgid "_Windowing type:" msgstr "Тип о_кна:" -#: modules/volume/volume_psf.c:466 +#: modules/volume/volume_psf.c:467 msgid "_Z level:" msgstr "_Уровень Z:" -#: modules/volume/volume_psf.c:474 +#: modules/volume/volume_psf.c:475 msgid "Sigma fitted at Z level:" msgstr "Параметр регуляризации на уровне Z:" -#: modules/volume/volume_psf.c:512 +#: modules/volume/volume_psf.c:513 msgid "_Border:" msgstr "_Граница:" -#: modules/volume/volume_psf.c:1078 +#: modules/volume/volume_psf.c:542 +msgid "_Display:" +msgstr "_Показать:" + +#: modules/volume/volume_psf.c:1079 msgid "Calculating volume transfer function..." msgstr "Расчёт передаточной функции для объёма..." -#: modules/volume/volume_psf.c:1273 +#: modules/volume/volume_psf.c:1274 msgid "Volume TF" msgstr "Объёмная ПФ" -#: modules/volume/volume_psf.c:1292 +#: modules/volume/volume_psf.c:1293 msgid "z level" msgstr "уровень z" +#: modules/volume/volume_removeframe.c:91 +msgid "Remove one frame from volume data stack" +msgstr "Удалить один фрейм из стопки объёмных данных" + +#: modules/volume/volume_removeframe.c:105 +msgid "/_Basic Operations/_Remove XY Plane..." +msgstr "/_Базовые действия/_Удалить плоскость XY..." + +#: modules/volume/volume_removeframe.c:109 +msgid "Remove single XY plane" +msgstr "Удалить отдельную плоскость XY" + +#: modules/volume/volume_removeframe.c:125 +msgid "_Extract the plane" +msgstr "_Извлечь плоскость" + +#: modules/volume/volume_removeframe.c:165 +msgid "Frame removed" +msgstr "Фрейм удалён" + +#: modules/volume/volume_removeframe.c:186 +#, c-format +msgid "Extracted frame (%d)" +msgstr "Извлеченный фрейм (%d)" + +#: modules/volume/volume_removeframe.c:223 +msgid "Remove XY Plane" +msgstr "Удалить плоскость XY" + +#: modules/volume/volume_removeframe.c:236 +msgid "_Remove Current Level" +msgstr "_Удалить текущий уровень" + #: modules/volume/volume_rephase.c:150 msgid "Swaps phase in continuous data based on user's selection" msgstr "Меняет фазу для непрерывных данных основываясь на выборе пользователя" #: modules/volume/volume_rephase.c:164 -msgid "/_Adjust Phase..." -msgstr "/Настроить _фазу..." +msgid "/SPM M_odes/_Adjust Phase..." +msgstr "/_Режимы СЗМ/_Настроить фазу..." #: modules/volume/volume_rephase.c:168 msgid "Change phase in continuous data" @@ -19211,13 +19629,33 @@ msgid "Volume Z graphs" msgstr "Графики Z объёма" +#: modules/volume/volume_scars.c:101 +msgid "Performs scars removal for all the volume data levels." +msgstr "Производит удаление штрихов/царапин на всех уровнях объёмных данных." + +#: modules/volume/volume_scars.c:115 +msgid "/_Correct Data/_Scars..." +msgstr "/Исправить _данные/_Убрать царапины..." + +#: modules/volume/volume_scars.c:119 +msgid "Remove scars in all levels" +msgstr "Удалить царапины на всех уровнях" + +#: modules/volume/volume_scars.c:181 +msgid "Scars corrected" +msgstr "Царапины исправлены" + +#: modules/volume/volume_scars.c:364 +msgid "Removing scars..." +msgstr "Удаление царапин..." + #: modules/volume/volume_slice.c:199 msgid "Extracts image planes and line graphs from volume data." msgstr "Извлекает плоскости с изображениями и графики из объёмных данных." #: modules/volume/volume_slice.c:213 -msgid "/Cut and _Slice..." -msgstr "/Вырезать..." +msgid "/_Basic Operations/Cut and _Slice..." +msgstr "/_Базовые действия/_Вырезать..." #: modules/volume/volume_slice.c:217 msgid "Extract image planes and line graphs" @@ -19281,6 +19719,23 @@ msgid "Volume Y graphs" msgstr "Графики Y объёма" +#: modules/volume/volume_stepline.c:50 +msgid "Performs step line correction" +msgstr "Делает линейную коррекцию ступеней" + +#: modules/volume/volume_stepline.c:68 +#, fuzzy +msgid "Step line correction in all XY planes" +msgstr "Исправление строк со ступенями на всех плоскостях XY" + +#: modules/volume/volume_stepline.c:87 +msgid "Step line correction..." +msgstr "Линейная коррекция ступеней..." + +#: modules/volume/volume_stepline.c:91 +msgid "Step line corrected" +msgstr "Линейная коррекция ступеней выполнена" + #: modules/volume/volume_strayfield.c:132 msgid "Single value evolution" msgstr "Эволюция отдельного значения" @@ -19294,8 +19749,8 @@ msgstr "Проверяет соответствие зависимости поля утечки." #: modules/volume/volume_strayfield.c:161 -msgid "/_Stray Field Consistency..." -msgstr "/Соответствие _поля утечки..." +msgid "/SPM M_odes/_Stray Field Consistency..." +msgstr "/_Режимы СЗМ/_Согласованность поля рассеяния..." #: modules/volume/volume_strayfield.c:254 msgid "Stray field consistency check" @@ -19309,70 +19764,162 @@ msgid "Building stray field dependence..." msgstr "Построение зависимости поля рассеяния..." -#: modules/volume/volume_swaxes.c:104 +#: modules/volume/volume_swaxes.c:82 msgid "Swaps axes of volume data." msgstr "Меняет местами оси объёмных данных." -#: modules/volume/volume_swaxes.c:118 -msgid "/S_wap Axes..." -msgstr "/Поменять м_естами оси..." +#: modules/volume/volume_swaxes.c:96 +msgid "/_Basic Operations/S_wap Axes..." +msgstr "/_Базовые действия/По_менять местами оси..." -#: modules/volume/volume_swaxes.c:122 +#: modules/volume/volume_swaxes.c:100 msgid "Swap axes" msgstr "Поменять местами оси" -#: modules/volume/volume_swaxes.c:156 +#: modules/volume/volume_swaxes.c:109 msgid "X" msgstr "X" -#: modules/volume/volume_swaxes.c:157 +#: modules/volume/volume_swaxes.c:110 msgid "X, reversed" msgstr "X, в обратном порядке" -#: modules/volume/volume_swaxes.c:158 +#: modules/volume/volume_swaxes.c:111 msgid "Y" msgstr "Y" -#: modules/volume/volume_swaxes.c:159 +#: modules/volume/volume_swaxes.c:112 msgid "Y, reversed" msgstr "Y, в обратном порядке" -#: modules/volume/volume_swaxes.c:160 +#: modules/volume/volume_swaxes.c:113 msgid "Z" msgstr "Z" -#: modules/volume/volume_swaxes.c:161 +#: modules/volume/volume_swaxes.c:114 msgid "Z, reversed" msgstr "Z, в обратном порядке" -#: modules/volume/volume_swaxes.c:175 +#: modules/volume/volume_swaxes.c:123 +msgid "Current _X axis will become" +msgstr "Текущая ось X станет" + +#: modules/volume/volume_swaxes.c:125 +msgid "Current _Y axis will become" +msgstr "Текущая ось Y станет" + +#: modules/volume/volume_swaxes.c:127 +msgid "Current _Z axis will become" +msgstr "Текущая ось Z станет" + +#: modules/volume/volume_swaxes.c:176 msgid "Swap Volume Axes" msgstr "Поменять местами оси" -#: modules/volume/volume_swaxes.c:196 -msgid "Current _X axis will become:" -msgstr "Текущая ось _X станет:" - -#: modules/volume/volume_swaxes.c:204 -msgid "Current _Y axis will become:" -msgstr "Текущая ось _Y станет:" - -#: modules/volume/volume_swaxes.c:212 -msgid "Current _Z axis will become:" -msgstr "Текущая ось _Z станет:" - -#: modules/volume/volume_swaxes.c:286 +#: modules/volume/volume_swaxes.c:222 msgid "Z axis calibration will be lost." msgstr "Калибровка оси Z будет утеряна." +#: modules/volume/volume_xyarithmetics.c:146 +msgid "Simple arithmetic operations with volume and plane data." +msgstr "Простые арифметические операции над объёмными данными и плоскостями." + +#: modules/volume/volume_xyarithmetics.c:160 +msgid "/_Basic Operations/_XY Arithmetic..." +msgstr "/_Базовые действия/_Арифметика XY..." + +#: modules/volume/volume_xyarithmetics.c:164 +msgid "Arithmetic operations on volume and plane data" +msgstr "Арифметические операции над объёмными данными и плоскостями." + +#: modules/volume/volume_xyarithmetics.c:280 +msgid "Volume - Plane Arithmetic" +msgstr "Арифметика объёма и плоскости" + +#: modules/volume/volume_xyarithmetics.c:323 +msgid "Volume data:" +msgstr "Объёмные данные:" + +#: modules/volume/volume_xyarithmetics.c:332 +msgid "Images:" +msgstr "Изображения:" + +#: modules/volume/volume_xyarithmetics.c:555 +msgid "No volume data in the expression" +msgstr "В выражении нет объёмных данных" + +#: modules/volume/volume_xystitch.c:96 +msgid "Merges all XY planes into XYZ data" +msgstr "Объединяет все плоскости XY в данные XYZ" + +#: modules/volume/volume_xystitch.c:110 +msgid "/SPM M_odes/_XY Stitch..." +msgstr "/_Режимы СЗМ/С_шивание XY..." + +#: modules/volume/volume_xystitch.c:114 +msgid "Merge all the XY planes to XYZ data" +msgstr "Объединить все плоскости XY в данные XYZ" + +#: modules/volume/volume_xystitch.c:129 +msgid "_X offsets graph" +msgstr "График смещений X" + +#: modules/volume/volume_xystitch.c:130 +msgid "X _offsets curve" +msgstr "Кривая смещений X" + +#: modules/volume/volume_xystitch.c:131 +msgid "_Y offsets graph" +msgstr "График смещений Y" + +#: modules/volume/volume_xystitch.c:132 +msgid "Y o_ffsets curve" +msgstr "Кривая смещений Y" + +#: modules/volume/volume_xystitch.c:133 +msgid "_Flip X axis" +msgstr "_Перевернуть ось X" + +#: modules/volume/volume_xystitch.c:134 +msgid "_Flip Y axis" +msgstr "_Перевернуть ось Y" + +#: modules/volume/volume_xystitch.c:135 +msgid "_Adjust shifts" +msgstr "_Настроить сдвиги" + +#: modules/volume/volume_xystitch.c:136 +msgid "A_djust rotation" +msgstr "Н_астроить поворот" + +#: modules/volume/volume_xystitch.c:137 +msgid "_Shift range" +msgstr "_Диапазон сдвигов" + +#: modules/volume/volume_xystitch.c:138 +msgid "_Rotation range" +msgstr "Диапазон _поворотов" + +#: modules/volume/volume_xystitch.c:179 +msgid "Stitched" +msgstr "Сшитые" + +#: modules/volume/volume_xystitch.c:212 +msgid "XY Stitch" +msgstr "Сшивание XY" + +#: modules/volume/volume_xystitch.c:214 +msgid "verb|_Stitch" +msgstr "Сшить" + #: modules/volume/volume_zcal.c:112 msgid "Attaches, extracts and removes volume data z-axis calibration." msgstr "" "Присоединяет, извлекает и удаляет калибровку оси Z для объёмных данных." #: modules/volume/volume_zcal.c:126 -msgid "/_Z-Calibration..." -msgstr "/Калибровка _Z..." +msgid "/_Basic Operations/_Z-Calibration..." +msgstr "/_Базовые действия/_Калибровка Z..." #: modules/volume/volume_zcal.c:130 msgid "Manage z-axis calibration" @@ -19446,8 +19993,8 @@ "месте." #: modules/volume/volume_zposlevel.c:162 -msgid "/S_hift Value To Zero..." -msgstr "/С_двинуть значение в нуль..." +msgid "/_Correct Data/S_hift Value To Zero..." +msgstr "/Исправить _данные/С_двинуть значение в нуль..." #: modules/volume/volume_zposlevel.c:166 msgid "Shift value at some z plane to zero" @@ -19459,13 +20006,29 @@ msgstr "Смещено в нуль для уровня z = %d" #: modules/volume/volumeops.c:53 -msgid "/Extract _Preview" -msgstr "/Извлечь изображение _предпросмотра" +msgid "/_Basic Operations/Extract _Preview" +msgstr "/_Базовые действия/Извлечь изображение _предпросмотра" #: modules/volume/volumeops.c:57 msgid "Extract volume data preview to an image" msgstr "Извлечь изображение предпросмотра из объёмных данных" +#: modules/xyz/xyz_autocrop.c:46 +msgid "Simple XYZ automated crop." +msgstr "Простая автоматическая обрезка данных XYZ" + +#: modules/xyz/xyz_autocrop.c:60 +msgid "/Crop Automatically" +msgstr "/Обрезать автоматически" + +#: modules/xyz/xyz_autocrop.c:64 +msgid "Crop data automatically to cover scanned areas" +msgstr "Кадрировать данные автоматически чтобы покрывать сканированные области" + +#: modules/xyz/xyz_autocrop.c:90 +msgid "Cropped" +msgstr "Кадрированные" + #: modules/xyz/xyz_drift.c:267 msgid "Analyzes drift in XYZ data." msgstr "Анализирует дрейф в данных XYZ." @@ -19494,18 +20057,6 @@ msgid "Y drift" msgstr "Дрейф Y" -#: modules/xyz/xyz_drift.c:421 -msgid "y-axis drift" -msgstr "дрейф оси y" - -#: modules/xyz/xyz_drift.c:429 modules/xyz/xyz_drift.c:851 -msgid "Z drift" -msgstr "Дрейф Z" - -#: modules/xyz/xyz_drift.c:440 -msgid "z-axis drift" -msgstr "дрейф оси z" - #: modules/xyz/xyz_drift.c:541 msgid "Analyze XYZ Drift" msgstr "Анализировать дрейф в данных XYZ" @@ -19747,6 +20298,181 @@ msgid "Merged" msgstr "Объединенные" +#~ msgid "/_Basic Operations/Insert XY plane..." +#~ msgstr "/_Базовые действия/Вставить плоскость XY..." + +#~ msgid "/_Correct Data/Estimate _drift..." +#~ msgstr "/Исправить _данные/Оценить _дрейф..." + +#~ msgid "Facet leveling..." +#~ msgstr "Выравнивание граней..." + +#~ msgid "Faced leveled" +#~ msgstr "Выровненные грани" + +#~ msgid "/_Correct Data/_Align rows..." +#~ msgstr "/Исправить _данные/Выровнять _строки..." + +#, fuzzy +#~ msgid "/SPM M_odes/_Localisation merge..." +#~ msgstr "/_Режимы СЗМ/Объединение локализации..." + +#~ msgid "/_Basic Operations/Remove XY plane..." +#~ msgstr "/_Базовые действия/Удалить плоскость XY..." + +#~ msgid "Removes single XY plane" +#~ msgstr "Удаляет отдельную плоскость XY" + +#~ msgid "Performe scars removal for all the volume data levels." +#~ msgstr "Выполняет удаление царапин на всех уровнях объёмных данных" + +#~ msgid "Performs scars removals on all levels" +#~ msgstr "Выполнить удаление царапин на всех уровнях" + +#~ msgid "/_Correct Data/Ste_p line correction" +#~ msgstr "/Исправить _данные/Линейная коррекция с_тупенек" + +#~ msgid "/Crop automatically" +#~ msgstr "/Кадрировать автоматически" + +#~ msgid "Add XY plane" +#~ msgstr "Добавить плоскость XY" + +#~ msgid "verb|_Add to current level" +#~ msgstr "Добавить к текущему уровню" + +#~ msgid "/_Arithmetic..." +#~ msgstr "/_Арифметические операции..." + +#~ msgid "/Export _Text..." +#~ msgstr "/Экспортировать _текст..." + +#~ msgid "_Precision:" +#~ msgstr "_Точность:" + +#~ msgid "/_Dimensions and Units..." +#~ msgstr "/Р_азмеры и единицы измерения..." + +#~ msgid "/_Isosurface Image..." +#~ msgstr "/Изображение изоповер_хности..." + +#~ msgid "/3D View..." +#~ msgstr "/Трёхмерный вид..." + +#~ msgid "/_Evaluate FD Data..." +#~ msgstr "/Расс_читать данные сила-расстояние..." + +#~ msgid "/_Invert Value" +#~ msgstr "/_Инвертировать значение" + +#~ msgid "/_K-Means Clustering..." +#~ msgstr "/_Кластеризация K-средних..." + +#~ msgid "/_K-Medians Clustering..." +#~ msgstr "/Кластеризация K-сре_динных..." + +#~ msgid "/Convert to _Curve Map..." +#~ msgstr "/Конвертировать в карту крив_ых..." + +#~ msgid "/Summarize _Profiles..." +#~ msgstr "/Характеризоват_ь профили..." + +#~ msgid "/_Magnetic Data to Force Gradient..." +#~ msgstr "/_Магнитные данные в градиент силы..." + +#~ msgid "/_XY Plane Outliers" +#~ msgstr "/_Выпадающие на плоскостях XY" + +#~ msgid "/_XY Plane Level" +#~ msgstr "/Вы_равнивание плоскостей XY" + +#~ msgid "/Summarize P_lanes..." +#~ msgstr "/Характеризовать _плоскости..." + +#~ msgid "/_Transfer Function Guess..." +#~ msgstr "/О_ценка передаточной функции..." + +#~ msgid "/_Adjust Phase..." +#~ msgstr "/Настроить _фазу..." + +#, fuzzy +#~ msgid "Extracts ROI average graphs from volume data." +#~ msgstr "Извлекает плоскости с изображениями и графики из объёмных данных." + +#, fuzzy +#~ msgid "/ROI Average..." +#~ msgstr "/Объ_единить..." + +#, fuzzy +#~ msgid "Extract ROI average line graphs" +#~ msgstr "Извлечь плоскости изображения и линии графиков" + +#, fuzzy +#~ msgid "Extracts average ROI graph from volume data." +#~ msgstr "Извлекает плоскости с изображениями и графики из объёмных данных." + +#, fuzzy +#~ msgid "/ROI _Average..." +#~ msgstr "/Объ_единить..." + +#, fuzzy +#~ msgid "Extract ROI average graph" +#~ msgstr "_Извлечь в виде графика" + +#~ msgid "/Cut and _Slice..." +#~ msgstr "/Вырезать..." + +#~ msgid "/_Stray Field Consistency..." +#~ msgstr "/Соответствие _поля утечки..." + +#~ msgid "/S_wap Axes..." +#~ msgstr "/Поменять м_естами оси..." + +#~ msgid "Current _X axis will become:" +#~ msgstr "Текущая ось _X станет:" + +#~ msgid "Current _Y axis will become:" +#~ msgstr "Текущая ось _Y станет:" + +#~ msgid "Current _Z axis will become:" +#~ msgstr "Текущая ось _Z станет:" + +#~ msgid "/_Z-Calibration..." +#~ msgstr "/Калибровка _Z..." + +#~ msgid "/S_hift Value To Zero..." +#~ msgstr "/С_двинуть значение в нуль..." + +#~ msgid "/Extract _Preview" +#~ msgstr "/Извлечь изображение _предпросмотра" + +#~ msgid "_Step detection kernel:" +#~ msgstr "_Ядро для детекции ступени:" + +#~ msgid "Step detection _threshold:" +#~ msgstr "_Порог для детекции ступени:" + +#~ msgid "Step _broadening:" +#~ msgstr "_Уширение ступени:" + +#~ msgid "_Polynomial degree:" +#~ msgstr "Степень _полинома:" + +#~ msgid "M_inimum polynomial degree:" +#~ msgstr "М_инимальная степень полинома:" + +#~ msgid "_Maximum polynomial degree:" +#~ msgstr "_Максимальная степень полинома:" + +#~ msgid "Minimum broadening:" +#~ msgstr "Минимальное уширение:" + +#~ msgid "Maximum broadening:" +#~ msgstr "Максимальное уширение:" + +#~ msgid "Survey cannot be run with independent degrees." +#~ msgstr "Обзор нельзя запускать с независимыми степенями." + #~ msgid "Change unit" #~ msgstr "Изменить единицы" diff -Nru gwyddion-2.62/python/Makefile.in gwyddion-2.63/python/Makefile.in --- gwyddion-2.62/python/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/python/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -361,6 +361,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/ruby/Makefile.in gwyddion-2.63/ruby/Makefile.in --- gwyddion-2.62/ruby/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/ruby/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -357,6 +357,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/thumbnailer/Makefile.in gwyddion-2.63/thumbnailer/Makefile.in --- gwyddion-2.62/thumbnailer/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/thumbnailer/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -440,6 +440,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/utils/extract-file-magic.py gwyddion-2.63/utils/extract-file-magic.py --- gwyddion-2.62/utils/extract-file-magic.py 2019-11-04 08:28:58.000000000 +0000 +++ gwyddion-2.63/utils/extract-file-magic.py 2023-05-18 12:44:09.000000000 +0000 @@ -59,6 +59,7 @@ out.append(entry % fmtsup(supinfo, noterefs, ('Save', 'Export'))) out.append(entry % fmtsup(supinfo, noterefs, ('SPS',))) out.append(entry % fmtsup(supinfo, noterefs, ('Volume',))) + out.append(entry % fmtsup(supinfo, noterefs, ('Curvemap',))) out.append('') for i, x in enumerate(out): out[i] = ' ' + x @@ -85,7 +86,7 @@ supported formats - + File Format @@ -95,6 +96,7 @@ Write SPS Volume + Curve map ''', diff -Nru gwyddion-2.62/utils/Makefile.in gwyddion-2.63/utils/Makefile.in --- gwyddion-2.62/utils/Makefile.in 2022-11-03 09:56:38.000000000 +0000 +++ gwyddion-2.63/utils/Makefile.in 2023-06-13 13:22:37.000000000 +0000 @@ -410,6 +410,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ ZLIB = @ZLIB@ +ZZIP_CFLAGS = @ZZIP_CFLAGS@ +ZZIP_LIBS = @ZZIP_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gwyddion-2.62/utils/user-guide-modules gwyddion-2.63/utils/user-guide-modules --- gwyddion-2.62/utils/user-guide-modules 2022-11-02 13:36:31.000000000 +0000 +++ gwyddion-2.63/utils/user-guide-modules 2023-06-12 09:33:12.000000000 +0000 @@ -128,6 +128,7 @@ graph_invert graph-processing graph-invert graph_level graph-processing graph-level graph_logscale graph-processing graph-logscale +graph_measure_period graph-processing graph-measure-period graph_peaks graph-processing graph-peaks graph_sfuncs graph-processing graph-sfuncs graph_stats graph-processing graph-stats @@ -358,6 +359,7 @@ zero_crossing presentations edge-zero-crossing nova-asc managing-files wfr_synth synthetic wetting-synthesis +dune_synth synthetic dunes-synthesis cmap::cmap_calibrate curve-maps-data-processing cmap-dimensions-and-units cmap::cmap_flip_horizontally curve-maps-data-processing cmap-flip cmap::cmap_flip_vertically curve-maps-data-processing cmap-flip

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

target_line

A data line to store the distribution to. It will be -resampled to requested width.

A data line to store the distribution to. It will be resampled to requested width.

  

nstats

The number of samples to take on the distribution function. If -nonpositive, a suitable resolution is determined automatically.

The number of samples to take on the distribution function. If nonpositive, a suitable resolution is +determined automatically.

  

xcenter

Location where to store the horizontal position of centre of mass -(in pixel coordinates), or NULL.

Location where to store the horizontal position of centre of mass (in pixel coordinates), or NULL.

  

ycenter

Location where to store the vertical position of centre of mass -(in pixel coordinates), or NULL.

Location where to store the vertical position of centre of mass (in pixel coordinates), or NULL.

  

xcenter

Location where to store the horizontal position of centre of mass -(in pixel coordinates), or NULL.

Location where to store the horizontal position of centre of mass (in pixel coordinates), or NULL.

  

ycenter

Location where to store the vertical position of centre of mass -(in pixel coordinates), or NULL.

Location where to store the vertical position of centre of mass (in pixel coordinates), or NULL.

  

derdist

A data line to fill with angular slope distribution. Its -resolution determines resolution of the distribution.

A data line to fill with angular slope distribution. Its resolution determines resolution of the +distribution.

  

kernel_size

If positive, local plane fitting will be used for slope -computation; if nonpositive, plain central derivations -will be used.

If positive, local plane fitting will be used for slope computation; if nonpositive, plain central +derivations will be used.

  

normalize1

true to normalize the normal vector to 1, false to normalize -the vector so that z-component is 1.

TRUE to normalize the normal vector to 1, FALSE to normalize the vector so that z +-component is 1.

  

normalize1

true to normalize the normal vector to 1, false to normalize -the vector so that z-component is 1.

TRUE to normalize the normal vector to 1, FALSE to normalize the vector so that z +-component is 1.

  

mask

Mask of values to take values into account, or NULL for full -data_field +

Mask of values to take values into account, or NULL for full data_field .

  

target_line

A data line to store the distribution to. It will be -resampled to the number of rows (columns).

A data line to store the distribution to. It will be resampled to the number of rows (columns).

  

orientation

Line orientation. For GWY_ORIENTATION_HORIZONTAL each -target_line -point corresponds to a row of the area, -for GWY_ORIENTATION_VERTICAL each target_line -point -corresponds to a column of the area.

Line orientation. For GWY_ORIENTATION_HORIZONTAL each target_line +point corresponds to a row of +the area, for GWY_ORIENTATION_VERTICAL each target_line +point corresponds to a column of the area.

  

mask

Mask of values to take values into account, or NULL for full -data_field +

Mask of values to take values into account, or NULL for full data_field .

  

masking

Masking mode to use. See the introduction for description of -masking modes.

Masking mode to use. See the introduction for description of masking modes.

  

target_line

A data line to store the distribution to. It will be -resampled to the number of rows (columns).

A data line to store the distribution to. It will be resampled to the number of rows (columns).

  

weights

A data line to store number of data points contributing to each -value in target_line -, or NULL. It is useful when masking is -used to possibly exclude values calculated from too few data -points.

A data line to store number of data points contributing to each value in target_line +, or NULL. It is +useful when masking is used to possibly exclude values calculated from too few data points.

  

orientation

Line orientation. For GWY_ORIENTATION_HORIZONTAL each -target_line -point corresponds to a row of the area, -for GWY_ORIENTATION_VERTICAL each target_line -point -corresponds to a column of the area.

Line orientation. For GWY_ORIENTATION_HORIZONTAL each target_line +point corresponds to a row of +the area, for GWY_ORIENTATION_VERTICAL each target_line +point corresponds to a column of the area.

  

target_line

A data line to store the distribution to. It will be -resampled to data_field +

A data line to store the distribution to. It will be resampled to data_field height (width).