diff -Nru gwyddion-2.46/app/authors.h gwyddion-2.47/app/authors.h --- gwyddion-2.46/app/authors.h 2016-10-14 09:42:30.000000000 +0000 +++ gwyddion-2.47/app/authors.h 2016-11-18 09:59:52.000000000 +0000 @@ -50,5 +50,5 @@ "Jeong Jiseong\n" ; static const gchar releasedate[] = - "2016-10-14" + "2016-11-18" ; diff -Nru gwyddion-2.46/app/data-browser.c gwyddion-2.47/app/data-browser.c --- gwyddion-2.46/app/data-browser.c 2016-10-10 08:25:22.000000000 +0000 +++ gwyddion-2.47/app/data-browser.c 2016-10-31 07:58:48.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: data-browser.c 19043 2016-10-08 18:58:43Z yeti-dn $ + * @(#) $Id: data-browser.c 19137 2016-10-31 07:51:16Z yeti-dn $ * Copyright (C) 2006-2016 David Necas (Yeti), Petr Klapetek, Chris Anderson * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, sidewinderasu@gmail.com. * @@ -5707,9 +5707,16 @@ GtkTreeIter *iter) { GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreePath *path; selection = gtk_tree_view_get_selection(treeview); gtk_tree_selection_select_iter(selection, iter); + + model = gtk_tree_view_get_model(treeview); + path = gtk_tree_model_get_path(model, iter); + gtk_tree_view_scroll_to_cell(treeview, path, NULL, FALSE, 0.0, 1.0); + gtk_tree_path_free(path); } static void @@ -7489,10 +7496,14 @@ /** * gwy_app_data_browser_get_data_ids: - * @data: A data container managed by the data-browser. + * @data: A data container. * * Gets the list of all channels in a data container. * + * The function originally could be used only for data containers managed by + * the data browser. Since version 2.45 it can be used for all file-like + * data containers. + * * Returns: A newly allocated array with channel ids, -1 terminated. **/ gint* @@ -7507,10 +7518,14 @@ /** * gwy_app_data_browser_get_graph_ids: - * @data: A data container managed by the data-browser. + * @data: A data container. * * Gets the list of all graphs in a data container. * + * The function originally could be used only for data containers managed by + * the data browser. Since version 2.45 it can be used for all file-like + * data containers. + * * Returns: A newly allocated array with graph ids, -1 terminated. **/ gint* @@ -7526,10 +7541,14 @@ /** * gwy_app_data_browser_get_spectra_ids: - * @data: A data container managed by the data-browser. + * @data: A data container. * * Gets the list of all spectra in a data container. * + * The function originally could be used only for data containers managed by + * the data browser. Since version 2.45 it can be used for all file-like + * data containers. + * * Returns: A newly allocated array with spectrum ids, -1 terminated. * * Since: 2.7 @@ -7546,10 +7565,14 @@ /** * gwy_app_data_browser_get_volume_ids: - * @data: A data container managed by the data-browser. + * @data: A data container. * * Gets the list of all volume data in a data container. * + * The function originally could be used only for data containers managed by + * the data browser. Since version 2.45 it can be used for all file-like + * data containers. + * * Returns: A newly allocated array with volume data ids, -1 terminated. * * Since: 2.33 @@ -7566,7 +7589,7 @@ /** * gwy_app_data_browser_get_xyz_ids: - * @data: A data container managed by the data-browser. + * @data: A data container. * * Gets the list of all XYZ data in a data container. * @@ -8192,6 +8215,42 @@ * SECTION:data-browser * @title: data-browser * @short_description: Data browser + * + * The data browser is both an entity that monitors of various data in Gwyddion + * and the corresponding user interface showing the data lists and letting the + * user deleting or copying them. The public functions are generally related + * to the first part. + * + * An #GwyContainer that represents an SPM file is managed by functions such as + * gwy_app_data_browser_add() or gwy_app_data_browser_remove(). Note that + * the high-level libgwyapp functions (with app in their name) such as + * gwy_app_file_load() already call the data browser functions as appropriate. + * + * If a file-like #GwyContainer has not been added to the data browser it is + * unmanaged and cannot be used with most of the data browser functions. + * The exceptions are + * #GQuark constructors such as gwy_app_get_mask_key_for_id(), + * copying functions such as gwy_app_data_browser_copy_channel(), + * title management functions such as gwy_app_set_surface_title(), + * thumbnail creation helpers such as gwy_app_get_graph_thumbnail(), + * and functions for listing the ids of various data types such as + * gwy_app_data_browser_get_data_ids(). + * + * Individual data pieces can be added to managed #GwyContainers with functions + * such as gwy_app_data_browser_add_data_field() that can take care of creating + * the window showing the new data. Removal is generally done by directly + * removing the corresponding data object(s) from the #GwyContainer. + * + * An important part of the data browser is keeping track which data item is + * currently selected (to know what a data processing method should process, + * etc.). You can obtain the information about various currently selected + * objects using gwy_app_data_browser_get_current(). Making a data item + * currently selected is accomplished either using function such as + * gwy_app_data_browser_select_data_view(), which corresponds to the user + * switching to the data window, or gwy_app_data_browser_select_data_field() + * which just selects the data item as current in the browser. The latter + * is less safe and can result in strange behaviour because for some purposes + * only data actually displayed can be ‘current’. **/ /** diff -Nru gwyddion-2.46/app/datachooser.c gwyddion-2.47/app/datachooser.c --- gwyddion-2.46/app/datachooser.c 2016-10-10 08:25:22.000000000 +0000 +++ gwyddion-2.47/app/datachooser.c 2016-11-01 11:52:14.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: datachooser.c 19043 2016-10-08 18:58:43Z yeti-dn $ + * @(#) $Id: datachooser.c 19157 2016-11-01 11:52:14Z yeti-dn $ * Copyright (C) 2006-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -129,6 +129,80 @@ G_OBJECT_CLASS(gwy_data_chooser_parent_class)->finalize(object); } +GType +gwy_app_data_id_get_type(void) +{ + static GType dataid_type = 0; + + if (G_UNLIKELY(!dataid_type)) { + dataid_type = g_boxed_type_register_static("GwyAppDataId", + (GBoxedCopyFunc)gwy_app_data_id_copy, + (GBoxedFreeFunc)gwy_app_data_id_free); + } + + return dataid_type; +} + +/** + * gwy_app_data_id_new: + * @datano: Numeric identifier of data container. Zero is used for none. + * @id: Numeric identifier of a specific data item, such as channel or graph + * number. Value -1 is used for none. + * + * Creates a new data identifier on heap. + * + * This is mostly useful for language bindings. + * + * Returns: Newly allocated data id. It must be freed with + * gwy_app_data_id_free(). + * + * Since: 2.47 + **/ +GwyAppDataId* +gwy_app_data_id_new(gint datano, + gint id) +{ + GwyAppDataId *dataid = g_slice_new(GwyAppDataId); + dataid->datano = datano; + dataid->id = id; + return dataid; +} + +/** + * gwy_app_data_id_copy: + * @dataid: Data identifier. + * + * Creates a copy of data identifier. + * + * This is mostly useful for language bindings. + * + * Returns: Newly allocated data id. It must be freed with + * gwy_app_data_id_free(). + * + * Since: 2.47 + **/ +GwyAppDataId* +gwy_app_data_id_copy(GwyAppDataId *dataid) +{ + return g_slice_dup(GwyAppDataId, dataid); +} + +/** + * gwy_app_data_id_free: + * @dataid: Data identifier. + * + * Frees a data identifier. + * + * This is mostly useful for language bindings. + * + * Since: 2.47 + **/ +void +gwy_app_data_id_free(GwyAppDataId *dataid) +{ + g_slice_free(GwyAppDataId, dataid); +} + static void proxy_free(Proxy *proxy) { diff -Nru gwyddion-2.46/app/datachooser.h gwyddion-2.47/app/datachooser.h --- gwyddion-2.46/app/datachooser.h 2016-03-12 09:37:22.000000000 +0000 +++ gwyddion-2.47/app/datachooser.h 2016-11-01 11:52:14.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: datachooser.h 18408 2016-03-10 17:59:12Z yeti-dn $ + * @(#) $Id: datachooser.h 19157 2016-11-01 11:52:14Z yeti-dn $ * Copyright (C) 2006-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -36,6 +36,8 @@ #define GWY_APP_DATA_ID_NONE { 0, -1 } +#define GWY_TYPE_APP_DATA_ID (gwy_app_data_id_get_type()) + #define GWY_TYPE_DATA_CHOOSER (gwy_data_chooser_get_type()) #define GWY_DATA_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GWY_TYPE_DATA_CHOOSER, GwyDataChooser)) #define GWY_DATA_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GWY_TYPE_DATA_CHOOSER, GwyDataChooserClass)) @@ -55,6 +57,12 @@ GtkWidget* gwy_data_chooser_new_graphs (void); GtkWidget* gwy_data_chooser_new_xyzs (void); +GType gwy_app_data_id_get_type (void) G_GNUC_CONST; +GwyAppDataId* gwy_app_data_id_new (gint datano, + gint id) G_GNUC_MALLOC; +GwyAppDataId* gwy_app_data_id_copy (GwyAppDataId *dataid) G_GNUC_MALLOC; +void gwy_app_data_id_free (GwyAppDataId *dataid); + GType gwy_data_chooser_get_type (void) G_GNUC_CONST; gboolean gwy_data_chooser_set_active (GwyDataChooser *chooser, GwyContainer *data, diff -Nru gwyddion-2.46/app/file.c gwyddion-2.47/app/file.c --- gwyddion-2.46/app/file.c 2016-09-01 08:37:22.000000000 +0000 +++ gwyddion-2.47/app/file.c 2016-11-13 20:46:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: file.c 18894 2016-08-29 08:01:23Z yeti-dn $ + * @(#) $Id: file.c 19229 2016-11-10 16:28:18Z yeti-dn $ * Copyright (C) 2003-2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -341,7 +341,6 @@ if (filename_utf8) gwy_app_recent_file_list_update(data, filename_utf8, filename_sys, 0); gwy_app_set_current_directory(filename_sys); - } /** @@ -430,7 +429,7 @@ * @data: Data to write. * @filename_utf8: Name of file to write data to, in UTF-8. * @filename_sys: Name of file to write data to, in GLib encoding. - * @name: File type to open file as, but normally %NULL to automatically detect + * @name: File type to save file as, but normally %NULL to automatically detect * from file name. * * Writes container to a file (a high-level function). diff -Nru gwyddion-2.46/app/gwyplaintool.c gwyddion-2.47/app/gwyplaintool.c --- gwyddion-2.46/app/gwyplaintool.c 2016-10-10 08:25:22.000000000 +0000 +++ gwyddion-2.47/app/gwyplaintool.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyplaintool.c 19043 2016-10-08 18:58:43Z yeti-dn $ + * @(#) $Id: gwyplaintool.c 19125 2016-10-26 20:52:58Z yeti-dn $ * Copyright (C) 2006,2014 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1091,6 +1091,14 @@ rlabels->in_update = FALSE; } +/** + * gwy_rect_selection_labels_select: + * @rlabels: Rectangular selection information table. + * @selection: A rectangular selection to fill information into. + * @dfield: A data field to use for real/pixel coordinate transforms. + * + * Updates selection data using rectangular selection information table. + **/ void gwy_rect_selection_labels_select(GwyRectSelectionLabels *rlabels, GwySelection *selection, diff -Nru gwyddion-2.46/app/log.c gwyddion-2.47/app/log.c --- gwyddion-2.46/app/log.c 2016-10-10 08:25:22.000000000 +0000 +++ gwyddion-2.47/app/log.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: log.c 19043 2016-10-08 18:58:43Z yeti-dn $ + * @(#) $Id: log.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2014-2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -375,8 +375,6 @@ *s = ' '; args = format_args(str->str); - if (!str) - str = g_string_new(NULL); g_string_printf(str, "%s(%s)@%s", function, args, optime); gwy_string_list_append_take(targetlog, g_string_free(str, FALSE)); g_free(args); diff -Nru gwyddion-2.46/app/logging.c gwyddion-2.47/app/logging.c --- gwyddion-2.46/app/logging.c 2016-07-19 15:28:32.000000000 +0000 +++ gwyddion-2.47/app/logging.c 2016-11-16 16:49:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: logging.c 18730 2016-07-19 15:27:30Z yeti-dn $ + * @(#) $Id: logging.c 19274 2016-11-16 16:49:18Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -61,27 +61,28 @@ guint capturing_from; } LoggingSetup; -static void logger (const gchar *log_domain_str, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data); -static void flush_last_message (LoggingSetup *setup); -static void emit_message_to_file (FILE *fh, - GLogLevelFlags log_level, - const gchar *message, - gboolean add_eol); -static void format_log_message (GString *str, - GQuark log_domain, - GLogLevelFlags log_level, - const gchar *message); -static void append_escaped_message(GString *str, - const gchar *message); -static void emit_log_message (LoggingSetup *setup, - GQuark log_domain, - GLogLevelFlags log_level); -static void append_level_prefix (GString *str, - GLogLevelFlags log_level); -static FILE* get_console_stream (GLogLevelFlags log_level); +static void logger (const gchar *log_domain_str, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data); +static void flush_last_message (LoggingSetup *setup); +static void emit_message_to_file (FILE *fh, + GLogLevelFlags log_level, + const gchar *message, + gboolean add_eol); +static void format_log_message (GString *str, + GQuark log_domain, + GLogLevelFlags log_level, + const gchar *message); +static void append_escaped_message(GString *str, + const gchar *message); +static void emit_log_message (LoggingSetup *setup, + GQuark log_domain, + GLogLevelFlags log_level); +static void append_level_prefix (GString *str, + GLogLevelFlags log_level); +static FILE* get_console_stream (GLogLevelFlags log_level); +static gboolean skip_annoying_message (const gchar *message); static LoggingSetup log_setup; @@ -104,6 +105,7 @@ "GLib", "GLib-GObject", "GLib-GIO", "GModule", "GThread", "GdkPixbuf", "Gdk", "Gtk", "GdkGLExt", "GtkGLExt", + "GtkSourceView", "Pango", "Unique", "Gwyddion", "GwyProcess", "GwyDraw", "Gwydgets", "GwyModule", "GwyApp", "Module", NULL @@ -260,8 +262,10 @@ gchar *message = setup->message->str; if (setup->to_console) { - emit_message_to_file(get_console_stream(log_level), - log_level, message, TRUE); + if (!skip_annoying_message(message)) { + emit_message_to_file(get_console_stream(log_level), + log_level, message, TRUE); + } } if (setup->to_file) @@ -393,6 +397,23 @@ return stdout; } +/* Annoying messages we keep in the log but do not print to console. */ +static gboolean +skip_annoying_message(const gchar *message) +{ + static const gchar *skip_message_prefixes[] = { + "GtkSourceView-WARNING: Cannot create a regex for all the transitions, " + "the syntax highlighting process will be slower than usual.", + }; + guint i; + + for (i = 0; i < G_N_ELEMENTS(skip_message_prefixes); i++) { + if (g_str_has_prefix(message, skip_message_prefixes[i])) + return TRUE; + } + return FALSE; +} + /** * gwy_app_get_log_text_buffer: * diff -Nru gwyddion-2.46/app/Makefile.am gwyddion-2.47/app/Makefile.am --- gwyddion-2.46/app/Makefile.am 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/app/Makefile.am 2016-11-15 08:25:23.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la libgwymodule = $(top_builddir)/libgwymodule/libgwymodule2.la @@ -112,7 +112,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 16:0:16 +libversion = -version-info 17:0:17 #libversion = -release @LIBRARY_RELEASE@ libgwyapp2_la_LDFLAGS = @GTKGLEXT_LIBS@ @GIO_LIBS@ @BASIC_LIBS@ $(win32_libs) -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyapp2_la_CPPFLAGS = -DG_LOG_DOMAIN=\"GwyApp\" $(AM_CPPFLAGS) diff -Nru gwyddion-2.46/app/Makefile.in gwyddion-2.47/app/Makefile.in --- gwyddion-2.46/app/Makefile.in 2016-10-14 09:41:56.000000000 +0000 +++ gwyddion-2.47/app/Makefile.in 2016-11-18 10:52:39.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ # Generic glib-mkenum rules. # @(#) $Id: mkenum.mk 11705 2011-01-03 08:32:55Z yeti-dn $ @@ -599,7 +599,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 16:0:16 +libversion = -version-info 17:0:17 #libversion = -release @LIBRARY_RELEASE@ libgwyapp2_la_LDFLAGS = @GTKGLEXT_LIBS@ @GIO_LIBS@ @BASIC_LIBS@ $(win32_libs) -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyapp2_la_CPPFLAGS = -DG_LOG_DOMAIN=\"GwyApp\" $(AM_CPPFLAGS) diff -Nru gwyddion-2.46/app/remote-win32.c gwyddion-2.47/app/remote-win32.c --- gwyddion-2.46/app/remote-win32.c 2015-07-29 08:28:19.000000000 +0000 +++ gwyddion-2.47/app/remote-win32.c 2016-11-16 16:46:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: remote-win32.c 15598 2013-11-11 12:33:32Z yeti-dn $ + * @(#) $Id: remote-win32.c 19272 2016-11-16 16:46:46Z yeti-dn $ * Copyright (C) 2007 David Necas (Yeti), Jan Horak. * E-mail: yeti@gwyddion.net, xhorak@gmail.com. * @@ -36,10 +36,8 @@ void gwy_remote_setup(GtkWidget *toolbox) { - GdkWindow *gdk_win; HWND hwnd = 0; - gdk_win = gtk_widget_get_root_window(toolbox); // Retrieve hWnd using gdk window hwnd = GDK_WINDOW_HWND(toolbox->window); // Create property and set it to 1 diff -Nru gwyddion-2.46/config.h.in gwyddion-2.47/config.h.in --- gwyddion-2.46/config.h.in 2016-10-14 09:42:11.000000000 +0000 +++ gwyddion-2.47/config.h.in 2016-11-18 10:52:36.000000000 +0000 @@ -139,6 +139,9 @@ /* Define to the remote control backend. */ #undef REMOTE_BACKEND +/* The size of `pid_t', as computed by sizeof. */ +#undef SIZEOF_PID_T + /* The size of `void*', as computed by sizeof. */ #undef SIZEOF_VOIDP diff -Nru gwyddion-2.46/configure gwyddion-2.47/configure --- gwyddion-2.46/configure 2016-10-14 09:41:59.000000000 +0000 +++ gwyddion-2.47/configure 2016-11-18 10:52:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Gwyddion 2.46. +# Generated by GNU Autoconf 2.69 for Gwyddion 2.47. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='Gwyddion' PACKAGE_TARNAME='gwyddion' -PACKAGE_VERSION='2.46' -PACKAGE_STRING='Gwyddion 2.46' +PACKAGE_VERSION='2.47' +PACKAGE_STRING='Gwyddion 2.47' PACKAGE_BUGREPORT='klapetek@gwyddion.net' PACKAGE_URL='' @@ -1628,7 +1628,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.46 to adapt to many kinds of systems. +\`configure' configures Gwyddion 2.47 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1702,7 +1702,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Gwyddion 2.46:";; + short | recursive ) echo "Configuration of Gwyddion 2.47:";; esac cat <<\_ACEOF @@ -1930,7 +1930,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Gwyddion configure 2.46 +Gwyddion configure 2.47 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2694,7 +2694,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.46, which was +It was created by Gwyddion $as_me 2.47, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3641,7 +3641,7 @@ # Define the identity of the package. PACKAGE='gwyddion' - VERSION='2.46' + VERSION='2.47' cat >>confdefs.h <<_ACEOF @@ -3798,8 +3798,8 @@ GWY_VERSION_MAJOR=2 -GWY_VERSION_MINOR=46 -GWY_VERSION_STRING='"2.46"' +GWY_VERSION_MINOR=47 +GWY_VERSION_STRING='"2.47"' @@ -17843,6 +17843,39 @@ HAVE_PYTHON_FALSE= fi +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 +$as_echo_n "checking size of pid_t... " >&6; } +if ${ac_cv_sizeof_pid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_pid_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (pid_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_pid_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 +$as_echo "$ac_cv_sizeof_pid_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_PID_T $ac_cv_sizeof_pid_t +_ACEOF + + # Change backward slashes in paths to forwards slashes to avoid mixed-slash # paths in MS Windows (forwards works just fine in MinGW). @@ -18863,6 +18896,43 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC knows -Wno-missing-field-initializers" >&5 +$as_echo_n "checking whether $CC knows -Wno-missing-field-initializers... " >&6; } +if ${ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS+:} false; then : + $as_echo_n "(cached) " >&6 +else + ye_PROG_CC_OPTION_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wno-missing-field-initializers" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS=yes +else + ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$ye_PROG_CC_OPTION_cflags" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS" >&5 +$as_echo "$ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS" >&6; } +if test "$ac_cv_prog_cc_option_WNO_MISSING_FIELD_INITIALIZERS" = "yes"; then + PROG_CC_WNO_MISSING_FIELD_INITIALIZERS="-Wno-missing-field-initializers" + +else + PROG_CC_WNO_MISSING_FIELD_INITIALIZERS= + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC knows -fno-trapping-math" >&5 $as_echo_n "checking whether $CC knows -fno-trapping-math... " >&6; } if ${ac_cv_prog_cc_option_FNO_TRAP_MATH+:} false; then : @@ -19017,7 +19087,7 @@ # comment there they can't fix it due to compatibility # -Wwrite-strings because it makes all struct initializations very noisy WARNING_CFLAGS="-Wall -W -Wshadow -Wpointer-arith -Wno-sign-compare -Wundef $PROG_CC_ERR_IFD $PROG_CC_ERR_RET $PROG_CC_WNO_SYS_HEADERS $PROG_CC_WNO_POINTER_SIGN $PROG_CC_WNO_EMPTY_FMT $PROG_CC_WMIXED_DECL $PROG_CC_WREDUNDANT_DECLS" - PYTHON_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR $PROG_CC_FNO_STRICT_ALIASING" + PYTHON_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR $PROG_CC_FNO_STRICT_ALIASING $PROG_CC_WNO_MISSING_FIELD_INITIALIZERS" GTKDOC_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR" PREMISE_CFLAGS="$PROG_CC_FNO_TRAP_MATH $PROG_CC_FNO_MATH_ERRNO $FEXCESS_PRECISION_FAST" fi @@ -20649,6 +20719,11 @@ fi +if test x$enable_fftw3 != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FFTW will become a required dependency in a future version." >&5 +$as_echo "$as_me: WARNING: FFTW will become a required dependency in a future version." >&2;} +fi + ############################################################################# # GtkSourceView # Optional. @@ -24806,7 +24881,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.46, which was +This file was extended by Gwyddion $as_me 2.47, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24872,7 +24947,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Gwyddion config.status 2.46 +Gwyddion config.status 2.47 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gwyddion-2.46/configure.ac gwyddion-2.47/configure.ac --- gwyddion-2.46/configure.ac 2016-10-14 09:24:37.000000000 +0000 +++ gwyddion-2.47/configure.ac 2016-11-18 10:17:57.000000000 +0000 @@ -1,7 +1,7 @@ -# @(#) $Id: configure.ac 18762 2016-07-23 12:43:46Z yeti-dn $ +# @(#) $Id: configure.ac 19287 2016-11-18 10:17:57Z yeti-dn $ dnl Process this file with autoconf to produce a configure script. m4_define([gwy_version_major],[2]) -m4_define([gwy_version_minor],[46]) +m4_define([gwy_version_minor],[47]) 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 @@ -218,6 +218,7 @@ GWY_WITH([python],,[Install Python modules and plug-ins]) AM_PATH_PYTHON(2.4,,:) AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != : -a "$enable_python" != no]) +AC_CHECK_SIZEOF([pid_t]) # Change backward slashes in paths to forwards slashes to avoid mixed-slash # paths in MS Windows (forwards works just fine in MinGW). @@ -359,6 +360,7 @@ # too much. GWY_PROG_CC_OPTION([WMIXED_DECL],[-Wdeclaration-after-statement],,) GWY_PROG_CC_OPTION([WREDUNDANT_DECLS],[-Wredundant-decls],,) + GWY_PROG_CC_OPTION([WNO_MISSING_FIELD_INITIALIZERS],[-Wno-missing-field-initializers],,) GWY_PROG_CC_OPTION([FNO_TRAP_MATH],[-fno-trapping-math],,) GWY_PROG_CC_OPTION([FNO_MATH_ERRNO],[-fno-math-errno],,) GWY_PROG_CC_OPTION([FEXCESS_PRECISION_FAST],[-fexcess-precision=fast],,) @@ -370,7 +372,7 @@ # comment there they can't fix it due to compatibility # -Wwrite-strings because it makes all struct initializations very noisy WARNING_CFLAGS="-Wall -W -Wshadow -Wpointer-arith -Wno-sign-compare -Wundef $PROG_CC_ERR_IFD $PROG_CC_ERR_RET $PROG_CC_WNO_SYS_HEADERS $PROG_CC_WNO_POINTER_SIGN $PROG_CC_WNO_EMPTY_FMT $PROG_CC_WMIXED_DECL $PROG_CC_WREDUNDANT_DECLS" - PYTHON_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR $PROG_CC_FNO_STRICT_ALIASING" + PYTHON_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR $PROG_CC_FNO_STRICT_ALIASING $PROG_CC_WNO_MISSING_FIELD_INITIALIZERS" GTKDOC_EXTRA_CFLAGS="$PROG_CC_WNO_UNUSED_PAR" PREMISE_CFLAGS="$PROG_CC_FNO_TRAP_MATH $PROG_CC_FNO_MATH_ERRNO $FEXCESS_PRECISION_FAST" fi @@ -469,6 +471,10 @@ fi AC_SUBST([FFTW3_DEPENDENCY]) +if test x$enable_fftw3 != xyes; then + AC_MSG_WARN([FFTW will become a required dependency in a future version.]) +fi + ############################################################################# # GtkSourceView # Optional. diff -Nru gwyddion-2.46/data/gwyddion.1 gwyddion-2.47/data/gwyddion.1 --- gwyddion-2.46/data/gwyddion.1 2015-07-29 08:28:26.000000000 +0000 +++ gwyddion-2.47/data/gwyddion.1 2016-11-09 09:17:14.000000000 +0000 @@ -180,7 +180,7 @@ .RS 4 Name of file to redirect log messages to\&. On MS Windows, messages are always sent to a file as working with the terminal is cumbersome there\&. The default log file location, gwyddion\&.log -in user\'s Documents and Settings, can be overriden with +in user\'s Documents and Settings, can be overridden with \fBGWYDDION_LOGFILE\fR\&. On Unix, messages go to the terminal by default and this environment variable has effect only if \fB\-\-log\-to\-file\fR is given\&. diff -Nru gwyddion-2.46/data/gwyddion.nsit.in gwyddion-2.47/data/gwyddion.nsit.in --- gwyddion-2.46/data/gwyddion.nsit.in 2016-07-25 10:58:51.000000000 +0000 +++ gwyddion-2.47/data/gwyddion.nsit.in 2016-11-16 16:51:18.000000000 +0000 @@ -3,7 +3,7 @@ ; Delete and RMDir commands (that's why the extension is nsit, not nsi). It ; also expands ARCH to either win32 or win64. ; Written by Yeti. Public domain. -; Revision $Id: gwyddion.nsit.in 18763 2016-07-23 12:45:07Z yeti-dn $ +; Revision $Id: gwyddion.nsit.in 19277 2016-11-16 16:51:18Z yeti-dn $ !define GTK_BIN_VERSION "2.10.0" !define PANGO_BIN_VERSION "1.8.0" @@ -260,6 +260,7 @@ GwyExpandFiles "share\gwyddion\ui\toolbox.xml" GwyExpandFiles "share\gwyddion\user-guide-modules" GwyExpandFiles "share\themes\*\*\gtkrc" + GwyExpandFiles "share\gtksourceview-2.0\language-specs\def.lang" GwyExpandFiles "share\gtksourceview-2.0\language-specs\pygwy.lang" GwyExpandFiles "share\gtksourceview-2.0\language-specs\python.lang" GwyExpandFiles "share\gtksourceview-2.0\language-specs\*.rng" diff -Nru gwyddion-2.46/data/gwyddion-thumbnailer.schemas.in gwyddion-2.47/data/gwyddion-thumbnailer.schemas.in --- gwyddion-2.46/data/gwyddion-thumbnailer.schemas.in 2016-10-14 09:43:24.000000000 +0000 +++ gwyddion-2.47/data/gwyddion-thumbnailer.schemas.in 2016-11-18 10:01:15.000000000 +0000 @@ -250,8 +250,8 @@ /schemas/desktop/gnome/thumbnailers/application@x-sensofar-spm/enable/desktop/gnome/thumbnailers/application@x-sensofar-spm/enablegwyddionbooltrueEnable thumbnailing of Sensofar PLu dataTrue enables thumbnailing and false disables the creation of new thumbnails /schemas/desktop/gnome/thumbnailers/application@x-sensofar-spm/command/desktop/gnome/thumbnailers/application@x-sensofar-spm/commandgwyddionstring@bindir@/gwyddion-thumbnailer gnome2 %s %i %oThumbnail command for Sensofar PLu dataValid command plus arguments for the Sensofar PLu data thumbnailer -/schemas/desktop/gnome/thumbnailers/application@x-sensofar-spm/enable/desktop/gnome/thumbnailers/application@x-sensofar-spm/enablegwyddionbooltrueEnable thumbnailing of Sensofar PLUx dataTrue enables thumbnailing and false disables the creation of new thumbnails -/schemas/desktop/gnome/thumbnailers/application@x-sensofar-spm/command/desktop/gnome/thumbnailers/application@x-sensofar-spm/commandgwyddionstring@bindir@/gwyddion-thumbnailer gnome2 %s %i %oThumbnail command for Sensofar PLUx dataValid command plus arguments for the Sensofar PLUx data thumbnailer +/schemas/desktop/gnome/thumbnailers/application@x-sensofarx-spm/enable/desktop/gnome/thumbnailers/application@x-sensofarx-spm/enablegwyddionbooltrueEnable thumbnailing of Sensofar PLUx dataTrue enables thumbnailing and false disables the creation of new thumbnails +/schemas/desktop/gnome/thumbnailers/application@x-sensofarx-spm/command/desktop/gnome/thumbnailers/application@x-sensofarx-spm/commandgwyddionstring@bindir@/gwyddion-thumbnailer gnome2 %s %i %oThumbnail command for Sensofar PLUx dataValid command plus arguments for the Sensofar PLUx data thumbnailer /schemas/desktop/gnome/thumbnailers/application@x-sensolytics-spm/enable/desktop/gnome/thumbnailers/application@x-sensolytics-spm/enablegwyddionbooltrueEnable thumbnailing of Sensolytics SPM dataTrue enables thumbnailing and false disables the creation of new thumbnails /schemas/desktop/gnome/thumbnailers/application@x-sensolytics-spm/command/desktop/gnome/thumbnailers/application@x-sensolytics-spm/commandgwyddionstring@bindir@/gwyddion-thumbnailer gnome2 %s %i %oThumbnail command for Sensolytics SPM dataValid command plus arguments for the Sensolytics SPM data thumbnailer diff -Nru gwyddion-2.46/data/gwyddion.vim gwyddion-2.47/data/gwyddion.vim --- gwyddion-2.46/data/gwyddion.vim 2016-10-14 09:46:04.000000000 +0000 +++ gwyddion-2.47/data/gwyddion.vim 2016-11-18 10:05:52.000000000 +0000 @@ -1,7 +1,7 @@ " Vim syntax file " Language: C gwyddion extension " Maintainer: David Nečas (Yeti) -" Last Change: 2016-10-14 +" Last Change: 2016-11-18 " URL: http://gwyddion.net/download/test/gwyddion.vim " Generated By: vim-syn-gen.py " Options: @@ -11,19 +11,21 @@ " 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_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_class_get_tooltips gwy_3d_window_class_set_tooltips gwy_3d_window_get_3d_view gwy_3d_window_get_type gwy_3d_window_new gwy_3d_window_set_overlay_chooser gwy_app_add_graph_or_curves gwy_app_add_main_accel_group 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_name gwy_app_data_browser_add gwy_app_data_browser_add_brick gwy_app_data_browser_add_channel_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_spectra gwy_app_data_browser_add_surface gwy_app_data_browser_copy_channel gwy_app_data_browser_copy_volume gwy_app_data_browser_copy_xyz 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_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_graph_watch gwy_app_data_browser_reset_visibility gwy_app_data_browser_restore 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_spectra 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_verify_channel 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_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_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_title_key_for_id gwy_app_get_graph_key_for_id gwy_app_get_graph_thumbnail 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_tooltips 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_widget_styles gwy_app_log_browser_for_channel 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_menu_recent_files_get gwy_app_menu_recent_files_update gwy_app_metadata_browser_for_channel 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_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_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_data_items 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_set_fraction gwy_app_wait_set_message gwy_app_wait_set_message_prefix gwy_app_wait_start 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_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_clear gwy_brick_data_changed gwy_brick_extract_line gwy_brick_extract_plane gwy_brick_fill gwy_brick_get_data gwy_brick_get_data_const gwy_brick_get_dval gwy_brick_get_dval_real 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_itor gwy_brick_jtor gwy_brick_ktor gwy_brick_ktor_cal gwy_brick_max_plane gwy_brick_maxpos_plane gwy_brick_mean_plane gwy_brick_min_plane gwy_brick_minpos_plane gwy_brick_multiply gwy_brick_new gwy_brick_new_alike gwy_brick_new_part gwy_brick_resample gwy_brick_rms_plane gwy_brick_rtoi gwy_brick_rtoj gwy_brick_rtok gwy_brick_rtok_cal 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_yoffset gwy_brick_set_yreal gwy_brick_set_zcalibration gwy_brick_set_zoffset gwy_brick_set_zreal gwy_brick_sum_plane 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_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_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_metric_unit_new gwy_combo_box_metric_unit_set_unit gwy_computation_state_type_get_type gwy_container_contains gwy_container_deserialize_from_text gwy_container_duplicate_by_prefix 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_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_correlation_type_get_enum gwy_correlation_type_get_type gwy_curve_channel_get_type gwy_curve_get_control_points gwy_curve_get_type 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_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_acf gwy_data_field_acf_uncertainty gwy_data_field_add gwy_data_field_affine gwy_data_field_angular_average gwy_data_field_area_1dfft gwy_data_field_area_2dacf gwy_data_field_area_2dfft 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_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_dh gwy_data_field_area_dh_uncertainty 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_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_fit_legendre gwy_data_field_area_fit_local_planes gwy_data_field_area_fit_plane gwy_data_field_area_fit_poly gwy_data_field_area_fit_poly_max gwy_data_field_area_fit_polynom gwy_data_field_area_gather 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_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_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_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_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_cached_get_type gwy_data_field_cda gwy_data_field_cdh gwy_data_field_cdh_uncertainty gwy_data_field_check_compatibility 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_convolve gwy_data_field_convolve_1d gwy_data_field_copy 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_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_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_filter_1d gwy_data_field_fft_postprocess 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_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_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_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_dval gwy_data_field_get_dval_real gwy_data_field_get_elliptic_area_size 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_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_max gwy_data_field_get_max_uncertainty 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_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_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_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_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_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_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_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_racf gwy_data_field_renormalize gwy_data_field_resample gwy_data_field_resize gwy_data_field_rotate 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_sum_fields gwy_data_field_threshold gwy_data_field_unrotate_find_corrections gwy_data_field_waterpour gwy_data_field_xdwt gwy_data_field_ydwt 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_clear gwy_data_line_copy gwy_data_line_copy_units_to_data_field gwy_data_line_correct_laplace 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_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_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_multiply 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_polynom gwy_data_line_threshold 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_class_get_tooltips gwy_data_window_class_set_tooltips 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_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_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_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_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_set_axis_label 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_class_get_tooltips gwy_graph_window_class_set_tooltips 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_hash_table_to_list_cb gwy_hash_table_to_slist_cb 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_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_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_find_nearest_line gwy_math_find_nearest_point gwy_math_fit_polynom gwy_math_humanize_numbers gwy_math_is_in_polygon gwy_math_lin_solve gwy_math_lin_solve_rewrite gwy_math_median gwy_math_median_uncertainty 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_correlations gwy_math_nlfit_get_dispersion gwy_math_nlfit_get_max_iterations gwy_math_nlfit_get_sigma gwy_math_nlfit_new gwy_math_nlfit_new_idx gwy_math_nlfit_set_callbacks gwy_math_nlfit_set_max_iterations gwy_math_nlfit_succeeded gwy_math_refine_maximum gwy_math_sort gwy_math_tridiag_solve_rewrite 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_min_max_filter_type_get_type gwy_module_browser gwy_module_error_get_type gwy_module_error_quark gwy_module_file_error_get_type gwy_module_file_error_quark gwy_module_foreach gwy_module_get_filename gwy_module_get_functions gwy_module_lookup gwy_module_register_module gwy_module_register_modules 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_set_model gwy_null_store_set_n_rows gwy_object_set_or_reset gwy_orientation_get_enum gwy_orientation_get_type 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_free gwy_peaks_get_quantity gwy_peaks_n_peaks gwy_peaks_new gwy_peaks_set_background gwy_peaks_set_order 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_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_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_rand_gen_set_choose_shuffle gwy_rand_gen_set_double gwy_rand_gen_set_exponential 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_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_classes_finalize gwy_resource_data_changed gwy_resource_data_saved 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_set_is_preferred gwy_resource_tree_view_set_active gwy_resource_use gwy_rgba_copy gwy_rgba_free gwy_rgba_from_gdk_color gwy_rgba_from_gdk_color_and_alpha gwy_rgba_get_from_container gwy_rgba_get_type gwy_rgba_interpolate 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_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_type_get_type gwy_save_auxiliary_data gwy_save_auxiliary_with_callback 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_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_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_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_si_unit_divide gwy_si_unit_equal 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_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_free gwy_spline_get_closed gwy_spline_get_npoints gwy_spline_get_points gwy_spline_get_slackness gwy_spline_get_tangents 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_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_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_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_table_attach_hscale gwy_table_attach_row gwy_table_attach_spinbutton gwy_table_get_child_widget 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_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_tip_name 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_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_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 +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_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_class_get_tooltips gwy_3d_window_class_set_tooltips gwy_3d_window_get_3d_view gwy_3d_window_get_type gwy_3d_window_new gwy_3d_window_set_overlay_chooser gwy_app_add_graph_or_curves gwy_app_add_main_accel_group 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_name gwy_app_data_browser_add gwy_app_data_browser_add_brick gwy_app_data_browser_add_channel_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_spectra gwy_app_data_browser_add_surface gwy_app_data_browser_copy_channel gwy_app_data_browser_copy_volume gwy_app_data_browser_copy_xyz 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_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_graph_watch gwy_app_data_browser_reset_visibility gwy_app_data_browser_restore 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_spectra 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_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_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_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_title_key_for_id gwy_app_get_graph_key_for_id gwy_app_get_graph_thumbnail 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_tooltips 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_widget_styles gwy_app_log_browser_for_channel 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_menu_recent_files_get gwy_app_menu_recent_files_update gwy_app_metadata_browser_for_channel 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_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_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_data_items 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_set_fraction gwy_app_wait_set_message gwy_app_wait_set_message_prefix gwy_app_wait_start 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_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_clear gwy_brick_data_changed gwy_brick_extract_line gwy_brick_extract_plane gwy_brick_fill gwy_brick_get_data gwy_brick_get_data_const gwy_brick_get_dval gwy_brick_get_dval_real 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_itor gwy_brick_jtor gwy_brick_ktor gwy_brick_ktor_cal gwy_brick_max_plane gwy_brick_maxpos_plane gwy_brick_mean_plane gwy_brick_min_plane gwy_brick_minpos_plane gwy_brick_multiply gwy_brick_new gwy_brick_new_alike gwy_brick_new_part gwy_brick_resample gwy_brick_rms_plane gwy_brick_rtoi gwy_brick_rtoj gwy_brick_rtok gwy_brick_rtok_cal 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_yoffset gwy_brick_set_yreal gwy_brick_set_zcalibration gwy_brick_set_zoffset gwy_brick_set_zreal gwy_brick_sum_plane 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_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_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_metric_unit_new gwy_combo_box_metric_unit_set_unit gwy_computation_state_type_get_type gwy_container_contains gwy_container_deserialize_from_text gwy_container_duplicate_by_prefix 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_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_correlation_type_get_enum gwy_correlation_type_get_type gwy_curve_channel_get_type gwy_curve_get_control_points gwy_curve_get_type 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_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_acf gwy_data_field_acf_uncertainty gwy_data_field_add gwy_data_field_affine gwy_data_field_angular_average gwy_data_field_area_1dfft gwy_data_field_area_2dacf gwy_data_field_area_2dfft 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_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_dh gwy_data_field_area_dh_uncertainty 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_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_fit_legendre gwy_data_field_area_fit_local_planes gwy_data_field_area_fit_plane gwy_data_field_area_fit_poly gwy_data_field_area_fit_poly_max gwy_data_field_area_fit_polynom gwy_data_field_area_gather 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_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_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_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_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_cached_get_type gwy_data_field_cda gwy_data_field_cdh gwy_data_field_cdh_uncertainty gwy_data_field_check_compatibility 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_convolve gwy_data_field_convolve_1d gwy_data_field_copy 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_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_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_filter_1d gwy_data_field_fft_postprocess 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_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_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_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_dval gwy_data_field_get_dval_real gwy_data_field_get_elliptic_area_size 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_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_max gwy_data_field_get_max_uncertainty 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_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_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_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_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_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_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_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_racf gwy_data_field_renormalize gwy_data_field_resample gwy_data_field_resize gwy_data_field_rotate 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_sum_fields gwy_data_field_threshold gwy_data_field_unrotate_find_corrections gwy_data_field_waterpour gwy_data_field_xdwt gwy_data_field_ydwt 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_clear gwy_data_line_copy gwy_data_line_copy_units_to_data_field gwy_data_line_correct_laplace 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_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_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_multiply 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_polynom gwy_data_line_threshold 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_class_get_tooltips gwy_data_window_class_set_tooltips 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_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_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_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_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_set_axis_label 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_class_get_tooltips gwy_graph_window_class_set_tooltips 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_hash_table_to_list_cb gwy_hash_table_to_slist_cb 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_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_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_find_nearest_line gwy_math_find_nearest_point gwy_math_fit_polynom gwy_math_humanize_numbers gwy_math_is_in_polygon 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_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_refine_maximum gwy_math_sort gwy_math_tridiag_solve_rewrite 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_min_max_filter_type_get_type gwy_module_browser gwy_module_error_get_type gwy_module_error_quark gwy_module_file_error_get_type gwy_module_file_error_quark gwy_module_foreach gwy_module_get_filename gwy_module_get_functions 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_set_model gwy_null_store_set_n_rows gwy_object_set_or_reset gwy_orientation_get_enum gwy_orientation_get_type 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_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_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_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_rand_gen_set_choose_shuffle gwy_rand_gen_set_double gwy_rand_gen_set_exponential 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_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_classes_finalize gwy_resource_data_changed gwy_resource_data_saved 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_set_is_preferred gwy_resource_tree_view_set_active gwy_resource_use gwy_rgba_copy gwy_rgba_free gwy_rgba_from_gdk_color gwy_rgba_from_gdk_color_and_alpha 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_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_type_get_type gwy_save_auxiliary_data gwy_save_auxiliary_with_callback 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_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_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_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_flags gwy_shape_fit_preset_get_param_name gwy_shape_fit_preset_get_param_units 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_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_setup gwy_shape_fit_presets gwy_si_unit_divide gwy_si_unit_equal 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_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_free gwy_spline_get_closed gwy_spline_get_npoints gwy_spline_get_points gwy_spline_get_slackness gwy_spline_get_tangents 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_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_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_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_table_attach_hscale gwy_table_attach_row gwy_table_attach_spinbutton gwy_table_get_child_widget 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_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_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_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_APP_BRICK GWY_APP_BRICK_ID GWY_APP_BRICK_KEY GWY_APP_CONTAINER GWY_APP_CONTAINER_ID 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_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_BYTE_ORDER_BIG_ENDIAN 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_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_LATERAL GWY_DATA_COMPATIBILITY_MEASURE 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_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_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_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_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_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_PIXEL_AREA GWY_GRAIN_VALUE_PROJECTED_AREA 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_LOG GWY_HSCALE_NO_SCALE 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_MEAN GWY_LINE_STAT_MEDIAN GWY_LINE_STAT_MINIMUM 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_DATA GWY_MENU_FLAG_DATA_MASK GWY_MENU_FLAG_DATA_SHOW GWY_MENU_FLAG_FILE GWY_MENU_FLAG_GRAPH 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_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_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_ORIENTATION_HORIZONTAL GWY_ORIENTATION_VERTICAL GWY_PAGE_CHANNELS GWY_PAGE_GRAPHS GWY_PAGE_NOPAGE GWY_PAGE_SPECTRA GWY_PAGE_VOLUMES GWY_PAGE_XYZS 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_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_SURFACE_DENSITY GWY_PREVIEW_SURFACE_FILL 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_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_SI_UNIT_FORMAT_MARKUP GWY_SI_UNIT_FORMAT_NONE GWY_SI_UNIT_FORMAT_PLAIN GWY_SI_UNIT_FORMAT_TEX GWY_SI_UNIT_FORMAT_VFMARKUP GWY_SYMMETRY_AUTO GWY_SYMMETRY_HEXAGONAL GWY_SYMMETRY_LAST GWY_SYMMETRY_PARALLEL GWY_SYMMETRY_RHOMBIC GWY_SYMMETRY_SQUARE GWY_SYMMETRY_TRIANGULAR 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_CONE GWY_TIP_CONTACT GWY_TIP_DELTA GWY_TIP_NONCONTACT GWY_TIP_PARABOLA 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 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 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 GwyLayerBasic GwyLayerBasicClass GwyLayerMask GwyLayerMaskClass GwyMarkerBox GwyMarkerBoxClass GwyModuleInfo GwyNLFitPreset GwyNLFitPresetBuiltin GwyNLFitPresetClass GwyNLFitter GwyNullStore GwyNullStoreClass GwyPeaks GwyPixmapLayer GwyPixmapLayerClass GwyPlainTool GwyPlainToolClass GwyRGBA GwyRandGenSet GwyRectSelectionLabels GwyResource GwyResourceClass GwyResourceEditor GwyResourceEditorClass 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 GwySpectra GwySpectraClass GwySpline GwyStatusbar GwyStatusbarClass GwyStringList GwyStringListClass GwySurface GwySurfaceClass GwyTextEntity GwyTextHeaderContext GwyTextHeaderParser GwyTipModelPreset 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_APP_BRICK GWY_APP_BRICK_ID GWY_APP_BRICK_KEY GWY_APP_CONTAINER GWY_APP_CONTAINER_ID 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_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_BYTE_ORDER_BIG_ENDIAN 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_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_LATERAL GWY_DATA_COMPATIBILITY_MEASURE 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_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_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_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_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_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_PIXEL_AREA GWY_GRAIN_VALUE_PROJECTED_AREA 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_LOG GWY_HSCALE_NO_SCALE 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_MEAN GWY_LINE_STAT_MEDIAN GWY_LINE_STAT_MINIMUM 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_DATA GWY_MENU_FLAG_DATA_MASK GWY_MENU_FLAG_DATA_SHOW GWY_MENU_FLAG_FILE GWY_MENU_FLAG_GRAPH 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_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_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_GRAPHS GWY_PAGE_NOPAGE GWY_PAGE_SPECTRA GWY_PAGE_VOLUMES GWY_PAGE_XYZS 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_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_SURFACE_DENSITY GWY_PREVIEW_SURFACE_FILL 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_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_SI_UNIT_FORMAT_MARKUP GWY_SI_UNIT_FORMAT_NONE GWY_SI_UNIT_FORMAT_PLAIN GWY_SI_UNIT_FORMAT_TEX GWY_SI_UNIT_FORMAT_VFMARKUP GWY_SYMMETRY_AUTO GWY_SYMMETRY_HEXAGONAL GWY_SYMMETRY_LAST GWY_SYMMETRY_PARALLEL GWY_SYMMETRY_RHOMBIC GWY_SYMMETRY_SQUARE GWY_SYMMETRY_TRIANGULAR 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_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 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 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 GwyLayerBasic GwyLayerBasicClass GwyLayerMask GwyLayerMaskClass GwyMarkerBox GwyMarkerBoxClass GwyModuleInfo GwyNLFitPreset GwyNLFitPresetBuiltin GwyNLFitPresetClass GwyNLFitter GwyNullStore GwyNullStoreClass GwyPeaks GwyPixmapLayer GwyPixmapLayerClass GwyPlainTool GwyPlainToolClass GwyRGBA GwyRandGenSet GwyRectSelectionLabels GwyResource GwyResourceClass GwyResourceEditor GwyResourceEditorClass 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 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_duplicate gwy_data_field_get_xmeasure gwy_data_field_get_ymeasure gwy_data_line_duplicate gwy_debug gwy_debug_objects_creation gwy_graph_curve_model_duplicate gwy_graph_model_duplicate gwy_info gwy_object_unref gwy_selection_duplicate gwy_si_unit_duplicate gwy_signal_handler_disconnect gwy_spectra_duplicate gwy_strequal gwy_string_list_duplicate gwy_surface_clone gwy_surface_duplicate 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_vector_layer_get_selection_type hypot ngettext pow10 -syn keyword gwyddionEnum Gwy2DCWTWaveletType Gwy3DMovement Gwy3DProjection Gwy3DViewLabel Gwy3DVisualization GwyAppLoggingFlags GwyAppPage GwyAppSettingsError GwyAppWhat GwyAxisScaleFormat GwyByteOrder GwyComputationStateType GwyCorrelationType GwyCurveChannel GwyCurveType GwyDWTDenoiseType GwyDWTType GwyDataCompatibilityFlags GwyDataError GwyDataFieldCached GwyDataItem GwyDataValidateFlags GwyDataViewLayerType GwyDataWatchEventType GwyDebugObjectsDumpFlags GwyDistanceTransformType GwyExprError GwyExteriorType GwyFileOperationType GwyGrainQuantity GwyGrainValueFlags GwyGrainValueGroup GwyGrainValueStoreColumn GwyGraphCurveType GwyGraphGridType GwyGraphLabelPosition GwyGraphModelExportStyle GwyGraphPointType GwyGraphStatusType GwyHScaleStyle GwyHelpFlags GwyInterpolationType GwyLayerBasicRangeType GwyLineStatQuantity GwyMarkerOperationType GwyMaskingType GwyMenuSensFlags GwyMergeType GwyMinMaxFilterType GwyModuleError GwyModuleFileError GwyOrientation GwyPeakBackgroundType GwyPeakOrderType GwyPeakQuantity GwyPlainToolChanged GwyPlaneFitQuantity GwyPlaneSymmetry GwyPreviewSurfaceFlags GwyRawDataType GwyRenderingTarget GwyRotateResizeType GwyRunType GwySIUnitFormatStyle GwyTextHeaderError GwyTicksStyle GwyTipType GwyToolResponseType GwyTransformDirection GwyUnitsPlacement GwyVisibilityResetType GwyWatershedStateType GwyWindowingType -syn keyword gwyddionUserFunction GwyAppDataForeachFunc GwyAppDataWatchFunc GwyColorAxisMapFunc GwyCoordTransform2DFunc GwyDataChooserFilterFunc GwyDeserializeFunc GwyFileDetectFunc GwyFileLoadFunc GwyFileSaveFunc GwyGraphFunc GwyMarkerValidateFunc GwyModuleQueryFunc GwyModuleRegisterFunc GwyNLFitDerFunc GwyNLFitFunc GwyNLFitIdxDiffFunc GwyNLFitIdxFunc GwyProcessFunc GwySaveAuxiliaryCreate GwySaveAuxiliaryDestroy GwySelectionFilterFunc GwySerializeFunc GwySetFractionFunc GwySetMessageFunc GwyTipGuessFunc GwyTipModelFunc 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_FILE_ERROR GWY_SQRT3 GWY_SQRT_PI GWY_STOCK_3D_BASE GWY_STOCK_ARITHMETIC 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_CORRECT_AFFINE GWY_STOCK_CROP GWY_STOCK_CWT GWY_STOCK_DATA_MEASURE 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_LEVEL GWY_STOCK_FAVOURITE GWY_STOCK_FFT GWY_STOCK_FFT_2D GWY_STOCK_FFT_FILTER_2D GWY_STOCK_FILTER GWY_STOCK_FIND_PEAKS GWY_STOCK_FIX_ZERO GWY_STOCK_FLIP_HORIZONTALLY GWY_STOCK_FLIP_VERTICALLY GWY_STOCK_FRACTAL 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_REMOVE GWY_STOCK_GRAINS_WATER GWY_STOCK_GRAIN_CORRELATION GWY_STOCK_GRAIN_EXSCRIBED_CIRCLE 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_VERTICAL GWY_STOCK_GRAPH_ZOOM_FIT GWY_STOCK_GRAPH_ZOOM_IN GWY_STOCK_GRAPH_ZOOM_OUT GWY_STOCK_GWYDDION GWY_STOCK_HOUGH 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_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_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_PAINT_DRAW GWY_STOCK_MASK_PAINT_ERASE GWY_STOCK_MASK_RECT_EXCLUSIVE GWY_STOCK_MASK_RECT_INCLUSIVE GWY_STOCK_MASK_REMOVE GWY_STOCK_MASK_SHRINK GWY_STOCK_MASK_SUBTRACT GWY_STOCK_MASK_THIN GWY_STOCK_MEASURE_LATTICE GWY_STOCK_MERGE GWY_STOCK_MORE GWY_STOCK_MUTUAL_CROP GWY_STOCK_NEURAL_APPLY GWY_STOCK_NEURAL_TRAIN GWY_STOCK_PALETTES GWY_STOCK_PATH_LEVEL GWY_STOCK_POINTER_MEASURE GWY_STOCK_POLYNOM GWY_STOCK_POLYNOM_LEVEL GWY_STOCK_POLY_DISTORT GWY_STOCK_PROFILE GWY_STOCK_PSDF_LOG_PHI GWY_STOCK_PSDF_SECTION GWY_STOCK_PYGWY GWY_STOCK_REMOVE_UNDER_MASK GWY_STOCK_ROTATE GWY_STOCK_ROTATE_180 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_SELECTIONS GWY_STOCK_SHADER GWY_STOCK_SPECTRUM GWY_STOCK_SPOT_REMOVE GWY_STOCK_STAT_QUANTITIES GWY_STOCK_STRAIGHTEN_PATH GWY_STOCK_SUBSCRIPT GWY_STOCK_SUPERSCRIPT GWY_STOCK_SYNTHETIC_BALLISTIC_DEPOSITION GWY_STOCK_SYNTHETIC_BROWNIAN_MOTION GWY_STOCK_SYNTHETIC_COLUMNAR GWY_STOCK_SYNTHETIC_DIFFUSION GWY_STOCK_SYNTHETIC_DOMAINS 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_SPECTRAL GWY_STOCK_SYNTHETIC_WAVES 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_CALIBRATE GWY_STOCK_VOLUME_DIMENSIONS GWY_STOCK_VOLUME_FD GWY_STOCK_VOLUME_INVERT GWY_STOCK_VOLUME_KMEANS GWY_STOCK_VOLUME_KMEDIANS GWY_STOCK_VOLUME_SLICE GWY_STOCK_VOLUMIZE GWY_STOCK_VOLUMIZE_LAYERS GWY_STOCK_ZERO_MEAN 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_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_BYTE_ORDER GWY_TYPE_CALDATA GWY_TYPE_CALIBRATION GWY_TYPE_CDLINE GWY_TYPE_COLOR_AXIS GWY_TYPE_COLOR_BUTTON GWY_TYPE_COMPUTATION_STATE_TYPE GWY_TYPE_CONTAINER GWY_TYPE_CORRELATION_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_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_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_MIN_MAX_FILTER_TYPE GWY_TYPE_MODULE_ERROR GWY_TYPE_MODULE_FILE_ERROR GWY_TYPE_NLFIT_PRESET GWY_TYPE_NULL_STORE GWY_TYPE_ORIENTATION GWY_TYPE_PEAK_BACKGROUND_TYPE GWY_TYPE_PEAK_ORDER_TYPE GWY_TYPE_PEAK_QUANTITY 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_RAW_DATA_TYPE GWY_TYPE_RESOURCE GWY_TYPE_RESOURCE_EDITOR GWY_TYPE_RGBA GWY_TYPE_ROTATE_RESIZE_TYPE GWY_TYPE_RULER GWY_TYPE_RUN_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_SI_UNIT GWY_TYPE_SI_UNIT_FORMAT_STYLE GWY_TYPE_SI_VALUE_FORMAT GWY_TYPE_SPECTRA GWY_TYPE_STATUSBAR GWY_TYPE_STRING_LIST GWY_TYPE_SURFACE GWY_TYPE_TEXT_HEADER_ERROR GWY_TYPE_TICKS_STYLE 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 +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_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_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_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_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_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_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_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_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_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_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_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_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_duplicate gwy_data_field_get_xmeasure gwy_data_field_get_ymeasure gwy_data_line_duplicate gwy_debug gwy_debug_objects_creation gwy_graph_curve_model_duplicate gwy_graph_model_duplicate gwy_info gwy_object_unref gwy_selection_duplicate gwy_si_unit_duplicate gwy_signal_handler_disconnect gwy_spectra_duplicate gwy_strequal gwy_string_list_duplicate gwy_surface_clone gwy_surface_duplicate 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_vector_layer_get_selection_type hypot ngettext pow10 +syn keyword gwyddionEnum Gwy2DCWTWaveletType Gwy3DMovement Gwy3DProjection Gwy3DViewLabel Gwy3DVisualization GwyAppLoggingFlags GwyAppPage GwyAppSettingsError GwyAppWhat GwyAxisScaleFormat GwyByteOrder GwyComputationStateType GwyCorrelationType GwyCurveChannel GwyCurveType GwyDWTDenoiseType GwyDWTType GwyDataCompatibilityFlags GwyDataError GwyDataFieldCached GwyDataItem GwyDataValidateFlags GwyDataViewLayerType GwyDataWatchEventType GwyDebugObjectsDumpFlags GwyDistanceTransformType GwyExprError GwyExteriorType GwyFileOperationType GwyGrainQuantity GwyGrainValueFlags GwyGrainValueGroup GwyGrainValueStoreColumn GwyGraphCurveType GwyGraphGridType GwyGraphLabelPosition GwyGraphModelExportStyle GwyGraphPointType GwyGraphStatusType GwyHScaleStyle GwyHelpFlags GwyInterpolationType GwyLayerBasicRangeType GwyLineStatQuantity GwyMarkerOperationType GwyMaskingType GwyMenuSensFlags GwyMergeType GwyMinMaxFilterType GwyModuleError GwyModuleFileError GwyNLFitParamFlags GwyOrientation GwyPeakBackgroundType GwyPeakOrderType GwyPeakQuantity GwyPlainToolChanged GwyPlaneFitQuantity GwyPlaneSymmetry GwyPreviewSurfaceFlags GwyRawDataType GwyRenderingTarget GwyRotateResizeType GwyRunType GwySIUnitFormatStyle GwyTextHeaderError GwyTicksStyle GwyTipParamType GwyTipType GwyToolResponseType GwyTransformDirection GwyUnitsPlacement GwyVisibilityResetType GwyWatershedStateType GwyWindowingType +syn keyword gwyddionUserFunction GwyAppDataForeachFunc GwyAppDataWatchFunc GwyColorAxisMapFunc GwyCoordTransform2DFunc GwyDataChooserFilterFunc GwyDeserializeFunc GwyFileDetectFunc GwyFileLoadFunc GwyFileSaveFunc GwyGraphFunc GwyMarkerValidateFunc GwyModuleQueryFunc GwyModuleRegisterFunc GwyNLFitDerFunc GwyNLFitFunc GwyNLFitIdxDiffFunc GwyNLFitIdxFunc GwyProcessFunc 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_FILE_ERROR GWY_SQRT3 GWY_SQRT_PI GWY_STOCK_3D_BASE GWY_STOCK_ARITHMETIC 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_CORRECT_AFFINE GWY_STOCK_CROP GWY_STOCK_CWT GWY_STOCK_DATA_MEASURE 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_LEVEL GWY_STOCK_FAVOURITE GWY_STOCK_FFT GWY_STOCK_FFT_2D GWY_STOCK_FFT_FILTER_2D GWY_STOCK_FILTER GWY_STOCK_FIND_PEAKS GWY_STOCK_FIX_ZERO GWY_STOCK_FLIP_HORIZONTALLY GWY_STOCK_FLIP_VERTICALLY GWY_STOCK_FRACTAL 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_REMOVE GWY_STOCK_GRAINS_WATER GWY_STOCK_GRAIN_CORRELATION GWY_STOCK_GRAIN_EXSCRIBED_CIRCLE 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_VERTICAL GWY_STOCK_GRAPH_ZOOM_FIT GWY_STOCK_GRAPH_ZOOM_IN GWY_STOCK_GRAPH_ZOOM_OUT GWY_STOCK_GWYDDION GWY_STOCK_HOUGH 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_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_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_PAINT_DRAW GWY_STOCK_MASK_PAINT_ERASE GWY_STOCK_MASK_RECT_EXCLUSIVE GWY_STOCK_MASK_RECT_INCLUSIVE GWY_STOCK_MASK_REMOVE GWY_STOCK_MASK_SHRINK GWY_STOCK_MASK_SUBTRACT GWY_STOCK_MASK_THIN GWY_STOCK_MEASURE_LATTICE GWY_STOCK_MERGE GWY_STOCK_MORE GWY_STOCK_MUTUAL_CROP GWY_STOCK_NEURAL_APPLY GWY_STOCK_NEURAL_TRAIN GWY_STOCK_PALETTES GWY_STOCK_PATH_LEVEL GWY_STOCK_POINTER_MEASURE GWY_STOCK_POLYNOM GWY_STOCK_POLYNOM_LEVEL GWY_STOCK_POLY_DISTORT GWY_STOCK_PROFILE GWY_STOCK_PSDF_LOG_PHI GWY_STOCK_PSDF_SECTION GWY_STOCK_PYGWY GWY_STOCK_REMOVE_UNDER_MASK GWY_STOCK_ROTATE GWY_STOCK_ROTATE_180 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_SELECTIONS GWY_STOCK_SHADER GWY_STOCK_SPECTRUM GWY_STOCK_SPOT_REMOVE GWY_STOCK_STAT_QUANTITIES GWY_STOCK_STRAIGHTEN_PATH GWY_STOCK_SUBSCRIPT GWY_STOCK_SUPERSCRIPT GWY_STOCK_SYNTHETIC_BALLISTIC_DEPOSITION GWY_STOCK_SYNTHETIC_BROWNIAN_MOTION GWY_STOCK_SYNTHETIC_COLUMNAR GWY_STOCK_SYNTHETIC_DIFFUSION GWY_STOCK_SYNTHETIC_DOMAINS 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_SPECTRAL GWY_STOCK_SYNTHETIC_WAVES 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_CALIBRATE GWY_STOCK_VOLUME_DIMENSIONS GWY_STOCK_VOLUME_FD GWY_STOCK_VOLUME_INVERT GWY_STOCK_VOLUME_KMEANS GWY_STOCK_VOLUME_KMEDIANS GWY_STOCK_VOLUME_SLICE GWY_STOCK_VOLUMIZE GWY_STOCK_VOLUMIZE_LAYERS GWY_STOCK_ZERO_MEAN 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_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_BYTE_ORDER GWY_TYPE_CALDATA GWY_TYPE_CALIBRATION GWY_TYPE_CDLINE GWY_TYPE_COLOR_AXIS GWY_TYPE_COLOR_BUTTON GWY_TYPE_COMPUTATION_STATE_TYPE GWY_TYPE_CONTAINER GWY_TYPE_CORRELATION_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_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_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_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_PEAKS GWY_TYPE_PEAK_BACKGROUND_TYPE GWY_TYPE_PEAK_ORDER_TYPE GWY_TYPE_PEAK_QUANTITY 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_RAW_DATA_TYPE GWY_TYPE_RENDERING_TARGET GWY_TYPE_RESOURCE GWY_TYPE_RESOURCE_EDITOR GWY_TYPE_RGBA GWY_TYPE_ROTATE_RESIZE_TYPE GWY_TYPE_RULER GWY_TYPE_RUN_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_STATUSBAR GWY_TYPE_STRING_LIST GWY_TYPE_SURFACE GWY_TYPE_TEXT_HEADER_ERROR GWY_TYPE_TICKS_STYLE 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 syn keyword gwyddionDeprecatedFunction 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_dialog_prevent_delete_cb gwy_get_pango_ft2_font_map syn keyword gwyddionDeprecatedConstant GWY_TOOL_SWITCH_TOOL GWY_TOOL_SWITCH_WINDOW +syn keyword gwyddionDeprecatedStruct GwyTipModelPreset syn keyword gwyddionDeprecatedMacro ROUND syn keyword gwyddionDeprecatedEnum GwyToolSwitchEvent +syn keyword gwyddionDeprecatedUserFunction GwyTipGuessFunc GwyTipModelFunc " Default highlighting hi def link gwyddionFunction Function @@ -37,14 +39,18 @@ hi def link gwyddionDefine Constant if exists("gwyddion_deprecated_errors") hi def link gwyddionDeprecatedFunction Error + hi def link gwyddionDeprecatedConstant Error + hi def link gwyddionDeprecatedStruct Error hi def link gwyddionDeprecatedMacro Error hi def link gwyddionDeprecatedEnum Error - hi def link gwyddionDeprecatedConstant Error + hi def link gwyddionDeprecatedUserFunction Error elseif exists("gwyddion_enable_deprecated") hi def link gwyddionDeprecatedFunction Function + hi def link gwyddionDeprecatedConstant Constant + hi def link gwyddionDeprecatedStruct Type hi def link gwyddionDeprecatedMacro Macro hi def link gwyddionDeprecatedEnum Type - hi def link gwyddionDeprecatedConstant Constant + hi def link gwyddionDeprecatedUserFunction Type endif diff -Nru gwyddion-2.46/data/gwyddion.xml gwyddion-2.47/data/gwyddion.xml --- gwyddion-2.46/data/gwyddion.xml 2016-10-14 09:43:24.000000000 +0000 +++ gwyddion-2.47/data/gwyddion.xml 2016-11-18 10:01:15.000000000 +0000 @@ -826,7 +826,7 @@ - + Sensofar PLUx data diff -Nru gwyddion-2.46/debian/changelog gwyddion-2.47/debian/changelog --- gwyddion-2.46/debian/changelog 2016-10-17 19:06:51.000000000 +0000 +++ gwyddion-2.47/debian/changelog 2016-11-22 20:51:38.000000000 +0000 @@ -1,3 +1,13 @@ +gwyddion (2.47-1) unstable; urgency=medium + + * debian/control: + - change to https-transport in Vcs-Browser field + * debian/rules: + - add hardening+=bindnow linker flag to increase security + * New upstream release + + -- Jan Beyer Tue, 22 Nov 2016 21:51:38 +0100 + gwyddion (2.46-1) unstable; urgency=medium * debian/control: diff -Nru gwyddion-2.46/debian/control gwyddion-2.47/debian/control --- gwyddion-2.46/debian/control 2016-06-20 10:00:19.000000000 +0000 +++ gwyddion-2.47/debian/control 2016-11-14 11:49:54.000000000 +0000 @@ -21,7 +21,7 @@ libxml2-dev, chrpath Standards-Version: 3.9.8 -Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gwyddion/trunk/ +Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/gwyddion/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gwyddion/trunk/ Homepage: http://gwyddion.net/ diff -Nru gwyddion-2.46/debian/copyright gwyddion-2.47/debian/copyright --- gwyddion-2.46/debian/copyright 2016-10-17 19:06:51.000000000 +0000 +++ gwyddion-2.47/debian/copyright 2016-11-14 11:49:54.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gwyddion Upstream-Contact: David Necas (Yeti) Petr Klapetek @@ -155,7 +155,7 @@ License: GPL-2+ Files: modules/tools/distance.c -Copyright: 2003-2006 Nenad Ocelic +Copyright: 2003-2006 Nenad Ocelic 2003-2006 David Necas (Yeti) 2003-2006 Petr Klapetek License: GPL-2+ @@ -189,11 +189,6 @@ and the GNU Lesser General Public License (LGPL) can be found in `/usr/share/common-licenses/'. -Files: app/ige-mac-menu.* -Copyright: 2007 Pioneer Research Center USA, Inc. - 2007, 2008 Imendio AB -License: LGPL-2.1 - Files: app/mac_integration.* Copyright: 2009 Andrey Gruzdev License: GPL-2+ @@ -290,25 +285,6 @@ On a Debian system, the GNU GPL license version 3 is distributed in the file ‘/usr/share/common-licenses/GPL-3’. -License: LGPL-2 - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; version 2.1 - of the License. - . - This library 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 - Lesser 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. - . - On a Debian system, the LGPL license version 2 is distributed in the file - ‘/usr/share/common-licenses/LGPL-2’. - License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -327,25 +303,6 @@ On a Debian system, the LGPL license version 2 is distributed in the file ‘/usr/share/common-licenses/LGPL-2’. -License: LGPL-2.1 - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; version 2.1 - of the License. - . - This library 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 - Lesser 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. - . - On a Debian system, the LGPL license version 2.1 is distributed in the file - ‘/usr/share/common-licenses/LGPL-2.1’. - License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -364,4 +321,3 @@ . On a Debian system, the LGPL license version 2.1 is distributed in the file ‘/usr/share/common-licenses/LGPL-2.1’. - diff -Nru gwyddion-2.46/debian/rules gwyddion-2.47/debian/rules --- gwyddion-2.46/debian/rules 2013-10-16 11:58:29.000000000 +0000 +++ gwyddion-2.47/debian/rules 2016-11-14 11:49:54.000000000 +0000 @@ -6,6 +6,9 @@ #DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=\$${libdir} CFLAGS= "-Wall -g" --disable-rpath DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=\$${libdir} --disable-rpath #DEB_BUILDDIR := $(DEB_SRCDIR)/debian/tmp +export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk DEB_DH_INSTALL_SOURCEDIR := $(DEB_SRCDIR)/debian/tmp DEB_INSTALL_CHANGELOGS_ALL := DEB_INSTALL_DOCS_gwyddion := modules/pygwy/README.pygwy diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-41.html gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-41.html --- gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-41.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-41.html 2016-11-18 10:59:31.000000000 +0000 @@ -26,10 +26,6 @@ Index of new symbols in 2.41

A

-GwyAppDataId, struct in GwyDataChooser -
-
-
gwy_app_add_graph_or_curves, function in module utils
diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-46.html gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-46.html --- gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-46.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-46.html 2016-11-18 10:59:31.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -18,7 +19,7 @@ Home Prev - +Next

diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-47.html gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-47.html --- gwyddion-2.46/devel-docs/libgwyapp/html/api-index-2-47.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/api-index-2-47.html 2016-11-18 10:59:31.000000000 +0000 @@ -0,0 +1,41 @@ + + + + +Index of new symbols in 2.47: Gwyddion Application Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.47

+

A

+
+gwy_app_data_id_copy, function in GwyDataChooser +
+
+
+gwy_app_data_id_free, function in GwyDataChooser +
+
+
+gwy_app_data_id_new, function in GwyDataChooser +
+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/api-index-all.html gwyddion-2.47/devel-docs/libgwyapp/html/api-index-all.html --- gwyddion-2.46/devel-docs/libgwyapp/html/api-index-all.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/api-index-all.html 2016-11-18 10:59:31.000000000 +0000 @@ -52,10 +52,6 @@
-GwyAppDataId, struct in GwyDataChooser -
-
-
GwyAppDataWatchFunc, user_function in data-browser
@@ -312,6 +308,18 @@
+gwy_app_data_id_copy, function in GwyDataChooser +
+
+
+gwy_app_data_id_free, function in GwyDataChooser +
+
+
+gwy_app_data_id_new, function in GwyDataChooser +
+
+
GWY_APP_DATA_ID_NONE, macro in GwyDataChooser
diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/GwyDataChooser.html gwyddion-2.47/devel-docs/libgwyapp/html/GwyDataChooser.html --- gwyddion-2.46/devel-docs/libgwyapp/html/GwyDataChooser.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/GwyDataChooser.html 2016-11-18 10:59:31.000000000 +0000 @@ -82,6 +82,30 @@ +GwyAppDataId * + + +gwy_app_data_id_new () + + + + +GwyAppDataId * + + +gwy_app_data_id_copy () + + + + +void + + +gwy_app_data_id_free () + + + + gboolean @@ -161,16 +185,10 @@ - - -  -GwyAppDataId - - + #define GWY_APP_DATA_ID_NONE - - +

@@ -369,6 +387,97 @@
+

gwy_app_data_id_new ()

+
GwyAppDataId *
+gwy_app_data_id_new (gint datano,
+                     gint id);
+

Creates a new data identifier on heap.

+

This is mostly useful for language bindings.

+
+

Parameters

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

datano

Numeric identifier of data container. Zero is used for none.

 

id

Numeric identifier of a specific data item, such as channel or graph +number. Value -1 is used for none.

 
+
+
+

Returns

+

Newly allocated data id. It must be freed with +gwy_app_data_id_free().

+
+

Since: 2.47

+
+
+
+

gwy_app_data_id_copy ()

+
GwyAppDataId *
+gwy_app_data_id_copy (GwyAppDataId *dataid);
+

Creates a copy of data identifier.

+

This is mostly useful for language bindings.

+
+

Parameters

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

dataid

Data identifier.

 
+
+
+

Returns

+

Newly allocated data id. It must be freed with +gwy_app_data_id_free().

+
+

Since: 2.47

+
+
+
+

gwy_app_data_id_free ()

+
void
+gwy_app_data_id_free (GwyAppDataId *dataid);
+

Frees a data identifier.

+

This is mostly useful for language bindings.

+
+

Parameters

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

dataid

Data identifier.

 
+
+

Since: 2.47

+
+
+

gwy_data_chooser_set_active ()

gboolean
 gwy_data_chooser_set_active (GwyDataChooser *chooser,
@@ -449,7 +558,7 @@
 
gwy_data_chooser_set_active_id ()

 
gboolean
 gwy_data_chooser_set_active_id (GwyDataChooser *chooser,
-                                const GwyAppDataId *id);

+                                const GwyAppDataId *id);

Selects a data in a data chooser using numerical identifiers.

Passing NULL as id is permitted as a request to select the ‘none’ item.

@@ -486,7 +595,7 @@

gwy_data_chooser_get_active_id ()

gboolean
 gwy_data_chooser_get_active_id (GwyDataChooser *chooser,
-                                GwyAppDataId *id);
+ GwyAppDataId *id);

Gets the selected item in a data chooser as numerical identifiers.

Parameters

@@ -689,46 +798,10 @@

Types and Values

-

GwyAppDataId

-
typedef struct {
-    gint datano;
-    gint id;
-} GwyAppDataId;
-
-

Auxiliary structure representing one data item in an open file.

-

The data container number can be obtained with gwy_app_data_browser_get() -and used to look up the container with gwy_app_data_browser_get_number().

-
-

Members

-
----- - - - - - - - - - - - - -

gint datano;

Numeric identifier of data container. Zero is used for none.

 

gint id;

Numeric identifier of a specific data item, such as channel or graph -number. Value -1 is used for none.

 
-
-

Since: 2.41

-
-
-

GWY_APP_DATA_ID_NONE

#define GWY_APP_DATA_ID_NONE { 0, -1 }
-

Initialiser for GwyAppDataId that corresponds to no data.

+

Initialiser for GwyAppDataId that corresponds to no data.

The macro would be typically used

diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/GwyPlainTool.html gwyddion-2.47/devel-docs/libgwyapp/html/GwyPlainTool.html --- gwyddion-2.46/devel-docs/libgwyapp/html/GwyPlainTool.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/GwyPlainTool.html 2016-11-18 10:59:31.000000000 +0000 @@ -523,6 +523,34 @@ gwy_rect_selection_labels_select (GwyRectSelectionLabels *rlabels, GwySelection *selection, GwyDataField *dfield); +

Updates selection data using rectangular selection information table.

+
+

Parameters

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

rlabels

Rectangular selection information table.

 

selection

A rectangular selection to fill information into.

 

dfield

A data field to use for real/pixel coordinate transforms.

 
+
diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/index.html gwyddion-2.47/devel-docs/libgwyapp/html/index.html --- gwyddion-2.46/devel-docs/libgwyapp/html/index.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/index.html 2016-11-18 10:59:31.000000000 +0000 @@ -15,7 +15,7 @@

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

@@ -106,6 +106,7 @@
Index of new symbols in 2.43
Index of new symbols in 2.45
Index of new symbols in 2.46
+
Index of new symbols in 2.47
diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-data-browser.html gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-data-browser.html --- gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-data-browser.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-data-browser.html 2016-11-18 10:59:31.000000000 +0000 @@ -752,6 +752,37 @@

Description

+

The data browser is both an entity that monitors of various data in Gwyddion +and the corresponding user interface showing the data lists and letting the +user deleting or copying them. The public functions are generally related +to the first part.

+

An GwyContainer that represents an SPM file is managed by functions such as +gwy_app_data_browser_add() or gwy_app_data_browser_remove(). Note that +the high-level libgwyapp functions (with app in their name) such as +gwy_app_file_load() already call the data browser functions as appropriate.

+

If a file-like GwyContainer has not been added to the data browser it is +unmanaged and cannot be used with most of the data browser functions. +The exceptions are +GQuark constructors such as gwy_app_get_mask_key_for_id(), +copying functions such as gwy_app_data_browser_copy_channel(), +title management functions such as gwy_app_set_surface_title(), +thumbnail creation helpers such as gwy_app_get_graph_thumbnail(), +and functions for listing the ids of various data types such as +gwy_app_data_browser_get_data_ids().

+

Individual data pieces can be added to managed GwyContainers with functions +such as gwy_app_data_browser_add_data_field() that can take care of creating +the window showing the new data. Removal is generally done by directly +removing the corresponding data object(s) from the GwyContainer.

+

An important part of the data browser is keeping track which data item is +currently selected (to know what a data processing method should process, +etc.). You can obtain the information about various currently selected +objects using gwy_app_data_browser_get_current(). Making a data item +currently selected is accomplished either using function such as +gwy_app_data_browser_select_data_view(), which corresponds to the user +switching to the data window, or gwy_app_data_browser_select_data_field() +which just selects the data item as current in the browser. The latter +is less safe and can result in strange behaviour because for some purposes +only data actually displayed can be ‘current’.

Functions

@@ -1487,6 +1518,9 @@ 
gint *
 gwy_app_data_browser_get_data_ids (GwyContainer *data);

Gets the list of all channels in a data container.

+

The function originally could be used only for data containers managed by +the data browser. Since version 2.45 it can be used for all file-like +data containers.

Parameters

@@ -1497,7 +1531,7 @@ - +

data

A data container managed by the data-browser.

A data container.

  
@@ -1513,6 +1547,9 @@ 
gint *
 gwy_app_data_browser_get_graph_ids (GwyContainer *data);

Gets the list of all graphs in a data container.

+

The function originally could be used only for data containers managed by +the data browser. Since version 2.45 it can be used for all file-like +data containers.

Parameters

@@ -1523,7 +1560,7 @@ - +

data

A data container managed by the data-browser.

A data container.

  
@@ -1539,6 +1576,9 @@ 
gint *
 gwy_app_data_browser_get_spectra_ids (GwyContainer *data);

Gets the list of all spectra in a data container.

+

The function originally could be used only for data containers managed by +the data browser. Since version 2.45 it can be used for all file-like +data containers.

Parameters

@@ -1549,7 +1589,7 @@ - +

data

A data container managed by the data-browser.

A data container.

  
@@ -1566,6 +1606,9 @@ 
gint *
 gwy_app_data_browser_get_volume_ids (GwyContainer *data);

Gets the list of all volume data in a data container.

+

The function originally could be used only for data containers managed by +the data browser. Since version 2.45 it can be used for all file-like +data containers.

Parameters

@@ -1576,7 +1619,7 @@ - +

data

A data container managed by the data-browser.

A data container.

  
@@ -1603,7 +1646,7 @@

data

-

A data container managed by the data-browser.

+

A data container.

 
diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp.devhelp2 gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp.devhelp2 --- gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp.devhelp2 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp.devhelp2 2016-11-18 10:59:31.000000000 +0000 @@ -40,6 +40,7 @@ + @@ -147,6 +148,9 @@ + + + @@ -156,7 +160,6 @@ - @@ -464,8 +467,6 @@ - - diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-file.html gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-file.html --- gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-file.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-file.html 2016-11-18 10:59:31.000000000 +0000 @@ -284,7 +284,7 @@

name

-

File type to open file as, but normally NULL to automatically detect +

File type to save file as, but normally NULL to automatically detect from file name.

  diff -Nru gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-module-utils.html gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-module-utils.html --- gwyddion-2.46/devel-docs/libgwyapp/html/libgwyapp-module-utils.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/html/libgwyapp-module-utils.html 2016-11-18 10:59:31.000000000 +0000 @@ -390,7 +390,7 @@ 
gint
 gwy_app_add_graph_or_curves (GwyGraphModel *gmodel,
                              GwyContainer *data,
-                             const GwyAppDataId *target_graph,
+                             const GwyAppDataId *target_graph,
                              gint colorstep);

Puts the curves of a graph to another graph if possible, or adds the graph as new.

@@ -501,7 +501,7 @@

gwy_app_data_id_verify_channel ()

gboolean
-gwy_app_data_id_verify_channel (GwyAppDataId *id);
+gwy_app_data_id_verify_channel (GwyAppDataId *id);

Checks if numerical channel identifiers correspond to an existing channel.

If either the data contained referenced in id or the channel does not exist @@ -534,7 +534,7 @@

gwy_app_data_id_verify_graph ()

gboolean
-gwy_app_data_id_verify_graph (GwyAppDataId *id);
+gwy_app_data_id_verify_graph (GwyAppDataId *id);

Checks if numerical graph identifiers correspond to an existing graph.

If either the data contained referenced in id or the graph model does not @@ -567,7 +567,7 @@

gwy_app_data_id_verify_volume ()

gboolean
-gwy_app_data_id_verify_volume (GwyAppDataId *id);
+gwy_app_data_id_verify_volume (GwyAppDataId *id);

Checks if numerical volume data identifiers correspond to existing volume data.

If either the data contained referenced in id @@ -602,7 +602,7 @@

gwy_app_data_id_verify_xyz ()

gboolean
-gwy_app_data_id_verify_xyz (GwyAppDataId *id);
+gwy_app_data_id_verify_xyz (GwyAppDataId *id);

Checks if numerical XYZ data identifiers correspond to existing XYZ data.

If either the data contained referenced in id or the XYZ data does not @@ -636,7 +636,7 @@

gwy_app_data_id_verify_spectra ()

gboolean
-gwy_app_data_id_verify_spectra (GwyAppDataId *id);
+gwy_app_data_id_verify_spectra (GwyAppDataId *id);

Checks if numerical spectra identifiers correspond to existing spectra.

If either the data contained referenced in id or the spectra does not diff -Nru gwyddion-2.46/devel-docs/libgwyapp/libgwyapp-docs.sgml gwyddion-2.47/devel-docs/libgwyapp/libgwyapp-docs.sgml --- gwyddion-2.46/devel-docs/libgwyapp/libgwyapp-docs.sgml 2016-10-14 09:21:52.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyapp/libgwyapp-docs.sgml 2016-11-08 08:23:06.000000000 +0000 @@ -98,5 +98,9 @@ Index of new symbols in 2.46 + + Index of new symbols in 2.47 + + diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-22.html gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-22.html --- gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-22.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-22.html 2016-11-18 10:59:27.000000000 +0000 @@ -32,6 +32,10 @@

+gwy_math_curvature, function in Math +
+
+
gwy_math_fallback_isinf, function in Math Fallback
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-39.html gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-39.html --- gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-39.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-39.html 2016-11-18 10:59:27.000000000 +0000 @@ -24,7 +24,7 @@ Index of new symbols in 2.39

G

-gwy_si_unit_value_format_copy, function in GwySIUnit +gwy_si_unit_value_format_copy, function in GwySIValueFormat
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-46.html gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-46.html --- gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-46.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-46.html 2016-11-18 10:59:27.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -16,7 +17,7 @@ Home Prev - +Next

@@ -35,6 +36,10 @@
+GWY_FREE, macro in gwymacros +
+
+
gwy_math_choleski_invert, function in Math
@@ -75,11 +80,11 @@
-gwy_si_unit_value_format_clone, function in GwySIUnit +gwy_si_unit_value_format_clone, function in GwySIValueFormat
-gwy_si_unit_value_format_new, function in GwySIUnit +gwy_si_unit_value_format_new, function in GwySIValueFormat
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-47.html gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-47.html --- gwyddion-2.46/devel-docs/libgwyddion/html/api-index-2-47.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/api-index-2-47.html 2016-11-18 10:59:27.000000000 +0000 @@ -0,0 +1,69 @@ + + + + +Index of new symbols in 2.47: Gwyddion Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.47

+

G

+
+GwyNLFitParamFlags, enum in gwyddionenums +
+
+
+gwy_math_nlfit_copy, function in GwyNLFitter +
+
+
+gwy_math_nlfit_get_approx_geometric, function in GwyNLFitter +
+
+
+gwy_math_nlfit_get_covar, function in GwyNLFitter +
+
+
+gwy_math_nlfit_get_eval, function in GwyNLFitter +
+
+
+gwy_math_nlfit_get_nparam, function in GwyNLFitter +
+
+
+gwy_math_nlfit_set_approx_geometric, function in GwyNLFitter +
+
+
+gwy_nlfit_preset_create_fitter, function in GwyNLFitPreset +
+
+
+gwy_xyz_new, function in Math +
+
+
+gwy_xy_new, function in Math +
+
+

+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/api-index-all.html gwyddion-2.47/devel-docs/libgwyddion/html/api-index-all.html --- gwyddion-2.46/devel-docs/libgwyddion/html/api-index-all.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/api-index-all.html 2016-11-18 10:59:27.000000000 +0000 @@ -157,6 +157,10 @@
+GwyNLFitParamFlags, enum in gwyddionenums +
+
+
GwyNLFitPreset, struct in GwyNLFitPreset
@@ -981,6 +985,10 @@
+gwy_math_nlfit_copy, function in GwyNLFitter +
+
+
gwy_math_nlfit_derive, function in GwyNLFitter
@@ -1013,18 +1021,34 @@
+gwy_math_nlfit_get_approx_geometric, function in GwyNLFitter +
+
+
gwy_math_nlfit_get_correlations, function in GwyNLFitter
+gwy_math_nlfit_get_covar, function in GwyNLFitter +
+
+
gwy_math_nlfit_get_dispersion, function in GwyNLFitter
+gwy_math_nlfit_get_eval, function in GwyNLFitter +
+
+
gwy_math_nlfit_get_max_iterations, function in GwyNLFitter
+gwy_math_nlfit_get_nparam, function in GwyNLFitter +
+
+
gwy_math_nlfit_get_sigma, function in GwyNLFitter
@@ -1037,6 +1061,10 @@
+gwy_math_nlfit_set_approx_geometric, function in GwyNLFitter +
+
+
gwy_math_nlfit_set_callbacks, function in GwyNLFitter
@@ -1077,6 +1105,10 @@
+gwy_nlfit_preset_create_fitter, function in GwyNLFitPreset +
+
+
gwy_nlfit_preset_fit, function in GwyNLFitPreset
@@ -1369,23 +1401,23 @@
-gwy_si_unit_value_format_clone, function in GwySIUnit +gwy_si_unit_value_format_clone, function in GwySIValueFormat
-gwy_si_unit_value_format_copy, function in GwySIUnit +gwy_si_unit_value_format_copy, function in GwySIValueFormat
-gwy_si_unit_value_format_free, function in GwySIUnit +gwy_si_unit_value_format_free, function in GwySIValueFormat
-gwy_si_unit_value_format_new, function in GwySIUnit +gwy_si_unit_value_format_new, function in GwySIValueFormat
-gwy_si_unit_value_format_set_units, function in GwySIUnit +gwy_si_unit_value_format_set_units, function in GwySIValueFormat
@@ -1509,6 +1541,10 @@
+gwy_xyz_new, function in Math +
+
+
gwy_xy_copy, function in Math
@@ -1516,6 +1552,10 @@ gwy_xy_free, function in Math
+
+gwy_xy_new, function in Math +
+

H

hypot, macro in Math Fallback diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/GwyInventory.html gwyddion-2.47/devel-docs/libgwyddion/html/GwyInventory.html --- gwyddion-2.46/devel-docs/libgwyddion/html/GwyInventory.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/GwyInventory.html 2016-11-18 10:59:27.000000000 +0000 @@ -716,7 +716,7 @@

Returns

-

Item position, or -1 if there is no such item.

+

Item position, or (guint)-1 if there is no such item.

diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/GwyNLFitPreset.html gwyddion-2.47/devel-docs/libgwyddion/html/GwyNLFitPreset.html --- gwyddion-2.46/devel-docs/libgwyddion/html/GwyNLFitPreset.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/GwyNLFitPreset.html 2016-11-18 10:59:27.000000000 +0000 @@ -91,6 +91,14 @@ GwyNLFitter * +gwy_nlfit_preset_create_fitter () + + + + +GwyNLFitter * + + gwy_nlfit_preset_fit () @@ -489,6 +497,38 @@
+

gwy_nlfit_preset_create_fitter ()

+
GwyNLFitter *
+gwy_nlfit_preset_create_fitter (GwyNLFitPreset *preset);
+

Creates a non-linear least-squares fitter for a preset function.

+

The created fitter will be of the function data type, as created with +gwy_math_nlfit_new().

+

If you do not need to modify the fitter settings you can use +gwy_nlfit_preset_fit() directly with NULL fitter.

+
+

Parameters

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

preset

A NL fitter function preset.

 
+
+
+

Returns

+

A newly created fitter for preset +.

+
+

Since: 2.47

+
+
+

gwy_nlfit_preset_fit ()

GwyNLFitter *
 gwy_nlfit_preset_fit (GwyNLFitPreset *preset,
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/GwySIUnit.html gwyddion-2.47/devel-docs/libgwyddion/html/GwySIUnit.html
--- gwyddion-2.46/devel-docs/libgwyddion/html/GwySIUnit.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyddion/html/GwySIUnit.html	2016-11-18 10:59:27.000000000 +0000
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -23,7 +23,7 @@
 Home
 
 Prev
-Next
+Next
 
 

 

@@ -168,46 +168,6 @@
 gwy_si_unit_get_format_with_digits ()
 
 
-
-
-GwySIValueFormat *
-
-
-gwy_si_unit_value_format_new ()
-
-
-
-
-void
-
-
-gwy_si_unit_value_format_free ()
-
-
-
-
-GwySIValueFormat *
-
-
-gwy_si_unit_value_format_copy ()
-
-
-
-
-GwySIValueFormat *
-
-
-gwy_si_unit_value_format_clone ()
-
-
-
-
-void
-
-
-gwy_si_unit_value_format_set_units ()
-
-
@@ -1021,174 +981,6 @@ itself is returned.

-
-
-

gwy_si_unit_value_format_new ()

-
GwySIValueFormat *
-gwy_si_unit_value_format_new (gdouble magnitude,
-                              gint precision,
-                              const gchar *units);
-

Constructs a new value format directly.

-

Usually you construct value formats from a GwySIUnit using functions such -as gwy_si_unit_get_format_with_digits() or obtain it from data object -functions.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

magnitude

Number to divide a quantity by (a power of 1000).

 

precision

Number of decimal places to format a quantity to.

 

units

Units to put after quantity divided by magnitude -.

 
-
-
-

Returns

-

Newly allocated value format.

-
-

Since: 2.46

-
-
-
-

gwy_si_unit_value_format_free ()

-
void
-gwy_si_unit_value_format_free (GwySIValueFormat *format);
-

Frees a value format structure.

-
-

Parameters

-
----- - - - - - -

format

A value format to free.

 
-
-
-
-
-

gwy_si_unit_value_format_copy ()

-
GwySIValueFormat *
-gwy_si_unit_value_format_copy (GwySIValueFormat *format);
-

Copies a value format structure.

-
-

Parameters

-
----- - - - - - -

format

A value format to copy.

 
-
-
-

Returns

-

Newly allocated value format, identical to format -.

-
-

Since: 2.39

-
-
-
-

gwy_si_unit_value_format_clone ()

-
GwySIValueFormat *
-gwy_si_unit_value_format_clone (GwySIValueFormat *source,
-                                GwySIValueFormat *dest);
-

Clones a value format to another.

-

This function follows the convention of many value format updating functions -that can either modify an existing format or allocate a new one.

-
-

Parameters

-
----- - - - - - - - - - - - - -

source

Source value format.

 

dest

Destination value format, or NULL.

 
-
-
-

Returns

-

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

-
-

Since: 2.46

-
-
-
-

gwy_si_unit_value_format_set_units ()

-
void
-gwy_si_unit_value_format_set_units (GwySIValueFormat *format,
-                                    const gchar *units);
-

Sets the units field of a value format structure.

-

This function keeps the units - and units_gstring - fields consistent.

-
-

Parameters

-
----- - - - - - - - - - - - - -

format

A value format to set units of.

 

units

The units string.

 
-
-

Types and Values

diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/index.html gwyddion-2.47/devel-docs/libgwyddion/html/index.html --- gwyddion-2.46/devel-docs/libgwyddion/html/index.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/index.html 2016-11-18 10:59:27.000000000 +0000 @@ -15,7 +15,7 @@

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

@@ -64,6 +64,9 @@ GwySIUnit — SI unit representation, physical quantitiy formatting
+GwySIValueFormat — Physical quantitiy formatting +
+
gwyutils — Various utility functions
@@ -114,6 +117,7 @@
Index of new symbols in 2.44
Index of new symbols in 2.45
Index of new symbols in 2.46
+
Index of new symbols in 2.47

This library contains basic classes and interfaces not directly related diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion.devhelp2 gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion.devhelp2 --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion.devhelp2 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion.devhelp2 2016-11-18 10:59:27.000000000 +0000 @@ -14,6 +14,7 @@ + @@ -46,9 +47,11 @@ + + @@ -160,7 +163,7 @@ - + @@ -173,8 +176,10 @@ + + @@ -188,7 +193,7 @@ - + @@ -219,15 +224,21 @@ + + + + + + @@ -240,6 +251,7 @@ + @@ -280,14 +292,14 @@ - - - - - + + + + + @@ -427,6 +439,8 @@ + + diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyddionenums.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyddionenums.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyddionenums.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyddionenums.html 2016-11-18 10:59:27.000000000 +0000 @@ -38,10 +38,16 @@ - + + enum GwySIUnitFormatStyle - + + +enum +GwyNLFitParamFlags + +

@@ -114,6 +120,43 @@
+
+
+

enum GwyNLFitParamFlags

+

Type of fitting parameter properties.

+
+

Members

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

GWY_NLFIT_PARAM_ANGLE

 +

Parameter is an angle. It is defined in radians and + unitless but you may wish to convert it from/to + degrees in the user interface. It is consdered + periodic and always reduced to the range [0, 2π).

+		 

GWY_NLFIT_PARAM_ABSVAL

 +

Parameter is a width or distance that is by + definition positive. Only its absolute value + matters and it is always made non-negative.

+		 
+
+

Since: 2.47

+
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwymacros.html 2016-11-18 10:59:27.000000000 +0000 @@ -498,7 +498,7 @@ 
#define             GWY_SI_VALUE_FORMAT_FREE(vf)

Frees and nulls a value format if it exists.

If vf - is not NULL, gwy_si_unit_value_format_free() is called on it and + is not NULL, gwy_si_unit_value_format_free() is called on it and NULL is assigned to the variable. In all cases vf will be NULL at the end.

@@ -524,6 +524,30 @@

GWY_FREE()

#define             GWY_FREE(ptr)
+

Frees and nulls a pointer if it exists.

+

The memory must have been allocated using one of the g_new() and g_malloc() +class of functions.

+

If ptr + is not NULL, g_free() is called on it and NULL is assigned to the +variable. In all cases ptr + will be NULL at the end.

+

A useful property of this macro is its idempotence.

+
+

Parameters

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

ptr

A pointer to free or NULL.

 
+
+

Since: 2.46

diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-GwyNLFitter.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-GwyNLFitter.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-GwyNLFitter.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-GwyNLFitter.html 2016-11-18 10:59:27.000000000 +0000 @@ -97,6 +97,14 @@ +GwyNLFitter * + + +gwy_math_nlfit_copy () + + + + gdouble @@ -148,6 +156,22 @@ gboolean +gwy_math_nlfit_get_approx_geometric () + + + + +void + + +gwy_math_nlfit_set_approx_geometric () + + + + +gboolean + + gwy_math_nlfit_succeeded () @@ -169,6 +193,29 @@ +gboolean + + +gwy_math_nlfit_get_eval () + + + +const gdouble * + + +gwy_math_nlfit_get_covar () + + + + +gint + + +gwy_math_nlfit_get_nparam () + + + + gdouble @@ -253,10 +300,10 @@

GwyNLFitFunc ()

gdouble
-(*GwyNLFitFunc) (gdouble x,
-                 gint nparam,
-                 const gdouble *param,
-                 gpointer user_data,
+(*GwyNLFitFunc) (gdouble x,
+                 gint nparam,
+                 const gdouble *param,
+                 gpointer user_data,
                  gboolean *success);

Fitting function type for real-valued independent variables.

@@ -613,6 +660,34 @@
+

gwy_math_nlfit_copy ()

+
GwyNLFitter *
+gwy_math_nlfit_copy (GwyNLFitter *nlfit);
+

Creates a copy of a nonlinear least squares fitter.

+

This function is mostly usefil for language bindings.

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 
+
+
+

Returns

+

The newly created fitter.

+
+

Since: 2.47

+
+
+

gwy_math_nlfit_fit ()

gdouble
 gwy_math_nlfit_fit (GwyNLFitter *nlfit,
@@ -982,6 +1057,71 @@
+

gwy_math_nlfit_get_approx_geometric ()

+
gboolean
+gwy_math_nlfit_get_approx_geometric (GwyNLFitter *nlfit);
+

Reports if a non-linear fitter performs approximately orthogonal fitting.

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 
+
+
+

Returns

+

TRUE if the fitting is approximately orthogonal; FALSE for +ordinary least squares.

+
+

Since: 2.47

+
+
+
+

gwy_math_nlfit_set_approx_geometric ()

+
void
+gwy_math_nlfit_set_approx_geometric (GwyNLFitter *nlfit,
+                                     gboolean setting);
+

Sets a non-linear fitter to perform ordinary or approximately orthogonal +fitting.

+

The orthogonal (geometrical) fitting is approximated by a simple reduction +of differences using the local function slope. It only makes sense when +the function values are the same physical quantities as the abscissae. +Furthermore, it is better used only when the fit is already relatively close +to the minimum.

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 

setting

TRUE to approximately orthogonal (geometrical) fitting.

 
+
+

Since: 2.47

+
+
+

gwy_math_nlfit_succeeded ()

gboolean
 gwy_math_nlfit_succeeded (GwyNLFitter *nlfit);
@@ -1082,6 +1222,93 @@
+

gwy_math_nlfit_get_eval ()

+
gboolean
+gwy_math_nlfit_get_eval (GwyNLFitter *nlfit);
+

Gets the state of a nonlinear fitter.

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 
+
+
+

Returns

+

TRUE if the last fit succeeded, FALSE if it failed.

+
+

Since: 2.47

+
+
+
+

gwy_math_nlfit_get_covar ()

+
const gdouble *
+gwy_math_nlfit_get_covar (GwyNLFitter *nlfit);
+

Gets the covariance matrix of a nonlinear fitter.

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 
+
+
+

Returns

+

The covariance matrix, as lower triangular matrix, owned by the +fitter. The return value will be NULL if the last fit did not +succeed.

+
+

Since: 2.47

+
+
+
+

gwy_math_nlfit_get_nparam ()

+
gint
+gwy_math_nlfit_get_nparam (GwyNLFitter *nlfit);
+

Gets the number of parameters of a nonlinear fitter.

+

The number of parameters determines the size of covariance matrix obtained +by gwy_math_nlfit_get_covar() and valid arguments for +gwy_math_nlfit_get_correlations().

+
+

Parameters

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

nlfit

A Marquardt-Levenberg nonlinear fitter.

 
+
+
+

Returns

+

The number of parameters for the last fit. If the last fit was not +successful zero is returned.

+
+

Since: 2.47

+
+
+

gwy_math_nlfit_get_sigma ()

gdouble
 gwy_math_nlfit_get_sigma (GwyNLFitter *nlfit,
@@ -1281,7 +1508,7 @@
  
 
 
-
diff

+
der

 
Array where the put the result to.

  
 
@@ -1391,15 +1618,15 @@
 };

Non-linear least-squares fitter.

-

Most of the fields should be considered private. Examining eval -, covar - -and dispersion - can be useful, as well as setting maxiter -, mdec +

The fields should be considered private.

+

Use gwy_math_nlfit_get_eval(), gwy_math_nlfit_get_covar() and +gwy_math_nlfit_get_dispersion() and gwy_math_nlfit_succeeded() to examine +the fitter state.

+

Use gwy_math_nlfit_set_max_iterations() to set the maximum iteration.

+

In rare occasions you might want modify mdec or minc -. -The rest is better left untouched.

+. The rest is better +left untouched.

Members

diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-GwySIValueFormat.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-GwySIValueFormat.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-GwySIValueFormat.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-GwySIValueFormat.html 2016-11-18 10:59:27.000000000 +0000 @@ -0,0 +1,277 @@ + + + + +GwySIValueFormat: Gwyddion Library Reference Manual + + + + + + + + + +
+ + + + + + +
+
+
+ + +
+

GwySIValueFormat

+

GwySIValueFormat — Physical quantitiy formatting

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
+GwySIValueFormat * + +gwy_si_unit_value_format_new () +
+GwySIValueFormat * + +gwy_si_unit_value_format_copy () +
+void + +gwy_si_unit_value_format_free () +
+GwySIValueFormat * + +gwy_si_unit_value_format_clone () +
+void + +gwy_si_unit_value_format_set_units () +
+
+
+

Includes

+
#include <libgwyddion/gwyddion.h>
+
+
+
+

Description

+

GwySIValueFormat object represents instructions how to format numbers +representing physical quantities, including precision and units. They +are usually created based on a GwySIUnit and some data ranges with +functions such as gwy_si_unit_get_format_with_resolution() or +gwy_si_unit_get_format_with_digits(). Various data objects also offer +method for obtaining value formats representing reasonably their coordinates +or values, for instance gwy_data_field_get_value_format_xy().

+
+
+

Functions

+
+

gwy_si_unit_value_format_new ()

+
GwySIValueFormat *
+gwy_si_unit_value_format_new (gdouble magnitude,
+                              gint precision,
+                              const gchar *units);
+

Constructs a new value format directly.

+

Usually you construct value formats from a GwySIUnit using functions such +as gwy_si_unit_get_format_with_digits() or obtain it from data object +functions.

+
+

Parameters

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

magnitude

Number to divide a quantity by (a power of 1000).

 

precision

Number of decimal places to format a quantity to.

 

units

Units to put after quantity divided by magnitude +.

 
+
+
+

Returns

+

Newly allocated value format.

+
+

Since: 2.46

+
+
+
+

gwy_si_unit_value_format_copy ()

+
GwySIValueFormat *
+gwy_si_unit_value_format_copy (GwySIValueFormat *format);
+

Copies a value format structure.

+
+

Parameters

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

format

A value format to copy.

 
+
+
+

Returns

+

Newly allocated value format, identical to format +.

+
+

Since: 2.39

+
+
+
+

gwy_si_unit_value_format_free ()

+
void
+gwy_si_unit_value_format_free (GwySIValueFormat *format);
+

Frees a value format structure.

+
+

Parameters

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

format

A value format to free.

 
+
+
+
+
+

gwy_si_unit_value_format_clone ()

+
GwySIValueFormat *
+gwy_si_unit_value_format_clone (GwySIValueFormat *source,
+                                GwySIValueFormat *dest);
+

Clones a value format to another.

+

This function follows the convention of many value format updating functions +that can either modify an existing format or allocate a new one.

+
+

Parameters

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

source

Source value format.

 

dest

Destination value format, or NULL.

 
+
+
+

Returns

+

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

+
+

Since: 2.46

+
+
+
+

gwy_si_unit_value_format_set_units ()

+
void
+gwy_si_unit_value_format_set_units (GwySIValueFormat *format,
+                                    const gchar *units);
+

Sets the units field of a value format structure.

+

This function keeps the units + and units_gstring + fields consistent.

+
+

Parameters

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

format

A value format to set units of.

 

units

The units string.

 
+
+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyutils.html 2016-11-18 10:59:27.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ Home -Prev +Prev Next
diff -Nru gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html --- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-gwyversion.html 2016-11-18 10:59:27.000000000 +0000 @@ -158,7 +158,7 @@

GWY_VERSION_MINOR

-
#define GWY_VERSION_MINOR 46
+
#define GWY_VERSION_MINOR 47
 

 
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.46"
+
#define GWY_VERSION_STRING "2.47"
 

 
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.46/devel-docs/libgwyddion/html/libgwyddion-Math.html gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-Math.html
--- gwyddion-2.46/devel-docs/libgwyddion/html/libgwyddion-Math.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyddion/html/libgwyddion-Math.html	2016-11-18 10:59:27.000000000 +0000
@@ -56,6 +56,14 @@
 GwyXY *
 
 
+gwy_xy_new ()
+
+
+
+
+GwyXY *
+
+
 gwy_xy_copy ()
 
 
@@ -72,6 +80,14 @@
 GwyXYZ *
 
 
+gwy_xyz_new ()
+
+
+
+
+GwyXYZ *
+
+
 gwy_xyz_copy ()
 
 
@@ -304,6 +320,43 @@
 

 

 

+
gwy_xy_new ()

+
GwyXY *
+gwy_xy_new (gdouble x,
+            gdouble y);

+
Creates Cartesian coordinates in plane.

+
This is mostly useful for language bindings.

+

+
Parameters

+

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





x
X-coordinate.
 
y
Y-coordinate.
 

+

+

+
Returns

+
 New XY structure.  The result must be freed using gwy_xy_free(),
+not g_free().

+

+
Since: 2.47

+

+

+

 
gwy_xy_copy ()

 
GwyXY *
 gwy_xy_copy (const GwyXY *xy);

@@ -327,7 +380,7 @@
 
Returns

 
 A copy of xy
 . The result must be freed using gwy_xy_free(),
-not g_free().

+not g_free().

 

 
Since: 2.45
@@ -356,6 +409,49 @@
+

gwy_xyz_new ()

+
GwyXYZ *
+gwy_xyz_new (gdouble x,
+             gdouble y,
+             gdouble z);
+

Creates Cartesian coordinates in space.

+

This is mostly useful for language bindings.

+
+

Parameters

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

x

X-coordinate.

 

y

Y-coordinate.

 

z

Z-coordinate.

 
+
+
+

Returns

+

New XYZ structure. The result must be freed using gwy_xyz_free(), +not g_free().

+
+

Since: 2.47

+
+
+

gwy_xyz_copy ()

GwyXYZ *
 gwy_xyz_copy (const GwyXYZ *xyz);
@@ -997,6 +1093,78 @@ gdouble *xc, gdouble *yc, gdouble *zc); +

Calculates curvature parameters from two-dimensional quadratic polynomial +coefficients.

+

If the quadratic surface was obtained by fitting the dimensions of the +fitted area should not differ, in the lateral coordinates used, by many +orders from 1. Otherwise the recognition of flat surfaces might not work.

+

Curvatures have signs, positive mean a concave (cup-like) surface, negative +mean a convex (cap-like) surface. They are ordered including the sign.

+

Directions are angles from the interval (-π/2, π/2].

+

If the quadratic surface is degenerate, i.e. flat in at least one direction, +the centre is undefined. The centre is then chosen as the closest point +the origin of coordinates. For flat surfaces this means the origin is +simply returned as the centre position. Consequently, you should use +Cartesian coordinates with origin in a natural centre, for instance centre +of image or grain.

+
+

Parameters

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

coeffs

Array of the six polynomial coefficients of a quadratic surface in +the following order: 1, x, y, x², xy, y².

 

kappa1

Location to store the smaller curvature to.

 

kappa2

Location to store the larger curvature to.

 

phi1

Location to store the direction of the smaller curvature to.

 

phi2

Location to store the direction of the larger curvature to.

 

xc

Location to store x-coordinate of the centre of the quadratic surface.

 

yc

Location to store y-coordinate of the centre of the quadratic surface.

 

zc

Location to store value at the centre of the quadratic surface.

 
+
+
+

Returns

+

The number of curved dimensions (0 to 2).

+
+

Since: 2.22

diff -Nru gwyddion-2.46/devel-docs/libgwyddion/libgwyddion-docs.sgml gwyddion-2.47/devel-docs/libgwyddion/libgwyddion-docs.sgml --- gwyddion-2.46/devel-docs/libgwyddion/libgwyddion-docs.sgml 2016-10-14 09:21:52.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyddion/libgwyddion-docs.sgml 2016-11-08 08:23:06.000000000 +0000 @@ -24,6 +24,7 @@ + @@ -126,5 +127,9 @@ Index of new symbols in 2.46 + + Index of new symbols in 2.47 + + diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/api-index-2-8.html gwyddion-2.47/devel-docs/libgwydgets/html/api-index-2-8.html --- gwyddion-2.46/devel-docs/libgwydgets/html/api-index-2-8.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/api-index-2-8.html 2016-11-18 10:59:29.000000000 +0000 @@ -62,6 +62,10 @@
+gwy_graph_curve_model_get_ranges, function in GwyGraphCurveModel +
+
+
gwy_graph_model_get_ranges, function in GwyGraphModel
diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/GwyAxis.html gwyddion-2.47/devel-docs/libgwydgets/html/GwyAxis.html --- gwyddion-2.46/devel-docs/libgwydgets/html/GwyAxis.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/GwyAxis.html 2016-11-18 10:59:29.000000000 +0000 @@ -634,6 +634,7 @@

gwy_axis_get_magnification ()

gdouble
 gwy_axis_get_magnification (GwyAxis *axis);
+

Gets the magnification value of a graph axis.

Parameters

@@ -651,7 +652,7 @@

Returns

-

Magnification value of the axis

+

Magnification value of the axis.

@@ -870,6 +871,9 @@ gint width, gint height, gint fontsize); +

Renders a graph axis in PostScript.

+

This is a helper functions for gwy_graph_export_postscript() and probably +not useful anywhere else.

Parameters

@@ -885,18 +889,37 @@ + + + + + + + + + + - + - + + + + + +
 

xmin

Left edge of the bounding rectangle.

 

ymin

Bottom edge of the bounding rectangle.

 

width

width of the x-axis

Width of the bounding rectangle.

  

height

hieght of the y-axis

Height of the bounding rectangle.

 

fontsize

Font size to use.

  
+
+

Returns

+

A newly created GString.

+
diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/GwyColorButton.html gwyddion-2.47/devel-docs/libgwydgets/html/GwyColorButton.html --- gwyddion-2.46/devel-docs/libgwydgets/html/GwyColorButton.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/GwyColorButton.html 2016-11-18 10:59:29.000000000 +0000 @@ -186,7 +186,7 @@

gwy_color_button_new_with_color ()

GtkWidget *
-gwy_color_button_new_with_color (GwyRGBA *color);
+gwy_color_button_new_with_color (const GwyRGBA *color);

Creates a new color button.

Parameters

@@ -213,7 +213,7 @@

gwy_color_button_set_color ()

void
 gwy_color_button_set_color (GwyColorButton *color_button,
-                            GwyRGBA *color);
+ const GwyRGBA *color);

Sets the current color to be color .

diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraphCurveModel.html gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraphCurveModel.html --- gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraphCurveModel.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraphCurveModel.html 2016-11-18 10:59:29.000000000 +0000 @@ -747,6 +747,74 @@ gdouble *x_max, gdouble *y_min, gdouble *y_max); +

Gets the log-scale suitable range minima of a graph curve.

+

Parameters x_logscale + and y_logscale + determine which axis or axes are +intended to use logarithmical scale. The range of displayble values for +an axis generally depends on the other axis too as it acts as a filter. +When both x_logscale + and y_logscale + are FALSE, the returned minima are +identical to those returned by gwy_graph_curve_model_get_x_range() +and gwy_graph_curve_model_get_y_range().

+

The return values are cached in the curve model therefore repeated calls to +this function (with unchanged data) are cheap.

+

If there are no data points that would be displayable with the intended +logarithmical scale setup, the output arguments are untouched and FALSE is +returned.

+
+

Parameters

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

gcmodel

A graph curve model.

 

x_logscale

TRUE if logarithmical scale is intended for the abscissa.

 

y_logscale

TRUE if logarithmical scale is intended for the ordinate.

 

x_min

Location to store the minimum abscissa value to, or NULL.

 

x_max

Location to store the maximum abscissa value to, or NULL.

 

y_min

Location to store the minimum ordinate value to, or NULL.

 

y_max

Location to store the maximum ordinate value to, or NULL.

 
+
+
+

Returns

+

TRUE if the output arguments were filled with the ranges.

+
+

Since: 2.8

diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraph.html gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraph.html --- gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraph.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraph.html 2016-11-18 10:59:29.000000000 +0000 @@ -482,6 +482,43 @@ gboolean export_title, gboolean export_axis, gboolean export_labels); +

Renders a graph widget into a pixbuf.

+
+

Parameters

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

graph

A graph widget.

 

export_title

TRUE to export graph title. Currently unimplemented.

 

export_axis

TRUE to export graph axes. Currently unimplemented.

 

export_labels

TRUE to export graph labels. Currently unimplemented.

 
+
+
+

Returns

+

A newly created pixbuf.

+
@@ -492,6 +529,50 @@ gboolean export_axis, gboolean export_labels, GString *str); +

Approximately renders a graph widget in PostScript.

+
+

Parameters

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

graph

A graph widget.

 

export_title

TRUE to export graph title. Currently unimplemented.

 

export_axis

TRUE to export graph axes. Currently unimplemented.

 

export_labels

TRUE to export graph labels. Currently unimplemented.

 

str

String to put the PostScript representation to, or NULL to +allocate a new string.

 
+
+
+

Returns

+

Either string +or a newly created GString.

+
diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraphModel.html gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraphModel.html --- gwyddion-2.46/devel-docs/libgwydgets/html/GwyGraphModel.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/GwyGraphModel.html 2016-11-18 10:59:29.000000000 +0000 @@ -499,6 +499,7 @@

gwy_graph_model_get_n_curves ()

gint
 gwy_graph_model_get_n_curves (GwyGraphModel *gmodel);
+

Reports the number of curves in a graph model.

Parameters

@@ -516,7 +517,7 @@

Returns

-

number of curves in graph model.

+

Number of curves in graph model.

diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/index.html gwyddion-2.47/devel-docs/libgwydgets/html/index.html --- gwyddion-2.46/devel-docs/libgwydgets/html/index.html 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/index.html 2016-11-18 10:59:29.000000000 +0000 @@ -15,7 +15,7 @@

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

diff -Nru gwyddion-2.46/devel-docs/libgwydgets/html/libgwydgets.devhelp2 gwyddion-2.47/devel-docs/libgwydgets/html/libgwydgets.devhelp2 --- gwyddion-2.46/devel-docs/libgwydgets/html/libgwydgets.devhelp2 2016-10-14 09:51:04.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydgets/html/libgwydgets.devhelp2 2016-11-18 10:59:29.000000000 +0000 @@ -314,7 +314,7 @@ - + diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/api-index-2-43.html gwyddion-2.47/devel-docs/libgwydraw/html/api-index-2-43.html --- gwyddion-2.46/devel-docs/libgwydraw/html/api-index-2-43.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/api-index-2-43.html 2016-11-18 10:59:28.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -16,7 +17,7 @@ Home Prev - +Next

diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/api-index-2-47.html gwyddion-2.47/devel-docs/libgwydraw/html/api-index-2-47.html --- gwyddion-2.46/devel-docs/libgwydraw/html/api-index-2-47.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/api-index-2-47.html 2016-11-18 10:59:28.000000000 +0000 @@ -0,0 +1,33 @@ + + + + +Index of new symbols in 2.47: Gwyddion Drawing Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.47

+

R

+
+gwy_rgba_new, function in GwyRGBA +
+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/api-index-all.html gwyddion-2.47/devel-docs/libgwydraw/html/api-index-all.html --- gwyddion-2.46/devel-docs/libgwydraw/html/api-index-all.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/api-index-all.html 2016-11-18 10:59:28.000000000 +0000 @@ -243,6 +243,10 @@
+gwy_rgba_new, function in GwyRGBA +
+
+
gwy_rgba_remove_from_container, function in GwyRGBA
diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/index.html gwyddion-2.47/devel-docs/libgwydraw/html/index.html --- gwyddion-2.46/devel-docs/libgwydraw/html/index.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/index.html 2016-11-18 10:59:28.000000000 +0000 @@ -15,7 +15,7 @@

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

@@ -49,6 +49,7 @@
Index of new symbols in 2.32
Index of new symbols in 2.39
Index of new symbols in 2.43
+
Index of new symbols in 2.47

This library contains low-level data visualization and color handling diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/libgwydraw.devhelp2 gwyddion-2.47/devel-docs/libgwydraw/html/libgwydraw.devhelp2 --- gwyddion-2.46/devel-docs/libgwydraw/html/libgwydraw.devhelp2 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/libgwydraw.devhelp2 2016-11-18 10:59:28.000000000 +0000 @@ -13,8 +13,10 @@ + + diff -Nru gwyddion-2.46/devel-docs/libgwydraw/html/libgwydraw-GwyRGBA.html gwyddion-2.47/devel-docs/libgwydraw/html/libgwydraw-GwyRGBA.html --- gwyddion-2.46/devel-docs/libgwydraw/html/libgwydraw-GwyRGBA.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwydraw/html/libgwydraw-GwyRGBA.html 2016-11-18 10:59:28.000000000 +0000 @@ -44,6 +44,14 @@ GwyRGBA * +gwy_rgba_new () + + + + +GwyRGBA * + + gwy_rgba_copy () @@ -172,6 +180,55 @@

Functions

+

gwy_rgba_new ()

+
GwyRGBA *
+gwy_rgba_new (gdouble r,
+              gdouble g,
+              gdouble b,
+              gdouble a);
+

Creates RGBA colour specification.

+

This is mostly useful for language bindings.

+
+

Parameters

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

r

The red component.

 

g

The green component.

 

b

The blue component.

 

a

The alpha (opacity) value.

 
+
+
+

Returns

+

New RGBA colour structure. The result must be freed with +gwy_rgba_free(), not g_free().

+
+

Since: 2.47

+
+
+

gwy_rgba_copy ()

GwyRGBA *
 gwy_rgba_copy (const GwyRGBA *rgba);
@@ -313,8 +370,8 @@

gwy_rgba_from_gdk_color_and_alpha ()

void
 gwy_rgba_from_gdk_color_and_alpha (GwyRGBA *rgba,
-                                   const GdkColor *gdkcolor,
-                                   guint16 gdkalpha);
+ const GdkColor *gdkcolor, + guint16 gdkalpha);

Converts a Gdk color plus an opacity value to a rgba.

Parameters

@@ -332,7 +389,7 @@

gdkcolor

-

A GdkColor.

+

A GdkColor.

  @@ -350,7 +407,7 @@ 
void
 gwy_rgba_interpolate (const GwyRGBA *src1,
                       const GwyRGBA *src2,
-                      gdouble x,
+                      gdouble x,
                       GwyRGBA *rgba);

Linearly interpolates two colors, including alpha blending.

Correct blending of two not fully opaque colors is tricky. Always use @@ -393,7 +450,7 @@

gwy_rgba_get_from_container ()

-
gboolean
+
gboolean
 gwy_rgba_get_from_container (GwyRGBA *rgba,
                              GwyContainer *container,
                              const gchar *prefix);

diff -Nru gwyddion-2.46/devel-docs/libgwydraw/libgwydraw-docs.sgml gwyddion-2.47/devel-docs/libgwydraw/libgwydraw-docs.sgml
--- gwyddion-2.46/devel-docs/libgwydraw/libgwydraw-docs.sgml	2016-10-14 09:21:52.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwydraw/libgwydraw-docs.sgml	2016-11-08 08:23:06.000000000 +0000
@@ -39,5 +39,9 @@
     Index of new symbols in 2.43
     
   
+  
+    Index of new symbols in 2.47
+    
+  
   
 
diff -Nru gwyddion-2.46/devel-docs/libgwymodule/html/index.html gwyddion-2.47/devel-docs/libgwymodule/html/index.html
--- gwyddion-2.46/devel-docs/libgwymodule/html/index.html	2016-10-14 09:51:04.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwymodule/html/index.html	2016-11-18 10:59:30.000000000 +0000
@@ -15,7 +15,7 @@
 

 

 

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

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-23.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-23.html
--- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-23.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-23.html	2016-11-18 10:59:27.000000000 +0000
@@ -102,6 +102,10 @@
 
 

 

+gwy_caldata_set_range, function in GwyCalData
+

+

+

 gwy_caldata_set_si_unit_x, function in GwyCalData
 

 

@@ -134,6 +138,10 @@
 
 

 

+gwy_calibration_get_ndata, function in GwyCalibration
+

+

+

 gwy_calibration_new, function in GwyCalibration
 

 

@@ -147,7 +155,7 @@
 
 

 

-gwy_data_field_area_cdh, function in stats
+gwy_data_field_area_cdh_uncertainty, function in stats uncertainty
 

 

 

@@ -219,6 +227,10 @@
 

 

 

+gwy_data_field_area_get_surface_area_uncertainty, function in stats uncertainty
+

+

+

 gwy_data_field_area_hhcf_uncertainty, function in stats uncertainty
 

 

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-37.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-37.html
--- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-37.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-37.html	2016-11-18 10:59:27.000000000 +0000
@@ -38,6 +38,10 @@
 
 

 

+gwy_data_field_mark_extrema, function in grains
+

+

+

 gwy_data_field_otsu_threshold, function in grains
 

 

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-42.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-42.html
--- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-42.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-42.html	2016-11-18 10:59:27.000000000 +0000
@@ -67,6 +67,10 @@
 
 

 

+gwy_data_line_get_xtm, function in linestats
+

+

+

 gwy_data_line_get_xvm, function in linestats
 

 

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-43.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-43.html
--- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-43.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-43.html	2016-11-18 10:59:27.000000000 +0000
@@ -26,6 +26,10 @@
 Index of new symbols in 2.43

D

+gwy_data_field_area_filter_disc_asf, function in filters +
+
+
gwy_data_field_area_filter_min_max, function in filters
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-46.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-46.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-46.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-46.html 2016-11-18 10:59:28.000000000 +0000 @@ -7,6 +7,7 @@ + @@ -22,7 +23,7 @@ Home Prev - +Next

@@ -62,10 +63,6 @@
-GwyPeaks, struct in peaks -
-
-
gwy_peaks_analyze, function in peaks
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-47.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-47.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-47.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-47.html 2016-11-18 10:59:28.000000000 +0000 @@ -0,0 +1,142 @@ + + + + +Index of new symbols in 2.47: Gwyddion Data Processing Library Reference Manual + + + + + + + + + + + + + + + +
+

+Index of new symbols in 2.47

+

D

+
+gwy_data_field_get_grain_sizes, function in grains +
+
+
+gwy_data_field_laplace_solve, function in correct +
+
+

P

+
+gwy_peaks_copy, function in peaks +
+
+

S

+
+gwy_shape_fit_presets, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_calculate_xyz, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_calculate_z, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_create_fitter, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_fit, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_nparams, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_nsecondary, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_flags, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_name, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_error, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_flags, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_name, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_value, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_value, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_guess, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_needs_same_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_setup, function in GwyShapeFitPreset +
+
+

T

+
+GwyTipParamType, enum in gwyprocessenums +
+
+
+gwy_tip_model_get_preset_params, function in tip +
+
+
+gwy_tip_model_preset_create, function in tip +
+
+
+gwy_tip_model_preset_create_for_zrange, function in tip +
+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-7.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-7.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-2-7.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-2-7.html 2016-11-18 10:59:28.000000000 +0000 @@ -114,6 +114,10 @@
+gwy_spectra_remove_spectrum, function in GwySpectra +
+
+
gwy_spectra_setpos, function in GwySpectra
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-all.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-all.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-all.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-all.html 2016-11-18 10:59:28.000000000 +0000 @@ -1449,6 +1449,10 @@
+gwy_data_field_get_grain_sizes, function in grains +
+
+
gwy_data_field_get_inclination, function in stats
@@ -1777,6 +1781,10 @@
+gwy_data_field_laplace_solve, function in correct +
+
+
gwy_data_field_local_plane_quantity, function in level
@@ -2661,10 +2669,6 @@
-GwyPeaks, struct in peaks -
-
-
gwy_peaks_analyze, function in peaks
@@ -2677,6 +2681,10 @@
+gwy_peaks_copy, function in peaks +
+
+
gwy_peaks_free, function in peaks
@@ -2723,6 +2731,90 @@

S

+GwyShapeFitPreset, struct in GwyShapeFitPreset +
+
+
+GwyShapeFitPresetClass, struct in GwyShapeFitPreset +
+
+
+gwy_shape_fit_presets, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_calculate_xyz, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_calculate_z, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_create_fitter, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_fit, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_nparams, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_nsecondary, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_flags, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_name, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_param_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_error, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_flags, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_name, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_secondary_value, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_get_value, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_guess, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_needs_same_units, function in GwyShapeFitPreset +
+
+
+gwy_shape_fit_preset_setup, function in GwyShapeFitPreset +
+
+
GwySpectra, struct in GwySpectra
@@ -3048,6 +3140,10 @@
+GwyTipParamType, enum in gwyprocessenums +
+
+
GwyTipType, enum in gwyprocessenums
@@ -3096,10 +3192,22 @@
+gwy_tip_model_get_preset_params, function in tip +
+
+
gwy_tip_model_get_preset_tip_name, function in tip
+gwy_tip_model_preset_create, function in tip +
+
+
+gwy_tip_model_preset_create_for_zrange, function in tip +
+
+
GwyTransformDirection, enum in gwyprocessenums
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-deprec.html gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-deprec.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/api-index-deprec.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/api-index-deprec.html 2016-11-18 10:59:28.000000000 +0000 @@ -15,7 +15,9 @@ + D +  |  + T @@ -62,6 +64,19 @@ gwy_data_line_line_rotate, function in GwyDataLine
+

T

+
+GwyTipGuessFunc, user_function in tip +
+
+
+GwyTipModelFunc, user_function in tip +
+
+
+GwyTipModelPreset, struct in tip +
+
Generated by GTK-Doc V1.19
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/GwyBrick.html gwyddion-2.47/devel-docs/libgwyprocess/html/GwyBrick.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/GwyBrick.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/GwyBrick.html 2016-11-18 10:59:27.000000000 +0000 @@ -1631,6 +1631,7 @@

gwy_brick_get_min ()

gdouble
 gwy_brick_get_min (GwyBrick *brick);
+

Find the minimum value in a data brick.

Parameters

@@ -1657,6 +1658,7 @@

gwy_brick_get_max ()

gdouble
 gwy_brick_get_max (GwyBrick *brick);
+

Find the maximum value in a data brick.

Parameters

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/GwyCalData.html gwyddion-2.47/devel-docs/libgwyprocess/html/GwyCalData.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/GwyCalData.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/GwyCalData.html 2016-11-18 10:59:27.000000000 +0000 @@ -660,7 +660,7 @@ gdouble *yto, gdouble *zfrom, gdouble *zto); -

Sets boundaries of calibration data validity.

+

Obtains boundaries of calibration data validity.

Parameters

@@ -721,6 +721,55 @@ gdouble yto, gdouble zfrom, gdouble zto); +

Sets boundaries of calibration data validity.

+
+

Parameters

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

caldata

Calibration data.

 

xfrom

x minimum

 

xto

x maximum

 

yfrom

y minimum

 

yto

y maximum

 

zfrom

z minimum

 

zto

z maximum

 
+
+

Since: 2.23

@@ -773,8 +822,8 @@

Returns

-

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

+

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

Since: 2.23

@@ -801,8 +850,8 @@

Returns

-

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

+

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

Since: 2.23

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/GwyCalibration.html gwyddion-2.47/devel-docs/libgwyprocess/html/GwyCalibration.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/GwyCalibration.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/GwyCalibration.html 2016-11-18 10:59:27.000000000 +0000 @@ -195,6 +195,28 @@

gwy_calibration_get_ndata ()

gint
 gwy_calibration_get_ndata (GwyCalibration *calibration);
+

Returns the number of points in a calibration.

+
+

Parameters

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

calibration

A calibration.

 
+
+
+

Returns

+

The number of points in calibration +.

+
+

Since: 2.23

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/GwyShapeFitPreset.html gwyddion-2.47/devel-docs/libgwyprocess/html/GwyShapeFitPreset.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/GwyShapeFitPreset.html 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/GwyShapeFitPreset.html 2016-11-18 10:59:27.000000000 +0000 @@ -0,0 +1,1110 @@ + + + + +GwyShapeFitPreset: Gwyddion Data Processing Library Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

GwyShapeFitPreset

+

GwyShapeFitPreset — 3D geometrical shape fitting functions

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gboolean + +gwy_shape_fit_preset_needs_same_units () +
+guint + +gwy_shape_fit_preset_get_nparams () +
const gchar * + +gwy_shape_fit_preset_get_param_name () +
+GwyNLFitParamFlags + +gwy_shape_fit_preset_get_param_flags () +
+GwySIUnit * + +gwy_shape_fit_preset_get_param_units () +
+guint + +gwy_shape_fit_preset_get_nsecondary () +
const gchar * + +gwy_shape_fit_preset_get_secondary_name () +
+GwyNLFitParamFlags + +gwy_shape_fit_preset_get_secondary_flags () +
+gdouble + +gwy_shape_fit_preset_get_secondary_value () +
+gdouble + +gwy_shape_fit_preset_get_secondary_error () +
+GwySIUnit * + +gwy_shape_fit_preset_get_secondary_units () +
+void + +gwy_shape_fit_preset_setup () +
+gboolean + +gwy_shape_fit_preset_guess () +
+gdouble + +gwy_shape_fit_preset_get_value () +
+void + +gwy_shape_fit_preset_calculate_z () +
+void + +gwy_shape_fit_preset_calculate_xyz () +
+GwyNLFitter * + +gwy_shape_fit_preset_create_fitter () +
+GwyNLFitter * + +gwy_shape_fit_preset_fit () +
+GwyInventory * + +gwy_shape_fit_presets () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
structGwyShapeFitPreset
structGwyShapeFitPresetClass
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GwyResource
+        ╰── GwyShapeFitPreset
+
+
+
+

Includes

+
#include <libprocess/gwyprocess.h>
+
+
+
+

Description

+Non-linear fitter 3D geometrical shape +

presets are predefined fitting functions that can be used to determine +the parameters of various features in images and XYZ data.

+

As of version 2.47 the defined functions include:

+ + + + + + + + + + + +
"Grating (simple)"
"Grating (3-level)"
"Holes"
"Sphere"
"Cylinder (lying)"
"Gaussian"
"Lorentzian"
"Pyramid (diamond)"
"Parabolic bump"
"Ring"
+
+
+

Functions

+
+

gwy_shape_fit_preset_needs_same_units ()

+
gboolean
+gwy_shape_fit_preset_needs_same_units (GwyShapeFitPreset *preset);
+

Reports if a 3D geometrical shape fitter preset requires the same lateral +and value units.

+

For instance, fitting a sphere is meaningless if the horizontal and +vertical radii would be different physical quantities.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 
+
+
+

Returns

+

TRUE if the function requires the same lateral and value units.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_nparams ()

+
guint
+gwy_shape_fit_preset_get_nparams (GwyShapeFitPreset *preset);
+

Reports the number of parameters of a 3D geometrical shape fitter preset.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 
+
+
+

Returns

+

The number of function parameters.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_param_name ()

+
const gchar *
+gwy_shape_fit_preset_get_param_name (GwyShapeFitPreset *preset,
+                                     guint i);
+

Gets the name of a fitting parameter of a 3D geometrical shape fitter +preset.

+

The name may contain Pango markup.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Parameter number.

 
+
+
+

Returns

+

The name of the i +-th parameter.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_param_flags ()

+
GwyNLFitParamFlags
+gwy_shape_fit_preset_get_param_flags (GwyShapeFitPreset *preset,
+                                      guint i);
+

Gets the properties of a fitting parameter of a 3D geometrical shape fitter +preset.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Parameter number.

 
+
+
+

Returns

+

The flags of the i +-th parameter.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_param_units ()

+
GwySIUnit *
+gwy_shape_fit_preset_get_param_units (GwyShapeFitPreset *preset,
+                                      guint i,
+                                      GwySIUnit *siunit_xy,
+                                      GwySIUnit *siunit_z);
+

Derives the SI unit of a fitting parameter from the units of abscissa and +ordinate.

+

Note that angle parameters are by default in radians and thus unitless. +If you want to convert them to degrees for presentation to the user you must +do it explicitly.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Parameter number.

 

siunit_xy

SI unit of lateral coordinates.

 

siunit_z

SI unit of values.

 
+
+
+

Returns

+

A newly created GwySIUnit with the units of the i +-th parameter.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_nsecondary ()

+
guint
+gwy_shape_fit_preset_get_nsecondary (GwyShapeFitPreset *preset);
+

Reports the number of secondary (derived) quantities of a 3D geometrical +shape fitter preset.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 
+
+
+

Returns

+

The number of secondary quantities.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_secondary_name ()

+
const gchar *
+gwy_shape_fit_preset_get_secondary_name
+                               (GwyShapeFitPreset *preset,
+                                guint i);
+

Gets the name of a secondary (derived) quantity of a 3D geometrical shape +fitter preset.

+

The name may contain Pango markup.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Secondary quantity number.

 
+
+
+

Returns

+

The name of the i +-th secondary quantity.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_secondary_flags ()

+
GwyNLFitParamFlags
+gwy_shape_fit_preset_get_secondary_flags
+                               (GwyShapeFitPreset *preset,
+                                guint i);
+

Gets the properties of a secondary (derived) quantity of a 3D geometrical +shape fitter preset.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Secondary quantity number.

 
+
+
+

Returns

+

The flags of the i +-th secondary quantity.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_secondary_value ()

+
gdouble
+gwy_shape_fit_preset_get_secondary_value
+                               (GwyShapeFitPreset *preset,
+                                guint i,
+                                const gdouble *param);
+

Calculates the value of a secondary (derived) quantity of a 3D geometrical +shape fitter preset.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Secondary quantity number.

 

param

Values of fitting parameters for function preset +.

 
+
+
+

Returns

+

The value of the i +-th secondary quantity.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_secondary_error ()

+
gdouble
+gwy_shape_fit_preset_get_secondary_error
+                               (GwyShapeFitPreset *preset,
+                                guint i,
+                                const gdouble *param,
+                                const gdouble *error,
+                                const gdouble *correl);
+

Calculates the error of a secondary (derived) quantity of a 3D geometrical +shape fitter preset.

+

The error is calculated by numerical differentiation of the function and +applying the law of error propagation.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Secondary quantity number.

 

param

Values of fitting parameters for function preset +.

 

error

Values of errors of fitting parameters for function preset +.

 

correl

Parameter correlation matrix for function preset +(passed as lower +triangular matrix).

 
+
+
+

Returns

+

The error of the i +-th secondary quantity.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_secondary_units ()

+
GwySIUnit *
+gwy_shape_fit_preset_get_secondary_units
+                               (GwyShapeFitPreset *preset,
+                                guint i,
+                                GwySIUnit *siunit_xy,
+                                GwySIUnit *siunit_z);
+

Derives the SI unit of a secondary (derived) quantity from the units of +abscissa and ordinate.

+

Note that angle parameters are by default in radians and thus unitless. +If you want to convert them to degrees for presentation to the user you must +do it explicitly.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

i

Secondary quantity number.

 

siunit_xy

SI unit of lateral coordinates.

 

siunit_z

SI unit of values.

 
+
+
+

Returns

+

A newly created GwySIUnit with the units of the i +-th secondary +quantity.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_setup ()

+
void
+gwy_shape_fit_preset_setup (GwyShapeFitPreset *preset,
+                            const GwyXYZ *points,
+                            guint n,
+                            gdouble *params);
+

Initialises parameter values of a 3D geometrical shape fitter preset.

+

The parameters are quickly set to reasonable values that roughly correspond +to the ranges of the data points. They may serve as starting values for +manual experimentation but often will not be good enough as initial +parameter estimates for the fit. See also gwy_shape_fit_preset_guess().

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

points

Array of XYZ data to fit.

 

n

Number of data points.

 

params

The array to fill with initialised parameter values.

 
+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_guess ()

+
gboolean
+gwy_shape_fit_preset_guess (GwyShapeFitPreset *preset,
+                            const GwyXYZ *points,
+                            guint n,
+                            gdouble *params);
+

Estimates parameter values of a 3D geometrical shape fitter preset.

+

This function tries to find initial parameter estimates that are good enough +for the fit the converge. Of course, it is not guaranteed it always +succeeds. For some shapes it can be noticeably slower than +gwy_shape_fit_preset_setup().

+

The estimate may not be deterministic. For large point sets some estimates +are carried out using a randomly selected subset of points.

+

If the function cannot find how the data points could correspond to the +preset geometrical shape it return FALSE. Parameter values are still set. +However, in this case they may be no better than from +gwy_shape_fit_preset_setup().

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

points

Array of XYZ data to fit.

 

n

Number of data points.

 

params

The array to fill with initialised parameter values.

 
+
+
+

Returns

+

TRUE if the estimation succeeded, FALSE if it failed.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_get_value ()

+
gdouble
+gwy_shape_fit_preset_get_value (GwyShapeFitPreset *preset,
+                                gdouble x,
+                                gdouble y,
+                                const gdouble *params);
+

Calculates the value of a 3D geometrical shape fitter preset in a single +point.

+

If you want multiple values you should use either +gwy_shape_fit_preset_calculate_z() or gwy_shape_fit_preset_calculate_xyz() +instead of calling this function in a cycle.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

x

X-coordinate.

 

y

Y-coordinate.

 

params

Fitting parameter values.

 
+
+
+

Returns

+

The calculated function value in (x +,y +).

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_calculate_z ()

+
void
+gwy_shape_fit_preset_calculate_z (GwyShapeFitPreset *preset,
+                                  const GwyXYZ *points,
+                                  gdouble *z,
+                                  guint n,
+                                  const gdouble *params);
+

Calculates values of a 3D geometrical shape fitter preset in an array of +points.

+

The z-coordinates in points + are ignored. Only the lateral coordinates are +used.

+

See also gwy_shape_fit_preset_calculate_xyz().

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

points

Array of n +XYZ data defining the lateral coordinates.

 

z

Array length n +to fill with calculated values.

 

n

Number of items in points +and z +.

 

params

Fitting parameter values.

 
+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_calculate_xyz ()

+
void
+gwy_shape_fit_preset_calculate_xyz (GwyShapeFitPreset *preset,
+                                    GwyXYZ *points,
+                                    guint n,
+                                    const gdouble *params);
+

Calculates values of a 3D geometrical shape fitter preset in an array of +points.

+

See also gwy_shape_fit_preset_calculate_z().

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

points

Array of n +XYZ data defining the lateral coordinates. The +z-coordinates will be filled with the calculated values.

 

n

Number of items in points +.

 

params

Fitting parameter values.

 
+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_create_fitter ()

+
GwyNLFitter *
+gwy_shape_fit_preset_create_fitter (GwyShapeFitPreset *preset);
+

Creates a non-linear least-squares fitter for a 3D geometrical shape.

+

The created fitter will be of the opaque indexed data type, as created with +gwy_math_nlfit_new_idx().

+

If you do not need to modify the fitter settings you can use +gwy_shape_fit_preset_fit() directly with NULL fitter.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 
+
+
+

Returns

+

A newly created fitter for preset +.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_preset_fit ()

+
GwyNLFitter *
+gwy_shape_fit_preset_fit (GwyShapeFitPreset *preset,
+                          GwyNLFitter *fitter,
+                          const GwyXYZ *points,
+                          guint n,
+                          gdouble *params,
+                          const gboolean *fixed_param,
+                          gdouble *rss);
+

Performs a non-linear least-squares fit with a 3D geometrical shape fitter.

+

If you pass NULL fitter + the function creates one for you and immediately +performs the fit. If you want to modify the fitter settings beforehand or +set callback functions create it using gwy_shape_fit_preset_create_fitter() +and pass to this function. The fitter must be created for the same preset.

+

Additional quantities such as parameter errors or the correlation matrix can +be obtained from the fitter. See gwy_math_nlfit_fit_full() for details.

+
+

Parameters

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

preset

A 3D geometrical shape fitting function.

 

fitter

A Marquardt-Levenberg nonlinear fitter already initialized for +preset +'s function, or NULL.

 

points

Array of n +XYZ data defining the lateral coordinates and values +to fit.

 

n

Number of items in points +.

 

params

Fitting parameters filled with initial estimates (the fitting +starts from the provided values).

 

fixed_param

Which parameters should be treated as fixed (set +corresponding element to TRUE for them). May be NULL if +all parameters are free.

 

rss

Location to store the residual sum of squares, as returned by +gwy_math_nlfit_fit_idx(), may be NULL.

 
+
+
+

Returns

+

Either fitter +itself, or a newly created fitter if it was NULL.

+
+

Since: 2.47

+
+
+
+

gwy_shape_fit_presets ()

+
GwyInventory *
+gwy_shape_fit_presets (void);
+

Gets inventory with all the 3D geometric shape fitting presets.

+
+

Returns

+

3D geometric shape fitting preset inventory.

+
+

Since: 2.47

+
+
+
+

Types and Values

+
+

struct GwyShapeFitPreset

+
struct GwyShapeFitPreset;
+
+
+
+

struct GwyShapeFitPresetClass

+
struct GwyShapeFitPresetClass {
+    GwyResourceClass parent_class;
+};
+
+
+
+
+

See Also

+

GwyNLFitter

+
+
+
+
Generated by GTK-Doc V1.19
+ + \ No newline at end of file diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/GwySpectra.html gwyddion-2.47/devel-docs/libgwyprocess/html/GwySpectra.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/GwySpectra.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/GwySpectra.html 2016-11-18 10:59:27.000000000 +0000 @@ -882,6 +882,31 @@ 
void
 gwy_spectra_remove_spectrum (GwySpectra *spectra,
                              guint i);
+

Removes the ith spectrum from the Spectra collection. The subsequent +spectra are moved down one place.

+
+

Parameters

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

spectra

A spectra object.

 

i

Index of spectrum to remove.

 
+
+

Since: 2.7

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/index.html gwyddion-2.47/devel-docs/libgwyprocess/html/index.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/index.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/index.html 2016-11-18 10:59:28.000000000 +0000 @@ -15,7 +15,7 @@

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

@@ -99,6 +99,9 @@ peaks
+GwyShapeFitPreset — 3D geometrical shape fitting functions +
+
GwySpline — Sampling curves in plane
@@ -150,6 +153,7 @@
Index of new symbols in 2.44
Index of new symbols in 2.45
Index of new symbols in 2.46
+
Index of new symbols in 2.47

This library contains classes representing one- and twodimensional data, diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-correct.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-correct.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-correct.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-correct.html 2016-11-18 10:59:28.000000000 +0000 @@ -52,6 +52,14 @@ void +gwy_data_field_laplace_solve () + + + + +void + + gwy_data_field_correct_laplace_iteration () @@ -198,6 +206,74 @@

+

gwy_data_field_laplace_solve ()

+
void
+gwy_data_field_laplace_solve (GwyDataField *field,
+                              GwyDataField *mask,
+                              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 +edge. If entire area of field + is to be replaced the problem is +underspecified; field + will be filled with zeroes.

+

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.

+
+

Parameters

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

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.

 
+
+

Since: 2.47

+
+
+

gwy_data_field_correct_laplace_iteration ()

void
 gwy_data_field_correct_laplace_iteration
@@ -211,6 +287,9 @@
 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-iteratie gwy_data_field_laplace_solve() which is simultaneously much
+faster and more accurate.

 

 
Parameters

 

@@ -569,10 +648,10 @@
 
void
 gwy_data_field_affine (GwyDataField *source,
                        GwyDataField *dest,
-                       const gdouble *invtrans,
+                       const gdouble *invtrans,
                        GwyInterpolationType interp,
                        GwyExteriorType exterior,
-                       gdouble fill_value);

+                       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
@@ -668,7 +747,7 @@
 

-
+
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2 gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2
--- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess.devhelp2	2016-11-18 10:59:27.000000000 +0000
@@ -26,6 +26,7 @@
     
     
     
+    
     
     
     
@@ -64,6 +65,7 @@
     
     
     
+    
   
   
     
@@ -205,7 +207,7 @@
     
     
     
-    
+    
     
     
     
@@ -325,7 +327,7 @@
     
     
     
-    
+    
     
     
     
@@ -346,7 +348,7 @@
     
     
     
-    
+    
     
     
     
@@ -382,6 +384,7 @@
     
     
     
+    
     
     
     
@@ -458,7 +461,7 @@
     
     
     
-    
+    
     
     
     
@@ -496,6 +499,7 @@
     
     
     
+    
     
     
     
@@ -510,7 +514,7 @@
     
     
     
-    
+    
     
     
     
@@ -624,7 +628,7 @@
     
     
     
-    
+    
     
     
     
@@ -637,6 +641,7 @@
     
     
     
+    
     
     
     
@@ -648,7 +653,27 @@
     
     
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -702,7 +727,7 @@
     
     
     
-    
+    
     
     
     
@@ -758,7 +783,7 @@
     
     
     
-    
+    
     
     
     
@@ -770,15 +795,15 @@
     
     
     
-    
+    
     
     
     
     
     
     
-    
-    
+    
+    
     
     
     
@@ -786,12 +811,15 @@
     
     
     
+    
+    
+    
     
     
     
     
     
-    
+    
     
     
     
@@ -833,6 +861,7 @@
     
     
     
+    
     
     
     
@@ -943,6 +972,13 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-dwt.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-dwt.html
--- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-dwt.html	2016-10-14 09:51:03.000000000 +0000
+++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-dwt.html	2016-11-18 10:59:28.000000000 +0000
@@ -339,6 +339,41 @@
                                     GwyDataLine *wt_coefs,
                                     gdouble ratio,
                                     gint lowlimit);
+
Performs steps of the 2D image wavelet decomposition.

+
The smallest low pass coefficients block is equal to minsize
+. Run with
+minsize
+ = dfield->xres
+/2 to perform one step of decomposition
+or minsize
+ = 4 to perform full decomposition (or anything between).

+

+
Parameters

+

 
 
 
 

 
mask_field
mask_line

 
Mask of places to be corrected.

  
 

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





dfield
Data field to mark anisotropy of (must be square).
 
wt_coefs
Data line to store wavelet transform coefficients to.
 
minsize
size of minimal transform result block
 

+
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-filters.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-filters.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-filters.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-filters.html 2016-11-18 10:59:28.000000000 +0000 @@ -2214,6 +2214,66 @@ 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 + + 1) × (2size + + 1) square.

+
+

Parameters

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

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).

 

col

Upper-left column coordinate.

 

row

Upper-left row coordinate.

 

width

Area width (number of columns).

 

height

Area height (number of rows).

 
+
+

Since: 2.43

@@ -2455,6 +2515,45 @@ GwyDataField *result, gint neighbourhood, gdouble alpha); +

Applies Harris corner detection filter to a pair of gradient data fields.

+

All passed data field must have the same size.

+
+

Parameters

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

x_gradient

Data field with pre-calculated horizontal derivative.

 

y_gradient

Data field with pre-calculated vertical derivative.

 

result

Data field for the result.

 

neighbourhood

Neighbourhood size.

 

alpha

Sensitivity paramter (the squared trace is multiplied by it).

 
+
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-grains.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-grains.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-grains.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-grains.html 2016-11-18 10:59:28.000000000 +0000 @@ -209,6 +209,14 @@ +gint * + + +gwy_data_field_get_grain_sizes () + + + + GwyDataLine * @@ -388,7 +396,7 @@ 
void
 gwy_data_field_grains_mark_watershed (GwyDataField *data_field,
                                       GwyDataField *grain_field,
-                                      gint locate_steps,
+                                      gint locate_steps,
                                       gint locate_thresh,
                                       gdouble locate_dropsize,
                                       gint wshed_steps,
@@ -1257,6 +1265,69 @@
+

gwy_data_field_get_grain_sizes ()

+
gint *
+gwy_data_field_get_grain_sizes (GwyDataField *mask_field,
+                                gint ngrains,
+                                const gint *grains,
+                                gint *sizes);
+

Find sizes of all grains in a mask data field.

+

Size is the number of pixels in the grain.

+

The zeroth element of sizes + is filled with the number of pixels not +covered by the mask.

+
+

Parameters

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

mask_field

Data field containing positive values in grains, nonpositive +in free space. However its contents is ignored as all +grain information is taken from grains +(its dimensions +determine the dimensions of grains +).

 

ngrains

The number of grains as returned by +gwy_data_field_number_grains().

 

grains

Grain numbers filled with gwy_data_field_number_grains().

 

sizes

Array of size at least ngrains ++1 to fill with grain sizes +(as usual zero does not correspond to any grain, grains +start from 1). It can be NULL to allocate a new array.

 
+
+
+

Returns

+

Either sizes +(if it was not NULL), or a newly allocated array +of size ngrains ++1.

+
+

Since: 2.47

+
+
+

gwy_data_field_grains_get_distribution ()

GwyDataLine *
 gwy_data_field_grains_get_distribution
@@ -1795,9 +1866,9 @@
 
Performs a distance transform of a data field with grains.

 
Each non-zero value will be replaced with a distance to the grain boundary,
 measured in pixels.

-
Note this function can calculate the Euclidean distance transform only since
-2.43.  Use gwy_data_field_grain_distance_transform() for the EDT if you need
-compatibility with older versions.

+
Note this function can calculate the true Euclidean distance transform
+only since 2.43.  Use gwy_data_field_grain_distance_transform() for the EDT
+if you need compatibility with older versions.

 

 
Parameters

 

@@ -2055,6 +2126,39 @@
 gwy_data_field_mark_extrema (GwyDataField *dfield,
                              GwyDataField *extrema,
                              gboolean maxima);
+
Marks local maxima or minima in a two-dimensional field.

+
Local (or regional) maximum is a contiguous set of pixels that have the same
+value and this value is sharply greater than the value of any pixel touching
+the set.  A minimum is defined analogously.  A field filled with a single
+value is considered to have neither minimum nor maximum.

+

+
Parameters

+

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





dfield
A two-dimensional data field.
 
extrema
Target field for the extrema mask.
 
maxima
TRUE to mark maxima, FALSE to mark minima.
 

+

+
Since: 2.37
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-gwyprocessenums.html 2016-11-18 10:59:28.000000000 +0000 @@ -189,6 +189,10 @@ enum +GwyTipParamType + + +enum GwyCorrelationType @@ -340,6 +344,11 @@

gwy_correlation_type_get_enum ()

const GwyEnum *
 gwy_correlation_type_get_enum (void);
+

Returns GwyEnum for GwyCorrelationType enum type.

+
+

Returns

+

NULL-terminated GwyEnum which must not be modified nor freed.

+
@@ -1096,6 +1105,7 @@

enum GwyTipType

+

Type of tip shape presets.

Members

@@ -1107,42 +1117,129 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + +

GWY_TIP_PYRAMID

   +

N-sided pyramidal tip.

+		 

GWY_TIP_PYRAMIDE

   +

Legacy name for GWY_TIP_PYRAMID.

+		 

GWY_TIP_CONTACT

   +

Four-sided pyramidal tip.

+		 

GWY_TIP_NONCONTACT

   +

Three-sided pyramidal tip.

+		 

GWY_TIP_DELTA

   +

Delta function (single-pixel tip).

+		 

GWY_TIP_PARABOLA

   +

Parabolic tip. (Since 2.45)

+		 

GWY_TIP_CONE

   +

Conical tip. (Since 2.45)

+		 

GWY_TIP_ELLPARABOLA

 +

Elliptical parabola tip. (Since 2.47)

+		 
+
+
+
+
+

enum GwyTipParamType

+

Type of tip model preset parameter.

+

This enum is used with the new tip preset functions +gwy_tip_model_get_preset_params(), gwy_tip_model_preset_create(), +gwy_tip_model_preset_create_for_zrange().

+
+

Members

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

GWY_TIP_PARAM_HEIGHT

 +

Total tip height. This is used only in the delta + function tip; for all others it is implied.

+		 

GWY_TIP_PARAM_RADIUS

 +

Radius of curvature of the tip apex.

+		 

GWY_TIP_PARAM_ROTATION

 +

Rotation angle.

+		 

GWY_TIP_PARAM_NSIDES

 +

Number of sides for pyramidal tips.

+		 

GWY_TIP_PARAM_SLOPE

 +

Half-angle of the apex (complement of the side slope + for straight sides).

+		 

GWY_TIP_PARAM_ANISOTROPY

 +

Ratio between larger and smaller tip width in + two orthotonal directions.

+		 
+

Since: 2.47

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-GwySpline.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-GwySpline.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-GwySpline.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-GwySpline.html 2016-11-18 10:59:28.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ Home -Prev +Prev Next
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-hough.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-hough.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-hough.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-hough.html 2016-11-18 10:59:28.000000000 +0000 @@ -161,6 +161,71 @@ gint skip, gdouble threshold, gboolean subpixel); +

Locates local maxima in a data field.

+

At most ndata + maxima are located.

+
+

Parameters

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

dfield

A two-dimensional data field.

 

xdata

Array of ndata +elements where the columns should be stored.

 

ydata

Array of ndata +elements where the rows should be stored.

 

zdata

Array of ndata +elements where the values should be stored.

 

ndata

Number of items in xdata +, ydata +and zdata +.

 

skip

Minimum pixel distance between maxima.

 

threshold

Minimum value to be considered a maximum.

 

subpixel

TRUE for subpixel refinement.

 
+
+
+

Returns

+

The actual number of maxima found.

+
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-linestats.html 2016-11-18 10:59:28.000000000 +0000 @@ -1363,9 +1363,16 @@ gwy_data_line_get_xvm (GwyDataLine *data_line, 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().

+

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 +.

Parameters

@@ -1387,7 +1394,7 @@ - + @@ -1395,7 +1402,7 @@

Returns

-

The total roughness quantity defined by m +

The valley roughness quantity defined by m and k .

@@ -1408,6 +1415,43 @@ gwy_data_line_get_xtm (GwyDataLine *data_line, 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().

+
+

Parameters

+

k

Number of peaks and valleys to consider.

Number of valleys to consider.

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

data_line

A data line.

 

m

Number of sampling lengths.

 

k

Number of peaks and valleys to consider.

 
+
+
+

Returns

+

The total roughness quantity defined by m +and k +.

+
+

Since: 2.42

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-peaks.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-peaks.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-peaks.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-peaks.html 2016-11-18 10:59:28.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ Home Prev -Next +Next
@@ -41,7 +41,7 @@ -GwyPeaks * +GwyPeaks * gwy_peaks_new () @@ -49,6 +49,14 @@ +GwyPeaks * + + +gwy_peaks_copy () + + + + void @@ -134,10 +142,6 @@ enum GwyPeakQuantity - -  -GwyPeaks -
@@ -153,7 +157,7 @@

Functions

gwy_peaks_new ()

-
GwyPeaks *
+
GwyPeaks *
 gwy_peaks_new (void);

 
Creates a new empty peak analyser.

 

@@ -164,9 +168,37 @@
 

 

 

+
gwy_peaks_copy ()

+
GwyPeaks *
+gwy_peaks_copy (GwyPeaks *peaks);

+
Creates a copy of a peak analyser.

+
This is mostly useful for language bindings.

+

+
Parameters

+

+++++
+
+
+
+
+
+





peaks
A peak analyser.
 

+

+

+
Returns

+
 A newly created peak analyser.

+

+
Since: 2.47

+

+

+

 
gwy_peaks_free ()

 
void
-gwy_peaks_free (GwyPeaks *peaks);

+gwy_peaks_free (GwyPeaks *peaks);

Frees a peak analyser and all associated data.

Parameters

@@ -189,7 +221,7 @@

gwy_peaks_set_background ()

void
-gwy_peaks_set_background (GwyPeaks *peaks,
+gwy_peaks_set_background (GwyPeaks *peaks,
                           GwyPeakBackgroundType background);

Sets the background type a peak analyser will use.

The default background is GWY_PEAK_BACKGROUND_MMSTEP. Note that the new @@ -223,7 +255,7 @@

gwy_peaks_set_order ()

void
-gwy_peaks_set_order (GwyPeaks *peaks,
+gwy_peaks_set_order (GwyPeaks *peaks,
                      GwyPeakOrderType order);

Sets the order type a peak analyser will use.

The default order is GWY_PEAK_ORDER_ABSCISSA. Note that the new order will @@ -257,7 +289,7 @@

gwy_peaks_analyze ()

guint
-gwy_peaks_analyze (GwyPeaks *peaks,
+gwy_peaks_analyze (GwyPeaks *peaks,
                    const gdouble *xdata,
                    const gdouble *ydata,
                    guint n,
@@ -317,7 +349,7 @@
 

 
gwy_peaks_analyze_xy ()

 
guint
-gwy_peaks_analyze_xy (GwyPeaks *peaks,
+gwy_peaks_analyze_xy (GwyPeaks *peaks,
                       const GwyXY *xydata,
                       guint n,
                       guint maxpeaks);

@@ -368,7 +400,7 @@
 

 
gwy_peaks_analyze_dataline ()

 
guint
-gwy_peaks_analyze_dataline (GwyPeaks *peaks,
+gwy_peaks_analyze_dataline (GwyPeaks *peaks,
                             GwyDataLine *dline,
                             guint maxpeaks);

 
Finds peaks a graph curve given as GwyDataLine.

@@ -411,7 +443,7 @@
 

 
gwy_peaks_n_peaks ()

 
guint
-gwy_peaks_n_peaks (GwyPeaks *peaks);

+gwy_peaks_n_peaks (GwyPeaks *peaks);

Gets the current number of peaks of a peak analyser.

Parameters

@@ -438,7 +470,7 @@

gwy_peaks_get_quantity ()

void
-gwy_peaks_get_quantity (GwyPeaks *peaks,
+gwy_peaks_get_quantity (GwyPeaks *peaks,
                         GwyPeakQuantity quantity,
                         gdouble *data);

Obtaines values of a given quantity for all found peaks.

@@ -599,14 +631,6 @@

Since: 2.46

-
-
-

GwyPeaks

-
typedef struct _GwyPeaks GwyPeaks;
-

GwyPeaks is an opaque data structure and should be only manipulated -with the functions below.

-

Since: 2.46

-
diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-stats.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-stats.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-stats.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-stats.html 2016-11-18 10:59:28.000000000 +0000 @@ -1831,6 +1831,57 @@ gint width, 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() + with masking mode +GWY_MASK_INCLUDE.

+
+

Parameters

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

data_field

A data field.

 

mask

Mask specifying which values to take into account/exclude, or NULL.

 

col

Upper-left column coordinate.

 

row

Upper-left row coordinate.

 

width

Area width (number of columns).

 

height

Area height (number of rows).

 
+
+
+

Returns

+

The surface area.

+
@@ -2849,7 +2900,6 @@
-

Since: 2.23

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-stats-uncertainty.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-stats-uncertainty.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-stats-uncertainty.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-stats-uncertainty.html 2016-11-18 10:59:28.000000000 +0000 @@ -1777,6 +1777,73 @@ gint row, gint width, gint height); +

Computes uncertainty of 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 GWY_MASK_INCLUDE.

+
+

Parameters

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

data_field

A data field.

 

uncz_field

The corresponding uncertainty data field.

 

uncx_field

The uncertainty in the x direction.

 

uncy_field

The uncertainty in the y direction.

 

mask

Mask specifying which values to take into account/exclude, or NULL.

 

col

Upper-left column coordinate.

 

row

Upper-left row coordinate.

 

width

Area width (number of columns).

 

height

Area height (number of rows).

 
+
+
+

Returns

+

The uncertainty of surface area.

+
+

Since: 2.23

@@ -2511,6 +2578,68 @@ gint width, gint height, gint nstats); +

Calculates uncertainty of the cumulative distribution of heights in a +rectangular part of the data field.

+
+

Parameters

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

data_field

A data field.

 

mask

Mask specifying which values to take into account/exclude, or NULL.

 

uncz_field

Corresponding uncertainty data field.

 

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.

 
+
+

Since: 2.23

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-tip.html gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-tip.html --- gwyddion-2.46/devel-docs/libgwyprocess/html/libgwyprocess-tip.html 2016-10-14 09:51:03.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/html/libgwyprocess-tip.html 2016-11-18 10:59:28.000000000 +0000 @@ -108,6 +108,29 @@ +const GwyTipParamType * + + +gwy_tip_model_get_preset_params () + + + + +void + + +gwy_tip_model_preset_create () + + + + +void + + +gwy_tip_model_preset_create_for_zrange () + + + GwyDataField * @@ -181,6 +204,7 @@ gdouble radius, gdouble rotation, gdouble *params); +

GwyTipModelFunc is deprecated and should not be used in newly-written code.

@@ -192,6 +216,7 @@ gdouble *params, gint *xres, gint *yres); +

GwyTipGuessFunc is deprecated and should not be used in newly-written code.

@@ -340,6 +365,13 @@ 
gint
 gwy_tip_model_get_preset_nparams (const GwyTipModelPreset *preset);

Get number of tip preset parameters.

+
In versions prior to 2.47 the function alwas returned zero and thus +was useless. You had to know the what parameters each model had and always +pass a maximum-nparams-sized array with only the interesting elements +containing your parameters. Since version 2.47 it returns the true number +of parameters used in functions such as gwy_tip_model_preset_create() and +gwy_tip_model_preset_create_for_zrange(). It does not return the number of +parameters the old functions take. They behave exactly as before.

Parameters

@@ -362,6 +394,156 @@
+

gwy_tip_model_get_preset_params ()

+
const GwyTipParamType *
+gwy_tip_model_get_preset_params (const GwyTipModelPreset *preset);
+

Gets the list of parameters of a tip model preset.

+

All tip models have parameters from a predefined set given by the +GwyTipParamType enum.

+

Note further items may be in principle added to the set in the future so +you may want to avoid tip models that have parameters with an unknown +(higher than known) id.

+
+

Parameters

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

preset

Tip model preset.

 
+
+
+

Returns

+

List of all tip model parameter ids in ascending order. The array +is owned by the library and must not be modified nor freed.

+
+

Since: 2.47

+
+
+
+

gwy_tip_model_preset_create ()

+
void
+gwy_tip_model_preset_create (const GwyTipModelPreset *preset,
+                             GwyDataField *tip,
+                             const gdouble *params);
+

Fills a data field with a preset tip model.

+

Both pixel and physical dimensions of the tip + data field are preserved by +this function. Ensure that before using this function the tip + data field +has the same pixels as target data field you want to use the tip model with.

+

The number of parameters is the true full number of parameters as reported +by gwy_tip_model_get_preset_nparams() and gwy_tip_model_get_preset_params(). +And only those parameters are passed in params +.

+
+

Parameters

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

preset

Tip model preset.

 

tip

Data field to fill with the tip model.

 

params

Parameters of the tip model.

 
+
+

Since: 2.47

+
+
+
+

gwy_tip_model_preset_create_for_zrange ()

+
void
+gwy_tip_model_preset_create_for_zrange
+                               (const GwyTipModelPreset *preset,
+                                GwyDataField *tip,
+                                gdouble zrange,
+                                gboolean square,
+                                const gdouble *params);
+

Fills a data field with a preset tip model, resizing it to make it suitable +for the given value range.

+

The dimensions of a pixel in tip + is preserved by this function. Ensure +that before using this function the tip + data field has the same pixels as +target data field you want to use the tip model with.

+

However, its dimensions will generally be changed to ensure it is optimal +for zrange +. This means it is guaranteed the height difference between the +apex and any border pixel in tip + is at least zrange +, while simultaneously +the smallest such difference is not much larger than zrange +.

+

The number of parameters is the true full number of parameters as reported +by gwy_tip_model_get_preset_nparams() and gwy_tip_model_get_preset_params(). +And only those parameters are passed in params +.

+
+

Parameters

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

preset

Tip model preset.

 

tip

Data field to fill with the tip model.

 

zrange

Range of height values in the data determining the required height +of the tip model.

 

square

TRUE to enforce a square data field (with xres +and yres +equal).

 

params

Parameters of the tip model.

 
+
+

Since: 2.47

+
+
+

gwy_tip_dilation ()

GwyDataField *
 gwy_tip_dilation (GwyDataField *tip,
@@ -689,6 +871,7 @@
     gint nparams;
 };
+

GwyTipModelPreset is deprecated and should not be used in newly-written code.

diff -Nru gwyddion-2.46/devel-docs/libgwyprocess/libgwyprocess-docs.sgml gwyddion-2.47/devel-docs/libgwyprocess/libgwyprocess-docs.sgml --- gwyddion-2.46/devel-docs/libgwyprocess/libgwyprocess-docs.sgml 2016-10-14 09:21:52.000000000 +0000 +++ gwyddion-2.47/devel-docs/libgwyprocess/libgwyprocess-docs.sgml 2016-10-31 16:16:10.000000000 +0000 @@ -36,6 +36,7 @@ + @@ -168,5 +169,9 @@ Index of new symbols in 2.46 + + Index of new symbols in 2.47 + + diff -Nru gwyddion-2.46/gwyddion.spec gwyddion-2.47/gwyddion.spec --- gwyddion-2.46/gwyddion.spec 2016-10-14 09:42:08.000000000 +0000 +++ gwyddion-2.47/gwyddion.spec 2016-11-18 10:53:12.000000000 +0000 @@ -3,7 +3,7 @@ %{expand:%global distro_is_suse %(test ! -f /etc/SuSE-release; echo $?)} Name: gwyddion -Version: 2.46 +Version: 2.47 Release: 1 Summary: An SPM data visualization and analysis tool diff -Nru gwyddion-2.46/libdraw/gwydraw.c gwyddion-2.47/libdraw/gwydraw.c --- gwyddion-2.46/libdraw/gwydraw.c 2016-01-19 11:41:23.000000000 +0000 +++ gwyddion-2.47/libdraw/gwydraw.c 2016-10-31 16:03:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwydraw.c 18122 2016-01-19 11:41:23Z yeti-dn $ + * @(#) $Id: gwydraw.c 19143 2016-10-31 16:03:46Z yeti-dn $ * Copyright (C) 2003-2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -49,7 +49,8 @@ g_type_class_peek(GWY_TYPE_GRADIENT); g_type_class_peek(GWY_TYPE_GL_MATERIAL); g_type_class_peek(GWY_TYPE_SELECTION); - types_initialized = gwy_rgba_get_type(); + g_type_class_peek(GWY_TYPE_RGBA); + types_initialized = TRUE; _gwy_gradient_class_setup_presets(); _gwy_gl_material_class_setup_presets(); diff -Nru gwyddion-2.46/libdraw/gwydraw.h gwyddion-2.47/libdraw/gwydraw.h --- gwyddion-2.46/libdraw/gwydraw.h 2015-07-29 08:28:27.000000000 +0000 +++ gwyddion-2.47/libdraw/gwydraw.h 2016-11-03 20:57:03.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwydraw.h 15598 2013-11-11 12:33:32Z yeti-dn $ + * @(#) $Id: gwydraw.h 19161 2016-11-02 09:32:11Z yeti-dn $ * Copyright (C) 2003,2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -23,6 +23,7 @@ #define __GWY_GWYDRAW_H__ #include +#include #include #include #include diff -Nru gwyddion-2.46/libdraw/gwydrawtypes.c gwyddion-2.47/libdraw/gwydrawtypes.c --- gwyddion-2.46/libdraw/gwydrawtypes.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libdraw/gwydrawtypes.c 2016-11-03 20:58:12.000000000 +0000 @@ -0,0 +1,26 @@ +/* This is a GENERATED file. */ +/* Generated data (by glib-mkenums) */ + +#include "gwydrawtypes.h" + +#include "./gwydrawenums.h" + +GType +gwy_rendering_target_get_type(void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = { + { GWY_RENDERING_TARGET_SCREEN, "GWY_RENDERING_TARGET_SCREEN", "screen" }, + { GWY_RENDERING_TARGET_PIXMAP_IMAGE, "GWY_RENDERING_TARGET_PIXMAP_IMAGE", "pixmap-image" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static("GwyRenderingTarget", values); + } + return etype; +} + + +/* Generated data ends here */ + diff -Nru gwyddion-2.46/libdraw/gwydrawtypes.h gwyddion-2.47/libdraw/gwydrawtypes.h --- gwyddion-2.46/libdraw/gwydrawtypes.h 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libdraw/gwydrawtypes.h 2016-11-03 20:58:12.000000000 +0000 @@ -0,0 +1,19 @@ +/* This is a GENERATED file. */ +/* Generated data (by glib-mkenums) */ + +#ifndef __GWYDRAW_TYPES_H__ +#define __GWYDRAW_TYPES_H__ + +#include + +G_BEGIN_DECLS + +GType gwy_rendering_target_get_type(void) G_GNUC_CONST; +#define GWY_TYPE_RENDERING_TARGET (gwy_rendering_target_get_type()) + +G_END_DECLS + +#endif /* __GWYDRAW_TYPES_H__ */ + +/* Generated data ends here */ + diff -Nru gwyddion-2.46/libdraw/gwyrgba.c gwyddion-2.47/libdraw/gwyrgba.c --- gwyddion-2.46/libdraw/gwyrgba.c 2015-07-29 08:28:27.000000000 +0000 +++ gwyddion-2.47/libdraw/gwyrgba.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: gwyrgba.c 15598 2013-11-11 12:33:32Z yeti-dn $ - * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: gwyrgba.c 19135 2016-10-30 14:53:30Z yeti-dn $ + * Copyright (C) 2004-2016 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 @@ -47,6 +47,38 @@ } /** + * gwy_rgba_new: + * @r: The red component. + * @g: The green component. + * @b: The blue component. + * @a: The alpha (opacity) value. + * + * Creates RGBA colour specification. + * + * This is mostly useful for language bindings. + * + * Returns: New RGBA colour structure. The result must be freed with + * gwy_rgba_free(), not g_free(). + * + * Since: 2.47 + **/ +GwyRGBA* +gwy_rgba_new(gdouble r, + gdouble g, + gdouble b, + gdouble a) +{ + GwyRGBA *rgba = g_slice_new(GwyRGBA); + + rgba->r = r; + rgba->g = g; + rgba->b = b; + rgba->a = a; + + return rgba; +} + +/** * gwy_rgba_copy: * @rgba: A RGBA color. * @@ -59,7 +91,7 @@ gwy_rgba_copy(const GwyRGBA *rgba) { g_return_val_if_fail(rgba, NULL); - return g_memdup(rgba, sizeof(GwyRGBA)); + return g_slice_dup(GwyRGBA, rgba); } /** @@ -72,7 +104,7 @@ gwy_rgba_free(GwyRGBA *rgba) { g_return_if_fail(rgba); - g_free(rgba); + g_slice_free(GwyRGBA, rgba); } /** @@ -428,7 +460,7 @@ * * RGB[A] color specification type. * - * All values are from the range [0,1]. + * All values are from the range [0,1]. The components are not premultiplied. **/ /* 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.46/libdraw/gwyrgba.h gwyddion-2.47/libdraw/gwyrgba.h --- gwyddion-2.46/libdraw/gwyrgba.h 2015-07-29 08:28:27.000000000 +0000 +++ gwyddion-2.47/libdraw/gwyrgba.h 2016-10-31 07:58:49.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: gwyrgba.h 15598 2013-11-11 12:33:32Z yeti-dn $ - * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: gwyrgba.h 19135 2016-10-30 14:53:30Z yeti-dn $ + * Copyright (C) 2004-2016 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 @@ -36,37 +36,41 @@ gdouble a; } GwyRGBA; -GType gwy_rgba_get_type (void) G_GNUC_CONST; -GwyRGBA* gwy_rgba_copy (const GwyRGBA *rgba); -void gwy_rgba_free (GwyRGBA *rgba); -void gwy_rgba_to_gdk_color (const GwyRGBA *rgba, - GdkColor *gdkcolor); -guint16 gwy_rgba_to_gdk_alpha (const GwyRGBA *rgba); -void gwy_rgba_from_gdk_color (GwyRGBA *rgba, - const GdkColor *gdkcolor); -void gwy_rgba_from_gdk_color_and_alpha (GwyRGBA *rgba, - const GdkColor *gdkcolor, - guint16 gdkalpha); -void gwy_rgba_interpolate (const GwyRGBA *src1, - const GwyRGBA *src2, - gdouble x, - GwyRGBA *rgba); -gboolean gwy_rgba_get_from_container (GwyRGBA *rgba, - GwyContainer *container, - const gchar *prefix); -void gwy_rgba_store_to_container (const GwyRGBA *rgba, - GwyContainer *container, - const gchar *prefix); -gboolean gwy_rgba_remove_from_container (GwyContainer *container, - const gchar *prefix); -void gwy_rgba_set_gdk_gc_fg (const GwyRGBA *rgba, - GdkGC *gc); -void gwy_rgba_set_gdk_gc_bg (const GwyRGBA *rgba, - GdkGC *gc); -void gwy_rgba_to_hex6 (const GwyRGBA *rgba, - gchar *hexout); -void gwy_rgba_to_hex8 (const GwyRGBA *rgba, - gchar *hexout); +GType gwy_rgba_get_type (void) G_GNUC_CONST; +GwyRGBA* gwy_rgba_new (gdouble r, + gdouble g, + gdouble b, + gdouble a) G_GNUC_MALLOC; +GwyRGBA* gwy_rgba_copy (const GwyRGBA *rgba) G_GNUC_MALLOC; +void gwy_rgba_free (GwyRGBA *rgba); +void gwy_rgba_to_gdk_color (const GwyRGBA *rgba, + GdkColor *gdkcolor); +guint16 gwy_rgba_to_gdk_alpha (const GwyRGBA *rgba); +void gwy_rgba_from_gdk_color (GwyRGBA *rgba, + const GdkColor *gdkcolor); +void gwy_rgba_from_gdk_color_and_alpha(GwyRGBA *rgba, + const GdkColor *gdkcolor, + guint16 gdkalpha); +void gwy_rgba_interpolate (const GwyRGBA *src1, + const GwyRGBA *src2, + gdouble x, + GwyRGBA *rgba); +gboolean gwy_rgba_get_from_container (GwyRGBA *rgba, + GwyContainer *container, + const gchar *prefix); +void gwy_rgba_store_to_container (const GwyRGBA *rgba, + GwyContainer *container, + const gchar *prefix); +gboolean gwy_rgba_remove_from_container (GwyContainer *container, + const gchar *prefix); +void gwy_rgba_set_gdk_gc_fg (const GwyRGBA *rgba, + GdkGC *gc); +void gwy_rgba_set_gdk_gc_bg (const GwyRGBA *rgba, + GdkGC *gc); +void gwy_rgba_to_hex6 (const GwyRGBA *rgba, + gchar *hexout); +void gwy_rgba_to_hex8 (const GwyRGBA *rgba, + gchar *hexout); G_END_DECLS diff -Nru gwyddion-2.46/libdraw/gwyselection.c gwyddion-2.47/libdraw/gwyselection.c --- gwyddion-2.46/libdraw/gwyselection.c 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/libdraw/gwyselection.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyselection.c 19059 2016-10-12 15:23:06Z yeti-dn $ + * @(#) $Id: gwyselection.c 19133 2016-10-30 14:52:22Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -638,7 +638,8 @@ if (nselected) { g_return_if_fail(data); - memcpy((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); diff -Nru gwyddion-2.46/libdraw/Makefile.am gwyddion-2.47/libdraw/Makefile.am --- gwyddion-2.46/libdraw/Makefile.am 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/libdraw/Makefile.am 2016-11-15 08:25:23.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la libgwyprocess = $(top_builddir)/libprocess/libgwyprocess2.la @@ -14,6 +14,7 @@ libgwydraw2include_HEADERS = \ gwydraw.h \ gwydrawenums.h \ + gwydrawtypes.h \ gwyglmaterial.h \ gwygradient.h \ gwypixfield.h \ @@ -22,13 +23,23 @@ lib_LTLIBRARIES = libgwydraw2.la - if OS_MSWIN no_undefined = -no-undefined export_symbols = -export-symbols libgwydraw2.def libgwydraw2_la_DEPENDENCIES = libgwydraw2.def endif +# Must init +EXTRA_DIST = +CLEANFILES = libgwydraw2.def +MAINTAINERCLEANFILES = +BUILT_SOURCES = + +MKENUM_NAME = gwydrawtypes +MKENUM_ID = GWYDRAW_TYPES +MKENUM_HFILES = $(srcdir)/gwydrawenums.h +include $(top_srcdir)/utils/mkenum.mk + noinst_HEADERS = \ gwydrawinternal.h @@ -48,21 +59,20 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 4:2:4 +libversion = -version-info 5:0:5 #libversion = -release @LIBRARY_RELEASE@ libgwydraw2_la_LDFLAGS = @GTK_LIBS@ @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwydraw2_la_LIBADD = $(libgwydraw_libadd) libgwydraw2_la_SOURCES = \ gwydraw.c \ + gwydrawtypes.c \ gwyglmaterial.c \ gwygradient.c \ gwypixfield.c \ gwyrgba.c \ gwyselection.c -CLEANFILES = libgwydraw2.def - clean-local: rm -f core.* *~ diff -Nru gwyddion-2.46/libdraw/Makefile.in gwyddion-2.47/libdraw/Makefile.in --- gwyddion-2.46/libdraw/Makefile.in 2016-10-14 09:41:57.000000000 +0000 +++ gwyddion-2.47/libdraw/Makefile.in 2016-11-18 10:52:39.000000000 +0000 @@ -14,7 +14,21 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ + +# Generic glib-mkenum rules. +# @(#) $Id: mkenum.mk 11705 2011-01-03 08:32:55Z yeti-dn $ +# +# Parameters: +# MKENUM_NAME -- output base name +# MKENUM_ID -- name to use for #ifndef __...__ header wrapping +# MKENUM_HFILES -- input header files +# +# Adds to common variables (must set before, at least to empty): +# BUILT_SOURCES +# CLEANFILES +# EXTRA_DIST +# MAINTAINERCLEANFILES VPATH = @srcdir@ @@ -92,6 +106,8 @@ build_triplet = @build@ host_triplet = @host@ @OS_MSWIN_FALSE@libgwydraw2_la_DEPENDENCIES = $(libgwydraw_libadd) +@MAINTAINER_MODE_TRUE@am__append_1 = $(mkenum_built_sources) $(mkenum_stamp_files) +@MAINTAINER_MODE_TRUE@am__append_2 = $(mkenum_built_sources) subdir = libdraw ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gconf-2.m4 \ @@ -142,8 +158,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libgwydraw2includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -am_libgwydraw2_la_OBJECTS = gwydraw.lo gwyglmaterial.lo gwygradient.lo \ - gwypixfield.lo gwyrgba.lo gwyselection.lo +am_libgwydraw2_la_OBJECTS = gwydraw.lo gwydrawtypes.lo \ + gwyglmaterial.lo gwygradient.lo gwypixfield.lo gwyrgba.lo \ + gwyselection.lo libgwydraw2_la_OBJECTS = $(am_libgwydraw2_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -214,7 +231,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/utils/mkenum.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -463,6 +481,7 @@ libgwydraw2include_HEADERS = \ gwydraw.h \ gwydrawenums.h \ + gwydrawtypes.h \ gwyglmaterial.h \ gwygradient.h \ gwypixfield.h \ @@ -473,6 +492,31 @@ @OS_MSWIN_TRUE@no_undefined = -no-undefined @OS_MSWIN_TRUE@export_symbols = -export-symbols libgwydraw2.def @OS_MSWIN_TRUE@libgwydraw2_la_DEPENDENCIES = libgwydraw2.def + +# Must init +EXTRA_DIST = $(mkenum_built_sources) +CLEANFILES = libgwydraw2.def $(MKENUM_NAME).c.xgen \ + $(MKENUM_NAME).h.xgen +MAINTAINERCLEANFILES = $(am__append_1) +BUILT_SOURCES = $(am__append_2) +MKENUM_NAME = gwydrawtypes +MKENUM_ID = GWYDRAW_TYPES +MKENUM_HFILES = $(srcdir)/gwydrawenums.h + +# TODO: Detect +GLIB_MKENUMS = glib-mkenums +mkenum_built_sources = $(MKENUM_NAME).h $(MKENUM_NAME).c +@MAINTAINER_MODE_TRUE@mkenum_stamp_files = $(MKENUM_NAME).h.stamp +@MAINTAINER_MODE_TRUE@mkenum_self = $(top_srcdir)/utils/mkenum.mk +@MAINTAINER_MODE_TRUE@mkenum_c_template = $(top_srcdir)/utils/mkenum.c.template +@MAINTAINER_MODE_TRUE@mkenum_h_template = $(top_srcdir)/utils/mkenum.h.template +# Keep the `GENERATED' string quoted to prevent match here +@MAINTAINER_MODE_TRUE@mkenum_fix_output = \ +@MAINTAINER_MODE_TRUE@ | sed -e 's/_\([123]\)_D/_\1D_/g' \ +@MAINTAINER_MODE_TRUE@ -e "s/@ID@/$(MKENUM_ID)/g" \ +@MAINTAINER_MODE_TRUE@ -e "s/@OWN_HEADER@/$(MKENUM_NAME).h/g" \ +@MAINTAINER_MODE_TRUE@ -e '1s:.*:/* This is a 'GENERATED' file. */:' + noinst_HEADERS = \ gwydrawinternal.h @@ -484,24 +528,25 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 4:2:4 +libversion = -version-info 5:0:5 #libversion = -release @LIBRARY_RELEASE@ libgwydraw2_la_LDFLAGS = @GTK_LIBS@ @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwydraw2_la_LIBADD = $(libgwydraw_libadd) libgwydraw2_la_SOURCES = \ gwydraw.c \ + gwydrawtypes.c \ gwyglmaterial.c \ gwygradient.c \ gwypixfield.c \ gwyrgba.c \ gwyselection.c -CLEANFILES = libgwydraw2.def -all: all-am +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/utils/mkenum.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -521,6 +566,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/utils/mkenum.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -576,6 +622,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwydraw.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwydrawtypes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyglmaterial.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwygradient.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwypixfield.Plo@am__quote@ @@ -713,13 +760,15 @@ fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgwydraw2includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -750,6 +799,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ @@ -822,7 +873,7 @@ uninstall-am: uninstall-libLTLIBRARIES \ uninstall-libgwydraw2includeHEADERS -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-local cscopelist-am \ @@ -843,6 +894,25 @@ .PRECIOUS: Makefile +@MAINTAINER_MODE_TRUE@$(MKENUM_NAME).h: $(MKENUM_NAME).h.stamp +@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)true + +@MAINTAINER_MODE_TRUE@$(MKENUM_NAME).h.stamp: $(MKENUM_HFILES) $(mkenum_h_template) $(mkenum_self) +@MAINTAINER_MODE_TRUE@ $(AM_V_at)$(GLIB_MKENUMS) --template $(mkenum_h_template) $(MKENUM_HFILES) \ +@MAINTAINER_MODE_TRUE@ $(mkenum_fix_output) \ +@MAINTAINER_MODE_TRUE@ >$(MKENUM_NAME).h.xgen \ +@MAINTAINER_MODE_TRUE@ && ( cmp -s $(MKENUM_NAME).h.xgen $(MKENUM_NAME).h \ +@MAINTAINER_MODE_TRUE@ || cp $(MKENUM_NAME).h.xgen $(MKENUM_NAME).h ) \ +@MAINTAINER_MODE_TRUE@ && rm -f $(MKENUM_NAME).h.xgen \ +@MAINTAINER_MODE_TRUE@ && echo timestamp >$(MKENUM_NAME).h.stamp + +@MAINTAINER_MODE_TRUE@$(MKENUM_NAME).c: $(MKENUM_HFILES) $(mkenum_c_template) $(mkenum_self) +@MAINTAINER_MODE_TRUE@ $(AM_V_GEN)$(GLIB_MKENUMS) --template $(mkenum_c_template) $(MKENUM_HFILES) \ +@MAINTAINER_MODE_TRUE@ $(mkenum_fix_output) \ +@MAINTAINER_MODE_TRUE@ >$(MKENUM_NAME).c.xgen \ +@MAINTAINER_MODE_TRUE@ && cp $(MKENUM_NAME).c.xgen $(MKENUM_NAME).c \ +@MAINTAINER_MODE_TRUE@ && rm -f $(MKENUM_NAME).c.xgen + libgwydraw2.def: $(libgwydraw2_la_OBJECTS) $(AM_V_GEN)echo EXPORTS >libgwydraw2.def $(AM_V_at)for lo in $(libgwydraw2_la_OBJECTS); do \ diff -Nru gwyddion-2.46/libgwyddion/gwyddion.c gwyddion-2.47/libgwyddion/gwyddion.c --- gwyddion-2.46/libgwyddion/gwyddion.c 2015-07-29 08:28:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddion.c 2016-11-07 21:13:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyddion.c 15598 2013-11-11 12:33:32Z yeti-dn $ + * @(#) $Id: gwyddion.c 19201 2016-11-07 21:07:07Z yeti-dn $ * Copyright (C) 2003-2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -53,7 +53,11 @@ g_type_class_peek(GWY_TYPE_NLFIT_PRESET); g_type_class_peek(GWY_TYPE_FD_CURVE_PRESET); g_type_class_peek(GWY_TYPE_STRING_LIST); - types_initialized = gwy_enum_get_type(); + g_type_class_peek(GWY_TYPE_XY); + g_type_class_peek(GWY_TYPE_XYZ); + g_type_class_peek(GWY_TYPE_ENUM); + g_type_class_peek(GWY_TYPE_SI_VALUE_FORMAT); + types_initialized = TRUE; _gwy_nlfit_preset_class_setup_presets(); _gwy_fd_curve_preset_class_setup_presets(); diff -Nru gwyddion-2.46/libgwyddion/gwyddionenums.h gwyddion-2.47/libgwyddion/gwyddionenums.h --- gwyddion-2.46/libgwyddion/gwyddionenums.h 2015-07-29 08:28:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddionenums.h 2016-10-21 11:58:11.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: gwyddionenums.h 15598 2013-11-11 12:33:32Z yeti-dn $ - * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: gwyddionenums.h 19109 2016-10-21 08:57:19Z yeti-dn $ + * Copyright (C) 2005-2016 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 @@ -34,7 +34,13 @@ GWY_SI_UNIT_FORMAT_TEX } GwySIUnitFormatStyle; +typedef enum { + GWY_NLFIT_PARAM_ANGLE = 1 << 0, + GWY_NLFIT_PARAM_ABSVAL = 1 << 1, +} GwyNLFitParamFlags; + G_END_DECLS #endif /*__GWYDDION_ENUMS_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 : */ diff -Nru gwyddion-2.46/libgwyddion/gwyddion.h gwyddion-2.47/libgwyddion/gwyddion.h --- gwyddion-2.46/libgwyddion/gwyddion.h 2015-07-29 08:28:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddion.h 2016-11-07 21:13:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyddion.h 16232 2014-05-30 19:41:35Z yeti-dn $ + * @(#) $Id: gwyddion.h 19201 2016-11-07 21:07:07Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff -Nru gwyddion-2.46/libgwyddion/gwyddioninternal.h gwyddion-2.47/libgwyddion/gwyddioninternal.h --- gwyddion-2.46/libgwyddion/gwyddioninternal.h 2016-09-01 08:37:22.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddioninternal.h 2016-10-19 12:56:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyddioninternal.h 18904 2016-09-01 06:29:14Z yeti-dn $ + * @(#) $Id: gwyddioninternal.h 19101 2016-10-19 12:56:46Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -24,6 +24,8 @@ #ifndef __GWY_INTERNAL_H__ #define __GWY_INTERNAL_H__ +#include "gwynlfitpreset.h" + G_BEGIN_DECLS typedef void (*GwyNLFitGuessFunc)(gint n_dat, diff -Nru gwyddion-2.46/libgwyddion/gwyddiontypes.c gwyddion-2.47/libgwyddion/gwyddiontypes.c --- gwyddion-2.46/libgwyddion/gwyddiontypes.c 2016-08-01 14:18:19.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddiontypes.c 2016-10-21 11:59:23.000000000 +0000 @@ -24,6 +24,22 @@ return etype; } +GType +gwy_nl_fit_param_flags_get_type(void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GFlagsValue values[] = { + { GWY_NLFIT_PARAM_ANGLE, "GWY_NLFIT_PARAM_ANGLE", "angle" }, + { GWY_NLFIT_PARAM_ABSVAL, "GWY_NLFIT_PARAM_ABSVAL", "absval" }, + { 0, NULL, NULL } + }; + etype = g_flags_register_static("GwyNLFitParamFlags", values); + } + return etype; +} + #include "./gwyutils.h" GType diff -Nru gwyddion-2.46/libgwyddion/gwyddiontypes.h gwyddion-2.47/libgwyddion/gwyddiontypes.h --- gwyddion-2.46/libgwyddion/gwyddiontypes.h 2015-07-29 09:09:05.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyddiontypes.h 2016-10-21 11:59:23.000000000 +0000 @@ -11,6 +11,9 @@ GType gwy_si_unit_format_style_get_type(void) G_GNUC_CONST; #define GWY_TYPE_SI_UNIT_FORMAT_STYLE (gwy_si_unit_format_style_get_type()) +GType gwy_nl_fit_param_flags_get_type(void) G_GNUC_CONST; +#define GWY_TYPE_NL_FIT_PARAM_FLAGS (gwy_nl_fit_param_flags_get_type()) + GType gwy_raw_data_type_get_type(void) G_GNUC_CONST; #define GWY_TYPE_RAW_DATA_TYPE (gwy_raw_data_type_get_type()) diff -Nru gwyddion-2.46/libgwyddion/gwyinventory.c gwyddion-2.47/libgwyddion/gwyinventory.c --- gwyddion-2.46/libgwyddion/gwyinventory.c 2016-01-19 10:15:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyinventory.c 2016-10-19 14:40:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyinventory.c 18117 2016-01-19 10:15:26Z yeti-dn $ + * @(#) $Id: gwyinventory.c 19103 2016-10-19 14:40:52Z yeti-dn $ * Copyright (C) 2003,2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -516,7 +516,7 @@ * * Finds position of an item in an inventory. * - * Returns: Item position, or -1 if there is no such item. + * Returns: Item position, or (guint)-1 if there is no such item. **/ guint gwy_inventory_get_item_position(GwyInventory *inventory, diff -Nru gwyddion-2.46/libgwyddion/gwymath.c gwyddion-2.47/libgwyddion/gwymath.c --- gwyddion-2.46/libgwyddion/gwymath.c 2016-09-08 11:59:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwymath.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwymath.c 18930 2016-09-07 20:02:38Z yeti-dn $ + * @(#) $Id: gwymath.c 19134 2016-10-30 14:53:05Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -49,6 +49,29 @@ } /** + * gwy_xy_new: + * @x: X-coordinate. + * @y: Y-coordinate. + * + * Creates Cartesian coordinates in plane. + * + * This is mostly useful for language bindings. + * + * Returns: New XY structure. The result must be freed using gwy_xy_free(), + * not g_free(). + * + * Since: 2.47 + **/ +GwyXY* +gwy_xy_new(gdouble x, gdouble y) +{ + GwyXY *xy = g_slice_new(GwyXY); + xy->x = x; + xy->y = y; + return xy; +} + +/** * gwy_xy_copy: * @xy: Cartesian coordinates in plane. * @@ -95,6 +118,31 @@ } /** + * gwy_xyz_new: + * @x: X-coordinate. + * @y: Y-coordinate. + * @z: Z-coordinate. + * + * Creates Cartesian coordinates in space. + * + * This is mostly useful for language bindings. + * + * Returns: New XYZ structure. The result must be freed using gwy_xyz_free(), + * not g_free(). + * + * Since: 2.47 + **/ +GwyXYZ* +gwy_xyz_new(gdouble x, gdouble y, gdouble z) +{ + GwyXYZ *xyz = g_slice_new(GwyXYZ); + xyz->x = x; + xyz->y = y; + xyz->z = z; + return xyz; +} + +/** * gwy_xyz_copy: * @xyz: Cartesian coordinates in space. * @@ -798,7 +846,7 @@ } } -/* +/** * gwy_math_curvature: * @coeffs: Array of the six polynomial coefficients of a quadratic surface in * the following order: 1, x, y, x², xy, y². diff -Nru gwyddion-2.46/libgwyddion/gwymath.h gwyddion-2.47/libgwyddion/gwymath.h --- gwyddion-2.46/libgwyddion/gwymath.h 2016-09-08 11:59:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwymath.h 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwymath.h 18930 2016-09-07 20:02:38Z yeti-dn $ + * @(#) $Id: gwymath.h 19134 2016-10-30 14:53:05Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -57,12 +57,17 @@ #define GWY_TYPE_XY (gwy_xy_get_type()) GType gwy_xy_get_type(void) G_GNUC_CONST; +GwyXY* gwy_xy_new (gdouble x, + gdouble y) G_GNUC_MALLOC; GwyXY* gwy_xy_copy (const GwyXY *xy) G_GNUC_MALLOC; void gwy_xy_free (GwyXY *xy); #define GWY_TYPE_XYZ (gwy_xyz_get_type()) GType gwy_xyz_get_type(void) G_GNUC_CONST; +GwyXYZ* gwy_xyz_new (gdouble x, + gdouble y, + gdouble z) G_GNUC_MALLOC; GwyXYZ* gwy_xyz_copy (const GwyXYZ *xyz) G_GNUC_MALLOC; void gwy_xyz_free (GwyXYZ *xyz); diff -Nru gwyddion-2.46/libgwyddion/gwynlfit.c gwyddion-2.47/libgwyddion/gwynlfit.c --- gwyddion-2.46/libgwyddion/gwynlfit.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwynlfit.c 2016-11-01 08:00:58.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwynlfit.c 19035 2016-10-08 10:12:39Z yeti-dn $ + * @(#) $Id: gwynlfit.c 19150 2016-10-31 21:34:48Z yeti-dn $ * Copyright (C) 2000-2003 Martin Siler. * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. @@ -45,6 +45,8 @@ GwySetMessageFunc set_message; GwyNLFitIdxFunc func_idx; GwyNLFitIdxDiffFunc diff_idx; + gboolean approx_geometric; + gint nparam; } GwyNLFitterPrivate; static void gwy_math_nlfit_init (GwyNLFitter *nlfit); @@ -64,6 +66,7 @@ const gdouble *x, const gdouble *y, const gdouble *weight, + const gdouble *gcorr, guint nparam, const gdouble *param, gpointer user_data, @@ -75,6 +78,22 @@ static GList *private_fitter_data = NULL; +#if 0 +GType +gwy_math_nlfit_get_type(void) +{ + static GType nlfit_type = 0; + + if (G_UNLIKELY(!nlfit_type)) { + nlfit_type = g_boxed_type_register_static("GwyMathNLFit", + (GBoxedCopyFunc)gwy_math_nlfit_copy, + (GBoxedFreeFunc)gwy_math_nlfit_free); + } + + return nlfit_type; +} +#endif + /** * gwy_math_nlfit_new: * @func: The fitted function. @@ -172,6 +191,37 @@ } /** + * gwy_math_nlfit_copy: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * + * Creates a copy of a nonlinear least squares fitter. + * + * This function is mostly usefil for language bindings. + * + * Returns: The newly created fitter. + * + * Since: 2.47 + **/ +GwyNLFitter* +gwy_math_nlfit_copy(GwyNLFitter *nlfit) +{ + GwyNLFitter *copy = g_memdup(nlfit, sizeof(GwyNLFitter)); + GwyNLFitterPrivate *priv; + gint n; + + priv = find_private_data(nlfit, FALSE); + if (nlfit->covar) { + g_assert(priv); + n = priv->nparam; + copy->covar = g_memdup(nlfit->covar, n*(n+1)/2*sizeof(gdouble)); + } + if (priv) + *find_private_data(copy, TRUE) = *priv; + + return copy; +} + +/** * gwy_math_nlfit_fit: * @nlfit: A Marquardt-Levenberg nonlinear fitter. * @ndata: The number of data points in @x, @y. @@ -338,7 +388,7 @@ gdouble mlambda = 1e-4; gdouble sumr1, sumr = G_MAXDOUBLE; gdouble *der = NULL, *v = NULL, *xr = NULL, *w = NULL, - *saveparam = NULL, *origparam = NULL, *resid = NULL, + *saveparam = NULL, *origparam = NULL, *resid = NULL, *gcorr = NULL, *a = NULL, *save_a = NULL; guint *var_param_id = NULL, *lmap = NULL; gboolean *fixed = NULL; @@ -346,6 +396,7 @@ guint i, j, k; guint n_var_param; guint miter = 0; + gboolean approx_geometric; gboolean step1 = TRUE; gboolean end = FALSE; @@ -355,6 +406,8 @@ priv = find_private_data(nlfit, TRUE); set_fraction = priv->set_fraction; set_message = priv->set_message; + approx_geometric = priv->approx_geometric; + priv->nparam = 0; func = nlfit->fmarq; diff = nlfit->dmarq; func_idx = priv->func_idx; @@ -398,7 +451,11 @@ } resid = g_new(gdouble, ndata); - sumr1 = gwy_math_nlfit_residua(func, func_idx, ndata, x, y, w, + gcorr = g_new(gdouble, ndata); + for (i = 0; i < ndata; i++) + gcorr[i] = 1.0; + + sumr1 = gwy_math_nlfit_residua(func, func_idx, ndata, x, y, w, gcorr, nparam, param, user_data, resid, &nlfit->eval); sumr = sumr1; @@ -503,27 +560,42 @@ der[j] *= w[i]; } - /* acummulate derivatives by slave parameters in master */ + /* Accumulate derivatives by slave parameters in master. */ for (j = 0; j < nparam; j++) { if (link_map[j] != j) der[link_map[j]] += der[j]; } + /* Reduce differences for approximate orthogonal fitting. + * NB: We remember the factor already squared because it only + * occurs in products of two quantities that both carry it. */ + if (approx_geometric) { + gcorr[i] = 1.0; + for (j = 0; j < nparam; j++) { + if (var_param_id[j] == G_MAXUINT || link_map[j] != j) + continue; + gcorr[i] += der[j] * der[j]; + } + gcorr[i] = 1.0/gcorr[i]; + } + + /* Accumulate the Hessian and gradient. */ for (j = 0; j < nparam; j++) { guint jid, diag; /* Only variable master parameters matter */ - if ((jid = var_param_id[j]) == G_MAXUINT || link_map[j] != j) + if ((jid = var_param_id[j]) == G_MAXUINT + || link_map[j] != j) continue; diag = jid*(jid + 1)/2; /* for J'r */ - v[jid] += der[j] * resid[i]; + v[jid] += der[j] * resid[i] * gcorr[i]; for (k = 0; k <= j; k++) { /* for J'J */ gint kid = var_param_id[k]; if (kid != G_MAXUINT) - a[diag + kid] += der[j] * der[k]; + a[diag + kid] += der[j] * der[k] * gcorr[i]; } } } @@ -585,8 +657,8 @@ if (count == n_var_param) break; - /* See what the new residua is */ - sumr1 = gwy_math_nlfit_residua(func, func_idx, ndata, x, y, weight, + /* See what the new residua is. */ + sumr1 = gwy_math_nlfit_residua(func, func_idx, ndata, x, y, w, gcorr, nparam, param, user_data, resid, &nlfit->eval); /* Catch failed evaluation even if it's not reported. */ @@ -661,8 +733,10 @@ } if (nlfit->covar) { + priv->nparam = nparam; for (i = 0; i < nparam*(nparam + 1)/2; i++) { if (gwy_isinf(nlfit->covar[i]) || gwy_isnan(nlfit->covar[i])) { + priv->nparam = 0; sumr = -1.0; GWY_FREE(nlfit->covar); gwy_assign(param, origparam, nparam); @@ -682,6 +756,7 @@ g_free(fixed); g_free(var_param_id); g_free(resid); + g_free(gcorr); g_free(w); g_free(lmap); @@ -697,7 +772,7 @@ * entries are set to %TRUE). * @func: The fitted function. * @user_data: User data to be passed to @func. - * @diff: Array where the put the result to. + * @der: Array where the put the result to. * @success: Set to %TRUE if succeeds, %FALSE on failure. * * Numerically computes the partial derivatives of a function. @@ -837,6 +912,9 @@ } } +/* NB: we apply weighting to to resid[] because it does not change. But we + * must not apply gcorr because that changes with derivatives. So the caller + * applies it directly to the Hessian and gradient... */ static gdouble gwy_math_nlfit_residua(GwyNLFitFunc func, GwyNLFitIdxFunc func_idx, @@ -844,6 +922,7 @@ const gdouble *x, const gdouble *y, const gdouble *weight, + const gdouble *gcorr, guint nparam, const gdouble *param, gpointer user_data, @@ -859,7 +938,7 @@ if (func_idx) { for (i = 0; i < ndata && ok; i++) { resid[i] = func_idx(i, param, user_data, &ok); - s += resid[i] * resid[i]; + s += resid[i] * resid[i] * gcorr[i]; } } else { @@ -867,7 +946,7 @@ resid[i] = func(x[i], nparam, param, user_data, &ok) - y[i]; if (weight) resid[i] *= weight[i]; - s += resid[i] * resid[i]; + s += resid[i] * resid[i] * gcorr[i]; } } *success = ok; @@ -905,6 +984,52 @@ } /** + * gwy_math_nlfit_get_approx_geometric: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * + * Reports if a non-linear fitter performs approximately orthogonal fitting. + * + * Returns: %TRUE if the fitting is approximately orthogonal; %FALSE for + * ordinary least squares. + * + * Since: 2.47 + **/ +gboolean +gwy_math_nlfit_get_approx_geometric(GwyNLFitter *nlfit) +{ + GwyNLFitterPrivate *priv; + + priv = find_private_data(nlfit, FALSE); + return priv && priv->approx_geometric; +} + +/** + * gwy_math_nlfit_set_approx_geometric: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * @setting: %TRUE to approximately orthogonal (geometrical) fitting. + * + * Sets a non-linear fitter to perform ordinary or approximately orthogonal + * fitting. + * + * The orthogonal (geometrical) fitting is approximated by a simple reduction + * of differences using the local function slope. It only makes sense when + * the function values are the same physical quantities as the abscissae. + * Furthermore, it is better used only when the fit is already relatively close + * to the minimum. + * + * Since: 2.47 + **/ +void +gwy_math_nlfit_set_approx_geometric(GwyNLFitter *nlfit, + gboolean setting) +{ + GwyNLFitterPrivate *priv; + + priv = find_private_data(nlfit, TRUE); + priv->approx_geometric = setting; +} + +/** * gwy_math_nlfit_succeeded: * @nlfit: A Marquardt-Levenberg nonlinear fitter. * @@ -968,6 +1093,64 @@ } /** + * gwy_math_nlfit_get_nparam: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * + * Gets the number of parameters of a nonlinear fitter. + * + * The number of parameters determines the size of covariance matrix obtained + * by gwy_math_nlfit_get_covar() and valid arguments for + * gwy_math_nlfit_get_correlations(). + * + * Returns: The number of parameters for the last fit. If the last fit was not + * successful zero is returned. + * + * Since: 2.47 + **/ +gint +gwy_math_nlfit_get_nparam(GwyNLFitter *nlfit) +{ + GwyNLFitterPrivate *priv; + + priv = find_private_data(nlfit, FALSE); + return priv ? priv->nparam : 0; +} + +/** + * gwy_math_nlfit_get_eval: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * + * Gets the state of a nonlinear fitter. + * + * Returns: %TRUE if the last fit succeeded, %FALSE if it failed. + * + * Since: 2.47 + **/ +gboolean +gwy_math_nlfit_get_eval(GwyNLFitter *nlfit) +{ + return nlfit->eval; +} + +/** + * gwy_math_nlfit_get_covar: + * @nlfit: A Marquardt-Levenberg nonlinear fitter. + * + * Gets the covariance matrix of a nonlinear fitter. + * + * Returns: The covariance matrix, as lower triangular matrix, owned by the + * fitter. The return value will be %NULL if the last fit did not + * succeed. + * + * Since: 2.47 + **/ +const gdouble* +gwy_math_nlfit_get_covar(GwyNLFitter *nlfit) +{ + return nlfit->covar; +} + +/** * gwy_math_nlfit_get_correlations: * @nlfit: A Marquardt-Levenberg nonlinear fitter. * @par1: First parameter index. @@ -982,7 +1165,7 @@ gdouble gwy_math_nlfit_get_correlations(GwyNLFitter *nlfit, gint par1, gint par2) { - gdouble Pom; + gdouble t; g_return_val_if_fail(nlfit->covar, G_MAXDOUBLE); @@ -991,13 +1174,13 @@ if (par1 < par2) GWY_SWAP(gint, par1, par2); - Pom = SLi(nlfit->covar, par1, par1) * SLi(nlfit->covar, par2, par2); - if (Pom == 0) { + t = SLi(nlfit->covar, par1, par1) * SLi(nlfit->covar, par2, par2); + if (t == 0) { g_warning("Zero element in covar matrix"); return G_MAXDOUBLE; } - return SLi(nlfit->covar, par1, par2)/sqrt(Pom); + return SLi(nlfit->covar, par1, par2)/sqrt(t); } /** @@ -1180,9 +1363,31 @@ * * Non-linear least-squares fitter. * - * Most of the fields should be considered private. Examining @eval, @covar - * and @dispersion can be useful, as well as setting @maxiter, @mdec or @minc. - * The rest is better left untouched. + * The fields should be considered private. + * + * Use gwy_math_nlfit_get_eval(), gwy_math_nlfit_get_covar() and + * gwy_math_nlfit_get_dispersion() and gwy_math_nlfit_succeeded() to examine + * the fitter state. + * + * Use gwy_math_nlfit_set_max_iterations() to set the maximum iteration. + * + * In rare occasions you might want modify @mdec or @minc. The rest is better + * left untouched. */ +/** + * GwyNLFitParamFlags: + * @GWY_NLFIT_PARAM_ANGLE: Parameter is an angle. It is defined in radians and + * unitless but you may wish to convert it from/to + * degrees in the user interface. It is consdered + * periodic and always reduced to the range [0, 2π). + * @GWY_NLFIT_PARAM_ABSVAL: Parameter is a width or distance that is by + * definition positive. Only its absolute value + * matters and it is always made non-negative. + * + * Type of fitting parameter properties. + * + * Since: 2.47 + **/ + /* 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.46/libgwyddion/gwynlfit.h gwyddion-2.47/libgwyddion/gwynlfit.h --- gwyddion-2.46/libgwyddion/gwynlfit.h 2016-09-08 11:59:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwynlfit.h 2016-11-01 08:00:58.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwynlfit.h 18930 2016-09-07 20:02:38Z yeti-dn $ + * @(#) $Id: gwynlfit.h 19150 2016-10-31 21:34:48Z yeti-dn $ * Copyright (C) 2000-2003 Martin Siler. * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. @@ -72,53 +72,60 @@ gdouble mtol; }; -GwyNLFitter* gwy_math_nlfit_new (GwyNLFitFunc func, - GwyNLFitDerFunc diff); -GwyNLFitter* gwy_math_nlfit_new_idx (GwyNLFitIdxFunc func, - GwyNLFitIdxDiffFunc diff); -void gwy_math_nlfit_free (GwyNLFitter *nlfit); -gdouble gwy_math_nlfit_fit (GwyNLFitter *nlfit, - gint ndata, - const gdouble *x, - const gdouble *y, - gint nparam, - gdouble *param, - gpointer user_data); -gdouble gwy_math_nlfit_fit_full (GwyNLFitter *nlfit, - gint ndata, - const gdouble *x, - const gdouble *y, - const gdouble *weight, - gint nparam, - gdouble *param, - const gboolean *fixed_param, - const gint *link_map, - gpointer user_data); -gdouble gwy_math_nlfit_fit_idx (GwyNLFitter *nlfit, - guint ndata, - guint nparam, - gdouble *param, - gpointer user_data); -gdouble gwy_math_nlfit_fit_idx_full (GwyNLFitter *nlfit, - guint ndata, - guint nparam, - gdouble *param, - const gboolean *fixed_param, - const gint *link_map, - gpointer user_data); -gint gwy_math_nlfit_get_max_iterations(GwyNLFitter *nlfit); -void gwy_math_nlfit_set_max_iterations(GwyNLFitter *nlfit, - gint maxiter); -gboolean gwy_math_nlfit_succeeded (GwyNLFitter *nlfit); -gdouble gwy_math_nlfit_get_dispersion (GwyNLFitter *nlfit); -gdouble gwy_math_nlfit_get_correlations (GwyNLFitter *nlfit, - gint par1, - gint par2); -gdouble gwy_math_nlfit_get_sigma (GwyNLFitter *nlfit, - gint par); -void gwy_math_nlfit_set_callbacks (GwyNLFitter *nlfit, - GwySetFractionFunc set_fraction, - GwySetMessageFunc set_message); +GwyNLFitter* gwy_math_nlfit_new (GwyNLFitFunc func, + GwyNLFitDerFunc diff); +GwyNLFitter* gwy_math_nlfit_new_idx (GwyNLFitIdxFunc func, + GwyNLFitIdxDiffFunc diff); +void gwy_math_nlfit_free (GwyNLFitter *nlfit); +GwyNLFitter* gwy_math_nlfit_copy (GwyNLFitter *nlfit); +gdouble gwy_math_nlfit_fit (GwyNLFitter *nlfit, + gint ndata, + const gdouble *x, + const gdouble *y, + gint nparam, + gdouble *param, + gpointer user_data); +gdouble gwy_math_nlfit_fit_full (GwyNLFitter *nlfit, + gint ndata, + const gdouble *x, + const gdouble *y, + const gdouble *weight, + gint nparam, + gdouble *param, + const gboolean *fixed_param, + const gint *link_map, + gpointer user_data); +gdouble gwy_math_nlfit_fit_idx (GwyNLFitter *nlfit, + guint ndata, + guint nparam, + gdouble *param, + gpointer user_data); +gdouble gwy_math_nlfit_fit_idx_full (GwyNLFitter *nlfit, + guint ndata, + guint nparam, + gdouble *param, + const gboolean *fixed_param, + const gint *link_map, + gpointer user_data); +gint gwy_math_nlfit_get_max_iterations (GwyNLFitter *nlfit); +void gwy_math_nlfit_set_max_iterations (GwyNLFitter *nlfit, + gint maxiter); +gboolean gwy_math_nlfit_get_approx_geometric(GwyNLFitter *nlfit); +void gwy_math_nlfit_set_approx_geometric(GwyNLFitter *nlfit, + gboolean setting); +gboolean gwy_math_nlfit_succeeded (GwyNLFitter *nlfit); +gdouble gwy_math_nlfit_get_dispersion (GwyNLFitter *nlfit); +gdouble gwy_math_nlfit_get_correlations (GwyNLFitter *nlfit, + gint par1, + gint par2); +gboolean gwy_math_nlfit_get_eval (GwyNLFitter *nlfit); +const gdouble* gwy_math_nlfit_get_covar (GwyNLFitter *nlfit); +gint gwy_math_nlfit_get_nparam (GwyNLFitter *nlfit); +gdouble gwy_math_nlfit_get_sigma (GwyNLFitter *nlfit, + gint par); +void gwy_math_nlfit_set_callbacks (GwyNLFitter *nlfit, + GwySetFractionFunc set_fraction, + GwySetMessageFunc set_message); void gwy_math_nlfit_diff (gdouble x, gint nparam, diff -Nru gwyddion-2.46/libgwyddion/gwynlfitpreset.c gwyddion-2.47/libgwyddion/gwynlfitpreset.c --- gwyddion-2.46/libgwyddion/gwynlfitpreset.c 2016-09-01 08:37:22.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwynlfitpreset.c 2016-10-31 16:29:54.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwynlfitpreset.c 18904 2016-09-01 06:29:14Z yeti-dn $ + * @(#) $Id: gwynlfitpreset.c 19146 2016-10-31 16:29:54Z yeti-dn $ * Copyright (C) 2000-2003 Martin Siler. * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. @@ -1931,6 +1931,32 @@ } /** + * gwy_nlfit_preset_create_fitter: + * @preset: A NL fitter function preset. + * + * Creates a non-linear least-squares fitter for a preset function. + * + * The created fitter will be of the function data type, as created with + * gwy_math_nlfit_new(). + * + * If you do not need to modify the fitter settings you can use + * gwy_nlfit_preset_fit() directly with %NULL fitter. + * + * Returns: A newly created fitter for @preset. + * + * Since: 2.47 + **/ +GwyNLFitter* +gwy_nlfit_preset_create_fitter(GwyNLFitPreset *preset) +{ + g_return_val_if_fail(GWY_IS_NLFIT_PRESET(preset), NULL); + return gwy_math_nlfit_new(preset->builtin->function, + preset->builtin->derive + ? preset->builtin->derive + : gwy_math_nlfit_derive); +} + +/** * gwy_nlfit_preset_fit: * @preset: A NL fitter function preset. * @fitter: A Marquardt-Levenberg nonlinear fitter already initialized for @@ -1990,7 +2016,7 @@ preset->builtin->nparams, param, fixed_param, NULL, preset) >= 0.0; - if (ok && err && fitter->covar) { + if (ok && err && gwy_math_nlfit_get_covar(fitter)) { /* FIXME: builtin */ for (i = 0; i < preset->builtin->nparams; i++) err[i] = gwy_math_nlfit_get_sigma(fitter, i); diff -Nru gwyddion-2.46/libgwyddion/gwynlfitpreset.h gwyddion-2.47/libgwyddion/gwynlfitpreset.h --- gwyddion-2.46/libgwyddion/gwynlfitpreset.h 2016-01-19 10:15:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwynlfitpreset.h 2016-10-31 16:29:54.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwynlfitpreset.h 18117 2016-01-19 10:15:26Z yeti-dn $ + * @(#) $Id: gwynlfitpreset.h 19146 2016-10-31 16:29:54Z yeti-dn $ * Copyright (C) 2000-2003 Martin Siler. * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. @@ -78,6 +78,7 @@ const gdouble *y, gdouble *params, gboolean *fres); +GwyNLFitter* gwy_nlfit_preset_create_fitter (GwyNLFitPreset *preset); GwyNLFitter* gwy_nlfit_preset_fit (GwyNLFitPreset *preset, GwyNLFitter *fitter, gint n_dat, diff -Nru gwyddion-2.46/libgwyddion/gwyserializable.c gwyddion-2.47/libgwyddion/gwyserializable.c --- gwyddion-2.46/libgwyddion/gwyserializable.c 2016-10-14 09:02:42.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyserializable.c 2016-11-09 09:22:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyserializable.c 19071 2016-10-14 09:02:41Z yeti-dn $ + * @(#) $Id: gwyserializable.c 19214 2016-11-09 09:22:44Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1186,7 +1186,7 @@ return; } - g_critical("Trying to skip uknown type `%c'", ctype); + g_critical("Trying to skip unknown type `%c'", ctype); *position = size; } diff -Nru gwyddion-2.46/libgwyddion/gwysiunit.c gwyddion-2.47/libgwyddion/gwysiunit.c --- gwyddion-2.46/libgwyddion/gwysiunit.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwysiunit.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwysiunit.c 19040 2016-10-08 13:08:23Z yeti-dn $ + * @(#) $Id: gwysiunit.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -181,21 +181,6 @@ (GwySIUnit, gwy_si_unit, G_TYPE_OBJECT, 0, GWY_IMPLEMENT_SERIALIZABLE(gwy_si_unit_serializable_init)) -GType -gwy_si_value_format_get_type(void) -{ - static GType type = 0; - - if (G_UNLIKELY(!type)) { - type = g_boxed_type_register_static - ("GwySIValueFormat", - (GBoxedCopyFunc)&gwy_si_unit_value_format_copy, - (GBoxedFreeFunc)&gwy_si_unit_value_format_free); - } - - return type; -} - static void gwy_si_unit_serializable_init(GwySerializableIface *iface) { @@ -679,126 +664,6 @@ } /** - * gwy_si_unit_value_format_new: - * @magnitude: Number to divide a quantity by (a power of 1000). - * @precision: Number of decimal places to format a quantity to. - * @units: Units to put after quantity divided by @magnitude. - * - * Constructs a new value format directly. - * - * Usually you construct value formats from a #GwySIUnit using functions such - * as gwy_si_unit_get_format_with_digits() or obtain it from data object - * functions. - * - * Returns: Newly allocated value format. - * - * Since: 2.46 - **/ -GwySIValueFormat* -gwy_si_unit_value_format_new(gdouble magnitude, - gint precision, - const gchar *units) -{ - GwySIValueFormat *vf = g_new(GwySIValueFormat, 1); - vf->magnitude = magnitude; - vf->precision = precision; - vf->units_gstring = g_string_new(units); - vf->units = vf->units_gstring->str; - return vf; -} - -/** - * gwy_si_unit_value_format_copy: - * @format: A value format to copy. - * - * Copies a value format structure. - * - * Returns: Newly allocated value format, identical to @format. - * - * Since: 2.39 - **/ -GwySIValueFormat* -gwy_si_unit_value_format_copy(GwySIValueFormat *format) -{ - GwySIValueFormat *vf; - - g_return_val_if_fail(format, NULL); - vf = g_memdup(format, sizeof(GwySIValueFormat)); - vf->units_gstring = g_string_new(format->units); - vf->units = vf->units_gstring->str; - return vf; -} - -/** - * gwy_si_unit_value_format_free: - * @format: A value format to free. - * - * Frees a value format structure. - **/ -void -gwy_si_unit_value_format_free(GwySIValueFormat *format) -{ - g_return_if_fail(format); - if (format->units_gstring) - g_string_free(format->units_gstring, TRUE); - g_free(format); -} - -/** - * gwy_si_unit_value_format_clone: - * @source: Source value format. - * @dest: Destination value format, or %NULL. - * - * Clones a value format to another. - * - * This function follows the convention of many value format updating functions - * that can either modify an existing format or allocate a new one. - * - * Returns: The @dest value format. If it was %NULL, a newly allocated format - * is returned, otherwise (modified) @dest itself is returned. - * - * Since: 2.46 - **/ -GwySIValueFormat* -gwy_si_unit_value_format_clone(GwySIValueFormat *source, - GwySIValueFormat *dest) -{ - g_return_val_if_fail(source, NULL); - if (!dest) { - return gwy_si_unit_value_format_new(source->magnitude, - source->precision, - source->units); - } - dest->magnitude = source->magnitude; - dest->precision = source->precision; - gwy_si_unit_value_format_set_units(dest, source->units); - - return dest; -} - -/** - * gwy_si_unit_value_format_set_units: - * @format: A value format to set units of. - * @units: The units string. - * - * Sets the units field of a value format structure. - * - * This function keeps the @units and @units_gstring fields consistent. - **/ -void -gwy_si_unit_value_format_set_units(GwySIValueFormat *format, - const gchar *units) -{ - g_return_if_fail(format); - if (!format->units_gstring) - format->units_gstring = g_string_new(units); - else - g_string_assign(format->units_gstring, units); - - format->units = format->units_gstring->str; -} - -/** * gwy_si_unit_equal: * @siunit1: First unit. * @siunit2: Second unit. @@ -1281,13 +1146,13 @@ return NULL; } - units = g_array_new(FALSE, FALSE, sizeof(GwySimpleUnit)); - /* XXX: Applicability not required */ - result->power10 = siunit->power10/ipower; - if (!result) result = gwy_si_unit_new(NULL); + /* XXX: Applicability not required */ + result->power10 = siunit->power10/ipower; + + units = g_array_new(FALSE, FALSE, sizeof(GwySimpleUnit)); g_array_append_vals(units, siunit->units->data, siunit->units->len); for (j = 0; j < units->len; j++) { unit = &g_array_index(units, GwySimpleUnit, j); diff -Nru gwyddion-2.46/libgwyddion/gwysiunit.h gwyddion-2.47/libgwyddion/gwysiunit.h --- gwyddion-2.46/libgwyddion/gwysiunit.h 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwysiunit.h 2016-11-07 21:13:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwysiunit.h 19040 2016-10-08 13:08:23Z yeti-dn $ + * @(#) $Id: gwysiunit.h 19201 2016-11-07 21:07:07Z yeti-dn $ * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -25,6 +25,7 @@ #include #include #include +#include G_BEGIN_DECLS @@ -35,19 +36,9 @@ #define GWY_IS_SI_UNIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GWY_TYPE_SI_UNIT)) #define GWY_SI_UNIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GWY_TYPE_SI_UNIT, GwySIUnitClass)) -#define GWY_TYPE_SI_VALUE_FORMAT (gwy_si_value_format_get_type()) - typedef struct _GwySIUnit GwySIUnit; typedef struct _GwySIUnitClass GwySIUnitClass; -typedef struct { - /**/ - gdouble magnitude; - gint precision; - gchar *units; - GString *units_gstring; -} GwySIValueFormat; - struct _GwySIUnit { GObject parent_instance; @@ -72,7 +63,6 @@ (GWY_SI_UNIT(gwy_serializable_duplicate(G_OBJECT(siunit)))) GType gwy_si_unit_get_type (void) G_GNUC_CONST; -GType gwy_si_value_format_get_type(void) G_GNUC_CONST; GwySIUnit* gwy_si_unit_new (const gchar *unit_string); GwySIUnit* gwy_si_unit_new_parse (const gchar *unit_string, @@ -123,16 +113,6 @@ gdouble maximum, gint sdigits, GwySIValueFormat *format); -GwySIValueFormat* gwy_si_unit_value_format_new (gdouble magnitude, - gint precision, - const gchar *units); -void gwy_si_unit_value_format_free (GwySIValueFormat *format); -GwySIValueFormat* gwy_si_unit_value_format_copy (GwySIValueFormat *format); -GwySIValueFormat* gwy_si_unit_value_format_clone (GwySIValueFormat *source, - GwySIValueFormat *dest); -void gwy_si_unit_value_format_set_units(GwySIValueFormat *format, - const gchar *units); - G_END_DECLS #endif /* __GWY_SI_UNIT_H__ */ diff -Nru gwyddion-2.46/libgwyddion/gwysivalueformat.c gwyddion-2.47/libgwyddion/gwysivalueformat.c --- gwyddion-2.46/libgwyddion/gwysivalueformat.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwysivalueformat.c 2016-11-07 21:13:57.000000000 +0000 @@ -0,0 +1,193 @@ +/* + * @(#) $Id: gwysivalueformat.c 19201 2016-11-07 21:07:07Z yeti-dn $ + * Copyright (C) 2016 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 + +GType +gwy_si_value_format_get_type(void) +{ + static GType type = 0; + + if (G_UNLIKELY(!type)) { + type = g_boxed_type_register_static + ("GwySIValueFormat", + (GBoxedCopyFunc)&gwy_si_unit_value_format_copy, + (GBoxedFreeFunc)&gwy_si_unit_value_format_free); + } + + return type; +} + +/** + * gwy_si_unit_value_format_new: + * @magnitude: Number to divide a quantity by (a power of 1000). + * @precision: Number of decimal places to format a quantity to. + * @units: Units to put after quantity divided by @magnitude. + * + * Constructs a new value format directly. + * + * Usually you construct value formats from a #GwySIUnit using functions such + * as gwy_si_unit_get_format_with_digits() or obtain it from data object + * functions. + * + * Returns: Newly allocated value format. + * + * Since: 2.46 + **/ +GwySIValueFormat* +gwy_si_unit_value_format_new(gdouble magnitude, + gint precision, + const gchar *units) +{ + GwySIValueFormat *vf = g_new(GwySIValueFormat, 1); + vf->magnitude = magnitude; + vf->precision = precision; + vf->units_gstring = g_string_new(units); + vf->units = vf->units_gstring->str; + return vf; +} + +/** + * gwy_si_unit_value_format_copy: + * @format: A value format to copy. + * + * Copies a value format structure. + * + * Returns: Newly allocated value format, identical to @format. + * + * Since: 2.39 + **/ +GwySIValueFormat* +gwy_si_unit_value_format_copy(GwySIValueFormat *format) +{ + GwySIValueFormat *vf; + + g_return_val_if_fail(format, NULL); + vf = g_memdup(format, sizeof(GwySIValueFormat)); + vf->units_gstring = g_string_new(format->units); + vf->units = vf->units_gstring->str; + return vf; +} + +/** + * gwy_si_unit_value_format_free: + * @format: A value format to free. + * + * Frees a value format structure. + **/ +void +gwy_si_unit_value_format_free(GwySIValueFormat *format) +{ + g_return_if_fail(format); + if (format->units_gstring) + g_string_free(format->units_gstring, TRUE); + g_free(format); +} + +/** + * gwy_si_unit_value_format_clone: + * @source: Source value format. + * @dest: Destination value format, or %NULL. + * + * Clones a value format to another. + * + * This function follows the convention of many value format updating functions + * that can either modify an existing format or allocate a new one. + * + * Returns: The @dest value format. If it was %NULL, a newly allocated format + * is returned, otherwise (modified) @dest itself is returned. + * + * Since: 2.46 + **/ +GwySIValueFormat* +gwy_si_unit_value_format_clone(GwySIValueFormat *source, + GwySIValueFormat *dest) +{ + g_return_val_if_fail(source, NULL); + if (!dest) { + return gwy_si_unit_value_format_new(source->magnitude, + source->precision, + source->units); + } + dest->magnitude = source->magnitude; + dest->precision = source->precision; + gwy_si_unit_value_format_set_units(dest, source->units); + + return dest; +} + +/** + * gwy_si_unit_value_format_set_units: + * @format: A value format to set units of. + * @units: The units string. + * + * Sets the units field of a value format structure. + * + * This function keeps the @units and @units_gstring fields consistent. + **/ +void +gwy_si_unit_value_format_set_units(GwySIValueFormat *format, + const gchar *units) +{ + g_return_if_fail(format); + if (!format->units_gstring) + format->units_gstring = g_string_new(units); + else + g_string_assign(format->units_gstring, units); + + format->units = format->units_gstring->str; +} + +/************************** Documentation ****************************/ + +/** + * SECTION:gwysivalueformat + * @title: GwySIValueFormat + * @short_description: Physical quantitiy formatting + * + * #GwySIValueFormat object represents instructions how to format numbers + * representing physical quantities, including precision and units. They + * are usually created based on a #GwySIUnit and some data ranges with + * functions such as gwy_si_unit_get_format_with_resolution() or + * gwy_si_unit_get_format_with_digits(). Various data objects also offer + * method for obtaining value formats representing reasonably their coordinates + * or values, for instance gwy_data_field_get_value_format_xy(). + **/ + +/** + * GwySIValueFormat: + * @magnitude: Number to divide a quantity by (a power of 1000). + * @precision: Number of decimal places to format a quantity to. + * @units: Units to put after quantity divided by @magnitude. This field must + * be considered read-only as it is actually an alias to + * @units_gstring->str. + * @units_gstring: #GString used to represent @units internally. + * + * A physical quantity formatting information. + * + * The @magnitude and @precision fields can be directly modified if necessary. + * Units must be always set with gwy_si_unit_value_format_set_units() to update + * the internal representation correctly. + */ + +/* 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.46/libgwyddion/gwysivalueformat.h gwyddion-2.47/libgwyddion/gwysivalueformat.h --- gwyddion-2.46/libgwyddion/gwysivalueformat.h 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwysivalueformat.h 2016-11-07 21:13:57.000000000 +0000 @@ -0,0 +1,56 @@ +/* + * @(#) $Id: gwysivalueformat.h 19201 2016-11-07 21:07:07Z yeti-dn $ + * Copyright (C) 2016 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. + */ + +#ifndef __GWY_SI_VALUE_FORMAT_H__ +#define __GWY_SI_VALUE_FORMAT_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GWY_TYPE_SI_VALUE_FORMAT (gwy_si_value_format_get_type()) + +typedef struct { + /**/ + gdouble magnitude; + gint precision; + gchar *units; + /**/ + GString *units_gstring; +} GwySIValueFormat; + +GType gwy_si_value_format_get_type (void) G_GNUC_CONST; +GwySIValueFormat* gwy_si_unit_value_format_new (gdouble magnitude, + gint precision, + const gchar *units) G_GNUC_MALLOC; +GwySIValueFormat* gwy_si_unit_value_format_copy (GwySIValueFormat *format) G_GNUC_MALLOC; +void gwy_si_unit_value_format_free (GwySIValueFormat *format); +GwySIValueFormat* gwy_si_unit_value_format_clone (GwySIValueFormat *source, + GwySIValueFormat *dest); +void gwy_si_unit_value_format_set_units(GwySIValueFormat *format, + const gchar *units); + +G_END_DECLS + +#endif /* __GWY_SI_VALUE_FORMAT_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 : */ diff -Nru gwyddion-2.46/libgwyddion/gwyutils.c gwyddion-2.47/libgwyddion/gwyutils.c --- gwyddion-2.46/libgwyddion/gwyutils.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyutils.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyutils.c 19035 2016-10-08 10:12:39Z yeti-dn $ + * @(#) $Id: gwyutils.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -223,7 +223,7 @@ if (!s1 || !s2) return -1; - while (*s1 && *s1 && *s1 == *s2) { + while (*s1 && *s2 && *s1 == *s2) { s1++; s2++; } @@ -2158,6 +2158,23 @@ * * A useful property of this macro is its idempotence. * + * Since: 2.46 + **/ + +/** + * GWY_FREE: + * @ptr: A pointer to free or %NULL. + * + * Frees and nulls a pointer if it exists. + * + * The memory must have been allocated using one of the g_new() and g_malloc() + * class of functions. + * + * If @ptr is not %NULL, g_free() is called on it and %NULL is assigned to the + * variable. In all cases @ptr will be %NULL at the end. + * + * A useful property of this macro is its idempotence. + * * Since: 2.46 **/ diff -Nru gwyddion-2.46/libgwyddion/gwyversion.h gwyddion-2.47/libgwyddion/gwyversion.h --- gwyddion-2.46/libgwyddion/gwyversion.h 2016-10-14 09:42:07.000000000 +0000 +++ gwyddion-2.47/libgwyddion/gwyversion.h 2016-11-18 10:53:03.000000000 +0000 @@ -27,8 +27,8 @@ G_BEGIN_DECLS #define GWY_VERSION_MAJOR 2 -#define GWY_VERSION_MINOR 46 -#define GWY_VERSION_STRING "2.46" +#define GWY_VERSION_MINOR 47 +#define GWY_VERSION_STRING "2.47" gint gwy_version_major(void); gint gwy_version_minor(void); diff -Nru gwyddion-2.46/libgwyddion/Makefile.am gwyddion-2.47/libgwyddion/Makefile.am --- gwyddion-2.46/libgwyddion/Makefile.am 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/libgwyddion/Makefile.am 2016-11-15 08:25:23.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ libgwyddion2includedir = $(pkgincludedir)/libgwyddion @@ -25,6 +25,7 @@ gwyresource.h \ gwyserializable.h \ gwysiunit.h \ + gwysivalueformat.h \ gwystringlist.h \ gwyutils.h \ gwyversion.h @@ -77,7 +78,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 21:0:21 +libversion = -version-info 22:0:22 #libversion = -release @LIBRARY_RELEASE@ libgwyddion2_la_LDFLAGS = @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyddion2_la_SOURCES = \ @@ -98,6 +99,7 @@ gwyresource.c \ gwyserializable.c \ gwysiunit.c \ + gwysivalueformat.c \ gwystringlist.c \ gwyutils.c \ gwyversion.c diff -Nru gwyddion-2.46/libgwyddion/Makefile.in gwyddion-2.47/libgwyddion/Makefile.in --- gwyddion-2.46/libgwyddion/Makefile.in 2016-10-14 09:41:57.000000000 +0000 +++ gwyddion-2.47/libgwyddion/Makefile.in 2016-11-18 10:52:40.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ # Generic glib-mkenum rules. # @(#) $Id: mkenum.mk 11705 2011-01-03 08:32:55Z yeti-dn $ @@ -163,7 +163,7 @@ gwyexpr.lo gwyfdcurvepreset.lo gwyinventory.lo gwymath.lo \ gwymd5.lo gwynlfit.lo gwynlfitpreset.lo gwyrandgenset.lo \ gwyresource.lo gwyserializable.lo gwysiunit.lo \ - gwystringlist.lo gwyutils.lo gwyversion.lo + gwysivalueformat.lo gwystringlist.lo gwyutils.lo gwyversion.lo libgwyddion2_la_OBJECTS = $(am_libgwyddion2_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -496,6 +496,7 @@ gwyresource.h \ gwyserializable.h \ gwysiunit.h \ + gwysivalueformat.h \ gwystringlist.h \ gwyutils.h \ gwyversion.h @@ -552,7 +553,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 21:0:21 +libversion = -version-info 22:0:22 #libversion = -release @LIBRARY_RELEASE@ libgwyddion2_la_LDFLAGS = @BASIC_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyddion2_la_SOURCES = \ @@ -573,6 +574,7 @@ gwyresource.c \ gwyserializable.c \ gwysiunit.c \ + gwysivalueformat.c \ gwystringlist.c \ gwyutils.c \ gwyversion.c @@ -676,6 +678,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyresource.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyserializable.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwysiunit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwysivalueformat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwystringlist.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyutils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyversion.Plo@am__quote@ diff -Nru gwyddion-2.46/libgwydgets/gwy3dview.c gwyddion-2.47/libgwydgets/gwy3dview.c --- gwyddion-2.46/libgwydgets/gwy3dview.c 2016-10-14 09:02:42.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwy3dview.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwy3dview.c 19071 2016-10-14 09:02:41Z yeti-dn $ + * @(#) $Id: gwy3dview.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2015 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * Copyright (C) 2004 Martin Siler. @@ -2092,39 +2092,39 @@ glBegin(GL_TRIANGLE_STRIP); glon = TRUE; for (i = 0; i < xres-1; i++) { - gdouble z; - guchar *color; - if (gwy3dview->setup->hide_masked && mask != NULL) { - if (mask[(yres-1 - (j))*xres + i] == 0 - && mask[(yres-2 - j)*xres + i] == 0 - && !glon) { - glBegin(GL_TRIANGLE_STRIP); - glon = TRUE; - if (mask[(yres-1 - (j))*xres + i - 1] > 0 - && mask[(yres-2 - j)*xres + i - 1] > 0) { - GWY_3D_VERTEX(i, j); - } - else if (mask[(yres-1 - (j))*xres + i - 1] > 0) { - GWY_3D_VERTEX(i-1, j+1); - } - else if (mask[(yres-2 - j)*xres + i - 1] > 0.) { - GWY_3D_VERTEX(i-1, j); - } - } - if (mask[(yres-1 - (j))*xres + i] == 0 && glon) - GWY_3D_VERTEX(i, j); - if (mask[(yres-2 - (j))*xres + i] == 0 && glon) - GWY_3D_VERTEX(i, j+1); - if (mask[(yres-1 - (j))*xres + i] > 0 - || mask[(yres-1 - (j))*xres + i] > 0) { - glEnd(); - glon = FALSE; + gdouble z; + guchar *color; + if (gwy3dview->setup->hide_masked && mask != NULL) { + if (mask[(yres-1 - j)*xres + i] == 0 + && mask[(yres-2 - j)*xres + i] == 0 + && !glon) { + glBegin(GL_TRIANGLE_STRIP); + glon = TRUE; + if (mask[(yres-1 - j)*xres + i - 1] > 0 + && mask[(yres-2 - j)*xres + i - 1] > 0) { + GWY_3D_VERTEX(i, j); + } + else if (mask[(yres-1 - j)*xres + i - 1] > 0) { + GWY_3D_VERTEX(i-1, j+1); + } + else if (mask[(yres-2 - j)*xres + i - 1] > 0.) { + GWY_3D_VERTEX(i-1, j); + } + } + if (mask[(yres-1 - j)*xres + i] == 0 && glon) + GWY_3D_VERTEX(i, j); + if (mask[(yres-2 - j)*xres + i] == 0 && glon) + GWY_3D_VERTEX(i, j+1); + if (mask[(yres-1 - j)*xres + i] > 0 + || mask[(yres-2 - j)*xres + i] > 0) { + glEnd(); + glon = FALSE; + } } - } - else { - GWY_3D_VERTEX(i, j); - GWY_3D_VERTEX(i, j+1); - }; + else { + GWY_3D_VERTEX(i, j); + GWY_3D_VERTEX(i, j+1); + }; } glEnd(); } diff -Nru gwyddion-2.46/libgwydgets/gwyaxis.c gwyddion-2.47/libgwydgets/gwyaxis.c --- gwyddion-2.46/libgwydgets/gwyaxis.c 2016-10-14 09:02:42.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwyaxis.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyaxis.c 19071 2016-10-14 09:02:41Z yeti-dn $ + * @(#) $Id: gwyaxis.c 19127 2016-10-26 21:09:48Z yeti-dn $ * Copyright (C) 2003-2006 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1817,7 +1817,9 @@ * gwy_axis_get_magnification: * @axis: Axis widget * - * Returns: Magnification value of the axis + * Gets the magnification value of a graph axis. + * + * Returns: Magnification value of the axis. **/ gdouble gwy_axis_get_magnification(GwyAxis *axis) @@ -1845,13 +1847,18 @@ /** * gwy_axis_export_vector: * @axis: An axis. - * @xmin: - * @ymin: - * @width: width of the x-axis - * @height: hieght of the y-axis - * @fontsize: + * @xmin: Left edge of the bounding rectangle. + * @ymin: Bottom edge of the bounding rectangle. + * @width: Width of the bounding rectangle. + * @height: Height of the bounding rectangle. + * @fontsize: Font size to use. + * + * Renders a graph axis in PostScript. * + * This is a helper functions for gwy_graph_export_postscript() and probably + * not useful anywhere else. * + * Returns: A newly created #GString. **/ GString* gwy_axis_export_vector(GwyAxis *axis, gint xmin, gint ymin, diff -Nru gwyddion-2.46/libgwydgets/gwycoloraxis.c gwyddion-2.47/libgwydgets/gwycoloraxis.c --- gwyddion-2.46/libgwydgets/gwycoloraxis.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwycoloraxis.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwycoloraxis.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwycoloraxis.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2014 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -735,20 +735,12 @@ axis = GWY_COLOR_AXIS(widget); gc = widget->style->fg_gc[GTK_WIDGET_STATE(widget)]; - if (axis->orientation == GTK_ORIENTATION_HORIZONTAL) - gdk_draw_pixbuf(widget->window, gc, axis->stripe, - 0, 0, - 0, 0, - gdk_pixbuf_get_width(axis->stripe), - gdk_pixbuf_get_height(axis->stripe), - GDK_RGB_DITHER_NONE, 0, 0); - else - gdk_draw_pixbuf(widget->window, gc, axis->stripe, - 0, 0, - 0, 0, - gdk_pixbuf_get_width(axis->stripe), - gdk_pixbuf_get_height(axis->stripe), - GDK_RGB_DITHER_NONE, 0, 0); + gdk_draw_pixbuf(widget->window, gc, axis->stripe, + 0, 0, + 0, 0, + gdk_pixbuf_get_width(axis->stripe), + gdk_pixbuf_get_height(axis->stripe), + GDK_RGB_DITHER_NONE, 0, 0); gwy_color_axis_draw_labels_ticks(axis); return FALSE; } diff -Nru gwyddion-2.46/libgwydgets/gwycolorbutton.c gwyddion-2.47/libgwydgets/gwycolorbutton.c --- gwyddion-2.46/libgwydgets/gwycolorbutton.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwycolorbutton.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwycolorbutton.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwycolorbutton.c 19136 2016-10-30 14:55:50Z yeti-dn $ * * GTK - The GIMP Toolkit * Copyright (C) 1998, 1999 Red Hat, Inc. @@ -382,7 +382,7 @@ * Returns: a new color button. **/ GtkWidget * -gwy_color_button_new_with_color(GwyRGBA *color) +gwy_color_button_new_with_color(const GwyRGBA *color) { return g_object_new(GWY_TYPE_COLOR_BUTTON, "color", color, NULL); } @@ -395,8 +395,8 @@ * Sets the current color to be @color. **/ void -gwy_color_button_set_color (GwyColorButton *color_button, - GwyRGBA *color) +gwy_color_button_set_color(GwyColorButton *color_button, + const GwyRGBA *color) { g_return_if_fail(GWY_IS_COLOR_BUTTON(color_button)); @@ -410,7 +410,6 @@ g_object_notify(G_OBJECT(color_button), "color"); } - /** * gwy_color_button_get_color: * @color_button: a #GwyColorButton. diff -Nru gwyddion-2.46/libgwydgets/gwycolorbutton.h gwyddion-2.47/libgwydgets/gwycolorbutton.h --- gwyddion-2.46/libgwydgets/gwycolorbutton.h 2015-07-29 08:28:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwycolorbutton.h 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwycolorbutton.h 15598 2013-11-11 12:33:32Z yeti-dn $ + * @(#) $Id: gwycolorbutton.h 19136 2016-10-30 14:55:50Z yeti-dn $ * * GTK - The GIMP Toolkit * Copyright (C) 1998, 1999 Red Hat, Inc. @@ -81,10 +81,10 @@ }; GType gwy_color_button_get_type (void) G_GNUC_CONST; -GtkWidget *gwy_color_button_new (void); -GtkWidget *gwy_color_button_new_with_color (GwyRGBA *color); +GtkWidget* gwy_color_button_new (void); +GtkWidget* gwy_color_button_new_with_color (const GwyRGBA *color); void gwy_color_button_set_color (GwyColorButton *color_button, - GwyRGBA *color); + const GwyRGBA *color); void gwy_color_button_get_color (GwyColorButton *color_button, GwyRGBA *color); void gwy_color_button_set_use_alpha (GwyColorButton *color_button, diff -Nru gwyddion-2.46/libgwydgets/gwydgetutils.c gwyddion-2.47/libgwydgets/gwydgetutils.c --- gwyddion-2.46/libgwydgets/gwydgetutils.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwydgetutils.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwydgetutils.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwydgetutils.c 19127 2016-10-26 21:09:48Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -717,130 +717,6 @@ G_CALLBACK(activate_on_unfocus), NULL); } -#if 0 -Has odd side effect and does not actually work with some fonts for unclear -reasons. -/************************** Baseline Alignment ****************************/ - -typedef struct { - gint ascent; - gint descent; - GList *alignments; -} GwyBaselineAlignmentGroup; - -typedef struct { - GwyBaselineAlignmentGroup *group; -} GwyBaselineAlignment; - -static void -gwy_baseline_alignment_measure_layout(PangoLayout *layout, - gint *ascent, - gint *descent) -{ - PangoLayoutIter *iter; - PangoRectangle rect; - - pango_layout_get_extents(layout, NULL, &rect); - iter = pango_layout_get_iter(layout); - rect.y -= pango_layout_iter_get_baseline(iter); - pango_layout_iter_free(iter); - *ascent = PANGO_PIXELS(PANGO_ASCENT(rect)); - *descent = PANGO_PIXELS(PANGO_DESCENT(rect)); -} - -static GwyBaselineAlignmentGroup* -gwy_baseline_alignment_label_get_group(GtkLabel *label) -{ - /* FIXME: Make this multihead friendly */ - static GwyBaselineAlignmentGroup *default_group = NULL; - - if (!default_group) { - PangoLayout *layout; - - default_group = g_new0(GwyBaselineAlignmentGroup, 1); - layout = gtk_widget_create_pango_layout(GTK_WIDGET(label), NULL); - pango_layout_set_markup(layout, "()00", -1); - gwy_baseline_alignment_measure_layout(layout, - &default_group->ascent, - &default_group->descent); - g_object_unref(layout); - } - - return default_group; -} - -static void -gwy_baseline_alignment_label_changed(GtkLabel *label, - G_GNUC_UNUSED GParamSpec *pspec, - GList *item) -{ - GwyBaselineAlignmentGroup *group; - GwyBaselineAlignment *alignment; - GtkAlignment *align; - gint top, bottom, x, y; - - alignment = (GwyBaselineAlignment*)item->data; - group = alignment->group; - gwy_baseline_alignment_measure_layout(gtk_label_get_layout(label), - &top, &bottom); - gtk_label_get_layout_offsets(label, &x, &y); - gwy_debug("%d %d vs. %d %d (at %d %d)\n", - top, bottom, group->ascent, group->descent, x, y); - top = group->ascent - top; - bottom = group->descent - bottom; - align = GTK_ALIGNMENT(gtk_widget_get_parent(GTK_WIDGET(label))); - gtk_alignment_set_padding(align, MAX(top, 0), MAX(bottom, 0), 0, 0); -} - -static void -gwy_baseline_alignment_label_destroyed(G_GNUC_UNUSED GtkLabel *label, - GList *item) -{ - GwyBaselineAlignmentGroup *group; - GwyBaselineAlignment *alignment; - - alignment = (GwyBaselineAlignment*)item->data; - group = alignment->group; - group->alignments = g_list_delete_link(group->alignments, item); - /* FIXME: Whatever. We do not destroy the default group. */ -} - -/** - * gwy_baseline_alignment_wrap_label: - * @label: A label to wrap. - * - * - * - * Returns: - * - * Since: 2.7 - **/ -GtkWidget* -gwy_baseline_alignment_wrap_label(GtkLabel *label) -{ - GwyBaselineAlignmentGroup *group; - GwyBaselineAlignment *alignment; - GList *item; - GtkWidget *align; - - g_return_val_if_fail(GTK_IS_LABEL(label), NULL); - align = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); - gtk_container_add(GTK_CONTAINER(align), GTK_WIDGET(label)); - alignment = g_new(GwyBaselineAlignment, 1); - group = gwy_baseline_alignment_label_get_group(label); - item = g_list_append(NULL, alignment); - group->alignments = g_list_concat(item, group->alignments); - alignment->group = group; - g_signal_connect(label, "notify::label", - G_CALLBACK(gwy_baseline_alignment_label_changed), item); - g_signal_connect(label, "destroy", - G_CALLBACK(gwy_baseline_alignment_label_destroyed), item); - gwy_baseline_alignment_label_changed(label, NULL, item); - - return align; -} -#endif - /************************** Utils ****************************/ /** diff -Nru gwyddion-2.46/libgwydgets/gwygraphcurvemodel.c gwyddion-2.47/libgwydgets/gwygraphcurvemodel.c --- gwyddion-2.46/libgwydgets/gwygraphcurvemodel.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwygraphcurvemodel.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwygraphcurvemodel.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwygraphcurvemodel.c 19127 2016-10-26 21:09:48Z yeti-dn $ * Copyright (C) 2005-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1126,7 +1126,7 @@ } /** - * gwy_graph_curve_model_get_min_log: + * gwy_graph_curve_model_get_ranges: * @gcmodel: A graph curve model. * @x_logscale: %TRUE if logarithmical scale is intended for the abscissa. * @y_logscale: %TRUE if logarithmical scale is intended for the ordinate. diff -Nru gwyddion-2.46/libgwydgets/gwygraphexport.c gwyddion-2.47/libgwydgets/gwygraphexport.c --- gwyddion-2.46/libgwydgets/gwygraphexport.c 2015-11-08 11:39:14.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwygraphexport.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwygraphexport.c 17718 2015-11-06 08:04:04Z pecold $ + * @(#) $Id: gwygraphexport.c 19129 2016-10-27 07:06:18Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -24,6 +24,17 @@ #include #include +/** + * gwy_graph_export_pixmap: + * @graph: A graph widget. + * @export_title: %TRUE to export graph title. Currently unimplemented. + * @export_axis: %TRUE to export graph axes. Currently unimplemented. + * @export_labels: %TRUE to export graph labels. Currently unimplemented. + * + * Renders a graph widget into a pixbuf. + * + * Returns: A newly created pixbuf. + **/ GdkPixbuf* gwy_graph_export_pixmap(GwyGraph *graph, G_GNUC_UNUSED gboolean export_title, @@ -104,6 +115,19 @@ return pixbuf; } +/** + * gwy_graph_export_postscript: + * @graph: A graph widget. + * @export_title: %TRUE to export graph title. Currently unimplemented. + * @export_axis: %TRUE to export graph axes. Currently unimplemented. + * @export_labels: %TRUE to export graph labels. Currently unimplemented. + * @str: String to put the PostScript representation to, or %NULL to + * allocate a new string. + * + * Approximately renders a graph widget in PostScript. + * + * Returns: Either @string or a newly created #GString. + **/ GString* gwy_graph_export_postscript(GwyGraph *graph, G_GNUC_UNUSED gboolean export_title, diff -Nru gwyddion-2.46/libgwydgets/gwygraphmodel.c gwyddion-2.47/libgwydgets/gwygraphmodel.c --- gwyddion-2.46/libgwydgets/gwygraphmodel.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwygraphmodel.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwygraphmodel.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwygraphmodel.c 19127 2016-10-26 21:09:48Z yeti-dn $ * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1246,7 +1246,9 @@ * gwy_graph_model_get_n_curves: * @gmodel: A graph model. * - * Returns: number of curves in graph model. + * Reports the number of curves in a graph model. + * + * Returns: Number of curves in graph model. **/ gint gwy_graph_model_get_n_curves(GwyGraphModel *gmodel) diff -Nru gwyddion-2.46/libgwydgets/gwyruler.c gwyddion-2.47/libgwydgets/gwyruler.c --- gwyddion-2.46/libgwydgets/gwyruler.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libgwydgets/gwyruler.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyruler.c 19037 2016-10-08 10:40:49Z yeti-dn $ + * @(#) $Id: gwyruler.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003,2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -795,7 +795,7 @@ m = GWY_ROUND(log10(base/format->magnitude)); - return format->precision + m >= (scale == SCALE_2_5) ? 1 : 0; + return format->precision + m >= (scale == SCALE_2_5); } static ScaleBase diff -Nru gwyddion-2.46/libgwymodule/gwymoduleloader.c gwyddion-2.47/libgwymodule/gwymoduleloader.c --- gwyddion-2.46/libgwymodule/gwymoduleloader.c 2016-02-22 16:55:56.000000000 +0000 +++ gwyddion-2.47/libgwymodule/gwymoduleloader.c 2016-11-16 16:51:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwymoduleloader.c 18322 2016-02-22 16:55:56Z yeti-dn $ + * @(#) $Id: gwymoduleloader.c 19278 2016-11-16 16:51:38Z yeti-dn $ * Copyright (C) 2003,2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -424,7 +424,6 @@ gchar pythondir[256]; DWORD size = sizeof(pythondir)-1; HKEY reg_key; - gchar *filename; gboolean ok = FALSE; gwy_clear(pythondir, sizeof(pythondir)); diff -Nru gwyddion-2.46/libprocess/brick.c gwyddion-2.47/libprocess/brick.c --- gwyddion-2.46/libprocess/brick.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/brick.c 2016-10-21 11:58:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: brick.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: brick.c 19108 2016-10-21 08:50:43Z yeti-dn $ * Copyright (C) 2012-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1404,6 +1404,8 @@ * gwy_brick_get_min: * @brick: A data brick. * + * Find the minimum value in a data brick. + * * Returns: The minimum value within the brick. * * Since: 2.31 @@ -1425,6 +1427,8 @@ * gwy_brick_get_max: * @brick: A data brick. * + * Find the maximum value in a data brick. + * * Returns: The maximum value within the brick. * * Since: 2.31 diff -Nru gwyddion-2.46/libprocess/correct.c gwyddion-2.47/libprocess/correct.c --- gwyddion-2.46/libprocess/correct.c 2016-09-18 19:17:53.000000000 +0000 +++ gwyddion-2.47/libprocess/correct.c 2016-10-31 16:19:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: correct.c 18965 2016-09-18 10:55:59Z yeti-dn $ + * @(#) $Id: correct.c 19145 2016-10-31 16:19:12Z yeti-dn $ * Copyright (C) 2004-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -20,14 +20,83 @@ */ #include "config.h" +#include #include #include #include #include #include +#include #include #include +enum { NONE = G_MAXUINT }; + +typedef enum { + UP, + RIGHT, + DOWN, + LEFT, + NDIRECTIONS +} LaplaceDirection; + +typedef struct { + guint col; + guint row; + guint width; + guint height; +} GwyDataFieldPart; + +/* + * @len: The number of blocks. (The allocated size is usually a bit larger.) + * @n: Start of each neighbour in @k and @w, size @len+1. + * @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: Coefficient blocks (for calculation of the second derivative from + * neigbours), allocated size is a + * multiple of @len but blocks are variable-size, given by @n. + * @z: Values of the points, size @len. + * @rhs: Right-hand-sides of the points, size @len. + * @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. + */ +/* FIXME: Most of the coefficient sets in @w are repeated many times. We could + * consilidate them, replacing 3-5 doubles (typically) per iterator with one + * integer. + */ +typedef struct { + gsize len; + gsize int_size; + gsize float_size; + guint *n; + guint *k; + gdouble *w; + gdouble *z; + gdouble *rhs; + gdouble *f; + gdouble *v; + gdouble *t; + guint *gindex; +} LaplaceIterators; + +typedef struct { + gboolean is_virtual : 1; + gboolean is_boundary : 1; + gboolean is_rhs : 1; + + guint bdist; // Distance of the boundary line where ∂z/∂x = 0 + guint step; + guint neighbour; + guint neighbour2; + + gdouble rhs; // Remember the exterior data used for rhs + gdouble weight; // Coefficient before (z_neighbour - z_0) + gdouble weight2; // Coefficient before (z_neighbour2 - z_0) +} LaplaceNeighbour; + static void gwy_data_field_distort_internal(GwyDataField *source, GwyDataField *dest, GwyInterpolationType interp, @@ -62,6 +131,10 @@ * 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-iteratie gwy_data_field_laplace_solve() which is simultaneously much + * faster and more accurate. **/ void gwy_data_field_correct_laplace_iteration(GwyDataField *data_field, @@ -139,6 +212,1334 @@ *error = err; } +/*************************************************************************** + * + * Efficient Laplace interpolation. + * + ***************************************************************************/ + +static gboolean +promote(const guint *levels, guint *buffer, + guint xres, guint yres, + guint level, guint step) +{ + guint nx = (xres + step-1)/step, ny = (yres + step-1)/step; + guint vstep = xres*step; + gboolean ok = FALSE; + guint i, j; + + if (nx < 3 || ny < 3) + return ok; + + for (i = 0; i < ny; i++) { + for (j = 0; j < nx; j++) { + guint k = (i*xres + j)*step; + + if (levels[k] == level + && (!i || levels[k-vstep] == level) + && (!j || levels[k-step] == level) + && (j == nx-1 || levels[k+step] == level) + && (i == ny-1 || levels[k+vstep] == level)) { + buffer[k] = level+1; + ok = TRUE; + } + } + } + + return ok; +} + +static void +demote(const guint *levels, guint *buffer, + guint xres, guint yres, + guint level, guint step) +{ + guint nx = (xres + step-1)/step, ny = (yres + step-1)/step; + guint vstep = xres*step; + guint i, j; + + if (nx < 3 || ny < 3) + return; + + for (i = 1; i < ny-1; i++) { + for (j = 1; j < nx-1; j++) { + 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)) { + if (buffer[k-vstep-step] > level) + buffer[k-vstep-step] = level; + if (buffer[k-vstep] > level) + buffer[k-vstep] = level; + if (buffer[k-vstep+step] > level) + buffer[k-vstep+step] = level; + if (buffer[k-step] > level) + buffer[k-step] = level; + if (buffer[k+step] > level) + buffer[k+step] = level; + if (buffer[k+vstep-step] > level) + buffer[k+vstep-step] = level; + if (buffer[k+vstep] > level) + buffer[k+vstep] = level; + if (buffer[k+vstep+step] > level) + buffer[k+vstep+step] = level; + } + } + } +} + +static gboolean +reduce(const guint *levels, guint *buffer, + guint xres, guint yres, + guint level, guint step) +{ + guint nx = (xres + step-1)/step, ny = (yres + step-1)/step; + guint halfstep = step/2; + guint vstep = xres*step, vhalfstep = xres*halfstep; + gboolean ok = FALSE; + gboolean right = (nx - 1)*step + halfstep < xres; + gboolean down = (ny - 1)*step + halfstep < yres; + guint i, j; + + g_return_val_if_fail(step % 2 == 0, FALSE); + + if (nx < 3 || ny < 3) + return ok; + + for (i = 0; i < ny; i++) { + for (j = 0; j < nx; j++) { + guint k = (i*xres + j)*step; + + if (levels[k] == level + && (!i || !j || levels[k-vstep-step] >= level) + && (!i || levels[k-vstep] == level) + && (!i || j == nx-1 || levels[k-vstep+step] >= level) + && (!j || levels[k-step] == level) + && (j == nx-1 || levels[k+step] == level) + && (i == ny-1 || !j || levels[k+vstep-step] >= level) + && (i == ny-1 || levels[k+vstep] == level) + && (i == ny-1 || j == nx-1 || levels[k+vstep+step] >= level)) { + buffer[k] = level+1; + if (i && j) + buffer[k-vhalfstep-halfstep] = NONE; + if (i) + buffer[k-vhalfstep] = NONE; + if (i && (right || j < nx-1)) + buffer[k-vhalfstep+halfstep] = NONE; + if (j) + buffer[k-halfstep] = NONE; + if (right || j < nx-1) + buffer[k+halfstep] = NONE; + if ((down || i < ny-1) && j) + buffer[k+vhalfstep-halfstep] = NONE; + if (down || i < ny-1) + buffer[k+vhalfstep] = NONE; + if ((down || i < ny-1) && (right || j < nx-1)) + buffer[k+vhalfstep+halfstep] = NONE; + ok = TRUE; + } + } + } + + return ok; +} + +static void +remove_spikes(guint *levels, + guint xres, guint yres, + guint level, guint step) +{ + guint nx = (xres + step-1)/step, ny = (yres + step-1)/step; + guint i, j; + + if (nx < 3 || ny < 3) + return; + + for (i = 1; i < ny-1; i++) { + for (j = 1; j < nx-1; j++) { + 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); + + if ((su & sd & ~sl & ~sr) || (~su & ~sd & sl & sr)) + levels[k] = NONE; + } + } + } +} + +static guint +build_levels(guint *levels, guint *buffer, + guint xres, guint yres) +{ + guint step = 1, level = 0; + + gwy_assign(buffer, levels, xres*yres); + while (TRUE) { + // 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; + + // Ensure a dense representation near the boundary. + if (level == 1) { + gwy_assign(levels, buffer, xres*yres); + demote(levels, buffer, xres, yres, level, step); + } + + 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. + 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). + if (level > 1) + remove_spikes(buffer, xres, yres, level, step/2); + + gwy_assign(levels, buffer, xres*yres); + } + + return level; +} + +static guint +count_grid_points(const guint *levels, + guint xres, guint yres) +{ + guint k, npoints = 0; + + for (k = 0; k < xres*yres; k++) { + if (levels[k] && levels[k] != NONE) + npoints++; + } + + return npoints; +} + +static void +build_grid_index(const guint *levels, + guint xres, guint yres, + guint *gindex, + guint *revindex) +{ + guint k, n = 0; + + for (k = 0; k < xres*yres; k++) { + if (levels[k] && levels[k] != NONE) { + revindex[k] = n; + gindex[n++] = k; + } + else + revindex[k] = NONE; + } +} + +static void +laplace_iterators_setup(LaplaceIterators *iterators, + guint maxneighbours) +{ + gsize len = iterators->len; + + iterators->k = iterators->n + (len + 2); + iterators->gindex = iterators->k + maxneighbours*len; + + iterators->rhs = iterators->z + len; + iterators->f = iterators->rhs + len; + iterators->v = iterators->f + len; + iterators->t = iterators->v + len; + iterators->w = iterators->t + len; +} + +static void +laplace_iterators_resize(LaplaceIterators *iterators, + guint len, + guint maxneighbours) +{ + gsize int_size = (maxneighbours + 2)*len + 2; + gsize float_size = (maxneighbours + 5)*len; + + iterators->len = len; + + if (int_size > iterators->int_size) { + if (G_UNLIKELY(iterators->int_size)) + g_warning("Laplace iterators need to be enlarged (int)."); + GWY_FREE(iterators->n); + iterators->n = g_new0(guint, int_size); + iterators->int_size = int_size; + } + else + gwy_clear(iterators->n, int_size); + + if (float_size > iterators->float_size) { + if (G_UNLIKELY(iterators->float_size)) + g_warning("Laplace iterators need to be enlarged (float)."); + GWY_FREE(iterators->z); + iterators->z = g_new0(gdouble, float_size); + iterators->float_size = float_size; + } + else + gwy_clear(iterators->z, float_size); + + laplace_iterators_setup(iterators, maxneighbours); +} + +static LaplaceIterators* +laplace_iterators_new(guint len, guint maxneighbours) +{ + LaplaceIterators *iterators = g_slice_new0(LaplaceIterators); + laplace_iterators_resize(iterators, len, maxneighbours); + return iterators; +} + +static void +laplace_iterators_free(LaplaceIterators *iterators) +{ + g_free(iterators->z); + g_free(iterators->n); + g_slice_free(LaplaceIterators, iterators); +} + +static void +analyse_neighbour_direction(const guint *levels, + const gdouble *data, + gint xres, gint yres, + gint xstep, gint ystep, + gint j, gint i, + const guint *revindex, + LaplaceNeighbour *nd) +{ + gint ineigh, jneigh, step; + gint xorthostep, yorthostep; + guint kk; + + gwy_clear(nd, 1); + step = MAX(ABS(xstep), ABS(ystep)); + ineigh = i + ystep; + jneigh = j + xstep; + + // 1 Primary neighbour. + // 1.a Neumann boundary. + // The upper and left boundaries are always aligned. + if (ineigh < 0) { + g_assert(i == 0); + nd->is_boundary = TRUE; + nd->step = step; + return; + } + if (jneigh < 0) { + g_assert(j == 0); + nd->is_boundary = TRUE; + nd->step = step; + return; + } + // The other boundaries can be unaligned. + if (ineigh >= yres) { + nd->is_boundary = TRUE; + nd->bdist = yres-1 - i; + nd->step = step; + return; + } + if (jneigh >= xres) { + nd->is_boundary = TRUE; + nd->bdist = xres-1 - j; + nd->step = step; + return; + } + + kk = ineigh*xres + jneigh; + + // 1.b Dirichlet boundary. + if (!levels[kk]) { + g_assert(step == 1); + nd->is_rhs = TRUE; + nd->step = step; + nd->rhs = data[kk]; + return; + } + + // 1.c Interior. + if (levels[kk] != NONE) { + nd->neighbour = revindex[kk]; + nd->step = step; + return; + } + + // 2 Secondary neighbour. + ineigh = i + 2*ystep; + jneigh = j + 2*xstep; + + // 2.a Neumann boundary. + // The upper and left boundaries are always aligned. + if (ineigh < 0) { + g_assert(i == 0); + nd->is_boundary = TRUE; + nd->step = 2*step; + return; + } + if (jneigh < 0) { + g_assert(j == 0); + nd->is_boundary = TRUE; + nd->step = 2*step; + return; + } + // The other boundaries can be unaligned. + if (ineigh >= yres) { + nd->is_boundary = TRUE; + nd->bdist = yres-1 - i; + nd->step = 2*step; + return; + } + if (jneigh >= xres) { + nd->is_boundary = TRUE; + nd->bdist = xres-1 - j; + nd->step = 2*step; + return; + } + + kk = ineigh*xres + jneigh; + g_assert(levels[kk]); // Dirichlet boundary is always at step one. + + // 2.b Interior. + if (levels[kk] != NONE) { + nd->neighbour = revindex[kk]; + nd->step = 2*step; + return; + } + + // 3 Virtual neighbour. + xorthostep = xstep ? 0 : ABS(ystep); + yorthostep = ystep ? 0 : ABS(xstep); + ineigh = i + 2*ystep - yorthostep; + jneigh = j + 2*xstep - xorthostep; + // The upper and left boundaries are always aligned. + g_assert(ineigh >= 0); + g_assert(jneigh >= 0); + kk = ineigh*xres + jneigh; + + nd->is_virtual = TRUE; + nd->neighbour = revindex[kk]; + nd->step = 2*step; // The long distance; the short is always half of that. + + ineigh = i + 2*ystep + yorthostep; + jneigh = j + 2*xstep + xorthostep; + g_assert(ineigh < yres || jneigh < xres); + if (ineigh < yres && jneigh < xres) { + kk = ineigh*xres + jneigh; + nd->neighbour2 = revindex[kk]; + g_assert(nd->neighbour2 != NONE); + } + else { + nd->is_boundary = TRUE; + if (ineigh >= yres) + nd->bdist = yres-1 - i; + else + nd->bdist = xres-1 - j; + } +} + +static void +calculate_weights(LaplaceNeighbour *nd) +{ + LaplaceDirection virtual_dir = NDIRECTIONS; + guint i, ii, ileft, iright, j, boundary_dir; + gboolean virtual_is_boundary; + + // At most one virtual direction. + for (j = 0; j < NDIRECTIONS; j++) { + if (nd[j].is_virtual) { + g_assert(virtual_dir == NDIRECTIONS); + virtual_dir = j; + } + } + + // No virtual, no mixing of z_xx and z_yy. + if (virtual_dir == NDIRECTIONS) { + for (j = 0; j < NDIRECTIONS; j++) { + guint jj = (j + 2) % NDIRECTIONS; + gdouble s, xs; + + if (nd[j].is_boundary) + continue; + + s = nd[j].step; + xs = nd[jj].is_boundary ? 2*nd[jj].bdist : nd[jj].step; + nd[j].weight = 2.0/(s + xs)/s; + } + return; + } + + // Virtual. + i = virtual_dir; + iright = (i + 1) % NDIRECTIONS; + ii = (i + 2) % NDIRECTIONS; + ileft = (i + 3) % NDIRECTIONS; + boundary_dir = NDIRECTIONS; + virtual_is_boundary = nd[i].is_boundary; + + // At most one boundary direction, except the boundary direction itself. + for (j = 0; j < NDIRECTIONS; j++) { + if (j != virtual_dir && nd[j].is_boundary) { + g_assert(boundary_dir == NDIRECTIONS); + boundary_dir = j; + } + } + 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; + gdouble w = 1.0 - 0.25*s/(s + ss); + nd[i].weight = nd[i].weight2 = 1.0/(s + ss)/s; + nd[ii].weight = 2.0/(s + ss)/ss; + nd[ileft].weight = 2.0*w/(sleft + sright)/sleft; + nd[iright].weight = 2.0*w/(sleft + sright)/sright; + } + else if (boundary_dir == ii) { + gdouble s = nd[i].step; + gdouble sleft = nd[ileft].step, sright = nd[iright].step; + gdouble b = nd[boundary_dir].bdist; + gdouble w = 1.0 - 0.25*s/(s + 2*b); + nd[i].weight = nd[i].weight2 = 1.0/(s + 2*b)/s; + nd[ileft].weight = 2.0*w/(sleft + sright)/sleft; + nd[iright].weight = 2.0*w/(sleft + sright)/sright; + } + else { + guint irem = (boundary_dir + 2) % NDIRECTIONS; + gdouble s = nd[i].step, ss = nd[ii].step; + gdouble srem = nd[irem].step; + gdouble b = nd[boundary_dir].bdist; + gdouble w = 1.0 - 0.25*(s + 4*b)/(s + ss); + nd[i].weight = 2.0/(s + ss)/s; + nd[ii].weight = 2.0/(s + ss)/ss; + nd[irem].weight = 2.0*w/(srem + 2*b)/srem; + } +} + +static void +build_iterator(LaplaceNeighbour *nd, + LaplaceIterators *iterators, + guint ipt, + gdouble *nrhs, + gdouble *rhssum) +{ + guint i, start, npt = 0; + gdouble ws = 0.0, rs = 0.0; + gboolean sorted = FALSE; + guint *iter_k; + gdouble *iter_w; + + // Figure out how many neighbours we have and sum the weights. + for (i = 0; i < NDIRECTIONS; i++) { + if (nd[i].weight) { + ws += nd[i].weight; + if (nd[i].is_rhs) { + g_assert(!nd[i].is_virtual); + g_assert(!nd[i].is_boundary); + rs += nd[i].rhs; + *nrhs += nd[i].weight; + } + else + npt++; + + if (nd[i].weight2) { + g_assert(nd[i].is_virtual); + ws += nd[i].weight2; + npt++; + } + } + } + g_assert(npt > 0 && npt <= 5); + + start = iterators->n[ipt]; + iterators->n[ipt+1] = start + npt; + if (rs) { + *rhssum += rs; + iterators->rhs[ipt] = rs/ws; + } + + // Create the iterators. + iter_w = iterators->w + start; + iter_k = iterators->k + start; + for (i = 0; i < NDIRECTIONS; i++) { + if (!nd[i].is_rhs && nd[i].weight) { + *(iter_w++) = nd[i].weight/ws; + *(iter_k++) = nd[i].neighbour; + if (nd[i].weight2) { + *(iter_w++) = nd[i].weight2/ws; + *(iter_k++) = nd[i].neighbour2; + } + } + } + + // Sort the segments by k. + iter_w = iterators->w + start; + iter_k = iterators->k + start; + do { + sorted = TRUE; + for (i = 1; i < npt; i++) { + if (iter_k[i-1] > iter_k[i]) { + GWY_SWAP(guint, iter_k[i-1], iter_k[i]); + GWY_SWAP(gdouble, iter_w[i-1], iter_w[i]); + sorted = FALSE; + } + } + } while (!sorted); +} + +static void +build_sparse_iterators(LaplaceIterators *iterators, + guint *revindex, + const guint *levels, + const gdouble *data, + guint xres, guint yres) +{ + LaplaceNeighbour nd[NDIRECTIONS]; + guint len = count_grid_points(levels, xres, yres); + gdouble rhssum = 0.0, nrhs = 0.0; + const guint *gindex; + guint ipt; + + laplace_iterators_resize(iterators, len, 5); + build_grid_index(levels, xres, yres, iterators->gindex, revindex); + + gindex = iterators->gindex; + + for (ipt = 0; ipt < len; ipt++) { + 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); + + calculate_weights(nd); + build_iterator(nd, iterators, ipt, &nrhs, &rhssum); + } + + // Initialise with the mean value of right hand sides, including + // multiplicity. + rhssum /= nrhs; + for (ipt = 0; ipt < len; ipt++) + iterators->z[ipt] = rhssum; +} + +static void +build_dense_iterators(LaplaceIterators *iterators, + guint *revindex, + const guint *levels, + const gdouble *data, + guint xres, guint yres) +{ + guint len = count_grid_points(levels, xres, yres); + const guint *gindex; + guint ipt; + + laplace_iterators_resize(iterators, len, 4); + build_grid_index(levels, xres, yres, iterators->gindex, revindex); + + gindex = iterators->gindex; + for (ipt = 0; ipt < len; ipt++) { + guint k = gindex[ipt], i = k/xres, j = k % xres, ws = 0, n = 0; + gdouble rs = 0.0; + guint *iter_k = iterators->k + iterators->n[ipt]; + gdouble *iter_w = iterators->w + iterators->n[ipt]; + + if (i) { + guint kk = k-xres; + ws++; + if (levels[kk]) { + *(iter_k++) = revindex[kk]; + n++; + } + else + rs += data[kk]; + } + if (j) { + guint kk = k-1; + ws++; + if (levels[kk]) { + *(iter_k++) = revindex[kk]; + n++; + } + else + rs += data[kk]; + } + if (j < xres-1) { + guint kk = k+1; + ws++; + if (levels[kk]) { + *(iter_k++) = revindex[kk]; + n++; + } + else + rs += data[kk]; + } + if (i < yres-1) { + guint kk = k+xres; + ws++; + if (levels[kk]) { + *(iter_k++) = revindex[kk]; + n++; + } + else + rs += data[kk]; + } + + iterators->z[ipt] = data[k]; + iterators->rhs[ipt] = rs/ws; + iterators->n[ipt+1] = iterators->n[ipt] + n; + while (n--) + *(iter_w++) = 1.0/ws; + } +} + +static void +calculate_f(LaplaceIterators *iterators) +{ + const guint *n = iterators->n, *k = iterators->k; + const gdouble *z = iterators->z, *iz = iterators->z, + *w = iterators->w, *rhs = iterators->rhs; + gdouble *f = iterators->f; + guint l, ipt; + + for (ipt = iterators->len; ipt; ipt--, n++, z++, rhs++, f++) { + gdouble lhs = 0.0; + for (l = *(n + 1) - *n; l; l--, k++, w++) + lhs += iz[*k]*(*w); + *f = (*z - lhs) - *rhs; + } +} + +static void +iterate_simple(LaplaceIterators *iterators) +{ + const gdouble *f = iterators->f; + gdouble *z = iterators->z; + guint ipt; + + for (ipt = iterators->len; ipt; ipt--, z++, f++) + *z -= 0.8*(*f); +} + +static void +matrix_multiply(LaplaceIterators *iterators, const gdouble *v, gdouble *r) +{ + const guint *n = iterators->n, *k = iterators->k; + const gdouble *w = iterators->w, *iv = v; + guint l, ipt; + + for (ipt = iterators->len; ipt; ipt--, n++, v++, r++) { + gdouble s = 0.0; + + for (l = *(n + 1) - *n; l; l--, k++, w++) + s += iv[*k]*(*w); + + *r = *v - s; + } +} + +static gboolean +iterate_conj_grad(LaplaceIterators *iterators) +{ + gdouble *z, *v = iterators->v, *t = iterators->t, *f = iterators->f; + gdouble S = 0.0, phi = 0.0, phiS; + guint ipt; + + // Temporary quantities: t = A.v, S = v.t, φ = v.f + matrix_multiply(iterators, iterators->v, iterators->t); + + for (ipt = iterators->len; ipt; ipt--, v++, t++, f++) { + S += (*v)*(*t); + phi += (*v)*(*f); + } + + if (S < 1e-16) + return TRUE; + + // New value and f = A.z-b + phiS = phi/S; + z = iterators->z; + v = iterators->v; + f = iterators->f; + t = iterators->t; + for (ipt = iterators->len; ipt; ipt--, z++, v++, f++, t++) { + *z -= phiS*(*v); + *f -= phiS*(*t); + } + + // New v + phi = 0.0; + f = iterators->f; + t = iterators->t; + for (ipt = iterators->len; ipt; ipt--, t++, f++) + phi += (*t)*(*f); + + phiS = phi/S; + v = iterators->v; + f = iterators->f; + for (ipt = iterators->len; ipt; ipt--, v++, f++) + *v = *f - phiS*(*v); + + return FALSE; +} + +static void +move_result_to_data(const LaplaceIterators *iterators, gdouble *data) +{ + guint ipt; + + for (ipt = 0; ipt < iterators->len; ipt++) + data[iterators->gindex[ipt]] = iterators->z[ipt]; +} + +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 i, j; + + if (nx < 3 || ny < 3) + return; + + // Six-point interpolation + for (i = 0; i < ny; i++) { + if (i % 2 == 0) { + // Interpolated point horizontally in between two other points. + for (j = 1; j < nx; j += 2) { + guint k = (i*xres + j)*step; + if (levels[k] != NONE) + continue; + + 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])); + 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])); + 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; + 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; + levels[k] = levels[k-step]; + } + else if (i < ny-2) { + // Upper boundary is aligned, right boundary can be + // unaligned. + guint bdist = xres-1 - j*step; + guint a = 3*step - 2*bdist, b = 2*bdist + step, d = 4*step; + data[k] = (a*data[k-step] + b*data[k-step+2*vstep])/d; + levels[k] = levels[k-step]; + } + else if (i >= 2) { + // Lower and right boundaries can be both unaligned. + guint xbdist = xres-1 - j*step; + guint ybdist = yres-1 - i*step; + guint a = 3*step + 4*ybdist - 2*xbdist, b = 2*xbdist + step; + data[k] = (a*data[k-step] + b*data[k-2*vstep])/(a + b); + levels[k] = levels[k-step]; + } + else { + g_assert_not_reached(); + } + } + } + else { + // Interpolated point vertically in between two other points. + for (j = 0; j < nx; j += 2) { + guint k = (i*xres + j)*step; + if (levels[k] != NONE) + continue; + + 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])); + 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])); + 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; + 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; + levels[k] = levels[k-vstep]; + } + else if (j < nx-2) { + // Left boundary is aligned, lower boundary can be + // unaligned. + guint bdist = yres-1 - i*step; + guint a = 3*step - 2*bdist, b = 2*bdist + step, d = 4*step; + data[k] = (a*data[k-vstep] + b*data[k+2*step-vstep])/d; + levels[k] = levels[k-vstep]; + } + else if (j >= 2) { + // Lower and right boundaries can be both unaligned. + guint xbdist = xres-1 - j*step; + guint ybdist = yres-1 - i*step; + guint a = 3*step + 4*xbdist - 2*ybdist, b = 2*ybdist + step; + data[k] = (a*data[k-vstep] + b*data[k-2*step])/(a + b); + levels[k] = levels[k-vstep]; + } + else { + g_assert_not_reached(); + } + } + } + } + + // Four-point interpolation + for (i = 1; i < ny; i += 2) { + for (j = 1; j < nx; j += 2) { + guint k = (i*xres + j)*step; + if (levels[k] != NONE) + 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; + } + 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; + 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; + levels[k] = (levels[k-step] + levels[k+step])/2; + } + else { + // Right and lower boundary can be unaligned both. + guint xbdist = xres-1 - j*step; + guint ybdist = yres-1 - i*step; + guint a = 2*ybdist + step, b = 2*xbdist + step; + data[k] = (a*data[k-step] + b*data[k-vstep])/(a + b); + levels[k] = (levels[k-step] + levels[k-vstep])/2; + } + } + } +} + +static void +reconstruct(guint *levels, gdouble *data, guint xres, guint yres, guint level) +{ + guint step = 1 << ((level - 1)/2); + + while (step) { + interpolate(levels, data, xres, yres, step); + step /= 2; + } +} + +static void +init_data_simple(gdouble *data, guint *levels, guint xres, guint yres) +{ + guint i, j, kk, level = 1; + gboolean finished = FALSE; + + for (kk = 0; kk < xres*yres; kk++) + levels[kk] = !!levels[kk]; + + while (!finished) { + finished = TRUE; + for (i = 0; i < yres; i++) { + for (j = 0; j < xres; j++) { + guint k = i*xres + j, n = 0; + gdouble s = 0; + + if (levels[k] != level) + continue; + + if (i && levels[k-xres] < level) { + s += data[k-xres]; + n++; + } + if (j && levels[k-1] < level) { + s += data[k-1]; + n++; + } + if (j+1 < xres && levels[k+1] < level) { + s += data[k+1]; + n++; + } + if (i+1 < yres && levels[k+xres] < level) { + s += data[k+xres]; + n++; + } + + if (n) { + data[k] = s/n; + } + else { + levels[k] = level+1; + finished = FALSE; + } + } + } + level++; + } +} + +static void +laplace_sparse(LaplaceIterators *iterators, + guint *revindex, + gdouble *data, guint *levels, guint xres, guint yres, + guint nconjgrad, guint nsimple) +{ + // Revindex is filled later, use is as a temporary xres*yres-sized buffer. + guint maxlevel = build_levels(levels, revindex, xres, yres); + gboolean finished = FALSE; + 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. + init_data_simple(data, levels, xres, yres); + return; + } + + build_sparse_iterators(iterators, revindex, levels, data, xres, yres); + calculate_f(iterators), + gwy_assign(iterators->v, iterators->f, iterators->len); + for (iter = 0; iter < nconjgrad; iter++) { + if ((finished = iterate_conj_grad(iterators))) + break; + } + if (!finished) { + for (iter = 0; iter < nsimple; iter++) { + calculate_f(iterators); + iterate_simple(iterators); + } + } + move_result_to_data(iterators, data); + reconstruct(levels, data, xres, yres, maxlevel); +} + +static void +laplace_dense(LaplaceIterators *iterators, + guint *revindex, + gdouble *data, guint *levels, guint xres, guint yres, + guint nconjgrad, guint nsimple) +{ + gboolean finished = FALSE; + guint iter; + + build_dense_iterators(iterators, revindex, levels, data, xres, yres); + calculate_f(iterators); + gwy_assign(iterators->v, iterators->f, iterators->len); + for (iter = 0; iter < nconjgrad; iter++) { + if ((finished = iterate_conj_grad(iterators))) + break; + } + if (!finished) { + for (iter = 0; iter < nsimple; iter++) { + calculate_f(iterators); + iterate_simple(iterators); + } + } + move_result_to_data(iterators, data); +} + +// Extract grain data from full-sized @grains and @data to workspace-sized +// @levels and @z. +static void +extract_grain(const gint *grains, + const gdouble *data, + guint xres, + const GwyDataFieldPart *fpart, + gint grain_id, + guint *levels, + gdouble *z) +{ + guint i, j; + const gint *grow; + guint *lrow; + + for (i = 0; i < fpart->height; i++) { + 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++) + *lrow = (*grow == grain_id); + } +} + +// Put interpolated grain data @z back to @data. +static void +insert_grain(const gint *grains, + gdouble *data, + guint xres, + const GwyDataFieldPart *fpart, + gint grain_id, + const gdouble *z) +{ + guint i, j; + + for (i = 0; i < fpart->height; i++) { + const gdouble *zrow = z + i*fpart->width; + const gint *grow = grains + (i + fpart->row)*xres + fpart->col; + gdouble *drow = data + (i + fpart->row)*xres + fpart->col; + for (j = fpart->width; j; j--, zrow++, drow++, grow++) { + if (*grow == grain_id) + *drow = *zrow; + } + } +} + +static void +enlarge_field_part(GwyDataFieldPart *fpart, guint xres, guint yres) +{ + if (fpart->col) { + fpart->col--; + fpart->width++; + } + if (fpart->col + fpart->width < xres) + fpart->width++; + + if (fpart->row) { + fpart->row--; + fpart->height++; + } + if (fpart->row + fpart->height < yres) + fpart->height++; +} + +/* + * 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. + */ +static void +find_largest_sizes(guint xres, guint yres, + const GwyDataFieldPart *bboxes, + const guint *sizes, + guint gfrom, guint gto, + guint *size, + guint *bboxsize) +{ + guint gno, bs; + GwyDataFieldPart bbox; + + *size = *bboxsize = 0; + for (gno = gfrom; gno <= gto; gno++) { + if (sizes[gno] > *size) + *size = sizes[gno]; + + bbox = bboxes[gno]; + enlarge_field_part(&bbox, xres, yres); + bs = bbox.width * bbox.height; + if (bs > *bboxsize) + *bboxsize = bs; + } +} + +/** + * 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. + * + * 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 zeroes. + * + * 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 + **/ +void +gwy_data_field_laplace_solve(GwyDataField *field, + GwyDataField *mask, + gint grain_id, + gdouble qprec) +{ + GwyDataField *ourmask; + guint xres, yres, maxsize, maxbboxsize; + gint ngrains, gfrom, gto; + GwyDataFieldPart *bboxes; + LaplaceIterators *iterators; + guint *levels, *revindex; + gint *grains; + guint *sizes; + gdouble *z; + + g_return_if_fail(GWY_IS_DATA_FIELD(mask)); + g_return_if_fail(GWY_IS_DATA_FIELD(field)); + 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. + if (grain_id == 0) { + ourmask = gwy_data_field_duplicate(mask); + gwy_data_field_grains_invert(ourmask); + grain_id = -1; + } + else + ourmask = g_object_ref((gpointer)mask); + + xres = field->xres; + yres = field->yres; + grains = g_new0(gint, xres*yres); + ngrains = gwy_data_field_number_grains(ourmask, grains); + if (grain_id > ngrains) { + g_free(grains); + 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); + + // The underspecified case. + if (ngrains == 1 && sizes[1] == xres*yres) { + gwy_data_field_clear(field); + g_object_unref(ourmask); + g_free(sizes); + g_free(bboxes); + g_free(grains); + return; + } + + gfrom = (grain_id < 0) ? 1 : grain_id; + 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); + + levels = g_new(guint, maxbboxsize); + revindex = g_new(guint, maxbboxsize); + z = g_new(gdouble, maxbboxsize); + iterators = laplace_iterators_new(maxsize, 5); + + for (grain_id = gfrom; grain_id <= gto; grain_id++) { + 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); + if (sizes[grain_id] > 1) + laplace_dense(iterators, revindex, z, levels, + bbox.width, bbox.height, 60*qprec, 30*qprec); + insert_grain(grains, field->data, xres, &bbox, grain_id, z); + } + + laplace_iterators_free(iterators); + g_free(z); + g_free(levels); + g_free(revindex); + g_free(sizes); + g_free(bboxes); + g_free(grains); + + g_object_unref(ourmask); + gwy_data_field_invalidate(field); +} + + + + + + /** * gwy_data_field_mask_outliers: * @data_field: A data field. @@ -802,7 +2203,7 @@ /** * gwy_data_line_correct_laplace: * @data_line: A data line. - * @mask_field: Mask of places to be corrected. + * @mask_line: Mask of places to be corrected. * * Fills missing values in a data line using Laplace data correction. * diff -Nru gwyddion-2.46/libprocess/correct.h gwyddion-2.47/libprocess/correct.h --- gwyddion-2.46/libprocess/correct.h 2016-09-18 19:17:53.000000000 +0000 +++ gwyddion-2.47/libprocess/correct.h 2016-10-18 08:13:27.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: correct.h 18965 2016-09-18 10:55:59Z yeti-dn $ + * @(#) $Id: correct.h 19086 2016-10-16 12:18:11Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -33,6 +33,10 @@ gdouble *py, gpointer user_data); +void gwy_data_field_laplace_solve (GwyDataField *field, + GwyDataField *mask, + gint grain_id, + gdouble qprec); void gwy_data_field_correct_laplace_iteration(GwyDataField *data_field, GwyDataField *mask_field, GwyDataField *buffer_field, diff -Nru gwyddion-2.46/libprocess/correlation.c gwyddion-2.47/libprocess/correlation.c --- gwyddion-2.46/libprocess/correlation.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/correlation.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: correlation.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: correlation.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -967,7 +967,7 @@ if (state->score) state->score->data[col + xres * row] = cormax; - if (state->x_dist || state->x_dist) { + if (state->x_dist || state->y_dist) { k = 0; for (m=-1; m<=1; m++) { for (n=-1; n<=1; n++) { diff -Nru gwyddion-2.46/libprocess/dwt.c gwyddion-2.47/libprocess/dwt.c --- gwyddion-2.46/libprocess/dwt.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/dwt.c 2016-10-21 11:58:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: dwt.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: dwt.c 19108 2016-10-21 08:50:43Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -665,7 +665,7 @@ #endif /** - * gwy_data_field_mark_anisotropy: + * gwy_data_field_dwt_mark_anisotropy: * @dfield: Data field to mark anisotropy of (must be square). * @wt_coefs: Data line to store wavelet transform coefficients to. * @minsize: size of minimal transform result block diff -Nru gwyddion-2.46/libprocess/filters.c gwyddion-2.47/libprocess/filters.c --- gwyddion-2.46/libprocess/filters.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/filters.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: filters.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: filters.c 19128 2016-10-26 21:25:12Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -3468,7 +3468,7 @@ } /** - * gwy_data_field_area_filter_circular_asf: + * 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. @@ -3689,6 +3689,18 @@ gwy_data_field_invalidate(target_field); } +/** + * gwy_data_field_filter_harris: + * @x_gradient: Data field with pre-calculated horizontal derivative. + * @y_gradient: Data field with pre-calculated vertical derivative. + * @result: Data field for the result. + * @neighbourhood: Neighbourhood size. + * @alpha: Sensitivity paramter (the squared trace is multiplied by it). + * + * Applies Harris corner detection filter to a pair of gradient data fields. + * + * All passed data field must have the same size. + **/ void gwy_data_field_filter_harris(GwyDataField *x_gradient, GwyDataField *y_gradient, diff -Nru gwyddion-2.46/libprocess/grains.c gwyddion-2.47/libprocess/grains.c --- gwyddion-2.46/libprocess/grains.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/grains.c 2016-11-07 21:13:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: grains.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: grains.c 19199 2016-11-07 20:03:54Z yeti-dn $ * Copyright (C) 2003-2015 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -350,7 +350,7 @@ return thresh; } -/** +/* * class_weight: * @hist: A #GwyDataLine histogram from where to calculate the class * probability for @t. @@ -386,9 +386,9 @@ return weight; } -/** +/* * class_mean: - * @hist: A #GwyDataLine hiustogram from where to calculate the class mean for + * @hist: A #GwyDataLine histogram from where to calculate the class mean for * @t. * @t: A threshold value. * @flag: Alternates between %BACKGROUND or %FOREGROUND class mean. @@ -1855,139 +1855,6 @@ } while (eps > 1e-3 || improvement > 1e-3); } -static gdouble -grain_volume_laplace(GwyDataField *data_field, - const gint *grains, - gint gno, - const gint *bound) -{ - GwyDataField *grain, *mask, *buffer; - gint xres, yres, col, row, w, h, i, j, k, ns; - gdouble v, s, maxerr, error, vol; - const gdouble *d; - gdouble *m, *g; - - xres = data_field->xres; - yres = data_field->yres; - - /* Caulcate extended boundaries */ - w = bound[2]; - col = bound[0]; - if (col > 0) { - col--; - w++; - } - if (col + w < xres) - w++; - - h = bound[3]; - row = bound[1]; - if (row > 0) { - row--; - h++; - } - if (row + h < yres) - h++; - - /* Create the mask for laplace iteration and calculate a suitable starting - * value to fill the grain with */ - grain = gwy_data_field_area_extract(data_field, col, row, w, h); - mask = gwy_data_field_new_alike(grain, TRUE); - - g = grain->data; - m = mask->data; - d = data_field->data + row*xres + col; - - s = maxerr = 0.0; - ns = 0; - for (i = 0; i < h; i++) { - for (j = 0; j < w; j++) { - k = (i + row)*xres + j + col; - if (grains[k] == gno) { - m[i*w + j] = 1.0; - if (i > 0 && !grains[k - xres]) { - v = g[i*w + j - w]; - s += v; - maxerr += v*v; - ns++; - } - if (j > 0 && !grains[k - 1]) { - v = g[i*w + j - 1]; - s += v; - maxerr += v*v; - ns++; - } - if (j + 1 < w && !grains[k + 1]) { - v = g[i*w + j + 1]; - s += v; - maxerr += v*v; - ns++; - } - if (i + 1 < h && !grains[k + xres]) { - v = g[i*w + j + w]; - s += v; - maxerr += v*v; - ns++; - } - } - } - } - g_assert(ns > 0); - s /= ns; - maxerr = 0.01*sqrt(fabs(maxerr/ns - s*s)); - - /* Fill with the starting value */ - for (i = 0; i < h; i++) { - for (j = 0; j < w; j++) { - k = (i + row)*xres + j + col; - if (grains[k] == gno) - g[i*w + j] = s; - } - } - - /* Iterate to get basis (background) */ - if (maxerr) { - buffer = gwy_data_field_new_alike(grain, FALSE); - for (i = 0; i < 500; i++) { - gwy_data_field_correct_laplace_iteration(grain, mask, buffer, - 0.2, &error); - if (error <= maxerr) - break; - } - g_object_unref(buffer); - } - g_object_unref(mask); - - /* Calculate the volume between data and basis */ - vol = 0.0; - for (i = 0; i < h; i++) { - for (j = 0; j < w; j++) { - k = (i + row)*xres + j + col; - if (grains[k] == gno) { - gint im, ip, jm, jp; - - im = (i > 0) ? i-1 : i; - ip = (i < h-1) ? i+1 : i; - jm = (j > 0) ? j-1 : j; - jp = (j < w-1) ? j+1 : j; - - vol += 52.0*(d[i*xres + j] - g[i*w + j]) - + 10.0*(d[im*xres + j] - g[im*w + j] - + d[i*xres + jm] - g[i*w + jm] - + d[i*xres + jp] - g[i*w + jp] - + d[ip*xres + j] - g[ip*w + j]) - + (d[im*xres + jm] - g[im*w + jm] - + d[im*xres + jp] - g[im*w + jp] - + d[ip*xres + jm] - g[ip*w + jm] - + d[ip*xres + jp] - g[ip*w + jp]); - } - } - } - g_object_unref(grain); - - return vol; -} - /** * gwy_data_field_grains_get_values: * @data_field: Data field used for marking. For some quantities its values @@ -2209,6 +2076,40 @@ } } +static void +integrate_grain_volume0(const gdouble *d, const gint *grains, + gint xres, gint yres, + gdouble *volume, guint ngrains, + gdouble pixelarea) +{ + gint i, j, gno; + + gwy_clear(volume, ngrains + 1); + for (i = 0; i < yres; i++) { + for (j = 0; j < xres; j++) { + gint ix, ipx, imx, jp, jm; + gdouble v; + + ix = i*xres; + if (!(gno = grains[ix + j])) + continue; + + imx = (i > 0) ? ix-xres : ix; + ipx = (i < yres-1) ? ix+xres : ix; + jm = (j > 0) ? j-1 : j; + jp = (j < xres-1) ? j+1 : j; + + v = (52.0*d[ix + j] + 10.0*(d[imx + j] + d[ix + jm] + + d[ix + jp] + d[ipx + j]) + + (d[imx + jm] + d[imx + jp] + d[ipx + jm] + d[ipx + jp])); + + volume[gno] += v; + } + } + for (gno = 0; gno <= ngrains; gno++) + volume[gno] *= pixelarea/96.0; +} + /** * gwy_data_field_grains_get_quantities: * @data_field: Data field used for marking. For some quantities its values @@ -2282,7 +2183,7 @@ NEED_XVALUE, /* centre x */ NEED_YVALUE, /* centre y */ 0, /* volume, 0-based */ - NEED_MIN, /* volume, min-based */ + NEED_MIN | NEED_SIZES, /* volume, min-based */ NEED_BBOX | NEED_SIZES, /* volume, Laplace-based */ INVALID, INVALID, @@ -2899,55 +2800,38 @@ gdouble *pv0 = quantity_data[GWY_GRAIN_VALUE_VOLUME_0]; gdouble *pvm = quantity_data[GWY_GRAIN_VALUE_VOLUME_MIN]; - if (pv0) - gwy_clear(pv0, ngrains + 1); - if (pvm) - gwy_clear(pvm, ngrains + 1); - - for (i = 0; i < yres; i++) { - for (j = 0; j < xres; j++) { - gint ix, ipx, imx, jp, jm; - gdouble v; - - ix = i*xres; - if (!(gno = grains[ix + j])) - continue; - - imx = (i > 0) ? ix-xres : ix; - ipx = (i < yres-1) ? ix+xres : ix; - jm = (j > 0) ? j-1 : j; - jp = (j < xres-1) ? j+1 : j; - - v = (52.0*d[ix + j] + 10.0*(d[imx + j] + d[ix + jm] - + d[ix + jp] + d[ipx + j]) - + (d[imx + jm] + d[imx + jp] + d[ipx + jm] + d[ipx + jp])); - - /* We know the basis would appear with total weight -96 so - * don't bother subtracting it from individual heights */ - if (pv0) - pv0[gno] += v; - if (pvm) - pvm[gno] += v - 96.0*min[gno]; - } - } if (pv0) { - for (gno = 1; gno <= ngrains; gno++) - pv0[gno] *= qarea/96.0; + integrate_grain_volume0(d, grains, xres, yres, pv0, ngrains, qarea); + if (pvm) { + for (gno = 0; gno <= ngrains; gno++) + pvm[gno] = pv0[gno] - qarea*min[gno]*sizes[gno]; + } } - if (pvm) { - for (gno = 1; gno <= ngrains; gno++) - pvm[gno] *= qarea/96.0; + else { + g_assert(pvm); + integrate_grain_volume0(d, grains, xres, yres, pvm, ngrains, qarea); + for (gno = 0; gno <= ngrains; gno++) + pvm[gno] -= qarea*min[gno]*sizes[gno]; } } if ((p = quantity_data[GWY_GRAIN_VALUE_VOLUME_LAPLACE])) { - gwy_clear(p, ngrains + 1); /* Fail gracefully when there is one big `grain' over all data. */ if (ngrains == 1 && sizes[1] == xres*yres) p[1] = 0.0; else { - for (gno = 1; gno <= ngrains; gno++) - p[gno] = qarea/96.0*grain_volume_laplace(data_field, grains, - gno, bbox + 4*gno); + GwyDataField *difference = gwy_data_field_duplicate(data_field); + GwyDataField *mask = gwy_data_field_new_alike(data_field, FALSE); + gdouble *m = mask->data; + + for (k = 0; k < nn; k++) + m[k] = grains[k]; + + gwy_data_field_laplace_solve(difference, mask, -1, 0.4); + g_object_unref(mask); + gwy_data_field_subtract_fields(difference, data_field, difference); + integrate_grain_volume0(difference->data, grains, xres, yres, p, + ngrains, qarea); + g_object_unref(difference); } } if (quantity_data[GWY_GRAIN_VALUE_SLOPE_THETA] @@ -3933,6 +3817,54 @@ } /** + * gwy_data_field_get_grain_sizes: + * @mask_field: Data field containing positive values in grains, nonpositive + * in free space. However its contents is ignored as all + * grain information is taken from @grains (its dimensions + * determine the dimensions of @grains). + * @ngrains: The number of grains as returned by + * gwy_data_field_number_grains(). + * @grains: Grain numbers filled with gwy_data_field_number_grains(). + * @sizes: Array of size at least @ngrains+1 to fill with grain sizes + * (as usual zero does not correspond to any grain, grains + * start from 1). It can be %NULL to allocate a new array. + * + * Find sizes of all grains in a mask data field. + * + * Size is the number of pixels in the grain. + * + * The zeroth element of @sizes is filled with the number of pixels not + * covered by the mask. + * + * Returns: Either @sizes (if it was not %NULL), or a newly allocated array + * of size @ngrains+1. + * + * Since: 2.47 + **/ +gint* +gwy_data_field_get_grain_sizes(GwyDataField *mask_field, + gint ngrains, + const gint *grains, + gint *sizes) +{ + gint xres, yres, k; + + g_return_val_if_fail(GWY_IS_DATA_FIELD(mask_field), NULL); + g_return_val_if_fail(grains, NULL); + + xres = mask_field->xres; + yres = mask_field->yres; + if (!sizes) + sizes = g_new(gint, ngrains + 1); + + gwy_clear(sizes, ngrains + 1); + for (k = 0; k < xres*yres; k++) + sizes[grains[k]]++; + + return sizes; +} + +/** * gwy_data_field_area_grains_tgnd: * @data_field: A data field. * @target_line: A data line to store the distribution to. It will be @@ -4774,9 +4706,9 @@ * Each non-zero value will be replaced with a distance to the grain boundary, * measured in pixels. * - * Note this function can calculate the Euclidean distance transform only since - * 2.43. Use gwy_data_field_grain_distance_transform() for the EDT if you need - * compatibility with older versions. + * Note this function can calculate the true Euclidean distance transform + * only since 2.43. Use gwy_data_field_grain_distance_transform() for the EDT + * if you need compatibility with older versions. * * Since: 2.41 **/ @@ -5582,7 +5514,7 @@ } /** - * gwy_field_mark_extrema: + * gwy_data_field_mark_extrema: * @dfield: A two-dimensional data field. * @extrema: Target field for the extrema mask. * @maxima: %TRUE to mark maxima, %FALSE to mark minima. diff -Nru gwyddion-2.46/libprocess/grains.h gwyddion-2.47/libprocess/grains.h --- gwyddion-2.46/libprocess/grains.h 2015-10-21 09:51:21.000000000 +0000 +++ gwyddion-2.47/libprocess/grains.h 2016-10-18 08:13:27.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: grains.h 17628 2015-10-21 09:51:21Z yeti-dn $ + * @(#) $Id: grains.h 19085 2016-10-16 12:17:32Z yeti-dn $ * Copyright (C) 2003-2015 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -97,14 +97,18 @@ guint *up, guint *down); -gint gwy_data_field_number_grains(GwyDataField *mask_field, - gint *grains); -gint gwy_data_field_number_grains_periodic(GwyDataField *mask_field, - gint *grains); +gint gwy_data_field_number_grains (GwyDataField *mask_field, + gint *grains); +gint gwy_data_field_number_grains_periodic (GwyDataField *mask_field, + gint *grains); gint* gwy_data_field_get_grain_bounding_boxes(GwyDataField *mask_field, gint ngrains, const gint *grains, gint *bboxes); +gint* gwy_data_field_get_grain_sizes (GwyDataField *mask_field, + gint ngrains, + const gint *grains, + gint *sizes); GwyDataLine* gwy_data_field_grains_get_distribution(GwyDataField *data_field, GwyDataField *grain_field, diff -Nru gwyddion-2.46/libprocess/gwycaldata.c gwyddion-2.47/libprocess/gwycaldata.c --- gwyddion-2.46/libprocess/gwycaldata.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/gwycaldata.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwycaldata.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: gwycaldata.c 19128 2016-10-26 21:25:12Z yeti-dn $ * Copyright (C) 2010,2011 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -134,11 +134,9 @@ GWY_OBJECT_UNREF(caldata->si_unit_z); if (caldata->err_m) - _gwy_delaunay_mesh_free(caldata->err_m); + _gwy_delaunay_mesh_free(caldata->err_m); if (caldata->unc_m) - _gwy_delaunay_mesh_free(caldata->unc_m); - //_gwy_delaunay_vertex_free(caldata->err_m); - //_gwy_delaunay_vertex_free(caldata->unc_m); + _gwy_delaunay_mesh_free(caldata->unc_m); g_free(caldata->x); g_free(caldata->y); @@ -538,8 +536,8 @@ * * Returns lateral SI unit of calibration data * - * Returns: SI unit corresponding to the lateral (Y) dimension of the calibration data. - * Its reference count is not incremented. + * Returns: SI unit corresponding to the lateral (Y) dimension of the + * calibration data. Its reference count is not incremented. * * Since: 2.23 **/ @@ -561,8 +559,8 @@ * * Returns value SI unit of calibration data * - * Returns: SI unit corresponding to the "height" (Z) dimension of calibration data. - * Its reference count is not incremented. + * Returns: SI unit corresponding to the "height" (Z) dimension of calibration + * data. Its reference count is not incremented. * * Since: 2.23 **/ @@ -886,7 +884,7 @@ } /** - * gwy_caldata_get_range: + * gwy_caldata_set_range: * @caldata: Calibration data. * @xfrom: x minimum * @xto: x maximum diff -Nru gwyddion-2.46/libprocess/gwycalibration.c gwyddion-2.47/libprocess/gwycalibration.c --- gwyddion-2.46/libprocess/gwycalibration.c 2016-02-22 15:05:27.000000000 +0000 +++ gwyddion-2.47/libprocess/gwycalibration.c 2016-10-21 11:58:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwycalibration.c 15598 2013-11-11 12:33:32Z yeti-dn $ + * @(#) $Id: gwycalibration.c 19108 2016-10-21 08:50:43Z yeti-dn $ * Copyright (C) 2010,2011 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -140,7 +140,7 @@ } /** - * gwy_calibration_get_npoints: + * gwy_calibration_get_ndata: * @calibration: A calibration. * * Returns the number of points in a calibration. @@ -155,12 +155,9 @@ g_return_val_if_fail(GWY_IS_CALIBRATION(calibration), 0); if (calibration->caldata) return gwy_caldata_get_ndata(calibration->caldata); - else return 0; + return 0; } - - - void _gwy_calibration_class_setup_presets(void) { diff -Nru gwyddion-2.46/libprocess/gwyprocess.c gwyddion-2.47/libprocess/gwyprocess.c --- gwyddion-2.46/libprocess/gwyprocess.c 2016-02-22 16:38:11.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocess.c 2016-10-19 12:56:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyprocess.c 18320 2016-02-22 16:38:11Z yeti-dn $ + * @(#) $Id: gwyprocess.c 19101 2016-10-19 12:56:46Z yeti-dn $ * Copyright (C) 2003-2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -73,6 +73,7 @@ _gwy_cdline_class_setup_presets(); _gwy_grain_value_class_setup_presets(); + _gwy_shape_fit_preset_class_setup_presets(); _gwy_calibration_class_setup_presets(); gwy_process_import_fftw_wisdom(); } diff -Nru gwyddion-2.46/libprocess/gwyprocessenums.c gwyddion-2.47/libprocess/gwyprocessenums.c --- gwyddion-2.46/libprocess/gwyprocessenums.c 2016-09-13 08:39:07.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocessenums.c 2016-10-31 16:19:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyprocessenums.c 18938 2016-09-09 18:36:02Z yeti-dn $ + * @(#) $Id: gwyprocessenums.c 19145 2016-10-31 16:19:12Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -257,6 +257,13 @@ return entries; } +/** + * gwy_correlation_type_get_enum: + * + * Returns #GwyEnum for #GwyCorrelationType enum type. + * + * Returns: %NULL-terminated #GwyEnum which must not be modified nor freed. + **/ const GwyEnum* gwy_correlation_type_get_enum(void) { @@ -604,6 +611,41 @@ } /** + * GwyTipType: + * @GWY_TIP_PYRAMID: N-sided pyramidal tip. + * @GWY_TIP_PYRAMIDE: Legacy name for %GWY_TIP_PYRAMID. + * @GWY_TIP_CONTACT: Four-sided pyramidal tip. + * @GWY_TIP_NONCONTACT: Three-sided pyramidal tip. + * @GWY_TIP_DELTA: Delta function (single-pixel tip). + * @GWY_TIP_PARABOLA: Parabolic tip. (Since 2.45) + * @GWY_TIP_CONE: Conical tip. (Since 2.45) + * @GWY_TIP_ELLPARABOLA: Elliptical parabola tip. (Since 2.47) + * + * Type of tip shape presets. + **/ + +/** + * GwyTipParamType: + * @GWY_TIP_PARAM_HEIGHT: Total tip height. This is used only in the delta + * function tip; for all others it is implied. + * @GWY_TIP_PARAM_RADIUS: Radius of curvature of the tip apex. + * @GWY_TIP_PARAM_ROTATION: Rotation angle. + * @GWY_TIP_PARAM_NSIDES: Number of sides for pyramidal tips. + * @GWY_TIP_PARAM_SLOPE: Half-angle of the apex (complement of the side slope + * for straight sides). + * @GWY_TIP_PARAM_ANISOTROPY: Ratio between larger and smaller tip width in + * two orthotonal directions. + * + * Type of tip model preset parameter. + * + * This enum is used with the new tip preset functions + * gwy_tip_model_get_preset_params(), gwy_tip_model_preset_create(), + * gwy_tip_model_preset_create_for_zrange(). + * + * Since: 2.47 + **/ + +/** * GwyMinMaxFilterType: * @GWY_MIN_MAX_FILTER_MINIMUM: Minimum filter, i.e. minimum of the surrounding * values. diff -Nru gwyddion-2.46/libprocess/gwyprocessenums.h gwyddion-2.47/libprocess/gwyprocessenums.h --- gwyddion-2.46/libprocess/gwyprocessenums.h 2016-09-13 08:39:07.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocessenums.h 2016-10-18 08:13:27.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyprocessenums.h 18938 2016-09-09 18:36:02Z yeti-dn $ + * @(#) $Id: gwyprocessenums.h 19080 2016-10-14 13:59:02Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -146,15 +146,28 @@ } GwyWindowingType; typedef enum { - GWY_TIP_PYRAMID = 0, - GWY_TIP_PYRAMIDE = GWY_TIP_PYRAMID, - GWY_TIP_CONTACT = 1, - GWY_TIP_NONCONTACT = 2, - GWY_TIP_DELTA = 3, - GWY_TIP_PARABOLA = 4, - GWY_TIP_CONE = 5, + GWY_TIP_PYRAMID = 0, + GWY_TIP_PYRAMIDE = GWY_TIP_PYRAMID, + GWY_TIP_CONTACT = 1, + GWY_TIP_NONCONTACT = 2, + GWY_TIP_DELTA = 3, + GWY_TIP_PARABOLA = 4, + GWY_TIP_CONE = 5, + GWY_TIP_ELLPARABOLA = 6, } GwyTipType; +/* The first three are the direct arguments of the old functions and the rest + * are additional parameters, always passed in a full-sized array at fixed + * positions equal to type-3. */ +typedef enum { + GWY_TIP_PARAM_HEIGHT = 0, + GWY_TIP_PARAM_RADIUS = 1, + GWY_TIP_PARAM_ROTATION = 2, + GWY_TIP_PARAM_NSIDES = 3, + GWY_TIP_PARAM_SLOPE = 4, + GWY_TIP_PARAM_ANISOTROPY = 5, +} GwyTipParamType; + typedef enum { GWY_CORRELATION_NORMAL = 0, GWY_CORRELATION_FFT = 1, diff -Nru gwyddion-2.46/libprocess/gwyprocess.h gwyddion-2.47/libprocess/gwyprocess.h --- gwyddion-2.46/libprocess/gwyprocess.h 2016-08-15 10:11:16.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocess.h 2016-10-31 08:48:20.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyprocess.h 18835 2016-08-15 10:11:16Z yeti-dn $ + * @(#) $Id: gwyprocess.h 19139 2016-10-31 08:48:13Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include diff -Nru gwyddion-2.46/libprocess/gwyprocessinternal.h gwyddion-2.47/libprocess/gwyprocessinternal.h --- gwyddion-2.46/libprocess/gwyprocessinternal.h 2016-02-22 16:34:18.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocessinternal.h 2016-10-19 12:56:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwyprocessinternal.h 18317 2016-02-22 16:34:17Z yeti-dn $ + * @(#) $Id: gwyprocessinternal.h 19101 2016-10-19 12:56:46Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -63,6 +63,9 @@ G_GNUC_INTERNAL void _gwy_calibration_class_setup_presets(void); +G_GNUC_INTERNAL +void _gwy_shape_fit_preset_class_setup_presets(void); + struct _GwySurfacePrivate { GwySIUnit *si_unit_xy; GwySIUnit *si_unit_z; diff -Nru gwyddion-2.46/libprocess/gwyprocesstypes.c gwyddion-2.47/libprocess/gwyprocesstypes.c --- gwyddion-2.46/libprocess/gwyprocesstypes.c 2016-09-13 08:41:34.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocesstypes.c 2016-11-03 20:58:09.000000000 +0000 @@ -288,12 +288,33 @@ { GWY_TIP_DELTA, "GWY_TIP_DELTA", "delta" }, { GWY_TIP_PARABOLA, "GWY_TIP_PARABOLA", "parabola" }, { GWY_TIP_CONE, "GWY_TIP_CONE", "cone" }, + { GWY_TIP_ELLPARABOLA, "GWY_TIP_ELLPARABOLA", "ellparabola" }, { 0, NULL, NULL } }; etype = g_enum_register_static("GwyTipType", values); } return etype; } + +GType +gwy_tip_param_type_get_type(void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = { + { GWY_TIP_PARAM_HEIGHT, "GWY_TIP_PARAM_HEIGHT", "height" }, + { GWY_TIP_PARAM_RADIUS, "GWY_TIP_PARAM_RADIUS", "radius" }, + { GWY_TIP_PARAM_ROTATION, "GWY_TIP_PARAM_ROTATION", "rotation" }, + { GWY_TIP_PARAM_NSIDES, "GWY_TIP_PARAM_NSIDES", "nsides" }, + { GWY_TIP_PARAM_SLOPE, "GWY_TIP_PARAM_SLOPE", "slope" }, + { GWY_TIP_PARAM_ANISOTROPY, "GWY_TIP_PARAM_ANISOTROPY", "anisotropy" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static("GwyTipParamType", values); + } + return etype; +} GType gwy_correlation_type_get_type(void) diff -Nru gwyddion-2.46/libprocess/gwyprocesstypes.h gwyddion-2.47/libprocess/gwyprocesstypes.h --- gwyddion-2.46/libprocess/gwyprocesstypes.h 2016-09-13 08:41:34.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyprocesstypes.h 2016-10-24 09:00:36.000000000 +0000 @@ -53,6 +53,9 @@ GType gwy_tip_type_get_type(void) G_GNUC_CONST; #define GWY_TYPE_TIP_TYPE (gwy_tip_type_get_type()) +GType gwy_tip_param_type_get_type(void) G_GNUC_CONST; +#define GWY_TYPE_TIP_PARAM_TYPE (gwy_tip_param_type_get_type()) + GType gwy_correlation_type_get_type(void) G_GNUC_CONST; #define GWY_TYPE_CORRELATION_TYPE (gwy_correlation_type_get_type()) diff -Nru gwyddion-2.46/libprocess/gwyshapefitpreset.c gwyddion-2.47/libprocess/gwyshapefitpreset.c --- gwyddion-2.46/libprocess/gwyshapefitpreset.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyshapefitpreset.c 2016-11-15 08:26:23.000000000 +0000 @@ -0,0 +1,3160 @@ +/* + * @(#) $Id: gwyshapefitpreset.c 19259 2016-11-15 08:26:23Z yeti-dn $ + * Copyright (C) 2016 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 "gwyprocessinternal.h" + +enum { NREDLIM = 4096 }; + +/* Lower symmetric part indexing */ +/* i MUST be greater or equal than j */ +#define SLi(a, i, j) a[(i)*((i) + 1)/2 + (j)] + +#define DECLARE_SECONDARY(funcname,name) \ + static gdouble funcname##_calc_##name (const gdouble *param); \ + static gdouble funcname##_calc_err_##name(const gdouble *param, \ + const gdouble *param_err, \ + const gdouble *correl); + +#define DECLARE_SHAPE_FUNC(name) \ + static gdouble name##_func(gdouble x, \ + gdouble y, \ + const gdouble *param); \ + static gdouble name##_fitfunc(guint i, \ + const gdouble *param, \ + gpointer user_data, \ + gboolean *fres) \ + { \ + const GwyXYZ *xyz = ((const ShapeFitPreset*)user_data)->xyz; \ + *fres = TRUE; \ + return name##_func(xyz[i].x, xyz[i].y, param) - xyz[i].z; \ + } \ + static gboolean name##_estimate(const GwyXYZ *xyz, \ + guint n, \ + gdouble *param, \ + FitShapeEstimateCache *estimcache); \ + static gboolean name##_init(const GwyXYZ *xyz, \ + guint n, \ + gdouble *param, \ + FitShapeEstimateCache *estimcache); + +/* XXX: This is a dirty trick assuming sizeof(FitShapeSecondary) > sizeof(NULL) + * so that we get zero nsecondary when name##_secondary is defined to NULL + * and correct array size otherwise. It is safe because FitShapeSecondary is + * a struct that contains at least two pointers plus other stuff, but it is + * dirty anyway. Static code analysis tends to dislike it. */ +#define SHAPE_FUNC_ITEM(name) \ + &name##_func, &name##_fitfunc, &name##_estimate, &name##_init, \ + G_N_ELEMENTS(name##_params), \ + sizeof(name##_secondary)/sizeof(FitShapeSecondary), \ + name##_params, \ + name##_secondary + +typedef struct { + gboolean have_mean; + gboolean have_circle; + gboolean have_zrange; + gboolean have_zstats; + /* Plain mean values */ + gdouble xm; + gdouble ym; + /* Circumscribed circle. */ + gdouble xc; + gdouble yc; + gdouble r; + /* Value range. */ + gdouble zmin; + gdouble zmax; + /* Simple value stats. */ + gdouble zmean; + gdouble zrms; + gdouble zskew; +} FitShapeEstimateCache; + +typedef gdouble (*FitShapeXYFunc)(gdouble x, gdouble y, + const gdouble *param); + +typedef gboolean (*FitShapeEstimate)(const GwyXYZ *xyz, + guint n, + gdouble *param, + FitShapeEstimateCache *estimcache); + +typedef gdouble (*FitShapeCalcParam)(const gdouble *param); +typedef gdouble (*FitShapeCalcError)(const gdouble *param, + const gdouble *param_err, + const gdouble *correl); + +typedef struct { + const char *name; + gint power_xy; + gint power_z; + GwyNLFitParamFlags flags; +} FitShapeParam; + +typedef struct { + const char *name; + gint power_xy; + gint power_z; + GwyNLFitParamFlags flags; + FitShapeCalcParam calc; + FitShapeCalcError calc_err; +} FitShapeSecondary; + +typedef struct { + const gchar *name; + gboolean needs_same_units; + FitShapeXYFunc function; + GwyNLFitIdxFunc fit_function; + FitShapeEstimate estimate; + FitShapeEstimate initialise; + guint nparams; + guint nsecondary; + const FitShapeParam *param; + const FitShapeSecondary *secondary; +} FitShapeFunc; + +struct _GwyShapeFitPresetPrivate { + const FitShapeFunc *builtin; + /* Context for the opaque function during fitting. */ + const GwyXYZ *xyz; +}; + +typedef struct _GwyShapeFitPresetPrivate ShapeFitPreset; + +DECLARE_SHAPE_FUNC(grating); +DECLARE_SHAPE_FUNC(grating3); +DECLARE_SHAPE_FUNC(holes); +DECLARE_SHAPE_FUNC(sphere); +DECLARE_SHAPE_FUNC(cylinder); +DECLARE_SHAPE_FUNC(gaussian); +DECLARE_SHAPE_FUNC(lorentzian); +DECLARE_SHAPE_FUNC(pyramidx); +DECLARE_SHAPE_FUNC(parbump); +DECLARE_SHAPE_FUNC(pring); + +DECLARE_SECONDARY(grating3, h); +DECLARE_SECONDARY(grating3, L0); +DECLARE_SECONDARY(grating3, L1); +DECLARE_SECONDARY(grating3, L2); +DECLARE_SECONDARY(grating3, L3); +DECLARE_SECONDARY(holes, wouter); +DECLARE_SECONDARY(holes, winner); +DECLARE_SECONDARY(holes, R); +DECLARE_SECONDARY(sphere, R); +DECLARE_SECONDARY(cylinder, R); +DECLARE_SECONDARY(gaussian, sigma1); +DECLARE_SECONDARY(gaussian, sigma2); +DECLARE_SECONDARY(lorentzian, b1); +DECLARE_SECONDARY(lorentzian, b2); + +static const FitShapeParam grating_params[] = { + { "L", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "h", 0, 1, 0, }, + { "p", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "z0", 0, 1, 0, }, + { "x0", 1, 0, 0, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "c", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, +}; + +#define grating_secondary NULL + +static const FitShapeParam grating3_params[] = { + { "L", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "h1", 0, 1, GWY_NLFIT_PARAM_ABSVAL, }, + { "h2", 0, 1, GWY_NLFIT_PARAM_ABSVAL, }, + { "h3", 0, 1, GWY_NLFIT_PARAM_ABSVAL, }, + { "p", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "q1", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "q2", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "q3", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "z0", 0, 1, 0, }, + { "x0", 1, 0, 0, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, +}; + +static const FitShapeSecondary grating3_secondary[] = { + { "h", 0, 1, 0, grating3_calc_h, grating3_calc_err_h, }, + { "L0", 1, 0, 0, grating3_calc_L0, grating3_calc_err_L0, }, + { "L1", 1, 0, 0, grating3_calc_L1, grating3_calc_err_L1, }, + { "L2", 1, 0, 0, grating3_calc_L2, grating3_calc_err_L2, }, + { "L3", 1, 0, 0, grating3_calc_L3, grating3_calc_err_L3, }, +}; + +static const FitShapeParam holes_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "L", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "p", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "h", 0, 1, 0, }, + { "s", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "r", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, +}; + +static const FitShapeSecondary holes_secondary[] = { + { "wouter", 1, 0, 0, holes_calc_wouter, holes_calc_err_wouter, }, + { "winner", 1, 0, 0, holes_calc_winner, holes_calc_err_winner, }, + { "R", 1, 0, 0, holes_calc_R, holes_calc_err_R, }, +}; + +static const FitShapeParam sphere_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "C", 0, -1, 0, }, +}; + +static const FitShapeSecondary sphere_secondary[] = { + { "R", 0, 1, 0, sphere_calc_R, sphere_calc_err_R, }, +}; + +static const FitShapeParam cylinder_params[] = { + { "x0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "C", 0, -1, 0, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "b∥", -1, 1, 0, }, +}; + +static const FitShapeSecondary cylinder_secondary[] = { + { "R", 0, 1, 0, cylinder_calc_R, cylinder_calc_err_R, }, +}; + +static const FitShapeParam gaussian_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "h", 0, 1, 0, }, + { "σmean", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "a", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "bx", -1, 1, 0, }, + { "by", -1, 1, 0, }, +}; + +static const FitShapeSecondary gaussian_secondary[] = { + { "σ1", 1, 0, 0, gaussian_calc_sigma1, gaussian_calc_err_sigma1, }, + { "σ2", 1, 0, 0, gaussian_calc_sigma2, gaussian_calc_err_sigma2, }, +}; + +static const FitShapeParam lorentzian_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "h", 0, 1, 0, }, + { "βmean", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "a", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "bx", -1, 1, 0, }, + { "by", -1, 1, 0, }, +}; + +static const FitShapeSecondary lorentzian_secondary[] = { + { "β1", 1, 0, 0, lorentzian_calc_b1, lorentzian_calc_err_b1, }, + { "β2", 1, 0, 0, lorentzian_calc_b2, lorentzian_calc_err_b2, }, +}; + +static const FitShapeParam pyramidx_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "h", 0, 1, 0, }, + { "L", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "a", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "bx", -1, 1, 0, }, + { "by", -1, 1, 0, }, +}; + +#define pyramidx_secondary NULL + +static const FitShapeParam parbump_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "h", 0, 1, 0, }, + { "Cmean", -1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "a", 0, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "φ", 0, 0, GWY_NLFIT_PARAM_ANGLE, }, + { "bx", -1, 1, 0, }, + { "by", -1, 1, 0, }, +}; + +#define parbump_secondary NULL + +static const FitShapeParam pring_params[] = { + { "x0", 1, 0, 0, }, + { "y0", 1, 0, 0, }, + { "z0", 0, 1, 0, }, + { "R", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "w", 1, 0, GWY_NLFIT_PARAM_ABSVAL, }, + { "h", 0, 1, 0, }, + { "s", 0, 1, 0, }, + { "bx", -1, 1, 0, }, + { "by", -1, 1, 0, }, +}; + +#define pring_secondary NULL + +static void enforce_param_flags (const FitShapeFunc *builtin, + gdouble *param); +static gdouble enforce_secondary_flags(const FitShapeFunc *builtin, + guint i, + gdouble value); +static GwyShapeFitPreset* create_static_preset (const FitShapeFunc *function); +static void reduce_data_size (const GwyXYZ *xyzsrc, + guint nsrc, + GwySurface *dest); + +G_DEFINE_TYPE(GwyShapeFitPreset, gwy_shape_fit_preset, GWY_TYPE_RESOURCE) + +static const FitShapeFunc functions[] = { + { N_("Grating (simple)"), FALSE, SHAPE_FUNC_ITEM(grating), }, + { N_("Grating (3-level)"), FALSE, SHAPE_FUNC_ITEM(grating3), }, + { N_("Holes"), FALSE, SHAPE_FUNC_ITEM(holes), }, + { N_("Sphere"), TRUE, SHAPE_FUNC_ITEM(sphere), }, + { N_("Cylinder (lying)"), TRUE, SHAPE_FUNC_ITEM(cylinder), }, + { N_("Gaussian"), FALSE, SHAPE_FUNC_ITEM(gaussian), }, + { N_("Lorentzian"), FALSE, SHAPE_FUNC_ITEM(lorentzian), }, + { N_("Pyramid (diamond)"), FALSE, SHAPE_FUNC_ITEM(pyramidx), }, + { N_("Parabolic bump"), FALSE, SHAPE_FUNC_ITEM(parbump), }, + { N_("Ring"), FALSE, SHAPE_FUNC_ITEM(pring), }, +}; + +static void +gwy_shape_fit_preset_class_init(GwyShapeFitPresetClass *klass) +{ + GwyResourceClass *parent_class, *res_class = GWY_RESOURCE_CLASS(klass); + + g_type_class_add_private(klass, sizeof(ShapeFitPreset)); + + parent_class = GWY_RESOURCE_CLASS(gwy_shape_fit_preset_parent_class); + res_class->item_type = *gwy_resource_class_get_item_type(parent_class); + + res_class->item_type.type = G_TYPE_FROM_CLASS(klass); + res_class->name = "shapefitpresets"; + res_class->inventory = gwy_inventory_new(&res_class->item_type); + gwy_inventory_forget_order(res_class->inventory); +} + +static void +gwy_shape_fit_preset_init(GwyShapeFitPreset *preset) +{ + gwy_debug_objects_creation(G_OBJECT(preset)); + preset->priv = G_TYPE_INSTANCE_GET_PRIVATE(preset, + GWY_TYPE_SHAPE_FIT_PRESET, + ShapeFitPreset); +} + +void +_gwy_shape_fit_preset_class_setup_presets(void) +{ + GwyResourceClass *klass; + GwyShapeFitPreset *preset; + guint i; + + /* Force class instantiation, this function is called before it's first + * referenced. */ + klass = g_type_class_ref(GWY_TYPE_SHAPE_FIT_PRESET); + + for (i = 0; i < G_N_ELEMENTS(functions); i++) { + preset = create_static_preset(functions + i); + gwy_inventory_insert_item(klass->inventory, preset); + g_object_unref(preset); + } + gwy_inventory_restore_order(klass->inventory); + gwy_inventory_set_default_item_name(klass->inventory, functions[0].name); + + /* The presets added a reference so we can safely unref it again */ + g_type_class_unref(klass); +} + +/** + * gwy_shape_fit_preset_needs_same_units: + * @preset: A 3D geometrical shape fitting function. + * + * Reports if a 3D geometrical shape fitter preset requires the same lateral + * and value units. + * + * For instance, fitting a sphere is meaningless if the horizontal and + * vertical radii would be different physical quantities. + * + * Returns: %TRUE if the function requires the same lateral and value units. + * + * Since: 2.47 + **/ +gboolean +gwy_shape_fit_preset_needs_same_units(GwyShapeFitPreset *preset) +{ + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), FALSE); + return preset->priv->builtin->needs_same_units; +} + +/** + * gwy_shape_fit_preset_get_nparams: + * @preset: A 3D geometrical shape fitting function. + * + * Reports the number of parameters of a 3D geometrical shape fitter preset. + * + * Returns: The number of function parameters. + * + * Since: 2.47 + **/ +guint +gwy_shape_fit_preset_get_nparams(GwyShapeFitPreset* preset) +{ + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0); + return preset->priv->builtin->nparams; +} + +/** + * gwy_shape_fit_preset_get_param_name: + * @preset: A 3D geometrical shape fitting function. + * @i: Parameter number. + * + * Gets the name of a fitting parameter of a 3D geometrical shape fitter + * preset. + * + * The name may contain Pango markup. + * + * Returns: The name of the @i-th parameter. + * + * Since: 2.47 + **/ +const gchar* +gwy_shape_fit_preset_get_param_name(GwyShapeFitPreset* preset, + guint i) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), ""); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nparams, ""); + + return builtin->param[i].name; +} + +/** + * gwy_shape_fit_preset_get_param_flags: + * @preset: A 3D geometrical shape fitting function. + * @i: Parameter number. + * + * Gets the properties of a fitting parameter of a 3D geometrical shape fitter + * preset. + * + * Returns: The flags of the @i-th parameter. + * + * Since: 2.47 + **/ +GwyNLFitParamFlags +gwy_shape_fit_preset_get_param_flags(GwyShapeFitPreset* preset, + guint i) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nparams, 0); + + return builtin->param[i].flags; +} + +/** + * gwy_shape_fit_preset_get_param_units: + * @preset: A 3D geometrical shape fitting function. + * @i: Parameter number. + * @siunit_xy: SI unit of lateral coordinates. + * @siunit_z: SI unit of values. + * + * Derives the SI unit of a fitting parameter from the units of abscissa and + * ordinate. + * + * Note that angle parameters are by default in radians and thus unitless. + * If you want to convert them to degrees for presentation to the user you must + * do it explicitly. + * + * Returns: A newly created #GwySIUnit with the units of the @i-th parameter. + * + * Since: 2.47 + **/ +GwySIUnit* +gwy_shape_fit_preset_get_param_units(GwyShapeFitPreset *preset, + guint i, + GwySIUnit *siunit_xy, + GwySIUnit *siunit_z) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), NULL); + g_return_val_if_fail(GWY_IS_SI_UNIT(siunit_xy), NULL); + g_return_val_if_fail(GWY_IS_SI_UNIT(siunit_z), NULL); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nparams, NULL); + + return gwy_si_unit_power_multiply(siunit_xy, builtin->param[i].power_xy, + siunit_z, builtin->param[i].power_z, + NULL); +} + +/** + * gwy_shape_fit_preset_get_nsecondary: + * @preset: A 3D geometrical shape fitting function. + * + * Reports the number of secondary (derived) quantities of a 3D geometrical + * shape fitter preset. + * + * Returns: The number of secondary quantities. + * + * Since: 2.47 + **/ +guint +gwy_shape_fit_preset_get_nsecondary(GwyShapeFitPreset *preset) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0); + builtin = preset->priv->builtin; + return builtin->nsecondary; +} + +/** + * gwy_shape_fit_preset_get_secondary_name: + * @preset: A 3D geometrical shape fitting function. + * @i: Secondary quantity number. + * + * Gets the name of a secondary (derived) quantity of a 3D geometrical shape + * fitter preset. + * + * The name may contain Pango markup. + * + * Returns: The name of the @i-th secondary quantity. + * + * Since: 2.47 + **/ +const gchar* +gwy_shape_fit_preset_get_secondary_name(GwyShapeFitPreset *preset, + guint i) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), ""); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nsecondary, ""); + return builtin->secondary[i].name; +} + +/** + * gwy_shape_fit_preset_get_secondary_flags: + * @preset: A 3D geometrical shape fitting function. + * @i: Secondary quantity number. + * + * Gets the properties of a secondary (derived) quantity of a 3D geometrical + * shape fitter preset. + * + * Returns: The flags of the @i-th secondary quantity. + * + * Since: 2.47 + **/ +GwyNLFitParamFlags +gwy_shape_fit_preset_get_secondary_flags(GwyShapeFitPreset *preset, + guint i) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nsecondary, 0); + return builtin->secondary[i].flags; +} + +/** + * gwy_shape_fit_preset_get_secondary_value: + * @preset: A 3D geometrical shape fitting function. + * @i: Secondary quantity number. + * @param: Values of fitting parameters for function @preset. + * + * Calculates the value of a secondary (derived) quantity of a 3D geometrical + * shape fitter preset. + * + * Returns: The value of the @i-th secondary quantity. + * + * Since: 2.47 + **/ +gdouble +gwy_shape_fit_preset_get_secondary_value(GwyShapeFitPreset *preset, + guint i, + const gdouble *param) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0.0); + g_return_val_if_fail(param, 0.0); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nsecondary, 0.0); + return enforce_secondary_flags(builtin, i, + builtin->secondary[i].calc(param)); +} + +/** + * gwy_shape_fit_preset_get_secondary_error: + * @preset: A 3D geometrical shape fitting function. + * @i: Secondary quantity number. + * @param: Values of fitting parameters for function @preset. + * @error: Values of errors of fitting parameters for function @preset. + * @correl: Parameter correlation matrix for function @preset (passed as lower + * triangular matrix). + * + * Calculates the error of a secondary (derived) quantity of a 3D geometrical + * shape fitter preset. + * + * The error is calculated by numerical differentiation of the function and + * applying the law of error propagation. + * + * Returns: The error of the @i-th secondary quantity. + * + * Since: 2.47 + **/ +gdouble +gwy_shape_fit_preset_get_secondary_error(GwyShapeFitPreset *preset, + guint i, + const gdouble *param, + const gdouble *error, + const gdouble *correl) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0.0); + g_return_val_if_fail(param, 0.0); + g_return_val_if_fail(error, 0.0); + g_return_val_if_fail(correl, 0.0); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nsecondary, 0.0); + return builtin->secondary[i].calc_err(param, error, correl); +} + +/** + * gwy_shape_fit_preset_get_secondary_units: + * @preset: A 3D geometrical shape fitting function. + * @i: Secondary quantity number. + * @siunit_xy: SI unit of lateral coordinates. + * @siunit_z: SI unit of values. + * + * Derives the SI unit of a secondary (derived) quantity from the units of + * abscissa and ordinate. + * + * Note that angle parameters are by default in radians and thus unitless. + * If you want to convert them to degrees for presentation to the user you must + * do it explicitly. + * + * Returns: A newly created #GwySIUnit with the units of the @i-th secondary + * quantity. + * + * Since: 2.47 + **/ +GwySIUnit* +gwy_shape_fit_preset_get_secondary_units(GwyShapeFitPreset *preset, + guint i, + GwySIUnit *siunit_xy, + GwySIUnit *siunit_z) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), NULL); + g_return_val_if_fail(GWY_IS_SI_UNIT(siunit_xy), NULL); + g_return_val_if_fail(GWY_IS_SI_UNIT(siunit_z), NULL); + builtin = preset->priv->builtin; + g_return_val_if_fail(i < builtin->nsecondary, NULL); + + return gwy_si_unit_power_multiply(siunit_xy, builtin->secondary[i].power_xy, + siunit_z, builtin->secondary[i].power_z, + NULL); +} + +/** + * gwy_shape_fit_preset_setup: + * @preset: A 3D geometrical shape fitting function. + * @points: Array of XYZ data to fit. + * @n: Number of data points. + * @params: The array to fill with initialised parameter values. + * + * Initialises parameter values of a 3D geometrical shape fitter preset. + * + * The parameters are quickly set to reasonable values that roughly correspond + * to the ranges of the data points. They may serve as starting values for + * manual experimentation but often will not be good enough as initial + * parameter estimates for the fit. See also gwy_shape_fit_preset_guess(). + * + * Since: 2.47 + **/ +void +gwy_shape_fit_preset_setup(GwyShapeFitPreset *preset, + const GwyXYZ *points, + guint n, + gdouble *params) +{ + FitShapeEstimateCache estimcache; + const FitShapeFunc *builtin; + + g_return_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset)); + g_return_if_fail(points); + g_return_if_fail(params); + builtin = preset->priv->builtin; + + gwy_clear(&estimcache, 1); + /* The function has a return value but it should always succeed. */ + builtin->initialise(points, n, params, &estimcache); + enforce_param_flags(builtin, params); +} + +/** + * gwy_shape_fit_preset_guess: + * @preset: A 3D geometrical shape fitting function. + * @points: Array of XYZ data to fit. + * @n: Number of data points. + * @params: The array to fill with initialised parameter values. + * + * Estimates parameter values of a 3D geometrical shape fitter preset. + * + * This function tries to find initial parameter estimates that are good enough + * for the fit the converge. Of course, it is not guaranteed it always + * succeeds. For some shapes it can be noticeably slower than + * gwy_shape_fit_preset_setup(). + * + * The estimate may not be deterministic. For large point sets some estimates + * are carried out using a randomly selected subset of points. + * + * If the function cannot find how the data points could correspond to the + * preset geometrical shape it return %FALSE. Parameter values are still set. + * However, in this case they may be no better than from + * gwy_shape_fit_preset_setup(). + * + * Returns: %TRUE if the estimation succeeded, %FALSE if it failed. + * + * Since: 2.47 + **/ +gboolean +gwy_shape_fit_preset_guess(GwyShapeFitPreset *preset, + const GwyXYZ *points, + guint n, + gdouble *params) +{ + FitShapeEstimateCache estimcache; + const FitShapeFunc *builtin; + gboolean ok; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), FALSE); + g_return_val_if_fail(points, FALSE); + g_return_val_if_fail(params, FALSE); + builtin = preset->priv->builtin; + + gwy_clear(&estimcache, 1); + ok = builtin->estimate(points, n, params, &estimcache); + enforce_param_flags(builtin, params); + + return ok; +} + +/** + * gwy_shape_fit_preset_get_value: + * @preset: A 3D geometrical shape fitting function. + * @x: X-coordinate. + * @y: Y-coordinate. + * @params: Fitting parameter values. + * + * Calculates the value of a 3D geometrical shape fitter preset in a single + * point. + * + * If you want multiple values you should use either + * gwy_shape_fit_preset_calculate_z() or gwy_shape_fit_preset_calculate_xyz() + * instead of calling this function in a cycle. + * + * Returns: The calculated function value in (@x,@y). + * + * Since: 2.47 + **/ +gdouble +gwy_shape_fit_preset_get_value(GwyShapeFitPreset *preset, + gdouble x, + gdouble y, + const gdouble *params) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), 0.0); + g_return_val_if_fail(params, 0.0); + builtin = preset->priv->builtin; + return builtin->function(x, y, params); +} + +/** + * gwy_shape_fit_preset_calculate_z: + * @preset: A 3D geometrical shape fitting function. + * @points: Array of @n XYZ data defining the lateral coordinates. + * @z: Array length @n to fill with calculated values. + * @n: Number of items in @points and @z. + * @params: Fitting parameter values. + * + * Calculates values of a 3D geometrical shape fitter preset in an array of + * points. + * + * The z-coordinates in @points are ignored. Only the lateral coordinates are + * used. + * + * See also gwy_shape_fit_preset_calculate_xyz(). + * + * Since: 2.47 + **/ +void +gwy_shape_fit_preset_calculate_z(GwyShapeFitPreset *preset, + const GwyXYZ *points, + gdouble *z, + guint n, + const gdouble *params) +{ + const FitShapeFunc *builtin; + FitShapeXYFunc func; + guint i; + + g_return_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset)); + g_return_if_fail(params); + if (!n) + return; + + g_return_if_fail(points); + g_return_if_fail(z); + builtin = preset->priv->builtin; + func = builtin->function; + for (i = 0; i < n; i++) + z[i] = func(points[i].x, points[i].y, params); +} + +/** + * gwy_shape_fit_preset_calculate_xyz: + * @preset: A 3D geometrical shape fitting function. + * @points: Array of @n XYZ data defining the lateral coordinates. The + * z-coordinates will be filled with the calculated values. + * @n: Number of items in @points. + * @params: Fitting parameter values. + * + * Calculates values of a 3D geometrical shape fitter preset in an array of + * points. + * + * See also gwy_shape_fit_preset_calculate_z(). + * + * Since: 2.47 + **/ +void +gwy_shape_fit_preset_calculate_xyz(GwyShapeFitPreset *preset, + GwyXYZ *points, + guint n, + const gdouble *params) +{ + const FitShapeFunc *builtin; + FitShapeXYFunc func; + guint i; + + g_return_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset)); + g_return_if_fail(params); + if (!n) + return; + + g_return_if_fail(points); + builtin = preset->priv->builtin; + func = builtin->function; + for (i = 0; i < n; i++) + points[i].z = func(points[i].x, points[i].y, params); +} + +/** + * gwy_shape_fit_preset_create_fitter: + * @preset: A 3D geometrical shape fitting function. + * + * Creates a non-linear least-squares fitter for a 3D geometrical shape. + * + * The created fitter will be of the opaque indexed data type, as created with + * gwy_math_nlfit_new_idx(). + * + * If you do not need to modify the fitter settings you can use + * gwy_shape_fit_preset_fit() directly with %NULL fitter. + * + * Returns: A newly created fitter for @preset. + * + * Since: 2.47 + **/ +GwyNLFitter* +gwy_shape_fit_preset_create_fitter(GwyShapeFitPreset *preset) +{ + const FitShapeFunc *builtin; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), NULL); + builtin = preset->priv->builtin; + return gwy_math_nlfit_new_idx(builtin->fit_function, NULL); +} + +/** + * gwy_shape_fit_preset_fit: + * @preset: A 3D geometrical shape fitting function. + * @fitter: A Marquardt-Levenberg nonlinear fitter already initialized for + * @preset's function, or %NULL. + * @points: Array of @n XYZ data defining the lateral coordinates and values + * to fit. + * @n: Number of items in @points. + * @params: Fitting parameters filled with initial estimates (the fitting + * starts from the provided values). + * @fixed_param: Which parameters should be treated as fixed (set + * corresponding element to %TRUE for them). May be %NULL if + * all parameters are free. + * @rss: Location to store the residual sum of squares, as returned by + * gwy_math_nlfit_fit_idx(), may be %NULL. + * + * Performs a non-linear least-squares fit with a 3D geometrical shape fitter. + * + * If you pass %NULL @fitter the function creates one for you and immediately + * performs the fit. If you want to modify the fitter settings beforehand or + * set callback functions create it using gwy_shape_fit_preset_create_fitter() + * and pass to this function. The fitter must be created for the same preset. + * + * Additional quantities such as parameter errors or the correlation matrix can + * be obtained from the fitter. See gwy_math_nlfit_fit_full() for details. + * + * Returns: Either @fitter itself, or a newly created fitter if it was %NULL. + * + * Since: 2.47 + **/ +GwyNLFitter* +gwy_shape_fit_preset_fit(GwyShapeFitPreset *preset, + GwyNLFitter *fitter, + const GwyXYZ *points, + guint n, + gdouble *params, + const gboolean *fixed_param, + gdouble *rss) +{ + ShapeFitPreset *priv; + const FitShapeFunc *builtin; + gdouble myrss; + + g_return_val_if_fail(GWY_IS_SHAPE_FIT_PRESET(preset), NULL); + g_return_val_if_fail(points, NULL); + g_return_val_if_fail(params, NULL); + if (!fitter) + fitter = gwy_shape_fit_preset_create_fitter(preset); + + priv = preset->priv; + priv->xyz = points; + builtin = priv->builtin; + myrss = gwy_math_nlfit_fit_idx_full(fitter, n, builtin->nparams, + params, fixed_param, NULL, priv); + priv->xyz = NULL; + enforce_param_flags(builtin, params); + if (rss) + *rss = myrss; + + return fitter; +} + +static void +enforce_param_flags(const FitShapeFunc *builtin, gdouble *param) +{ + guint i; + + for (i = 0; i < builtin->nparams; i++) { + GwyNLFitParamFlags flags = builtin->param[i].flags; + + if (flags & GWY_NLFIT_PARAM_ANGLE) + param[i] = fmod(param[i], 2.0*G_PI); + if (flags & GWY_NLFIT_PARAM_ABSVAL) + param[i] = fabs(param[i]); + } +} + +static gdouble +enforce_secondary_flags(const FitShapeFunc *builtin, guint i, gdouble value) +{ + GwyNLFitParamFlags flags; + + g_return_val_if_fail(i < builtin->nsecondary, value); + flags = builtin->secondary[i].flags; + + if (flags & GWY_NLFIT_PARAM_ANGLE) + value = fmod(value, 2.0*G_PI); + if (flags & GWY_NLFIT_PARAM_ABSVAL) + value = fabs(value); + + return value; +} + +static void +reduce_data_size(const GwyXYZ *xyzsrc, guint nsrc, GwySurface *dest) +{ + GwyRandGenSet *rngset = gwy_rand_gen_set_new(1); + guint ndest = gwy_surface_get_npoints(dest); + guint *redindex = gwy_rand_gen_set_choose_shuffle(rngset, 0, nsrc, ndest); + GwyXYZ *xyzdest = gwy_surface_get_data(dest); + guint i; + + for (i = 0; i < ndest; i++) + xyzdest[i] = xyzsrc[redindex[i]]; + + g_free(redindex); + gwy_rand_gen_set_free(rngset); +} + +static GwyShapeFitPreset* +create_static_preset(const FitShapeFunc *builtin) +{ + GwyShapeFitPreset *preset; + + preset = g_object_new(GWY_TYPE_SHAPE_FIT_PRESET, "is-const", TRUE, NULL); + preset->priv->builtin = builtin; + g_string_assign(GWY_RESOURCE(preset)->name, builtin->name); + + return preset; +} + +/** + * gwy_shape_fit_presets: + * + * Gets inventory with all the 3D geometric shape fitting presets. + * + * Returns: 3D geometric shape fitting preset inventory. + * + * Since: 2.47 + **/ +GwyInventory* +gwy_shape_fit_presets(void) +{ + GTypeClass *klass = g_type_class_peek(GWY_TYPE_SHAPE_FIT_PRESET); + return GWY_RESOURCE_CLASS(klass)->inventory; +} + +/************************************************************************** + * + * General estimator helpers and math support functions. + * + **************************************************************************/ + +#ifdef HAVE_SINCOS +#define _gwy_sincos sincos +#else +static inline void +_gwy_sincos(gdouble x, gdouble *s, gdouble *c) +{ + *s = sin(x); + *c = cos(x); +} +#endif + +/* cosh(x) - 1, safe for small arguments */ +static inline gdouble +gwy_coshm1(gdouble x) +{ + gdouble x2 = x*x; + if (x2 > 3e-5) + return cosh(x) - 1.0; + return x2*(0.5 + x2/24.0); +} + +#define DEFINE_PHI_CACHE(phi) \ + static gdouble phi##_last = 0.0, cphi_last = 1.0, sphi_last = 0.0 + +#define HANDLE_PHI_CACHE(phi) \ + do { \ + if (phi == phi##_last) { \ + cphi = cphi_last; \ + sphi = sphi_last; \ + } \ + else { \ + sincos(phi, &sphi, &cphi); \ + cphi_last = cphi; \ + sphi_last = sphi; \ + phi##_last = phi; \ + } \ + } while (0) + +/* Mean value of xy point cloud (not necessarily centre, that depends on + * the density). */ +static void +mean_x_y(const GwyXYZ *xyz, guint n, gdouble *pxm, gdouble *pym, + FitShapeEstimateCache *estimcache) +{ + gdouble xm = 0.0, ym = 0.0; + guint i; + + if (estimcache && estimcache->have_mean) { + gwy_debug("using cache %p", estimcache); + *pxm = estimcache->xm; + *pym = estimcache->ym; + return; + } + + if (!n) { + *pxm = *pym = 0.0; + return; + } + + for (i = 0; i < n; i++) { + xm += xyz[i].x; + ym += xyz[i].y; + } + + *pxm = xm/n; + *pym = ym/n; + + if (estimcache) { + gwy_debug("filling cache %p", estimcache); + estimcache->have_mean = TRUE; + estimcache->xm = *pxm; + estimcache->ym = *pym; + } +} + +/* Minimum and maximum of an array of values. */ +static void +range_z(const GwyXYZ *xyz, guint n, gdouble *pmin, gdouble *pmax, + FitShapeEstimateCache *estimcache) +{ + gdouble min, max; + guint i; + + if (estimcache && estimcache->have_zrange) { + gwy_debug("using cache %p", estimcache); + *pmin = estimcache->zmin; + *pmax = estimcache->zmax; + return; + } + + if (!n) { + *pmin = *pmax = 0.0; + return; + } + + min = max = xyz[0].z; + for (i = 1; i < n; i++) { + if (xyz[i].z < min) + min = xyz[i].z; + if (xyz[i].z > max) + max = xyz[i].z; + } + + *pmin = min; + *pmax = max; + + if (estimcache) { + gwy_debug("filling cache %p", estimcache); + estimcache->have_zrange = TRUE; + estimcache->zmin = *pmin; + estimcache->zmax = *pmax; + } +} + +/* Simple stats of an array of values. */ +static void +stat_z(const GwyXYZ *xyz, guint n, + gdouble *zmean, gdouble *zrms, gdouble *zskew, + FitShapeEstimateCache *estimcache) +{ + gdouble s = 0.0, s2 = 0.0, s3 = 0.0; + guint i; + + if (estimcache && estimcache->have_zstats) { + gwy_debug("using cache %p", estimcache); + if (zmean) + *zmean = estimcache->zmean; + if (zrms) + *zrms = estimcache->zrms; + if (zskew) + *zskew = estimcache->zskew; + return; + } + + if (!n) { + if (zmean) + *zmean = 0.0; + if (zrms) + *zrms = 0.0; + if (zskew) + *zskew = 0.0; + return; + } + + for (i = 0; i < n; i++) + s += xyz[i].z; + s /= n; + + for (i = 0; i < n; i++) { + gdouble d = xyz[i].z - s; + s2 += d*d; + s3 += d*d*d; + } + + if (s2) { + s2 = sqrt(s2/n); + s3 /= n*s2*s2*s2; + } + + if (zmean) + *zmean = s; + if (zrms) + *zrms = s2; + if (zskew) + *zskew = s3; + + if (estimcache) { + gwy_debug("filling cache %p", estimcache); + estimcache->have_zstats = TRUE; + estimcache->zmean = s; + estimcache->zrms = s2; + estimcache->zskew = s3; + } +} + +/* Approximately cicrumscribe a set of points by finding a containing + * octagon. */ +static void +circumscribe_x_y(const GwyXYZ *xyz, guint n, + gdouble *pxc, gdouble *pyc, gdouble *pr, + FitShapeEstimateCache *estimcache) +{ + gdouble min[4], max[4], r[4]; + guint i, j; + + if (estimcache && estimcache->have_circle) { + gwy_debug("using cache %p", estimcache); + *pxc = estimcache->xc; + *pyc = estimcache->yc; + *pr = estimcache->r; + return; + } + + if (!n) { + *pxc = *pyc = 0.0; + *pr = 1.0; + return; + } + + for (j = 0; j < 4; j++) { + min[j] = G_MAXDOUBLE; + max[j] = -G_MAXDOUBLE; + } + + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x, y = xyz[i].y; + gdouble t[4] = { x, x+y, y, y-x }; + + for (j = 0; j < 4; j++) { + if (t[j] < min[j]) + min[j] = t[j]; + if (t[j] > max[j]) + max[j] = t[j]; + } + } + + for (j = 0; j < 4; j++) { + r[j] = sqrt(10.0)/3.0*(max[j] - min[j]); + if (j % 2) + r[j] /= G_SQRT2; + } + + i = 0; + for (j = 1; j < 4; j++) { + if (r[j] > r[i]) + i = j; + } + + *pr = 0.5*r[i]; + if (i % 2) { + *pxc = (min[1] - min[3] + max[1] - max[3])/4.0; + *pyc = (min[1] + min[3] + max[1] + max[3])/4.0; + } + else { + *pxc = (min[0] + max[0])/2.0; + *pyc = (min[2] + max[2])/2.0; + } + + if (estimcache) { + gwy_debug("filling cache %p", estimcache); + estimcache->have_circle = TRUE; + estimcache->xc = *pxc; + estimcache->yc = *pyc; + estimcache->r = *pr; + } +} + +/* Project xyz point cloud to a line rotated by angle phi anti-clockwise + * from the horizontal line (x axis). */ +static gdouble +projection_to_line(const GwyXYZ *xyz, + guint n, + gdouble phi, + gdouble xc, gdouble yc, + GwyDataLine *mean_line, + GwyDataLine *rms_line, + guint *counts) +{ + guint res = gwy_data_line_get_res(mean_line); + gdouble *mean = gwy_data_line_get_data(mean_line); + gdouble *rms = rms_line ? gwy_data_line_get_data(rms_line) : NULL; + gdouble dx = gwy_data_line_get_real(mean_line)/res; + gdouble off = gwy_data_line_get_offset(mean_line); + gdouble c = cos(phi), s = sin(phi), total_ms = 0.0; + guint i, total_n = 0; + gint j; + + gwy_data_line_clear(mean_line); + gwy_clear(counts, res); + + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + x = x*c - y*s; + j = (gint)floor((x - off)/dx); + if (j >= 0 && j < res) { + mean[j] += xyz[i].z; + counts[j]++; + } + } + + for (j = 0; j < res; j++) { + if (counts[j]) { + mean[j] /= counts[j]; + } + } + + if (!rms_line) + return 0.0; + + gwy_data_line_clear(rms_line); + + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + x = x*c - y*s; + j = (gint)floor((x - off)/dx); + if (j >= 0 && j < res) + rms[j] += (xyz[i].z - mean[j])*(xyz[i].z - mean[j]); + } + + for (j = 0; j < res; j++) { + if (counts[j]) { + total_ms += rms[j]; + rms[j] = sqrt(rms[j]/counts[j]); + total_n += counts[j]; + } + } + + return sqrt(total_ms/total_n); +} + +/* Find direction along which projections capture best the shape, i.e. most + * variance remains in the line-averaged data. The returned angle is rotation + * of the axis anti-clockwise with respect to the x-axis. */ +static gdouble +estimate_projection_direction(const GwyXYZ *xyz, guint n, + FitShapeEstimateCache *estimcache) +{ + enum { NROUGH = 60, NFINE = 8 }; + + GwyDataLine *mean_line, *rms_line; + guint *counts; + gdouble xc, yc, r, phi, alpha0, alpha_step, rms; + gdouble best_rms = G_MAXDOUBLE, best_alpha = 0.0; + guint iter, i, ni, res; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + res = (guint)floor(0.8*sqrt(n) + 1.0); + + mean_line = gwy_data_line_new(res, 2.0*r, FALSE); + gwy_data_line_set_offset(mean_line, -r); + rms_line = gwy_data_line_new_alike(mean_line, FALSE); + counts = g_new(guint, res); + + for (iter = 0; iter < 6; iter++) { + if (iter == 0) { + ni = NROUGH; + alpha_step = G_PI/ni; + alpha0 = 0.0; + } + else { + /* Choose the fine points so that we do not repeat calculation in + * any of the rough points. */ + ni = NFINE; + alpha0 = best_alpha - alpha_step*(NFINE - 1.0)/(NFINE + 1.0); + alpha_step = 2.0*alpha_step/(NFINE + 1.0); + } + + for (i = 0; i < ni; i++) { + phi = alpha0 + i*alpha_step; + rms = projection_to_line(xyz, n, phi, xc, yc, + mean_line, rms_line, counts); + gwy_debug("[%u] %g %g", iter, phi, rms); + if (rms < best_rms) { + best_rms = rms; + best_alpha = phi; + } + } + } + + g_object_unref(mean_line); + g_object_unref(rms_line); + g_free(counts); + + if (best_alpha > 0.5*G_PI) + best_alpha += G_PI; + + return best_alpha; +} + +/* Estimate projection direction, possibly on reduced data. This is useful + * when the estimator does not need reduced data for anything else. */ +static gdouble +estimate_projection_direction_red(const GwyXYZ *xyz, guint n, + FitShapeEstimateCache *estimcache) +{ + FitShapeEstimateCache estimcachered; + guint nred = (guint)sqrt(n*(gdouble)NREDLIM); + GwySurface *surface; + gdouble phi; + + if (nred >= n) + return estimate_projection_direction(xyz, n, estimcache); + + surface = gwy_surface_new_sized(nred); + reduce_data_size(xyz, n, surface); + + /* Make sure caching still works for the reduced data. */ + gwy_clear(&estimcachered, 1); + phi = estimate_projection_direction(gwy_surface_get_data_const(surface), + nred, &estimcachered); + + g_object_unref(surface); + + return phi; +} + +static void +data_line_shorten(GwyDataLine *dline, const guint *counts, guint threshold) +{ + guint res = gwy_data_line_get_res(dline); + guint from = 0, to = res-1; + gdouble off; + + while (to > from && counts[to] < threshold) + to--; + while (from < to && counts[from] < threshold) + from++; + + off = (from*gwy_data_line_get_real(dline)/res + + gwy_data_line_get_offset(dline)); + + gwy_data_line_resize(dline, from, to+1); + gwy_data_line_set_offset(dline, off); +} + +/* Estimate the period of a periodic structure, knowing already the rotation. + * The returned phase is such that if you subtract it from the rotated abscissa + * value then the projection will have a positive peak (some kind of maximum) + * centered around zero, whatever that means for specific grating-like + * structures. */ +static gboolean +estimate_period_and_phase(const GwyXYZ *xyz, guint n, + gdouble phi, gdouble *pT, gdouble *poff, + FitShapeEstimateCache *estimcache) +{ + GwyDataLine *mean_line, *tmp_line; + gdouble xc, yc, r, T, t, real, off, a_s, a_c, phi0, av, bv; + const gdouble *mean, *tmp; + guint *counts; + guint res, i, ibest; + gboolean found; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + /* Using more sqrt(n) than can make the sampling too sparse, causing noise + * and oscillations. */ + res = (guint)floor(0.8*sqrt(n) + 1.0); + + *pT = r/4.0; + *poff = 0.0; + + mean_line = gwy_data_line_new(res, 2.0*r, FALSE); + gwy_data_line_set_offset(mean_line, -r); + tmp_line = gwy_data_line_new_alike(mean_line, FALSE); + counts = g_new(guint, res); + + projection_to_line(xyz, n, phi, xc, yc, mean_line, NULL, counts); + data_line_shorten(mean_line, counts, 4); + g_free(counts); + + res = gwy_data_line_get_res(mean_line); + gwy_data_line_get_line_coeffs(mean_line, &av, &bv); + gwy_data_line_line_level(mean_line, av, bv); + gwy_data_line_psdf(mean_line, tmp_line, + GWY_WINDOWING_HANN, GWY_INTERPOLATION_LINEAR); + tmp = gwy_data_line_get_data_const(tmp_line); + + found = FALSE; + ibest = G_MAXUINT; + for (i = 3; i < MIN(res/3, res-3); i++) { + if (tmp[i] > tmp[i-2] && tmp[i] > tmp[i-1] + && tmp[i] > tmp[i+1] && tmp[i] > tmp[i+2]) { + if (ibest == G_MAXUINT || tmp[i] > tmp[ibest]) { + found = TRUE; + ibest = i; + } + } + } + if (!found) + goto fail; + + T = *pT = 2.0*G_PI/gwy_data_line_itor(tmp_line, ibest); + gwy_debug("found period %g", T); + + mean = gwy_data_line_get_data_const(mean_line); + real = gwy_data_line_get_real(mean_line); + off = gwy_data_line_get_offset(mean_line); + a_s = a_c = 0.0; + for (i = 0; i < res; i++) { + t = off + real/res*(i + 0.5); + a_s += sin(2*G_PI*t/T)*mean[i]; + a_c += cos(2*G_PI*t/T)*mean[i]; + } + gwy_debug("a_s %g, a_c %g", a_s, a_c); + + phi0 = atan2(a_s, a_c); + *poff = phi0*T/(2.0*G_PI) + xc*cos(phi) - yc*sin(phi); + +fail: + g_object_unref(mean_line); + g_object_unref(tmp_line); + + return found; +} + +/* For a shape that consists of a more or less flat base with some feature + * on it, estimate the base plane (z0) and feature height (h). The height + * can be either positive or negative. */ +static gboolean +estimate_feature_height(const GwyXYZ *xyz, guint n, + gdouble *pz0, gdouble *ph, + gdouble *px, gdouble *py, + FitShapeEstimateCache *estimcache) +{ + gdouble xm, ym, xc, yc, r, zmin, zmax; + gdouble r2_large, r2_small; + gdouble t, zbest, zmean_large = 0.0, zmean_small = 0.0; + guint i, n_large = 0, n_small = 0; + gboolean positive; + + if (!n) { + *pz0 = *ph = 0.0; + return FALSE; + } + + range_z(xyz, n, &zmin, &zmax, estimcache); + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + r2_large = 0.7*r*r; + r2_small = 0.1*r*r; + + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + gdouble r2 = x*x + y*y; + + if (r2 <= r2_small) { + zmean_small += xyz[i].z; + n_small++; + } + else if (r2 >= r2_large) { + zmean_large += xyz[i].z; + n_large++; + } + } + + g_assert(n_large); /* circumscribe_x_y() should ensure this. */ + zmean_large /= n_large; + + if (n_small) { + zmean_small /= n_small; + positive = (zmean_small >= zmean_large); + } + else + positive = (fabs(zmean_large - zmin) <= fabs(zmean_large - zmax)); + + t = zmax - zmin; + if (positive) { + *pz0 = zmin + 0.05*t; + *ph = 0.9*t; + } + else { + *pz0 = zmax - 0.05*t; + *ph = -0.9*t; + } + + xm = 0.0; + ym = 0.0; + if (n_small) { + if (positive) { + zbest = -G_MAXDOUBLE; + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + gdouble r2 = x*x + y*y; + + if (r2 <= r2_small && xyz[i].z > zbest) { + zbest = xyz[i].z; + xm = x; + ym = y; + } + } + } + else { + zbest = G_MAXDOUBLE; + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + gdouble r2 = x*x + y*y; + + if (r2 <= r2_small && xyz[i].z < zbest) { + zbest = xyz[i].z; + xm = x; + ym = y; + } + } + } + } + *px = xc + xm; + *py = yc + ym; + + return TRUE; +} + +static gboolean +common_bump_feature_init(const GwyXYZ *xyz, guint n, + gdouble *xc, gdouble *yc, gdouble *z0, + gdouble *height, gdouble *size, + gdouble *a, gdouble *phi, + FitShapeEstimateCache *estimcache) +{ + gdouble xm, ym, r, zmin, zmax; + + circumscribe_x_y(xyz, n, &xm, &ym, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + *xc = xm; + *yc = ym; + *z0 = zmin; + *height = zmax - zmin; + *size = r/3.0; + *a = 1.0; + *phi = 0.0; + + return TRUE; +} + +static gboolean +common_bump_feature_estimate(const GwyXYZ *xyz, guint n, + gdouble *xc, gdouble *yc, gdouble *z0, + gdouble *height, gdouble *size, + gdouble *a, gdouble *phi, + FitShapeEstimateCache *estimcache) +{ + gdouble xm, ym, r; + + /* Just initialise the shape parameters with some sane defaults. */ + *a = 1.0; + *phi = 0.0; + circumscribe_x_y(xyz, n, &xm, &ym, &r, estimcache); + *size = r/3.0; + + return estimate_feature_height(xyz, n, z0, height, xc, yc, estimcache); +} + +static gdouble +dotprod_with_correl(const gdouble *diff, + const gdouble *param_err, + const gdouble *correl, + guint n) +{ + guint i, j; + gdouble s = 0.0; + + for (i = 0; i < n; i++) { + for (j = 0; j < n; j++) { + if (diff[i] != 0 && diff[j] != 0) { + gdouble c_ij = (j <= i) ? SLi(correl, i, j) : SLi(correl, j, i); + gdouble s_ij = c_ij*param_err[i]*param_err[j]; + s += s_ij*diff[i]*diff[j]; + } + } + } + + return sqrt(fmax(s, 0.0)); +} + +static gdouble +data_line_pearson_coeff(GwyDataLine *dline1, GwyDataLine *dline2) +{ + gdouble avg1 = gwy_data_line_get_avg(dline1); + gdouble avg2 = gwy_data_line_get_avg(dline2); + gdouble rms1 = gwy_data_line_get_rms(dline1); + gdouble rms2 = gwy_data_line_get_rms(dline2); + const gdouble *d1, *d2; + gdouble c = 0.0; + guint res, i; + + if (!rms1 || !rms2) + return 0.0; + + res = gwy_data_line_get_res(dline1); + g_return_val_if_fail(gwy_data_line_get_res(dline2) == res, 0.0); + d1 = gwy_data_line_get_data_const(dline1); + d2 = gwy_data_line_get_data_const(dline2); + for (i = 0; i < res; i++) + c += (d1[i] - avg1)*(d2[i] - avg2); + + c /= res*rms1*rms2; + gwy_debug("%g", c); + return c; +} + +/************************************************************************** + * + * Sphere + * + **************************************************************************/ + +static gdouble +sphere_func(gdouble x, gdouble y, const gdouble *param) +{ + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble kappa = param[3]; + gdouble r2k, t, val; + + x -= xc; + y -= yc; + /* Rewrite R - sqrt(R² - r²) as κ*r²/(1 + sqrt(1 - κ²r²)) where + * r² = x² + y² and κR = 1 to get nice behaviour in the close-to-denegerate + * cases, including completely flat surface. The expression 1.0/kappa + * is safe because we cannot get to this branch for κ → 0 unless + * simultaneously r → ∞. */ + r2k = kappa*(x*x + y*y); + t = 1.0 - kappa*r2k; + if (t > 0.0) + val = z0 + r2k/(1.0 + sqrt(t)); + else + val = z0 + 2.0/kappa; + + return val; +} + +static gboolean +sphere_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax, zmean; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + stat_z(xyz, n, &zmean, NULL, NULL, estimcache); + + param[0] = xc; + param[1] = yc; + if (fabs(zmean - zmin) > fabs(zmean - zmax)) { + param[2] = zmax; + param[3] = 2.0*(zmin - zmax)/(r*r); + } + else { + param[2] = zmin; + param[3] = 2.0*(zmax - zmin)/(r*r); + } + + return TRUE; +} + +/* Fit the data with a rotationally symmetric parabola and use its parameters + * for the spherical surface estimate. */ +static gboolean +sphere_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc; + /* Linear fit with functions 1, x, y and x²+y². */ + gdouble a[10], b[4]; + guint i; + + /* XXX: Handle the surrounding flat area, which can be a part of the + * function, better? */ + + /* Using centered coodinates improves the condition number. */ + mean_x_y(xyz, n, &xc, &yc, estimcache); + gwy_clear(a, 10); + gwy_clear(b, 4); + for (i = 0; i < n; i++) { + gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; + gdouble r2 = x*x + y*y; + + b[0] += xyz[i].z; + b[1] += x*xyz[i].z; + b[2] += y*xyz[i].z; + b[3] += r2*xyz[i].z; + + a[2] += x*x; + a[4] += x*y; + a[5] += y*y; + a[6] += r2; + a[7] += x*r2; + a[8] += y*r2; + a[9] += r2*r2; + } + a[0] = n; + a[1] = a[3] = 0.0; + + param[0] = xc; + param[1] = yc; + param[2] = b[0]/n; + param[3] = 0.0; + + if (!gwy_math_choleski_decompose(4, a)) + return FALSE; + + gwy_math_choleski_solve(4, a, b); + + param[3] = 2.0*b[3]; + if (param[3]) { + param[0] = xc - b[1]/param[3]; + param[1] = yc - b[2]/param[3]; + param[2] = b[0] - 0.5*(b[1]*b[1] + b[2]*b[2])/param[3]; + } + + return TRUE; +} + +static gdouble +sphere_calc_R(const gdouble *param) +{ + return 1.0/param[3]; +} + +static gdouble +sphere_calc_err_R(const gdouble *param, + const gdouble *param_err, + G_GNUC_UNUSED const gdouble *correl) +{ + return param_err[3]/(param[3]*param[3]); +} + +/************************************************************************** + * + * Cylinder (lying) + * + **************************************************************************/ + +/* XXX: We might want + * - finite-size cylinders + * - cylinders cut elsewhere than in the half + * Unfortunately, the derivatives by the corresponding parameters are often + * zero (or something odd) because of the sharp boundaries in the function that + * either catch a data point inside some region or not. */ +static gdouble +cylinder_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble x0 = param[0]; + gdouble z0 = param[1]; + gdouble kappa = param[2]; + gdouble phi = param[3]; + gdouble bparallel = param[4]; + gdouble r2k, t, val, cphi, sphi; + + HANDLE_PHI_CACHE(phi); + z0 += bparallel*(x*sphi + y*cphi); + t = x*cphi - y*sphi - x0; + r2k = kappa*t*t; + t = 1.0 - kappa*r2k; + if (t > 0.0) + val = z0 + r2k/(1.0 + sqrt(t)); + else + val = z0 + 2.0/kappa; + + return val; +} + +static gboolean +cylinder_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax, zmean; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + stat_z(xyz, n, &zmean, NULL, NULL, estimcache); + + param[0] = xc; + if (fabs(zmean - zmin) > fabs(zmean - zmax)) { + param[1] = zmax; + param[2] = 2.0*(zmin - zmax)/(r*r); + } + else { + param[1] = zmin; + param[2] = 2.0*(zmax - zmin)/(r*r); + } + param[3] = 0.0; + param[4] = 0.0; + + return TRUE; +} + +/* Fit the data with a rotationally symmetric parabola and use its parameters + * for the spherical surface estimate. */ +static gboolean +cylinder_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + GwyDataLine *mean_line; + gdouble xc, yc, r, zmin, zmax, t, phi; + guint *counts = NULL; + guint i, mpos, res; + gint d2sign; + const gdouble *d; + + /* First we estimate the orientation (phi). */ + phi = estimate_projection_direction_red(xyz, n, estimcache); + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + res = (guint)floor(0.8*sqrt(n) + 1.0); + mean_line = gwy_data_line_new(res, 2.0*r, FALSE); + counts = g_new(guint, res); + gwy_data_line_set_offset(mean_line, -r); + projection_to_line(xyz, n, phi, xc, yc, mean_line, NULL, counts); + d = gwy_data_line_get_data(mean_line); + + d2sign = 0; + for (i = 1; i < res-1; i++) { + if (d[i] < 0.5*(d[i-1] + d[i+1])) + d2sign += 1; + else if (d[i] > 0.5*(d[i-1] + d[i+1])) + d2sign -= 1; + } + gwy_debug("d2sign %d", d2sign); + + if (d2sign > 0) + gwy_data_line_multiply(mean_line, -1.0); + mpos = 0; + for (i = 1; i < res; i++) { + if (d[i] > d[mpos]) + mpos = i; + } + + t = 2.0*r/res*mpos - r; + param[0] = ((xc + t*cos(phi))*cos(phi) - (yc - t*sin(phi))*sin(phi)); + + if (d2sign > 0) { + param[1] = zmin; + param[2] = 4.0*(zmax - zmin)/(r*r); + } + else { + param[1] = zmax; + param[2] = 4.0*(zmin - zmax)/(r*r); + } + param[3] = phi; + param[4] = 0.0; + + g_free(counts); + g_object_unref(mean_line); + + return TRUE; +} + +static gdouble +cylinder_calc_R(const gdouble *param) +{ + return 1.0/param[2]; +} + +static gdouble +cylinder_calc_err_R(const gdouble *param, + const gdouble *param_err, + G_GNUC_UNUSED const gdouble *correl) +{ + return param_err[2]/(param[2]*param[2]); +} + +/************************************************************************** + * + * Grating (simple) + * + **************************************************************************/ + +static gdouble +grating_func(gdouble x, gdouble y, const gdouble *param) +{ + static gdouble c_last = 0.0, coshm1_c_last = 1.0; + DEFINE_PHI_CACHE(phi); + + gdouble L = fabs(param[0]); + gdouble h = param[1]; + gdouble p = fabs(param[2]); + gdouble z0 = param[3]; + gdouble x0 = param[4]; + gdouble phi = param[5]; + gdouble c = param[6]; + gdouble t, Lp2, val, coshm1_c, cphi, sphi; + + Lp2 = 0.5*L*p; + if (G_UNLIKELY(!Lp2)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi - x0 + Lp2; + t = (t - L*floor(t/L))/Lp2 - 1.0; + if (fabs(t) < 1.0) { + if (c == c_last) + coshm1_c = coshm1_c_last; + else { + coshm1_c = coshm1_c_last = gwy_coshm1(c); + c_last = c; + } + + val = z0 + h*(1.0 - gwy_coshm1(c*t)/coshm1_c); + } + else + val = z0; + + return val; +} + +static gboolean +grating_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + param[0] = r/4.0; + param[1] = zmax - zmin; + param[2] = 0.5; + param[3] = zmin; + param[4] = 0.0; + param[5] = 0.0; + param[6] = 5.0; + + return TRUE; +} + +static gboolean +grating_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble t; + + /* Just initialise the percentage and shape with some sane defaults. */ + param[2] = 0.5; + param[6] = 5.0; + + /* Simple height parameter estimate. */ + range_z(xyz, n, param+3, param+1, estimcache); + t = param[1] - param[3]; + param[1] = 0.9*t; + param[3] += 0.05*t; + + /* First we estimate the orientation (phi). */ + param[5] = estimate_projection_direction_red(xyz, n, estimcache); + + /* Then we extract a representative profile with this orientation. */ + return estimate_period_and_phase(xyz, n, param[5], param + 0, param + 4, + estimcache); +} + +/************************************************************************** + * + * Grating (3-level) + * + **************************************************************************/ + +static gdouble +grating3_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble L = fabs(param[0]); + gdouble h1 = fabs(param[1]); + gdouble h2 = fabs(param[2]); + gdouble h3 = fabs(param[3]); + gdouble p = fmin(fabs(param[4]), 1.0); + gdouble q1 = fabs(param[5]); + gdouble q2 = fabs(param[6]); + gdouble q3 = fabs(param[7]); + gdouble z0 = param[8]; + gdouble x0 = param[9]; + gdouble phi = param[10]; + gdouble t, Lp2, cphi, sphi, Ll, Lu; + + Lp2 = 0.5*L*p; + if (G_UNLIKELY(!Lp2)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi - x0 + Lp2; + t -= L*floor(t/L) + Lp2; + t = fabs(t); + + Lu = Lp2; + if (t >= Lu) + return z0; + + Ll = Lu; + Lu = Ll/(1.0 + q1); + if (t >= Lu) { + if (G_UNLIKELY(Lu == Ll)) + return z0; + return z0 + h1/(Lu - Ll)*(t - Ll); + } + + Ll = Lu; + Lu = Ll/(1.0 + q2); + z0 += h1; + if (t >= Lu) { + if (G_UNLIKELY(Lu == Ll)) + return z0; + return z0 + h2/(Lu - Ll)*(t - Ll); + } + + Ll = Lu; + Lu = Ll/(1.0 + q3); + z0 += h2; + if (t >= Lu) { + if (G_UNLIKELY(Lu == Ll)) + return z0; + return z0 + h3/(Lu - Ll)*(t - Ll); + } + + return z0 + h3; +} + +static gboolean +grating3_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + param[0] = r/4.0; + param[1] = 0.1*(zmax - zmin); + param[2] = 0.8*(zmax - zmin); + param[3] = 0.1*(zmax - zmin); + param[4] = 0.7; + param[5] = 0.5; + param[6] = 0.2; + param[7] = 0.5; + param[8] = zmin; + param[9] = 0.0; + param[10] = 0.0; + + return TRUE; +} + +static gboolean +grating3_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble zmin, zmax; + + /* Just initialise the percentage and shape with some sane defaults. */ + param[4] = 0.7; + param[5] = 0.5; + param[6] = 0.2; + param[7] = 0.5; + + /* Simple height parameter estimate. */ + range_z(xyz, n, &zmin, &zmax, estimcache); + param[1] = 0.1*(zmax - zmin); + param[2] = 0.8*(zmax - zmin); + param[3] = 0.1*(zmax - zmin); + param[8] = zmin; + + /* First we estimate the orientation (phi). */ + param[10] = estimate_projection_direction_red(xyz, n, estimcache); + + /* Then we extract a representative profile with this orientation. */ + return estimate_period_and_phase(xyz, n, param[10], param + 0, param + 9, + estimcache); +} + +static gdouble +grating3_calc_h(const gdouble *param) +{ + return param[1] + param[2] + param[3]; +} + +static gdouble +grating3_calc_err_h(G_GNUC_UNUSED const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble diff[G_N_ELEMENTS(grating3_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[1] = diff[2] = diff[3] = 1.0; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +grating3_calc_L0(const gdouble *param) +{ + return param[0]*param[4]; +} + +static gdouble +grating3_calc_err_L0(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble diff[G_N_ELEMENTS(grating3_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[0] = param[4]; + diff[4] = param[0]; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +grating3_calc_L1(const gdouble *param) +{ + return grating3_calc_L0(param)/(1.0 + param[5]); +} + +static gdouble +grating3_calc_err_L1(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble L1 = grating3_calc_L1(param); + gdouble diff[G_N_ELEMENTS(grating3_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[0] = L1/param[0]; + diff[4] = L1/param[4]; + diff[5] = -L1/(1.0 + param[5]); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +grating3_calc_L2(const gdouble *param) +{ + return grating3_calc_L1(param)/(1.0 + param[6]); +} + +static gdouble +grating3_calc_err_L2(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble L2 = grating3_calc_L2(param); + gdouble diff[G_N_ELEMENTS(grating3_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[0] = L2/param[0]; + diff[4] = L2/param[4]; + diff[5] = -L2/(1.0 + param[5]); + diff[6] = -L2/(1.0 + param[6]); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +grating3_calc_L3(const gdouble *param) +{ + return grating3_calc_L2(param)/(1.0 + param[7]); +} + +static gdouble +grating3_calc_err_L3(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble L3 = grating3_calc_L3(param); + gdouble diff[G_N_ELEMENTS(grating3_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[0] = L3/param[0]; + diff[4] = L3/param[4]; + diff[5] = -L3/(1.0 + param[5]); + diff[6] = -L3/(1.0 + param[6]); + diff[7] = -L3/(1.0 + param[7]); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +/************************************************************************** + * + * Holes + * + **************************************************************************/ + +static inline gdouble +hole_radial_intersection(gdouble q, gdouble A, gdouble R) +{ + gdouble A1q = A*(1.0 - q); + gdouble q21 = 1.0 + q*q; + gdouble D = R*R*q21 - A1q*A1q; + gdouble sqrtD = sqrt(MAX(D, 0.0)); + gdouble x = (1.0 + q)*A + sqrtD; + return x/sqrt(q21); +} + +static gdouble +hole_shape(gdouble x, gdouble y, gdouble size, gdouble slope, gdouble roundness) +{ + gdouble rx, ry, r, rr, rsz; + gdouble v = 0.0; + + if (roundness) { + rsz = roundness*size; + rx = fabs(x) - (size - rsz); + ry = fabs(y) - (size - rsz); + r = MAX(rx, ry); + rr = MIN(rx, ry); + if (r <= 0.0 || (r <= rsz && rr <= 0.0) || rx*rx + ry*ry <= rsz*rsz) + v = -1.0; + else if (slope) { + gdouble ss = size + slope; + rsz = roundness*ss; + rx = fabs(x) - (ss - rsz); + ry = fabs(y) - (ss - rsz); + r = MAX(rx, ry); + rr = MIN(rx, ry); + if (r <= 0.0 || (r <= rsz && rr <= 0.0) + || rx*rx + ry*ry <= rsz*rsz) { + gdouble q = (rr + ss - rsz)/(r + ss - rsz); + if (q <= 1.0 - roundness) + v = (r - rsz)/slope; + else { + r = hole_radial_intersection(q, ss - rsz, rsz); + rr = hole_radial_intersection(q, size - roundness*size, + roundness*size); + v = (sqrt(x*x + y*y) - r)/(r - rr); + } + } + } + } + else { + rx = fabs(x) - size; + ry = fabs(y) - size; + r = MAX(rx, ry); + if (r <= 0.0) + v = -1.0; + else if (r < slope) + v = (r - slope)/slope; + + v = sin(x); + } + + return v; +} + +static gdouble +holes_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble L = fabs(param[3]); + gdouble p = param[4]; + gdouble h = param[5]; + gdouble s = param[6]; + gdouble r = param[7]; + gdouble phi = param[8]; + gdouble t, cphi, sphi; + + x -= xc; + y -= yc; + + if (G_UNLIKELY(L*p == 0.0)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi; + y = x*sphi + y*cphi; + x = t; + + x -= L*floor(x/L) + 0.5*L; + y -= L*floor(y/L) + 0.5*L; + + p = 1.0/(1.0 + fabs(p)); + /* Map zero values to no roundness and no slope. */ + s = fabs(s)/(1.0 + fabs(s)); + r = fabs(r)/(1.0 + fabs(s)); + + return z0 + h*hole_shape(fabs(x), fabs(y), (1.0 - s)*0.5*L*p, s*0.5*L*p, r); +} + +static gboolean +holes_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + param[0] = 0; + param[1] = 0; + param[2] = zmin; + param[3] = r/4.0; + param[4] = 1.0; + param[5] = zmax - zmin; + param[6] = 0.1; + param[7] = 0.1; + param[8] = 0.0; + + return TRUE; +} + +static gboolean +holes_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + GwyDataLine *mean_line, *rms_line; + gdouble xc, yc, r, phi, L1, L2, zmin, zmax, u, v; + guint *counts; + guint res; + gboolean ok1, ok2; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + param[4] = 1.0; + param[6] = 0.1; + param[7] = 0.1; + + param[8] = phi = estimate_projection_direction_red(xyz, n, estimcache); + + ok1 = estimate_period_and_phase(xyz, n, phi, &L1, &u, estimcache); + ok2 = estimate_period_and_phase(xyz, n, phi - 0.5*G_PI, &L2, &v, + estimcache); + param[3] = 0.5*(L1 + L2); + param[0] = u*cos(phi) + v*sin(phi); + param[1] = u*sin(phi) + v*cos(phi); + + /* Estimate h sign: do projection and if smaller values correlate with + * large rms then it is holes (h > 0); if larger values correlate with + * large rms then it is bumps (h < 0). */ + res = (guint)floor(0.8*sqrt(n) + 1.0); + mean_line = gwy_data_line_new(res, 2.0*r, FALSE); + gwy_data_line_set_offset(mean_line, -r); + rms_line = gwy_data_line_new_alike(mean_line, FALSE); + counts = g_new(guint, res); + projection_to_line(xyz, n, phi, xc, yc, mean_line, rms_line, counts); + data_line_shorten(mean_line, counts, 4); + data_line_shorten(rms_line, counts, 4); + g_free(counts); + + if (data_line_pearson_coeff(mean_line, rms_line) <= 0.0) { + gwy_debug("holes"); + param[2] = zmax; + param[5] = zmax - zmin; + } + else { + gwy_debug("bumps"); + param[2] = zmin; + param[5] = zmin - zmax; + /* estimate_period_and_phase() finds maxima but we want minima here */ + param[0] += 0.5*param[3]; + param[1] += 0.5*param[3]; + } + + g_object_unref(rms_line); + g_object_unref(mean_line); + + return ok1 && ok2; +} + +static gdouble +holes_calc_wouter(const gdouble *param) +{ + return param[3]/(1.0 + fabs(param[4])); +} + +static gdouble +holes_calc_err_wouter(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble diff[G_N_ELEMENTS(holes_params)]; + gdouble wouter = holes_calc_wouter(param); + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[3] = wouter/param[3]; + diff[4] = -wouter/(1.0 + fabs(param[4])); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +holes_calc_winner(const gdouble *param) +{ + return param[3]/(1.0 + fabs(param[4]))/(1.0 + fabs(param[6])); +} + +static gdouble +holes_calc_err_winner(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble diff[G_N_ELEMENTS(holes_params)]; + gdouble winner = holes_calc_winner(param); + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[3] = winner/param[3]; + diff[4] = -winner/(1.0 + fabs(param[4])); + diff[6] = -winner/(1.0 + fabs(param[6])); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +holes_calc_R(const gdouble *param) +{ + return param[3]/(1.0 + fabs(param[4]))/fabs(param[7])/(1.0 + fabs(param[7])); +} + +static gdouble +holes_calc_err_R(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble diff[G_N_ELEMENTS(holes_params)]; + gdouble R = holes_calc_R(param); + gdouble t = 1.0 + fabs(param[7]); + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[3] = R/param[3]; + diff[4] = -R/(1.0 + fabs(param[4])); + diff[7] = -param[3]/(1.0 + fabs(param[4]))/(t*t); + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +/************************************************************************** + * + * Ring + * + **************************************************************************/ + +static gdouble +pring_func(gdouble x, gdouble y, const gdouble *param) +{ + static gdouble s_h_last = 0.0, rinner_last = 1.0, router_last = 1.0; + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble R = param[3]; + gdouble w = fabs(param[4]); + gdouble h = param[5]; + gdouble s = param[6]; + gdouble bx = param[7]; + gdouble by = param[8]; + gdouble r, r2, s_h, rinner, router; + + x -= xc; + y -= yc; + z0 += bx*x + by*y; + r2 = x*x + y*y; + + if (G_UNLIKELY(w == 0.0)) + return r2 <= R*R ? z0 - 0.5*s : z0 + 0.5*s; + + if (G_UNLIKELY(h == 0.0)) { + if (r2 >= R*R) + return z0 + 0.5*s; + else if (r2 < (R - w)*(R - w)) + return z0 - 0.5*s; + + r = (R - sqrt(r2))/w; + return z0 + s*(0.5 - r*r); + } + + r = sqrt(r2) - R; + s_h = s/h; + if (s_h == s_h_last) { + rinner = rinner_last; + router = router_last; + } + else { + rinner = rinner_last = sqrt(fmax(1.0 + 0.5*s_h, 0.0)); + router = router_last = sqrt(fmax(1.0 - 0.5*s_h, 0.0)); + s_h_last = s_h; + } + + rinner *= -0.5*w; + if (r <= rinner) + return z0 - 0.5*s; + + router *= 0.5*w; + if (r >= router) + return z0 + 0.5*s; + + r *= 2.0/w; + return z0 + h*(1.0 - r*r); +} + +static gboolean +pring_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble xc, yc, r, zmin, zmax; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + + param[0] = xc; + param[1] = yc; + param[2] = zmin; + param[3] = r/3.0; + param[4] = r/12.0; + param[5] = zmax - zmin; + param[6] = (zmax - zmin)/12.0; + param[7] = 0.0; + param[8] = 0.0; + + return TRUE; +} + +static gboolean +pring_estimate_projection(const GwyXYZ *xyz, guint n, + gdouble xc, gdouble yc, gdouble r, + gboolean vertical, gboolean upwards, + GwyDataLine *proj, GwyXY *projdata, guint *counts, + GwyPeaks *peaks, gdouble *param) +{ + guint i, j, res; + const gdouble *d; + gdouble c, real, off, width[2]; + + c = (vertical ? yc : xc); + gwy_data_line_set_real(proj, 2.0*r); + gwy_data_line_set_offset(proj, -r); + projection_to_line(xyz, n, vertical ? -0.5*G_PI : 0.0, + xc, yc, proj, NULL, counts); + data_line_shorten(proj, counts, 4); + + if (!upwards) + gwy_data_line_multiply(proj, -1.0); + + res = gwy_data_line_get_res(proj); + real = gwy_data_line_get_real(proj); + off = gwy_data_line_get_offset(proj); + d = gwy_data_line_get_data(proj); + for (i = j = 0; i < res; i++) { + if (counts[i] > 5) { + projdata[j].x = c + off + (i + 0.5)*real/res; + projdata[j].y = d[i]; + j++; + } + } + if (gwy_peaks_analyze_xy(peaks, projdata, j, 2) != 2) + return FALSE; + + gwy_peaks_get_quantity(peaks, GWY_PEAK_ABSCISSA, param); + gwy_peaks_get_quantity(peaks, GWY_PEAK_WIDTH, width); + param[2] = 0.5*(width[0] + width[1]); + return TRUE; +} + +static gboolean +pring_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + GwyDataLine *proj; + GwyXY *projdata; + GwyPeaks *peaks; + gdouble xc, yc, r, zmin, zmax, zskew; + gdouble xestim[3], yestim[3]; + guint *counts; + gboolean ok1, ok2; + guint res; + + circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); + range_z(xyz, n, &zmin, &zmax, estimcache); + stat_z(xyz, n, NULL, NULL, &zskew, estimcache); + res = (guint)floor(0.8*sqrt(n) + 1.0); + if (zskew < 0.0) + GWY_SWAP(gdouble, zmin, zmax); + + proj = gwy_data_line_new(res, 2.0*r, FALSE); + counts = g_new(guint, res); + projdata = g_new(GwyXY, res); + + peaks = gwy_peaks_new(); + gwy_peaks_set_order(peaks, GWY_PEAK_ORDER_ABSCISSA); + gwy_peaks_set_background(peaks, GWY_PEAK_BACKGROUND_MMSTEP); + + gwy_data_line_resample(proj, res, GWY_INTERPOLATION_NONE); + ok1 = pring_estimate_projection(xyz, n, xc, yc, r, FALSE, zskew >= 0.0, + proj, projdata, counts, peaks, xestim); + + gwy_data_line_resample(proj, res, GWY_INTERPOLATION_NONE); + ok2 = pring_estimate_projection(xyz, n, xc, yc, r, TRUE, zskew >= 0.0, + proj, projdata, counts, peaks, yestim); + + g_free(counts); + g_object_unref(proj); + gwy_peaks_free(peaks); + + if (!ok1 || !ok2) + return FALSE; + + param[0] = 0.5*(xestim[0] + xestim[1]); + param[1] = 0.5*(yestim[0] + yestim[1]); + param[2] = zmin; + param[3] = 0.25*(yestim[1] - yestim[0] + xestim[1] - xestim[0]); + /* A bit too high value is OK because at least the estimated function + * does not miss the ring completely. */ + param[4] = 1.5*(xestim[2] + yestim[2]); + param[5] = zmax - zmin; + param[6] = (zmax - zmin)/12.0; + param[7] = 0.0; + param[8] = 0.0; + + return TRUE; +} + +/************************************************************************** + * + * Gaussian + * + **************************************************************************/ + +static gdouble +gaussian_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble h = param[3]; + gdouble sigma = param[4]; + gdouble a = fabs(param[5]); + gdouble phi = param[6]; + gdouble bx = param[7]; + gdouble by = param[8]; + gdouble t, val, cphi, sphi, s2; + + x -= xc; + y -= yc; + z0 += bx*x + by*y; + + s2 = sigma*sigma; + if (G_UNLIKELY(!s2 || !a)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi; + y = x*sphi + y*cphi; + x = t; + + t = 0.5*(x*x*a + y*y/a)/s2; + val = z0 + h*exp(-t); + + return val; +} + +static gboolean +gaussian_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + param[7] = 0.0; + param[8] = 0.0; + return common_bump_feature_init(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); +} + +static gboolean +gaussian_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + param[7] = 0.0; + param[8] = 0.0; + return common_bump_feature_estimate(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); +} + +static gdouble +gaussian_calc_sigma1(const gdouble *param) +{ + return param[4]/sqrt(fabs(param[5])); +} + +static gdouble +gaussian_calc_err_sigma1(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble sigma1 = gaussian_calc_sigma1(param); + gdouble diff[G_N_ELEMENTS(gaussian_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[4] = sigma1/param[4]; + diff[5] = -0.5*sigma1/param[5]; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +gaussian_calc_sigma2(const gdouble *param) +{ + return param[4]*sqrt(fabs(param[5])); +} + +static gdouble +gaussian_calc_err_sigma2(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble sigma1 = gaussian_calc_sigma1(param); + gdouble diff[G_N_ELEMENTS(gaussian_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[4] = sigma1/param[4]; + diff[5] = 0.5*sigma1/param[5]; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +/************************************************************************** + * + * Lorentzian + * + **************************************************************************/ + +static gdouble +lorentzian_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble h = param[3]; + gdouble b = param[4]; + gdouble a = fabs(param[5]); + gdouble phi = param[6]; + gdouble bx = param[7]; + gdouble by = param[8]; + gdouble t, val, cphi, sphi, b2; + + x -= xc; + y -= yc; + z0 += bx*x + by*y; + + b2 = b*b; + if (G_UNLIKELY(!b2 || !a)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi; + y = x*sphi + y*cphi; + x = t; + + t = (x*x*a + y*y/a)/b2; + val = z0 + h/(1.0 + t); + + return val; +} + +static gboolean +lorentzian_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + param[7] = 0.0; + param[8] = 0.0; + return common_bump_feature_init(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); +} + +static gboolean +lorentzian_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + param[7] = 0.0; + param[8] = 0.0; + return common_bump_feature_estimate(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); +} + +static gdouble +lorentzian_calc_b1(const gdouble *param) +{ + return param[4]/sqrt(fabs(param[5])); +} + +static gdouble +lorentzian_calc_err_b1(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble b1 = lorentzian_calc_b1(param); + gdouble diff[G_N_ELEMENTS(lorentzian_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[4] = b1/param[4]; + diff[5] = -0.5*b1/param[5]; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +static gdouble +lorentzian_calc_b2(const gdouble *param) +{ + return param[4]*sqrt(fabs(param[5])); +} + +static gdouble +lorentzian_calc_err_b2(const gdouble *param, + const gdouble *param_err, + const gdouble *correl) +{ + gdouble b1 = lorentzian_calc_b1(param); + gdouble diff[G_N_ELEMENTS(lorentzian_params)]; + + gwy_clear(diff, G_N_ELEMENTS(diff)); + diff[4] = b1/param[4]; + diff[5] = 0.5*b1/param[5]; + return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); +} + +/************************************************************************** + * + * Pyramid (diamond) + * + **************************************************************************/ + +static gdouble +pyramidx_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble h = param[3]; + gdouble L = param[4]; + gdouble a = fabs(param[5]); + gdouble phi = param[6]; + gdouble bx = param[7]; + gdouble by = param[8]; + gdouble t, val, cphi, sphi, q; + + x -= xc; + y -= yc; + z0 += bx*x + by*y; + + if (G_UNLIKELY(!L || !a)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi; + y = x*sphi + y*cphi; + x = t; + + q = 0.5*L*sqrt(1.0 + a*a); + x /= q; + y *= a/q; + t = fabs(x) + fabs(y); + if (t < 1.0) + val = z0 + h*(1.0 - t); + else + val = z0; + + return val; +} + +static gboolean +pyramidx_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gboolean ok; + + param[7] = 0.0; + param[8] = 0.0; + ok = common_bump_feature_init(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); + param[4] *= 2.0; + + return ok; +} + +static gboolean +pyramidx_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gboolean ok; + + /* XXX: The pyramid has minimum projection when oriented along x and y + * axes. But not very deep. Can we use it to estimate phi? */ + param[7] = 0.0; + param[8] = 0.0; + ok = common_bump_feature_estimate(xyz, n, + param + 0, param + 1, param + 2, + param + 3, param + 4, + param + 5, param + 6, + estimcache); + param[4] *= 2.0; + + return ok; +} + +/************************************************************************** + * + * Parabolic bump + * + **************************************************************************/ + +static gdouble +parbump_func(gdouble x, gdouble y, const gdouble *param) +{ + DEFINE_PHI_CACHE(phi); + + gdouble xc = param[0]; + gdouble yc = param[1]; + gdouble z0 = param[2]; + gdouble h = param[3]; + gdouble C = fabs(param[4]); + gdouble a = fabs(param[5]); + gdouble phi = param[6]; + gdouble bx = param[7]; + gdouble by = param[8]; + gdouble t, val, cphi, sphi; + + x -= xc; + y -= yc; + z0 += bx*x + by*y; + + if (G_UNLIKELY(!C || !a)) + return z0; + + HANDLE_PHI_CACHE(phi); + t = x*cphi - y*sphi; + y = x*sphi + y*cphi; + x = t; + + t = fabs(h) - 0.5*C*(x*x*a + y*y/a); + if (h >= 0.0) + val = (t > 0.0 ? z0 + t : z0); + else + val = (t > 0.0 ? z0 - t : z0); + + return val; +} + +static gboolean +parbump_init(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble w; + gboolean ok; + + param[7] = 0.0; + param[8] = 0.0; + ok = common_bump_feature_init(xyz, n, + param + 0, param + 1, param + 2, + param + 3, &w, + param + 5, param + 6, + estimcache); + param[4] = 2.0*param[3]/(w*w); + + return ok && w >= 0.0; +} + +static gboolean +parbump_estimate(const GwyXYZ *xyz, guint n, gdouble *param, + FitShapeEstimateCache *estimcache) +{ + gdouble w; + gboolean ok; + + param[7] = 0.0; + param[8] = 0.0; + ok = common_bump_feature_estimate(xyz, n, + param + 0, param + 1, param + 2, + param + 3, &w, + param + 5, param + 6, + estimcache); + param[4] = 2.0*param[3]/(w*w); + + return ok && w >= 0.0; +} + +/************************** Documentation ****************************/ + +/** + * SECTION:gwyshapefitpreset + * @title: GwyShapeFitPreset + * @short_description: 3D geometrical shape fitting functions + * @see_also: #GwyNLFitter + * + * Non-linear fitter 3D geometrical shape + * presets are predefined fitting functions that can be used to determine + * the parameters of various features in images and XYZ data. + * + * As of version 2.47 the defined functions include: + * + * "Grating (simple)" + * "Grating (3-level)" + * "Holes" + * "Sphere" + * "Cylinder (lying)" + * "Gaussian" + * "Lorentzian" + * "Pyramid (diamond)" + * "Parabolic bump" + * "Ring" + * + **/ + +/* 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.46/libprocess/gwyshapefitpreset.h gwyddion-2.47/libprocess/gwyshapefitpreset.h --- gwyddion-2.46/libprocess/gwyshapefitpreset.h 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/libprocess/gwyshapefitpreset.h 2016-10-21 11:58:11.000000000 +0000 @@ -0,0 +1,115 @@ +/* + * @(#) $Id: gwyshapefitpreset.h 19109 2016-10-21 08:57:19Z yeti-dn $ + * Copyright (C) 2016 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. + */ + +#ifndef __GWY_SHAPE_FIT_PRESET_H__ +#define __GWY_SHAPE_FIT_PRESET_H__ + +#include +#include +#include +#include +#include + +G_BEGIN_DECLS + +#define GWY_TYPE_SHAPE_FIT_PRESET (gwy_shape_fit_preset_get_type()) +#define GWY_SHAPE_FIT_PRESET(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GWY_TYPE_SHAPE_FIT_PRESET, GwyShapeFitPreset)) +#define GWY_SHAPE_FIT_PRESET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GWY_TYPE_SHAPE_FIT_PRESET, GwyShapeFitPresetClass)) +#define GWY_IS_SHAPE_FIT_PRESET(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GWY_TYPE_SHAPE_FIT_PRESET)) +#define GWY_IS_SHAPE_FIT_PRESET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GWY_TYPE_SHAPE_FIT_PRESET)) +#define GWY_SHAPE_FIT_PRESET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GWY_TYPE_SHAPE_FIT_PRESET, GwyShapeFitPresetClass)) + +typedef struct _GwyShapeFitPreset GwyShapeFitPreset; +typedef struct _GwyShapeFitPresetClass GwyShapeFitPresetClass; + +struct _GwyShapeFitPreset { + GwyResource parent_instance; + struct _GwyShapeFitPresetPrivate *priv; +}; + +struct _GwyShapeFitPresetClass { + GwyResourceClass parent_class; +}; + +GType gwy_shape_fit_preset_get_type (void) G_GNUC_CONST; +gboolean gwy_shape_fit_preset_needs_same_units (GwyShapeFitPreset *preset); +guint gwy_shape_fit_preset_get_nparams (GwyShapeFitPreset *preset); +const gchar* gwy_shape_fit_preset_get_param_name (GwyShapeFitPreset *preset, + guint i); +GwyNLFitParamFlags gwy_shape_fit_preset_get_param_flags (GwyShapeFitPreset *preset, + guint i); +GwySIUnit* gwy_shape_fit_preset_get_param_units (GwyShapeFitPreset *preset, + guint i, + GwySIUnit *siunit_xy, + GwySIUnit *siunit_z); +guint gwy_shape_fit_preset_get_nsecondary (GwyShapeFitPreset *preset); +const gchar* gwy_shape_fit_preset_get_secondary_name (GwyShapeFitPreset *preset, + guint i); +GwyNLFitParamFlags gwy_shape_fit_preset_get_secondary_flags(GwyShapeFitPreset *preset, + guint i); +gdouble gwy_shape_fit_preset_get_secondary_value(GwyShapeFitPreset *preset, + guint i, + const gdouble *param); +gdouble gwy_shape_fit_preset_get_secondary_error(GwyShapeFitPreset *preset, + guint i, + const gdouble *param, + const gdouble *error, + const gdouble *correl); +GwySIUnit* gwy_shape_fit_preset_get_secondary_units(GwyShapeFitPreset *preset, + guint i, + GwySIUnit *siunit_xy, + GwySIUnit *siunit_z); +void gwy_shape_fit_preset_setup (GwyShapeFitPreset *preset, + const GwyXYZ *points, + guint n, + gdouble *params); +gboolean gwy_shape_fit_preset_guess (GwyShapeFitPreset *preset, + const GwyXYZ *points, + guint n, + gdouble *params); +gdouble gwy_shape_fit_preset_get_value (GwyShapeFitPreset *preset, + gdouble x, + gdouble y, + const gdouble *params); +void gwy_shape_fit_preset_calculate_z (GwyShapeFitPreset *preset, + const GwyXYZ *points, + gdouble *z, + guint n, + const gdouble *params); +void gwy_shape_fit_preset_calculate_xyz (GwyShapeFitPreset *preset, + GwyXYZ *points, + guint n, + const gdouble *params); +GwyNLFitter* gwy_shape_fit_preset_create_fitter (GwyShapeFitPreset *preset); +GwyNLFitter* gwy_shape_fit_preset_fit (GwyShapeFitPreset *preset, + GwyNLFitter *fitter, + const GwyXYZ *points, + guint n, + gdouble *params, + const gboolean *fixed_param, + gdouble *rss); +GwyInventory* gwy_shape_fit_presets (void); + +G_END_DECLS + +#endif /* __GWY_SHAPE_FIT_PRESET_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 : */ diff -Nru gwyddion-2.46/libprocess/hough.c gwyddion-2.47/libprocess/hough.c --- gwyddion-2.46/libprocess/hough.c 2016-02-22 15:05:27.000000000 +0000 +++ gwyddion-2.47/libprocess/hough.c 2016-10-27 09:28:52.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: hough.c 16117 2014-04-07 11:24:13Z yeti-dn $ + * @(#) $Id: hough.c 19128 2016-10-26 21:25:12Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -535,7 +535,23 @@ *yval = (gdouble)mrow; } - +/** + * gwy_data_field_get_local_maxima_list: + * @dfield: A two-dimensional data field. + * @xdata: Array of @ndata elements where the columns should be stored. + * @ydata: Array of @ndata elements where the rows should be stored. + * @zdata: Array of @ndata elements where the values should be stored. + * @ndata: Number of items in @xdata, @ydata and @zdata. + * @skip: Minimum pixel distance between maxima. + * @threshold: Minimum value to be considered a maximum. + * @subpixel: %TRUE for subpixel refinement. + * + * Locates local maxima in a data field. + * + * At most @ndata maxima are located. + * + * Returns: The actual number of maxima found. + **/ gint gwy_data_field_get_local_maxima_list(GwyDataField *dfield, gdouble *xdata, diff -Nru gwyddion-2.46/libprocess/linestats.c gwyddion-2.47/libprocess/linestats.c --- gwyddion-2.46/libprocess/linestats.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/linestats.c 2016-10-21 11:58:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: linestats.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: linestats.c 19108 2016-10-21 08:50:43Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1368,7 +1368,7 @@ } /** - * gwy_data_line_get_xvm: + * gwy_data_line_get_xtm: * @data_line: A data line. * @m: Number of sampling lengths. * @k: Number of peaks and valleys to consider. diff -Nru gwyddion-2.46/libprocess/Makefile.am gwyddion-2.47/libprocess/Makefile.am --- gwyddion-2.46/libprocess/Makefile.am 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/libprocess/Makefile.am 2016-11-15 08:25:23.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ libgwyddion = $(top_builddir)/libgwyddion/libgwyddion2.la @@ -29,6 +29,7 @@ gwyprocess.h \ gwyprocessenums.h \ gwyprocesstypes.h \ + gwyshapefitpreset.h \ hough.h \ interpolation.h \ inttrans.h \ @@ -89,7 +90,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 29:0:29 +libversion = -version-info 30:0:30 #libversion = -release @LIBRARY_RELEASE@ libgwyprocess2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyprocess2_la_LIBADD = $(libgwyprocess_libadd) @@ -115,6 +116,7 @@ gwyprocess.c \ gwyprocessenums.c \ gwyprocesstypes.c \ + gwyshapefitpreset.c \ hough.c \ interpolation.c \ inttrans.c \ diff -Nru gwyddion-2.46/libprocess/Makefile.in gwyddion-2.47/libprocess/Makefile.in --- gwyddion-2.46/libprocess/Makefile.in 2016-10-14 09:41:57.000000000 +0000 +++ gwyddion-2.47/libprocess/Makefile.in 2016-11-18 10:52:40.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 19063 2016-10-12 20:44:52Z yeti-dn $ +# @(#) $Id: Makefile.am 19258 2016-11-15 08:25:23Z yeti-dn $ # Generic glib-mkenum rules. # @(#) $Id: mkenum.mk 11705 2011-01-03 08:32:55Z yeti-dn $ @@ -163,11 +163,11 @@ cdline.lo correct.lo correlation.lo cwt.lo datafield.lo \ dataline.lo dwt.lo elliptic.lo filters.lo fractals.lo \ grains.lo gwycaldata.lo gwycalibration.lo gwygrainvalue.lo \ - gwyprocess.lo gwyprocessenums.lo gwyprocesstypes.lo hough.lo \ - interpolation.lo inttrans.lo level.lo linestats.lo \ - monte-carlo-unc.lo morph_lib.lo peaks.lo simplefft.lo \ - spectra.lo spline.lo stats.lo stats_uncertainty.lo surface.lo \ - tip.lo triangulation.lo + gwyprocess.lo gwyprocessenums.lo gwyprocesstypes.lo \ + gwyshapefitpreset.lo hough.lo interpolation.lo inttrans.lo \ + level.lo linestats.lo monte-carlo-unc.lo morph_lib.lo peaks.lo \ + simplefft.lo spectra.lo spline.lo stats.lo \ + stats_uncertainty.lo surface.lo tip.lo triangulation.lo libgwyprocess2_la_OBJECTS = $(am_libgwyprocess2_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -503,6 +503,7 @@ gwyprocess.h \ gwyprocessenums.h \ gwyprocesstypes.h \ + gwyshapefitpreset.h \ hough.h \ interpolation.h \ inttrans.h \ @@ -566,7 +567,7 @@ # Any iface change C++: 0: A # Adding ifaces C: R: A++ # Changing ifaces C: R: 0 -libversion = -version-info 29:0:29 +libversion = -version-info 30:0:30 #libversion = -release @LIBRARY_RELEASE@ libgwyprocess2_la_LDFLAGS = @BASIC_LIBS@ @FFTW3_LIBS@ -export-dynamic $(no_undefined) $(export_symbols) $(libversion) libgwyprocess2_la_LIBADD = $(libgwyprocess_libadd) @@ -591,6 +592,7 @@ gwyprocess.c \ gwyprocessenums.c \ gwyprocesstypes.c \ + gwyshapefitpreset.c \ hough.c \ interpolation.c \ inttrans.c \ @@ -707,6 +709,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyprocess.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyprocessenums.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyprocesstypes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwyshapefitpreset.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hough.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpolation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inttrans.Plo@am__quote@ diff -Nru gwyddion-2.46/libprocess/peaks.c gwyddion-2.47/libprocess/peaks.c --- gwyddion-2.46/libprocess/peaks.c 2016-08-22 07:57:46.000000000 +0000 +++ gwyddion-2.47/libprocess/peaks.c 2016-11-03 20:57:03.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: peaks.c 18861 2016-08-20 15:18:54Z yeti-dn $ + * @(#) $Id: peaks.c 19166 2016-11-03 10:11:16Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -42,6 +42,20 @@ gconstpointer b); static gint compare_abscissa_ascending (gconstpointer a, gconstpointer b); +GType +gwy_peaks_get_type(void) +{ + static GType peaks_type = 0; + + if (G_UNLIKELY(!peaks_type)) { + peaks_type = g_boxed_type_register_static("GwyPeaks", + (GBoxedCopyFunc)gwy_peaks_copy, + (GBoxedFreeFunc)gwy_peaks_free); + } + + return peaks_type; +} + /** * gwy_peaks_new: * @@ -65,6 +79,29 @@ } /** + * gwy_peaks_copy: + * @peaks: A peak analyser. + * + * Creates a copy of a peak analyser. + * + * This is mostly useful for language bindings. + * + * Returns: A newly created peak analyser. + * + * Since: 2.47 + **/ +GwyPeaks* +gwy_peaks_copy(GwyPeaks *peaks) +{ + GwyPeaks *copy = g_slice_dup(GwyPeaks, peaks); + + copy->peaks = g_array_new(FALSE, FALSE, sizeof(Peak)); + g_array_append_vals(copy->peaks, peaks->peaks->data, peaks->peaks->len); + + return copy; +} + +/** * gwy_peaks_free: * @peaks: A peak analyser. * diff -Nru gwyddion-2.46/libprocess/peaks.h gwyddion-2.47/libprocess/peaks.h --- gwyddion-2.46/libprocess/peaks.h 2016-08-16 15:37:57.000000000 +0000 +++ gwyddion-2.47/libprocess/peaks.h 2016-11-03 20:57:03.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: peaks.h 18841 2016-08-16 07:14:40Z yeti-dn $ + * @(#) $Id: peaks.h 19166 2016-11-03 10:11:16Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -48,7 +48,11 @@ typedef struct _GwyPeaks GwyPeaks; -GwyPeaks* gwy_peaks_new (void); +#define GWY_TYPE_PEAKS (gwy_peaks_get_type()) + +GType gwy_peaks_get_type (void) G_GNUC_CONST; +GwyPeaks* gwy_peaks_new (void) G_GNUC_MALLOC; +GwyPeaks* gwy_peaks_copy (GwyPeaks *peaks) G_GNUC_MALLOC; void gwy_peaks_free (GwyPeaks *peaks); void gwy_peaks_set_background (GwyPeaks *peaks, GwyPeakBackgroundType background); diff -Nru gwyddion-2.46/libprocess/spectra.c gwyddion-2.47/libprocess/spectra.c --- gwyddion-2.46/libprocess/spectra.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/spectra.c 2016-10-21 11:58:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: spectra.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: spectra.c 19108 2016-10-21 08:50:43Z yeti-dn $ * Copyright (C) 2006 Owain Davies, David Necas (Yeti), Petr Klapetek. * E-mail: owain.davies@blueyonder.co.uk * yeti@gwyddion.net, klapetek@gwyddion.net. @@ -1009,7 +1009,7 @@ } /** - * gwy_spectra_remove: + * gwy_spectra_remove_spectrum: * @spectra: A spectra object. * @i: Index of spectrum to remove. * diff -Nru gwyddion-2.46/libprocess/stats.c gwyddion-2.47/libprocess/stats.c --- gwyddion-2.46/libprocess/stats.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/stats.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: stats.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * @(#) $Id: stats.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2009 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -492,6 +492,8 @@ return; } + /* 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); @@ -3535,7 +3537,7 @@ } /** - * gwy_data_field_area_get_surface_area_mask: + * gwy_data_field_area_get_surface_area: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. * @col: Upper-left column coordinate. @@ -3546,8 +3548,8 @@ * 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 %GWY_MASK_INCLUDE. + * @gwy_data_field_area_get_surface_area_mask() with masking mode + * %GWY_MASK_INCLUDE. * * Returns: The surface area. **/ diff -Nru gwyddion-2.46/libprocess/stats_uncertainty.c gwyddion-2.47/libprocess/stats_uncertainty.c --- gwyddion-2.46/libprocess/stats_uncertainty.c 2016-02-22 15:05:27.000000000 +0000 +++ gwyddion-2.47/libprocess/stats_uncertainty.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: stats_uncertainty.c 18239 2016-01-27 21:15:05Z yeti-dn $ + * @(#) $Id: stats_uncertainty.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2009 Anna Campbellova * E-mail: acampbellova@cmi.cz. * @@ -598,6 +598,8 @@ return; } + /* Static code analysis: sod off. We ensure just above that at most one + * pointer is NULL. */ if (!min_unc) { *max_unc = gwy_data_field_area_get_max_uncertainty(data_field, uncz_field, NULL, GWY_MASK_IGNORE, col, row, width, height); @@ -2834,7 +2836,7 @@ /** - * gwy_data_field_area_get_surface_area_mask_uncertainty: + * gwy_data_field_area_get_surface_area_uncertainty: * @data_field: A data field. * @uncz_field: The corresponding uncertainty data field. * @uncx_field: The uncertainty in the x direction. @@ -3715,7 +3717,7 @@ } /** - * gwy_data_field_area_cdh: + * gwy_data_field_area_cdh_uncertainty: * @data_field: A data field. * @mask: Mask specifying which values to take into account/exclude, or %NULL. * @uncz_field: Corresponding uncertainty data field. diff -Nru gwyddion-2.46/libprocess/surface.c gwyddion-2.47/libprocess/surface.c --- gwyddion-2.46/libprocess/surface.c 2016-10-10 08:25:28.000000000 +0000 +++ gwyddion-2.47/libprocess/surface.c 2016-11-07 21:13:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: surface.c 19036 2016-10-08 10:32:41Z yeti-dn $ + * $Id: surface.c 19186 2016-11-06 18:10:10Z yeti-dn $ * Copyright (C) 2011-2016 David Nečas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -1244,7 +1244,7 @@ } /** - * SECTION: surface + * SECTION:surface * @title: GwySurface * @short_description: General two-dimensional data * diff -Nru gwyddion-2.46/libprocess/tip.c gwyddion-2.47/libprocess/tip.c --- gwyddion-2.46/libprocess/tip.c 2016-04-27 08:04:01.000000000 +0000 +++ gwyddion-2.47/libprocess/tip.c 2016-11-14 08:42:00.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: tip.c 18664 2016-04-26 20:23:50Z yeti-dn $ + * @(#) $Id: tip.c 19251 2016-11-14 08:42:00Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -25,10 +25,25 @@ #include #include #include +#include #include /* INTERPOLATION: New (not applicable). */ +/* Update when new parameter type is added. */ +enum { + NPARAMTYPES = 6 +}; + +typedef struct { + const gchar *tip_name; + const gchar *group_name; + GwyTipModelFunc func; + GwyTipGuessFunc guess; + gint nparams; + const GwyTipParamType *params; +} GwyTipModelPresetReal; + static void guess_symmetrical(GwyDataField *data, gdouble height, @@ -37,11 +52,17 @@ gint *xres, gint *yres) { - gdouble xreal = (height + radius)*tan(angle); - gint xpix = gwy_data_field_rtoi(data, xreal); + gdouble xreal; + gint xpix; + /* radius*cos(angle) is the maximum lateral dimension of the spherical + * part of the tip – for sane angles it takes little height so we do + * not take that into accout; height*tan(angle) is the actual width from + * the sloped part. */ + xreal = height*tan(angle) + radius*cos(angle); + xpix = gwy_data_field_rtoi(data, xreal); xpix = 2*xpix + 1; - xpix = CLAMP(xpix, 10, 1000); + xpix = CLAMP(xpix, 5, 1201); *xres = xpix; *yres = xpix; @@ -92,13 +113,25 @@ gint xpix = gwy_data_field_rtoi(data, xreal); xpix = 2*xpix + 1; - xpix = CLAMP(xpix, 10, 1000); + xpix = CLAMP(xpix, 5, 1201); *xres = xpix; *yres = xpix; } static void +ell_parabola_guess(GwyDataField *data, + gdouble height, + gdouble radius, + gdouble *params, + gint *xres, + gint *yres) +{ + gdouble r1 = radius*sqrt(params[2]), r2 = radius/sqrt(params[2]); + parabola_guess(data, height, fmax(r1, r2), params, xres, yres); +} + +static void cone_guess(GwyDataField *data, gdouble height, gdouble radius, @@ -203,6 +236,7 @@ gwy_data_field_invalidate(tip); } +/* params[0]...number of sides, params[1]...slope angle */ static void pyramid(GwyDataField *tip, G_GNUC_UNUSED gdouble height, @@ -210,7 +244,6 @@ gdouble rotation, gdouble *params) { - /*params[0]..number of sides, params[1]..angle*/ create_pyramid(tip, params[1], params[0], rotation); round_pyramid(tip, params[1], params[0], radius); } @@ -254,7 +287,7 @@ scol = tip->xres/2; srow = tip->yres/2; x = gwy_data_field_jtor(tip, scol); - z0 = a*x*x; + z0 = 2.0*a*x*x; for (row = 0; row < tip->yres; row++) { y = gwy_data_field_jtor(tip, row - srow); @@ -268,6 +301,38 @@ gwy_data_field_invalidate(tip); } +/* params[2]...anisotropy */ +static void +ell_parabola(GwyDataField *tip, + G_GNUC_UNUSED gdouble height, + gdouble radius, + gdouble rotation, + gdouble *params) +{ + gdouble a1 = 0.5/radius/sqrt(params[2]), a2 = 0.5/radius*sqrt(params[2]); + gint col, row; + gdouble scol, srow; + gdouble x, y, xx, yy, ca = cos(rotation), sa = sin(rotation); + + scol = tip->xres/2; + srow = tip->yres/2; + x = gwy_data_field_jtor(tip, scol); + + for (row = 0; row < tip->yres; row++) { + y = gwy_data_field_jtor(tip, row - srow); + for (col = 0; col < tip->xres; col++) { + x = gwy_data_field_itor(tip, col - scol); + xx = x*ca - y*sa; + yy = x*sa + y*ca; + tip->data[col + tip->xres*row] = -(a1*xx*xx + a2*yy*yy); + } + } + + gwy_data_field_invalidate(tip); + gwy_data_field_add(tip, -gwy_data_field_get_min(tip)); +} + +/* params[1]...slope angle */ static void cone(GwyDataField *tip, G_GNUC_UNUSED gdouble height, @@ -315,48 +380,85 @@ gwy_data_field_invalidate(tip); } -static const GwyTipModelPreset tip_presets[] = { +static const GwyTipParamType pyramid_params[] = { + GWY_TIP_PARAM_RADIUS, + GWY_TIP_PARAM_ROTATION, + GWY_TIP_PARAM_NSIDES, + GWY_TIP_PARAM_SLOPE, +}; + +static const GwyTipParamType contact_params[] = { + GWY_TIP_PARAM_RADIUS, + GWY_TIP_PARAM_ROTATION, +}; + +static const GwyTipParamType noncontact_params[] = { + GWY_TIP_PARAM_RADIUS, + GWY_TIP_PARAM_ROTATION, +}; + +static const GwyTipParamType delta_params[] = { + GWY_TIP_PARAM_HEIGHT, +}; + +static const GwyTipParamType parabola_params[] = { + GWY_TIP_PARAM_RADIUS, +}; + +static const GwyTipParamType cone_params[] = { + GWY_TIP_PARAM_RADIUS, + GWY_TIP_PARAM_SLOPE, +}; + +static const GwyTipParamType ell_parabola_params[] = { + GWY_TIP_PARAM_RADIUS, + GWY_TIP_PARAM_ROTATION, + GWY_TIP_PARAM_ANISOTROPY, +}; + +/* Must match the GwyTipTyp enum! */ +static const GwyTipModelPresetReal tip_presets[] = { { N_("Pyramid"), N_("Pyramidal"), - &pyramid, - &pyramid_guess, - 0 + &pyramid, &pyramid_guess, + G_N_ELEMENTS(pyramid_params), pyramid_params, }, { N_("Contact"), N_("Pyramidal"), - &contact, - &contact_guess, - 0 + &contact, &contact_guess, + G_N_ELEMENTS(contact_params), contact_params, }, { N_("Noncontact"), N_("Pyramidal"), - &noncontact, - &noncontact_guess, - 0 + &noncontact, &noncontact_guess, + G_N_ELEMENTS(noncontact_params), noncontact_params, }, { N_("Delta function"), N_("Analytical"), - &delta, - &delta_guess, - 0 + &delta, &delta_guess, + G_N_ELEMENTS(delta_params), delta_params, }, { N_("Parabola"), N_("Symmetric"), - ¶bola, - ¶bola_guess, - 0 + ¶bola, ¶bola_guess, + G_N_ELEMENTS(parabola_params), parabola_params, }, { N_("Cone"), N_("Symmetric"), - &cone, - &cone_guess, - 0 + &cone, &cone_guess, + G_N_ELEMENTS(cone_params), cone_params, + }, + { + N_("Elliptical parabola"), + N_("Asymmetric"), + &ell_parabola, &ell_parabola_guess, + G_N_ELEMENTS(ell_parabola_params), ell_parabola_params, }, }; @@ -388,7 +490,7 @@ && preset_id < (gint)G_N_ELEMENTS(tip_presets), NULL); - return tip_presets + preset_id; + return (const GwyTipModelPreset*)(tip_presets + preset_id); } /** @@ -402,12 +504,14 @@ const GwyTipModelPreset* gwy_tip_model_get_preset_by_name(const gchar *name) { - gsize i; + guint i; + g_return_val_if_fail(name, NULL); for (i = 0; i < G_N_ELEMENTS(tip_presets); i++) { if (gwy_strequal(name, tip_presets[i].tip_name)) - return tip_presets + i; + return (GwyTipModelPreset*)(tip_presets + i); } + return NULL; } @@ -422,7 +526,8 @@ gint gwy_tip_model_get_preset_id(const GwyTipModelPreset* preset) { - return preset - tip_presets; + g_return_val_if_fail(preset, 0); + return (const GwyTipModelPresetReal*)preset - tip_presets; } /** @@ -436,6 +541,7 @@ const gchar* gwy_tip_model_get_preset_tip_name(const GwyTipModelPreset* preset) { + g_return_val_if_fail(preset, NULL); return preset->tip_name; } @@ -450,6 +556,7 @@ const gchar* gwy_tip_model_get_preset_group_name(const GwyTipModelPreset* preset) { + g_return_val_if_fail(preset, NULL); return preset->group_name; } @@ -459,14 +566,278 @@ * * Get number of tip preset parameters. * + * In versions prior to 2.47 the function alwas returned zero and thus + * was useless. You had to know the what parameters each model had and always + * pass a maximum-nparams-sized array with only the interesting elements + * containing your parameters. Since version 2.47 it returns the true number + * of parameters used in functions such as gwy_tip_model_preset_create() and + * gwy_tip_model_preset_create_for_zrange(). It does not return the number of + * parameters the old functions take. They behave exactly as before. + * * Returns: Number of parameters. **/ gint gwy_tip_model_get_preset_nparams(const GwyTipModelPreset* preset) { + g_return_val_if_fail(preset, 0); return preset->nparams; } +/** + * gwy_tip_model_get_preset_params: + * @preset: Tip model preset. + * + * Gets the list of parameters of a tip model preset. + * + * All tip models have parameters from a predefined set given by the + * #GwyTipParamType enum. + * + * Note further items may be in principle added to the set in the future so + * you may want to avoid tip models that have parameters with an unknown + * (higher than known) id. + * + * Returns: List of all tip model parameter ids in ascending order. The array + * is owned by the library and must not be modified nor freed. + * + * Since: 2.47 + **/ +const GwyTipParamType* +gwy_tip_model_get_preset_params(const GwyTipModelPreset* preset) +{ + g_return_val_if_fail(preset, NULL); + return ((const GwyTipModelPresetReal*)preset)->params; +} + +/* Take the real parameters the function actually has and fill the full-sized + * arrays (including ignored parameters) the functions want to take. */ +static void +params_to_old_params(const GwyTipModelPreset *preset, + const gdouble *params, + gdouble *height, gdouble *radius, gdouble *rotation, + gdouble *oldparams) +{ + const GwyTipModelPresetReal *rpreset = (const GwyTipModelPresetReal*)preset; + guint i; + + *height = *radius = *rotation = 0.0; + gwy_clear(oldparams, NPARAMTYPES-3); + + for (i = 0; i < rpreset->nparams; i++) { + GwyTipParamType paramid = rpreset->params[i]; + + if (paramid == GWY_TIP_PARAM_HEIGHT) + *height = params[i]; + else if (paramid == GWY_TIP_PARAM_RADIUS) + *radius = params[i]; + else if (paramid == GWY_TIP_PARAM_ROTATION) + *rotation = params[i]; + else { + g_assert((guint)paramid < NPARAMTYPES); + oldparams[paramid-3] = params[i]; + } + } +} + +/** + * gwy_tip_model_preset_create: + * @preset: Tip model preset. + * @tip: Data field to fill with the tip model. + * @params: Parameters of the tip model. + * + * Fills a data field with a preset tip model. + * + * Both pixel and physical dimensions of the @tip data field are preserved by + * this function. Ensure that before using this function the @tip data field + * has the same pixels as target data field you want to use the tip model with. + * + * The number of parameters is the true full number of parameters as reported + * by gwy_tip_model_get_preset_nparams() and gwy_tip_model_get_preset_params(). + * And only those parameters are passed in @params. + * + * Since: 2.47 + **/ +void +gwy_tip_model_preset_create(const GwyTipModelPreset* preset, + GwyDataField *tip, + const gdouble *params) +{ + gdouble old_params[NPARAMTYPES - 3]; + gdouble height, radius, rotation; + + g_return_if_fail(GWY_IS_DATA_FIELD(tip)); + g_return_if_fail(preset); + + params_to_old_params(preset, params, + &height, &radius, &rotation, old_params); + preset->func(tip, height, radius, rotation, old_params); +} + +static gboolean +check_tip_zrange(GwyDataField *tip, gdouble zrange, + gdouble *zrange_leftright, gdouble *zrange_topbottom, + guint *can_shrink_width, guint *can_shrink_height) +{ + GwyDataField *mask; + gdouble max = gwy_data_field_get_max(tip); + guint xres = tip->xres, yres = tip->yres, left, right, up, down; + gdouble hmax, vmax; + + vmax = fmax(gwy_data_field_area_get_max(tip, NULL, 0, 0, xres, 1), + gwy_data_field_area_get_max(tip, NULL, 0, yres-1, xres, 1)); + *zrange_topbottom = max - vmax; + hmax = fmax(gwy_data_field_area_get_max(tip, NULL, 0, 0, 1, yres), + gwy_data_field_area_get_max(tip, NULL, xres-1, 0, 1, yres)); + *zrange_leftright = max - hmax; + *can_shrink_height = *can_shrink_width = 0; + + if (!(fmax(*zrange_topbottom, *zrange_leftright) >= zrange)) + return FALSE; + + mask = gwy_data_field_duplicate(tip); + gwy_data_field_threshold(mask, max - zrange, 0.0, 1.0); + if (gwy_data_field_grains_autocrop(mask, TRUE, &left, &right, &up, &down)) { + /* There were some empty rows, i.e. rows with too small values. */ + *can_shrink_width = left; + *can_shrink_height = up; + } + g_object_unref(mask); + + return TRUE; +} + +/** + * gwy_tip_model_preset_create_for_zrange: + * @preset: Tip model preset. + * @tip: Data field to fill with the tip model. + * @zrange: Range of height values in the data determining the required height + * of the tip model. + * @square: %TRUE to enforce a square data field (with @xres and @yres equal). + * @params: Parameters of the tip model. + * + * Fills a data field with a preset tip model, resizing it to make it suitable + * for the given value range. + * + * The dimensions of a pixel in @tip is preserved by this function. Ensure + * that before using this function the @tip data field has the same pixels as + * target data field you want to use the tip model with. + * + * However, its dimensions will generally be changed to ensure it is optimal + * for @zrange. This means it is guaranteed the height difference between the + * apex and any border pixel in @tip is at least @zrange, while simultaneously + * the smallest such difference is not much larger than @zrange. + * + * The number of parameters is the true full number of parameters as reported + * by gwy_tip_model_get_preset_nparams() and gwy_tip_model_get_preset_params(). + * And only those parameters are passed in @params. + * + * Since: 2.47 + **/ +void +gwy_tip_model_preset_create_for_zrange(const GwyTipModelPreset* preset, + GwyDataField *tip, + gdouble zrange, + gboolean square, + const gdouble *params) +{ + gdouble old_params[NPARAMTYPES - 3]; + gdouble height, radius, rotation; + gdouble dx, dy, zrange_lr, zrange_tb; + guint xres_good, yres_good, redw, redh, iter; + gboolean is_delta; + gint xres, yres; + + g_return_if_fail(GWY_IS_DATA_FIELD(tip)); + g_return_if_fail(preset); + + is_delta = (gwy_tip_model_get_preset_id(preset) == GWY_TIP_DELTA); + dx = gwy_data_field_get_xmeasure(tip); + dy = gwy_data_field_get_ymeasure(tip); + + /* Create tip according to the guess function. The guess function only + * uses the dx and dy from the data field so we pass tip itself to it. */ + params_to_old_params(preset, params, + &height, &radius, &rotation, old_params); + if (is_delta) + xres = yres = 3; + else + preset->guess(tip, zrange, radius, old_params, &xres, &yres); + if (square) + xres = yres = MAX(xres, yres); + + gwy_data_field_resample(tip, xres, yres, GWY_INTERPOLATION_NONE); + tip->xreal = xres*dx; + tip->yreal = yres*dy; + preset->func(tip, height, radius, rotation, old_params); + if (is_delta) + return; + + /* Enlarge the tip while it is too small. */ + iter = 0; + while (!check_tip_zrange(tip, 1.1*zrange, + &zrange_lr, &zrange_tb, &redw, &redh)) { + if (zrange_tb <= 1.1*zrange) + yres = (4*yres/3 + 1) | 1; + if (zrange_lr <= 1.1*zrange) + xres = (4*xres/3 + 1) | 1; + if (square) + xres = yres = MAX(xres, yres); + + gwy_data_field_resample(tip, xres, yres, GWY_INTERPOLATION_NONE); + tip->xreal = xres*dx; + tip->yreal = yres*dy; + preset->func(tip, height, radius, rotation, old_params); + + /* This means about 10 times larger tip than estimated. */ + if (iter++ == 8) { + g_warning("Failed to guarantee zrange by enlagring tip model."); + break; + } + } + xres_good = xres; + yres_good = yres; + + if (square) + redw = redh = MIN(redw, redh); + if (redw) + redw--; + if (redh) + redh--; + + if (!MAX(redw, redh)) + return; + + /* The tip seems too large so try cropping it a bit. */ + xres -= 2*redw; + yres -= 2*redh; + gwy_data_field_resample(tip, xres, yres, GWY_INTERPOLATION_NONE); + tip->xreal = xres*dx; + tip->yreal = yres*dy; + preset->func(tip, height, radius, rotation, old_params); + if (check_tip_zrange(tip, 1.01*zrange, + &zrange_lr, &zrange_tb, &redw, &redh)) + return; + + /* It fails the check after size reduction so try two things: first adding + * just one pixel to each side, then just reverting to the last know good + * tip. */ + xres += 2; + yres += 2; + gwy_data_field_resample(tip, xres, yres, GWY_INTERPOLATION_NONE); + tip->xreal = xres*dx; + tip->yreal = yres*dy; + preset->func(tip, height, radius, rotation, old_params); + if (check_tip_zrange(tip, 1.01*zrange, + &zrange_lr, &zrange_tb, &redw, &redh)) + return; + + xres = xres_good; + yres = yres_good; + gwy_data_field_resample(tip, xres, yres, GWY_INTERPOLATION_NONE); + tip->xreal = xres*dx; + tip->yreal = yres*dy; + preset->func(tip, height, radius, rotation, old_params); +} + static gint** i_datafield_to_field(GwyDataField *datafield, gboolean maxzero, diff -Nru gwyddion-2.46/libprocess/tip.h gwyddion-2.47/libprocess/tip.h --- gwyddion-2.46/libprocess/tip.h 2016-01-25 13:15:44.000000000 +0000 +++ gwyddion-2.47/libprocess/tip.h 2016-10-18 08:13:27.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: tip.h 18144 2016-01-21 13:17:10Z yeti-dn $ - * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: tip.h 19080 2016-10-14 13:59:02Z yeti-dn $ + * Copyright (C) 2003-2016 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 @@ -27,6 +27,9 @@ G_BEGIN_DECLS +typedef struct _GwyTipModelPreset GwyTipModelPreset; + +#ifndef GWY_DISABLE_DEPRECATED typedef void (*GwyTipModelFunc)(GwyDataField *tip, gdouble height, gdouble radius, @@ -40,8 +43,6 @@ gint *xres, gint *yres); -typedef struct _GwyTipModelPreset GwyTipModelPreset; - struct _GwyTipModelPreset { const gchar *tip_name; const gchar *group_name; @@ -49,17 +50,24 @@ GwyTipGuessFunc guess; gint nparams; }; +#endif - -/* XXX: remove presets, each tip type is quite different */ -gint gwy_tip_model_get_npresets (void); -const GwyTipModelPreset* gwy_tip_model_get_preset (gint preset_id); -const GwyTipModelPreset* gwy_tip_model_get_preset_by_name (const gchar *name); -gint gwy_tip_model_get_preset_id (const GwyTipModelPreset* preset); -const gchar* gwy_tip_model_get_preset_tip_name (const GwyTipModelPreset* preset); -const gchar* gwy_tip_model_get_preset_group_name(const GwyTipModelPreset* preset); -gint gwy_tip_model_get_preset_nparams (const GwyTipModelPreset* preset); - +gint gwy_tip_model_get_npresets (void); +const GwyTipModelPreset* gwy_tip_model_get_preset (gint preset_id); +const GwyTipModelPreset* gwy_tip_model_get_preset_by_name (const gchar *name); +gint gwy_tip_model_get_preset_id (const GwyTipModelPreset* preset); +const gchar* gwy_tip_model_get_preset_tip_name (const GwyTipModelPreset* preset); +const gchar* gwy_tip_model_get_preset_group_name (const GwyTipModelPreset* preset); +gint gwy_tip_model_get_preset_nparams (const GwyTipModelPreset* preset); +const GwyTipParamType* gwy_tip_model_get_preset_params (const GwyTipModelPreset* preset); +void gwy_tip_model_preset_create (const GwyTipModelPreset* preset, + GwyDataField *tip, + const gdouble *params); +void gwy_tip_model_preset_create_for_zrange(const GwyTipModelPreset* preset, + GwyDataField *tip, + gdouble zrange, + gboolean square, + const gdouble *params); GwyDataField* gwy_tip_dilation(GwyDataField *tip, GwyDataField *surface, diff -Nru gwyddion-2.46/modules/file/bcrfile.c gwyddion-2.47/modules/file/bcrfile.c --- gwyddion-2.46/modules/file/bcrfile.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/bcrfile.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: bcrfile.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * $Id: bcrfile.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -300,13 +300,13 @@ return; s += sizeof(HEADER_SIZE_MAGIC)-1; - while (s - buffer < *header_size && (c = gwy_get_guint16_le(&s) == ' ')) + 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) == '=')) + 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) == ' ')) + while (s - buffer < *header_size && (c = gwy_get_guint16_le(&s)) == ' ') ; s -= sizeof(guint16); while (s - buffer < *header_size diff -Nru gwyddion-2.46/modules/file/burleigh_exp.c gwyddion-2.47/modules/file/burleigh_exp.c --- gwyddion-2.46/modules/file/burleigh_exp.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/burleigh_exp.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: burleigh_exp.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: burleigh_exp.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2007 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -306,7 +306,7 @@ if (sscanf(line, ".Binary Format, Header Length=%u, Integer %u bits", &header->length, &header->bpp)) header->binary = TRUE; - if (!line || !p || p[0] != '.') + if (!p || p[0] != '.') break; } diff -Nru gwyddion-2.46/modules/file/hdrimage.cc gwyddion-2.47/modules/file/hdrimage.cc --- gwyddion-2.46/modules/file/hdrimage.cc 2015-07-29 08:28:23.000000000 +0000 +++ gwyddion-2.47/modules/file/hdrimage.cc 2016-11-09 09:22:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: hdrimage.cc 16521 2014-09-10 17:08:28Z yeti-dn $ + * @(#) $Id: hdrimage.cc 19214 2016-11-09 09:22:44Z yeti-dn $ * Copyright (C) 2011,2013 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -1448,7 +1448,7 @@ /* FIXME: Not very helpful. Thread-unsafe. */ g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, - _("libpng error occured")); + _("libpng error occurred")); goto fail; } diff -Nru gwyddion-2.46/modules/file/imgexport.c gwyddion-2.47/modules/file/imgexport.c --- gwyddion-2.46/modules/file/imgexport.c 2016-10-14 09:02:42.000000000 +0000 +++ gwyddion-2.47/modules/file/imgexport.c 2016-11-13 20:46:21.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: imgexport.c 19071 2016-10-14 09:02:41Z yeti-dn $ + * @(#) $Id: imgexport.c 19219 2016-11-09 20:12:49Z yeti-dn $ * Copyright (C) 2014-2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -217,6 +217,7 @@ GtkWidget *inset_length_auto; GtkWidget *inset_draw_ticks; GtkWidget *inset_draw_label; + GtkWidget *inset_draw_text_above; /* Values */ GtkWidget *table_value; @@ -513,7 +514,7 @@ "Export to some formats relies on GDK and other libraries thus may " "be installation-dependent."), "Yeti ", - "2.0", + "2.1", "David Nečas (Yeti)", "2014", }; @@ -1161,7 +1162,7 @@ real /= vf->magnitude; sizes->vf_fmruler = vf; - sizes->zunits_nonempty = strlen(vf->units); + sizes->zunits_nonempty = !!strlen(vf->units); gwy_debug("unit '%s'", vf->units); /* Return after creating vf, we are supposed to do that. */ @@ -1250,16 +1251,25 @@ if (pos == INSET_POS_TOP_LEFT || pos == INSET_POS_TOP_CENTER || pos == INSET_POS_TOP_RIGHT) - rect->y = lw + fs*args->inset_ygap; + if (args->inset_draw_text_above) + rect->y = lw + fs*args->inset_ygap + rect->h; + else + rect->y = lw + fs*args->inset_ygap; else - rect->y = vsize - lw - rect->h - fs*args->inset_ygap; + if (args->inset_draw_text_above) + if (args->inset_draw_ticks) + rect->y = vsize - lw - tl - fs*args->inset_ygap; + else + rect->y = vsize - lw - fs*args->inset_ygap; + else + rect->y = vsize - lw - rect->h - fs*args->inset_ygap; if (pos == INSET_POS_TOP_LEFT || pos == INSET_POS_BOTTOM_LEFT) - rect->x = 2.0*lw + fs*args->inset_xgap; + rect->x = 2.0 * lw + fs*args->inset_xgap; else if (pos == INSET_POS_TOP_RIGHT || pos == INSET_POS_BOTTOM_RIGHT) - rect->x = hsize - 2.0*lw - rect->w - fs*args->inset_xgap; + rect->x = hsize - 2.0 * lw - rect->w - fs*args->inset_xgap; else - rect->x = hsize/2 - 0.5*rect->w; + rect->x = hsize / 2 - 0.5 * rect->w; } static void @@ -1920,7 +1930,7 @@ const ImgExportRect *rect = &sizes->inset, *imgrect = &sizes->image; const GwyRGBA *colour = &args->inset_color; const GwyRGBA *outcolour = &args->inset_outline_color; - PangoRectangle logical; + PangoRectangle logical, ink; gdouble lw = sizes->sizes.line_width; gdouble tl = sizes->sizes.tick_length; gdouble olw = sizes->sizes.outline_width; @@ -1977,7 +1987,9 @@ cairo_stroke(cr); cairo_restore(cr); - if (args->inset_draw_ticks) + if (args->inset_draw_text_above) + y = -2.0*lw; + else if (args->inset_draw_ticks) y = tl + 2.0*lw; else y = 2.0*lw; @@ -1985,7 +1997,12 @@ if (args->inset_draw_label) { cairo_save(cr); format_layout(layout, &logical, s, "%s", args->inset_length); - cairo_move_to(cr, xcentre - 0.5*logical.width/pangoscale, y); + /* We need ink rectangle to position labels with no ink below baseline, + * such as 100 nm, as expected. */ + pango_layout_get_extents(layout, &ink, NULL); + if (args->inset_draw_text_above) + y -= (ink.y + ink.height)/pangoscale; + cairo_move_to(cr, xcentre - 0.5*ink.width/pangoscale, y); draw_text_with_outline(cr, layout, colour, outcolour, olw); cairo_restore(cr); } @@ -3236,6 +3253,7 @@ gtk_widget_set_sensitive(controls->inset_length_auto, insetsens); gtk_widget_set_sensitive(controls->inset_draw_ticks, insetsens); gtk_widget_set_sensitive(controls->inset_draw_label, insetsens); + gtk_widget_set_sensitive(controls->inset_draw_text_above, insetsens); for (i = 0; i < G_N_ELEMENTS(controls->inset_pos_label); i++) gtk_widget_set_sensitive(controls->inset_pos_label[i], insetsens); gwy_table_hscale_set_sensitive(controls->inset_xgap, insetsens*hgapsens); @@ -3332,6 +3350,17 @@ } static void +inset_draw_text_above_changed(ImgExportControls *controls, + GtkToggleButton *button) +{ + ImgExportArgs *args = controls->args; + + args->inset_draw_text_above = gtk_toggle_button_get_active(button); + if (args->xytype == IMGEXPORT_LATERAL_INSET) + update_preview(controls); +} + +static void inset_pos_changed(ImgExportControls *controls, GtkToggleButton *button) { @@ -3437,7 +3466,7 @@ GtkWidget *table, *label; gint row = 0; - table = controls->table_lateral = gtk_table_new(16, 4, FALSE); + table = controls->table_lateral = gtk_table_new(18, 4, FALSE); gtk_container_set_border_width(GTK_CONTAINER(table), 4); gtk_table_set_row_spacings(GTK_TABLE(table), 2); gtk_table_set_col_spacings(GTK_TABLE(table), 6); @@ -3576,6 +3605,17 @@ G_CALLBACK(inset_draw_label_changed), controls); row++; + controls->inset_draw_text_above + = gtk_check_button_new_with_mnemonic(_("Draw text _above scale bar")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->inset_draw_text_above), + args->inset_draw_text_above); + gtk_table_attach(GTK_TABLE(table), controls->inset_draw_text_above, + 0, 4, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_signal_connect_swapped(controls->inset_draw_text_above, "toggled", + G_CALLBACK(inset_draw_text_above_changed), + controls); + row++; + update_lateral_sensitivity(controls); } @@ -4239,6 +4279,8 @@ src->inset_draw_ticks); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->inset_draw_label), src->inset_draw_label); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->inset_draw_text_above), + src->inset_draw_text_above); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->draw_frame), src->draw_frame); @@ -5279,7 +5321,7 @@ /* FIXME: Not very helpful. Thread-unsafe. */ g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, - _("libpng error occured")); + _("libpng error occurred")); ok = FALSE; /* might be clobbered by longjmp otherwise, says gcc. */ goto end; } @@ -6497,6 +6539,7 @@ static const gchar font_size_key[] = "/module/pixmap/font_size"; static const gchar inset_color_key[] = "/module/pixmap/inset_color"; static const gchar inset_draw_label_key[] = "/module/pixmap/inset_draw_label"; +static const gchar inset_draw_text_above_key[] = "/module/pixmap/inset_draw_text_above"; static const gchar inset_draw_ticks_key[] = "/module/pixmap/inset_draw_ticks"; static const gchar inset_length_key[] = "/module/pixmap/inset_length"; static const gchar inset_outline_color_key[] = "/module/pixmap/inset_outline_color"; @@ -6618,6 +6661,8 @@ &args->inset_draw_ticks); gwy_container_gis_boolean_by_name(container, inset_draw_label_key, &args->inset_draw_label); + gwy_container_gis_boolean_by_name(container, inset_draw_text_above_key, + &args->inset_draw_text_above); gwy_container_gis_boolean_by_name(container, units_in_title_key, &args->units_in_title); gwy_container_gis_string_by_name(container, selection_key, @@ -6710,6 +6755,8 @@ args->inset_draw_ticks); gwy_container_set_boolean_by_name(container, inset_draw_label_key, args->inset_draw_label); + gwy_container_set_boolean_by_name(container, inset_draw_text_above_key, + args->inset_draw_text_above); gwy_container_set_boolean_by_name(container, units_in_title_key, args->units_in_title); gwy_container_set_string_by_name(container, selection_key, diff -Nru gwyddion-2.46/modules/file/imgexportpreset.h gwyddion-2.47/modules/file/imgexportpreset.h --- gwyddion-2.46/modules/file/imgexportpreset.h 2016-07-30 22:24:49.000000000 +0000 +++ gwyddion-2.47/modules/file/imgexportpreset.h 2016-10-18 08:13:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: imgexportpreset.h 18789 2016-07-30 07:59:38Z yeti-dn $ + * @(#) $Id: imgexportpreset.h 19082 2016-10-14 20:40:18Z dn2010 $ * Copyright (C) 2014-2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -105,6 +105,7 @@ gboolean decomma; gboolean inset_draw_ticks; gboolean inset_draw_label; + gboolean inset_draw_text_above; gdouble fmscale_gap; gdouble inset_xgap; gdouble inset_ygap; @@ -162,7 +163,7 @@ GWYRGBA_BLACK, GWYRGBA_WHITE, TRUE, TRUE, TRUE, FALSE, TRUE, "Helvetica", TRUE, - FALSE, TRUE, TRUE, + FALSE, TRUE, TRUE, FALSE, 1.0, 1.0, 1.0, 0.0, 1.0, FALSE, 2, FALSE, 1200.0, @@ -258,6 +259,7 @@ args->bg_color.a = 1.0; args->inset_draw_ticks = !!args->inset_draw_ticks; args->inset_draw_label = !!args->inset_draw_label; + args->inset_draw_text_above = !!args->inset_draw_text_above; args->units_in_title = !!args->units_in_title; args->sizes.font_size = CLAMP(args->sizes.font_size, 1.0, 1024.0); args->sizes.line_width = CLAMP(args->sizes.line_width, 0.0, 16.0); @@ -536,6 +538,8 @@ data.inset_draw_ticks = atoi(value); else if (gwy_strequal(key, "inset_draw_label")) data.inset_draw_label = atoi(value); + else if (gwy_strequal(key, "inset_draw_text_above")) + data.inset_draw_text_above = atoi(value); else if (gwy_strequal(key, "units_in_title")) data.units_in_title = atoi(value); else if (gwy_strequal(key, "sel_number_objects")) diff -Nru gwyddion-2.46/modules/file/intelliwave.c gwyddion-2.47/modules/file/intelliwave.c --- gwyddion-2.46/modules/file/intelliwave.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/intelliwave.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: intelliwave.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * $Id: intelliwave.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -311,7 +311,7 @@ } if (err_DIMENSION(error, intwfile.info.nx) - || err_DIMENSION(error, intwfile.info.nx)) + || err_DIMENSION(error, intwfile.info.ny)) goto fail; n = intwfile.info.nz; diff -Nru gwyddion-2.46/modules/file/jpkscan.c gwyddion-2.47/modules/file/jpkscan.c --- gwyddion-2.46/modules/file/jpkscan.c 2016-10-11 20:04:06.000000000 +0000 +++ gwyddion-2.47/modules/file/jpkscan.c 2016-10-19 07:54:14.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: jpkscan.c 19053 2016-10-11 18:00:31Z yeti-dn $ + * @(#) $Id: jpkscan.c 19097 2016-10-18 21:19:05Z dn2010 $ * Loader for JPK Image Scans. * Copyright (C) 2005 JPK Instruments AG. * Written by Sven Neumann . @@ -52,6 +52,7 @@ #include "config.h" #include +#include #include #include #include diff -Nru gwyddion-2.46/modules/file/leica.c gwyddion-2.47/modules/file/leica.c --- gwyddion-2.46/modules/file/leica.c 2016-10-11 20:04:06.000000000 +0000 +++ gwyddion-2.47/modules/file/leica.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: leica.c 19051 2016-10-11 04:41:30Z dn2010 $ + * $Id: leica.c 19130 2016-10-27 20:58:23Z dn2010 $ * Copyright (C) 2014 Daniil Bratashov (dn2010), David Necas (Yeti).. * * E-mail: dn2010@gmail.com. @@ -350,12 +350,12 @@ && (element->dimensions->len != 3)) { /* check for case ndim == 4 && res == 1 */ - for (i = 0; i < element->dimensions->len; i++) { + for (j = 0; j < element->dimensions->len; j++) { dimension = &g_array_index(element->dimensions, - LIFDimension, i); + LIFDimension, j); xres = dimension->res; - gwy_debug("dim[%d].res=%d", i, xres); - if (i == 2) { + gwy_debug("dim[%d].res=%d", j, xres); + if (j == 2) { res = xres; } } @@ -699,7 +699,7 @@ } g_free(file); } - if (header->xmlheader) + if (header && header->xmlheader) g_free(header->xmlheader); if (header) { g_free(header); diff -Nru gwyddion-2.46/modules/file/nanomagnetics.c gwyddion-2.47/modules/file/nanomagnetics.c --- gwyddion-2.46/modules/file/nanomagnetics.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/nanomagnetics.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: nanomagnetics.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: nanomagnetics.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2012 Sameer Grover, David Necas (Yeti). * E-mail: sameer.grover.1@gmail.com, yeti@gwyddion.net. * @@ -1964,16 +1964,15 @@ get_string_LEB128(const guchar **p, gsize *size) { /* decode LEB128 number (pseudocode from wikipedia) */ - gulong result = 0; + gulong byte, result = 0; guint shift = 0; - guchar byte; gchar *strng; glong i; while (TRUE) { if (*size < 1) return NULL; - byte = (guint)(**p); + byte = **p; *p += 1; *size -= 1; result |= ((byte & 0x7F) << shift); diff -Nru gwyddion-2.46/modules/file/nmmxyz.c gwyddion-2.47/modules/file/nmmxyz.c --- gwyddion-2.46/modules/file/nmmxyz.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/nmmxyz.c 2016-11-16 17:31:42.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: nmmxyz.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * $Id: nmmxyz.c 19280 2016-11-16 17:31:41Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -64,11 +64,19 @@ #define EXTENSION ".dsc" #define DASHED_LINE "------------------------------------------" +/* We need the array size represented as gsize; otherwise we could use GArray. + * Also inlining the code makes reading the huge data a bit faster. */ +typedef struct { + gdouble *data; + gsize len; + gsize size; +} GwyDoubleArray; + typedef struct { const gchar *filename; - guint nfiles; - guint blocksize; - gulong ndata; + gsize nfiles; + gsize blocksize; + gsize ndata; gdouble xmin; gdouble xmax; gdouble ymin; @@ -104,74 +112,82 @@ gchar *long_name; } NMMXYZProfileDescription; -static gboolean module_register (void); -static gint nmmxyz_detect (const GwyFileDetectInfo *fileinfo, - gboolean only_name); -static GwyContainer* nmmxyz_load (const gchar *filename, - GwyRunType mode, - GError **error); -static void update_nincluded (NMMXYZArgs *args, - guint blocksize); -static gboolean nmmxyz_dialogue (NMMXYZArgs *args, - NMMXYZInfo *info, - GArray *dscs); -static gint add_info_count (GtkTable *table, - gint row, - const gchar *description, - gulong n); -static void update_ok_sensitivity (NMMXYZControls *controls); -static void include_channel_changed (GtkToggleButton *toggle, - NMMXYZControls *controls); -static void plot_density_changed (NMMXYZControls *controls, - GtkToggleButton *toggle); -static gint construct_resolutions (NMMXYZControls *controls, - GtkTable *table, - gint row); -static void xres_changed (NMMXYZControls *controls, - GtkAdjustment *adj); -static void yres_changed (NMMXYZControls *controls, - GtkAdjustment *adj); -static void xymeasureeq_changed (NMMXYZControls *controls, - GtkToggleButton *toggle); -static gboolean gather_data_files (const gchar *filename, - NMMXYZInfo *info, - const NMMXYZArgs *args, - GArray *dscs, - GArray *data, - GError **error); -static GwyXYZ* create_points_with_xy (GArray *data, - guint nincluded); -static void create_data_field (GwyContainer *container, - GwyContainer *meta, - const NMMXYZInfo *info, - const NMMXYZArgs *args, - GArray *dscs, - GArray *data, - GwyXYZ *points, - guint i, - gboolean plot_density); -static void find_data_range (const GwyXYZ *points, - NMMXYZInfo *info); -static void read_data_file (GArray *data, - const gchar *filename, - guint nrec, - const gboolean *include_channel, - guint nincluded); -static gboolean profile_descriptions_match(GArray *descs1, - GArray *descs2); -static void read_profile_description (const gchar *filename, - GArray *dscs); -static void free_profile_descriptions (GArray *dscs, - gboolean free_array); -static void copy_profile_descriptions (GArray *source, - GArray *dest); -static GwyContainer* parse_dsc_file (const gchar *filename); -static void nmmxyz_load_args (GwyContainer *container, - NMMXYZArgs *args, - GArray *dscs); -static void nmmxyz_save_args (GwyContainer *container, - NMMXYZArgs *args, - GArray *dscs); +static gboolean module_register (void); +static gint nmmxyz_detect (const GwyFileDetectInfo *fileinfo, + gboolean only_name); +static GwyContainer* nmmxyz_load (const gchar *filename, + GwyRunType mode, + GError **error); +static void update_nincluded (NMMXYZArgs *args, + guint blocksize); +static gboolean nmmxyz_dialogue (NMMXYZArgs *args, + NMMXYZInfo *info, + GArray *dscs); +static gint add_info_count (GtkTable *table, + gint row, + const gchar *description, + gsize n); +static void update_ok_sensitivity (NMMXYZControls *controls); +static void include_channel_changed (GtkToggleButton *toggle, + NMMXYZControls *controls); +static void plot_density_changed (NMMXYZControls *controls, + GtkToggleButton *toggle); +static gint construct_resolutions (NMMXYZControls *controls, + GtkTable *table, + gint row); +static void xres_changed (NMMXYZControls *controls, + GtkAdjustment *adj); +static void yres_changed (NMMXYZControls *controls, + GtkAdjustment *adj); +static void xymeasureeq_changed (NMMXYZControls *controls, + GtkToggleButton *toggle); +static gboolean gather_data_files (const gchar *filename, + NMMXYZInfo *info, + const NMMXYZArgs *args, + GArray *dscs, + GwyDoubleArray *data, + GError **error); +static GwyXYZ* create_points_with_xy (GwyDoubleArray *data, + guint nincluded); +static void create_data_field (GwyContainer *container, + GwyContainer *meta, + const NMMXYZInfo *info, + const NMMXYZArgs *args, + GArray *dscs, + GwyDoubleArray *data, + GwyXYZ *points, + guint i, + gboolean plot_density); +static void find_data_range (const GwyXYZ *points, + NMMXYZInfo *info); +static void read_data_file (GwyDoubleArray *data, + const gchar *filename, + guint nrec, + const gboolean *include_channel, + guint nincluded); +static gboolean profile_descriptions_match (GArray *descs1, + GArray *descs2); +static void read_profile_description (const gchar *filename, + GArray *dscs); +static void free_profile_descriptions (GArray *dscs, + gboolean free_array); +static void copy_profile_descriptions (GArray *source, + GArray *dest); +static GwyContainer* parse_dsc_file (const gchar *filename); +static GwyDoubleArray* gwy_double_array_new (gsize prealloc); +static void gwy_double_array_ensure_size(GwyDoubleArray *array, + gsize n); +static void gwy_double_array_append (GwyDoubleArray *array, + const gdouble *values, + gsize n); +static gdouble* gwy_double_array_free (GwyDoubleArray *array, + gboolean free_data); +static void nmmxyz_load_args (GwyContainer *container, + NMMXYZArgs *args, + GArray *dscs); +static void nmmxyz_save_args (GwyContainer *container, + NMMXYZArgs *args, + GArray *dscs); static const NMMXYZArgs nmmxyz_defaults = { NULL, 0, @@ -185,7 +201,7 @@ &module_register, N_("Imports Nano Measuring Machine profile files."), "Yeti ", - "1.1", + "1.2", "David Nečas (Yeti)", "2016", }; @@ -229,7 +245,7 @@ NMMXYZArgs args; GwyContainer *settings; GwyContainer *container = NULL, *meta = NULL; - GArray *data = NULL; + GwyDoubleArray *data = NULL; GArray *dscs = NULL; GwyXYZ *points = NULL; gboolean waiting = FALSE; @@ -283,8 +299,7 @@ gwy_app_wait_start(NULL, _("Reading files...")); free_profile_descriptions(dscs, FALSE); - data = g_array_sized_new(FALSE, FALSE, sizeof(gdouble), - info.ndata*args.nincluded); + data = gwy_double_array_new(info.ndata*args.nincluded); if (!gather_data_files(filename, &info, &args, dscs, data, error)) goto fail; @@ -335,7 +350,7 @@ g_free(points); free_profile_descriptions(dscs, TRUE); if (data) - g_array_free(data, TRUE); + gwy_double_array_free(data, TRUE); return container; } @@ -457,7 +472,7 @@ } static gint -add_info_count(GtkTable *table, gint row, const gchar *description, gulong n) +add_info_count(GtkTable *table, gint row, const gchar *description, gsize n) { GtkWidget *label; gchar buf[16]; @@ -467,7 +482,7 @@ gtk_table_attach(table, label, 0, 1, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); - g_snprintf(buf, sizeof(buf), "%lu", n); + g_snprintf(buf, sizeof(buf), "%" G_GSIZE_FORMAT, n); label = gtk_label_new(buf); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 1, 2, row, row+1, @@ -624,11 +639,11 @@ } static GwyXYZ* -create_points_with_xy(GArray *data, guint nincluded) +create_points_with_xy(GwyDoubleArray *data, guint nincluded) { GwyXYZ *points; const gdouble *d; - gulong i, npts; + gsize i, npts; gwy_debug("data->len %u, included block size %u", data->len, nincluded); d = (const gdouble*)data->data; @@ -679,7 +694,7 @@ const NMMXYZInfo *info, const NMMXYZArgs *args, GArray *dscs, - GArray *data, + GwyDoubleArray *data, GwyXYZ *points, guint i, gboolean plot_density) @@ -687,7 +702,7 @@ const NMMXYZProfileDescription *dsc = &g_array_index(dscs, NMMXYZProfileDescription, i); GwyDataField *dfield, *density_map = NULL; - gulong k, ndata; + gsize k, ndata; guint nincluded, xres, yres; gint id; const gdouble *d; @@ -736,7 +751,7 @@ } gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(dfield), zunit); - d = (const gdouble*)data->data + i; + d = data->data + i; nincluded = args->nincluded; ndata = info->ndata; for (k = 0; k < ndata; k++) { @@ -744,6 +759,8 @@ d += nincluded; } + /* FIXME: This has gint ndata argument. So no matter how we handle the + * arrays it will fail for > 2GB points. */ gwy_data_field_average_xyz(dfield, density_map, points, ndata); if (q != 1.0) gwy_data_field_multiply(dfield, q); @@ -794,7 +811,7 @@ static gboolean gather_data_files(const gchar *filename, NMMXYZInfo *info, const NMMXYZArgs *args, - GArray *dscs, GArray *data, + GArray *dscs, GwyDoubleArray *data, GError **error) { const NMMXYZProfileDescription *dsc; @@ -914,7 +931,7 @@ } static void -read_data_file(GArray *data, const gchar *filename, +read_data_file(GwyDoubleArray *data, const gchar *filename, guint nrec, const gboolean *include_channel, guint nincluded) { static const gboolean floating_point_chars[] = { @@ -973,7 +990,7 @@ } } /* Now we have read a complete record so append it to the array. */ - g_array_append_vals(data, rec, nincluded); + gwy_double_array_append(data, rec, nincluded); linecount++; } @@ -1170,6 +1187,58 @@ return meta; } +static GwyDoubleArray* +gwy_double_array_new(gsize nprealloc) +{ + GwyDoubleArray *array = g_slice_new0(GwyDoubleArray); + + nprealloc = MAX(nprealloc, 16UL); + array->size = nprealloc; + array->data = g_new(gdouble, nprealloc); + return array; +} + +static void +gwy_double_array_ensure_size(GwyDoubleArray *array, gsize n) +{ + gsize size; + + if (G_LIKELY(n <= array->size)) + return; + + /* size = 0 occurs when we shift the size out of the gsize variable. + * In such case we just abort. */ + for (size = 1; size && size < n; size <<= 1) + ; + + g_assert(size); + array->size = size; + array->data = g_renew(gdouble, array->data, array->size); +} + +static void +gwy_double_array_append(GwyDoubleArray *array, const gdouble *values, gsize n) +{ + g_assert(G_MAXSIZE - array->len > n); + gwy_double_array_ensure_size(array, array->len + n); + gwy_assign(array->data + array->len, values, n); + array->len += n; +} + +static gdouble* +gwy_double_array_free(GwyDoubleArray *array, gboolean free_data) +{ + gdouble *retval = array->data; + + if (free_data) { + g_free(array->data); + retval = NULL; + } + g_slice_free(GwyDoubleArray, array); + + return retval; +} + static const gchar include_channel_prefix[] = "/module/nmmxyz/include_channel/"; static const gchar plot_density_key[] = "/module/nmmxyz/plot-density"; diff -Nru gwyddion-2.46/modules/file/nt-mdt.c gwyddion-2.47/modules/file/nt-mdt.c --- gwyddion-2.46/modules/file/nt-mdt.c 2016-01-28 11:11:55.000000000 +0000 +++ gwyddion-2.47/modules/file/nt-mdt.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: nt-mdt.c 18238 2016-01-27 21:14:14Z yeti-dn $ + * @(#) $Id: nt-mdt.c 19131 2016-10-30 11:28:17Z dn2010 $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -2427,7 +2427,7 @@ mdt_units, mdt_units_name); siunitz = gwy_si_unit_new_parse(cunit, &power10z); } - gwy_debug("z unit power %d", power10xy); + gwy_debug("z unit power %d", power10z); nx = xAxis->maxIndex - xAxis->minIndex + 1; ny = yAxis->maxIndex - yAxis->minIndex + 1; @@ -2534,13 +2534,15 @@ break; case MDA_DATA_FLOAT32: - while (data < end_data) + while (data < end_data) { *(data++) = zoffset + zscale * gwy_get_gfloat_le(&p); + } break; case MDA_DATA_FLOAT64: - while (data < end_data) + while (data < end_data) { *(data++) = zoffset + zscale * gwy_get_gdouble_le(&p); + } break; default: @@ -3245,6 +3247,9 @@ ystep = xres; } } + gwy_debug("xyoffset = %d", xyoffset); + gwy_debug("xstep = %d", xstep); + gwy_debug("ystep = %d", ystep); nmes = dataframe->nMesurands; if (frame_type @@ -3264,6 +3269,8 @@ data2 = gwy_brick_get_data(brick2); p = base; + sdata = NULL; + tscale = NULL; if (nmes > 1) { sdata = g_new(gdouble *, (nmes - 1)); tscale = g_new(gdouble, (nmes - 1)); @@ -3285,7 +3292,7 @@ gwy_data_field_set_si_unit_z(scandata, siunitt); } else - tscale[i] = 1; + tscale[i] = 1.0; sdata[i] = gwy_data_field_get_data(scandata); strkey = g_strdup_printf("/%d/data", *numdata); @@ -3309,14 +3316,18 @@ (*numdata)++; } } + for (i = 0; i < yres; i++) for (j = 0; j < xres; j++) { - for (k = 0; k < nmes - 1; k++) { - if ((!ext_name) || (p - base <= size2)) - sdata[k][xyoffset + j * xstep + i * ystep] - = (gdouble)gwy_get_gfloat_le(&p) * tscale[k]; + if (sdata && tscale) { + for (k = 0; k < nmes - 1; k++) { + if ((!ext_name) || (p - base <= size2)) + sdata[k][xyoffset + j * xstep + i * ystep] + = (gdouble)gwy_get_gfloat_le(&p) + * tscale[k]; + } } - for (k = 0; k < zres / 2; k++) { + for (k = 0; k < zres/2; k++) { if ((!ext_name) || (p - base <= size2)) { w = (gdouble)gwy_get_gfloat_le(&p); *(data + k * xres * yres diff -Nru gwyddion-2.46/modules/file/pt3file.c gwyddion-2.47/modules/file/pt3file.c --- gwyddion-2.46/modules/file/pt3file.c 2015-11-08 11:39:13.000000000 +0000 +++ gwyddion-2.47/modules/file/pt3file.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: pt3file.c 17718 2015-11-06 08:04:04Z pecold $ + * $Id: pt3file.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2009 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -597,7 +597,7 @@ gwy_debug("yres: %u", pt3file->imaging.common.yres); if (err_DIMENSION(error, pt3file->imaging.common.xres) - || err_DIMENSION(error, pt3file->imaging.common.xres)) + || err_DIMENSION(error, pt3file->imaging.common.yres)) return 0; return (gsize)(p - buffer); diff -Nru gwyddion-2.46/modules/file/rhk-spm32.c gwyddion-2.47/modules/file/rhk-spm32.c --- gwyddion-2.46/modules/file/rhk-spm32.c 2016-02-15 20:05:12.000000000 +0000 +++ gwyddion-2.47/modules/file/rhk-spm32.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: rhk-spm32.c 18276 2016-02-11 11:53:17Z yeti-dn $ + * $Id: rhk-spm32.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -700,6 +700,8 @@ spectra = gwy_spectra_new(); for (i = 0; i < rhkpage->yres; i++) { + /* Static code analysis: sod off. We can only get here when we + * allocated the spectrum above. */ dline = g_ptr_array_index(spectrum, i); // since RHK spm32 does not record where it took the spectra, // i'm setting these to zero diff -Nru gwyddion-2.46/modules/file/sensofarx.c gwyddion-2.47/modules/file/sensofarx.c --- gwyddion-2.46/modules/file/sensofarx.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/sensofarx.c 2016-10-23 20:13:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: sensofarx.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * $Id: sensofarx.c 19118 2016-10-23 12:22:32Z yeti-dn $ * Copyright (C) 2015 David Necas (Yeti). * * This program is free software; you can redistribute it and/or modify @@ -27,7 +27,7 @@ /** * [FILE-MAGIC-FREEDESKTOP] - * + * * Sensofar PLUx data * * diff -Nru gwyddion-2.46/modules/file/sis.c gwyddion-2.47/modules/file/sis.c --- gwyddion-2.46/modules/file/sis.c 2016-10-10 08:25:24.000000000 +0000 +++ gwyddion-2.47/modules/file/sis.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: sis.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: sis.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -168,22 +168,23 @@ When you edit processing_steps[] data above, re-run flatten.py SOURCE.c. */ static const gchar processing_steps_symbol[] = - "BLOB\0003DJS\000ACOR\000ALNC\000BFFT\000CONT\000DIF2\000EDGE\000FFBP\000" - "FFLP\000FFMP\000FFT2\000FLIP\000HIST\000IFT2\000LNCT\000MEDN\000MIRR\000" - "PAVE\000RAWR\000RGOI\000ROTN\000SHRP\000SMTH\000STAT\000STEP\000SURF\000" - "TIBQ\000TIL3\000TILT"; + "BLOB\0003DJS\000ACOR\000ALNC\000BFFT\000CONT\000DIF2\000EDGE\000FFBP" + "\000FFLP\000FFMP\000FFT2\000FLIP\000HIST\000IFT2\000LNCT\000MEDN\000MI" + "RR\000PAVE\000RAWR\000RGOI\000ROTN\000SHRP\000SMTH\000STAT\000STEP\000" + "SURF\000TIBQ\000TIL3\000TILT"; G_GNUC_UNUSED static const gchar processing_steps_meta[] = - "Particle count\0003DJS\000Autocorrelation\000Autocorrelation LineCut\000" - "Biqudratic Fourier filter fit\000Contrast histogram\000Differentiation" - "\000Edge detection filter\000Band pass frequency filter\000Low pass freq" - "uency filter\000High pass frequency filter\000Twodimensional FFT\000Y ax" - "is flip\000Histogram\000Fourier filter back 2D\000Line profile\000Median" - " filter\000X axis mirror\000Profile average\000Raw raster data\000Region" - " of interest\000Rotation\000Sharpening filter\000Smoothing filter\000Sta" - "tistics in z\000Step correction\000Surface area\000Biquadratic plane cor" - "rection\000Three point plane correction\000Automatic plane correction"; + "Particle count\0003DJS\000Autocorrelation\000Autocorrelation LineCut" + "\000Biqudratic Fourier filter fit\000Contrast histogram\000Differentia" + "tion\000Edge detection filter\000Band pass frequency filter\000Low pas" + "s frequency filter\000High pass frequency filter\000Twodimensional FFT" + "\000Y axis flip\000Histogram\000Fourier filter back 2D\000Line profile" + "\000Median filter\000X axis mirror\000Profile average\000Raw raster da" + "ta\000Region of interest\000Rotation\000Sharpening filter\000Smoothing" + " filter\000Statistics in z\000Step correction\000Surface area\000Biqua" + "dratic plane correction\000Three point plane correction\000Automatic p" + "lane correction"; static const struct { gint symbol; @@ -233,7 +234,7 @@ { 3, G_TYPE_DOUBLE, "Scanning range in y direction", "nm" }, { 4, G_TYPE_DOUBLE, "Range in z direction", "nm" }, { 5, G_TYPE_DOUBLE, "Offset in z direction", NULL }, /* ?? */ - { 6, G_TYPE_INT, "Type of aquisition", NULL }, + { 6, G_TYPE_INT, "Type of acquisition", NULL }, { 7, G_TYPE_INT, "Number of pixels in x direction", NULL }, { 8, G_TYPE_INT, "Number of pixels in y direction", NULL }, { 9, G_TYPE_DOUBLE, "Speed of scanning", "lines/s" }, @@ -307,42 +308,43 @@ When you edit sis_parameters[] data above, re-run flatten.py SOURCE.c. */ static const gchar sis_parameters_meta[] = - "Name of the sample\000Comment of the sample\000Scanning range in x direc" - "tion\000Scanning range in y direction\000Range in z direction\000Offset " - "in z direction\000Type of aquisition\000Number of pixels in x direction" - "\000Number of pixels in y direction\000Speed of scanning\000Type of tip" - "\000Bits per pixels\000Value of the proportional part of feedback\000Val" - "ue of the integral part of feedback\000Load force of the tip\000Resonanc" - "e frequency of the cantilever\000Date of the measurement\000Feedback\000" - "Scanning direction\000Spring constant\000HighVoltage in x and y directio" - "n\000Measurement with x and y linearisation\000Amplification of the inte" - "rferometer signal\000Free amplitude of the cantilever\000Damping of the " - "free amplitude of the cantilever during the measurement\000Voltage betwe" - "en the tip and the electrode under the sample\000Oscilation frequency of" - " the cantilever during the measurement\000Field contrast\000Type of pale" - "tte\000Units of data in channel 1\000Units of data in channel 2\000Units" - " of data in channel 3\000Units of data in channel 4\000Units of data in " - "channel 5\000Units of data in channel 6\000Units of data in channel 7" - "\000Units of data in channel 8\000Range of of data in channel 1\000Range" - " of of data in channel 2\000Range of of data in channel 3\000Range of of" - " data in channel 4\000Range of of data in channel 5\000Range of of data " - "in channel 6\000Range of of data in channel 7\000Range of of data in cha" - "nnel 8\000Number of channels\000Offset in x direction in the scanning ra" - "nge\000Offset in y direction in the scanning range\000Maximum scanning r" - "ange in x direction\000Maximum scanning range in y direction\000Minimum " - "range of of data in channel 1\000Minimum range of of data in channel 2" - "\000Minimum range of of data in channel 3\000Minimum range of of data in" - " channel 4\000Minimum range of of data in channel 5\000Minimum range of " - "of data in channel 6\000Minimum range of of data in channel 7\000Minimum" - " range of of data in channel 8\000Maximum range of of data in channel 1" - "\000Maximum range of of data in channel 2\000Maximum range of of data in" - " channel 3\000Maximum range of of data in channel 4\000Maximum range of " - "of data in channel 5\000Maximum range of of data in channel 6\000Maximum" - " range of of data in channel 7\000Maximum range of of data in channel 8" - "\000Name of data in channel 1\000Name of data in channel 2\000Name of da" - "ta in channel 3\000Name of data in channel 4\000Name of data in channel " - "5\000Name of data in channel 6\000Name of data in channel 7\000Name of d" - "ata in channel 8"; + "Name of the sample\000Comment of the sample\000Scanning range in x dir" + "ection\000Scanning range in y direction\000Range in z direction\000Off" + "set in z direction\000Type of acquisition\000Number of pixels in x dir" + "ection\000Number of pixels in y direction\000Speed of scanning\000Type" + " of tip\000Bits per pixels\000Value of the proportional part of feedba" + "ck\000Value of the integral part of feedback\000Load force of the tip" + "\000Resonance frequency of the cantilever\000Date of the measurement" + "\000Feedback\000Scanning direction\000Spring constant\000HighVoltage i" + "n x and y direction\000Measurement with x and y linearisation\000Ampli" + "fication of the interferometer signal\000Free amplitude of the cantile" + "ver\000Damping of the free amplitude of the cantilever during the meas" + "urement\000Voltage between the tip and the electrode under the sample" + "\000Oscilation frequency of the cantilever during the measurement\000F" + "ield contrast\000Type of palette\000Units of data in channel 1\000Unit" + "s of data in channel 2\000Units of data in channel 3\000Units of data " + "in channel 4\000Units of data in channel 5\000Units of data in channel" + " 6\000Units of data in channel 7\000Units of data in channel 8\000Rang" + "e of of data in channel 1\000Range of of data in channel 2\000Range of" + " of data in channel 3\000Range of of data in channel 4\000Range of of " + "data in channel 5\000Range of of data in channel 6\000Range of of data" + " in channel 7\000Range of of data in channel 8\000Number of channels" + "\000Offset in x direction in the scanning range\000Offset in y directi" + "on in the scanning range\000Maximum scanning range in x direction\000M" + "aximum scanning range in y direction\000Minimum range of of data in ch" + "annel 1\000Minimum range of of data in channel 2\000Minimum range of o" + "f data in channel 3\000Minimum range of of data in channel 4\000Minimu" + "m range of of data in channel 5\000Minimum range of of data in channel" + " 6\000Minimum range of of data in channel 7\000Minimum range of of dat" + "a in channel 8\000Maximum range of of data in channel 1\000Maximum ran" + "ge of of data in channel 2\000Maximum range of of data in channel 3" + "\000Maximum range of of data in channel 4\000Maximum range of of data " + "in channel 5\000Maximum range of of data in channel 6\000Maximum range" + " of of data in channel 7\000Maximum range of of data in channel 8\000N" + "ame of data in channel 1\000Name of data in channel 2\000Name of data " + "in channel 3\000Name of data in channel 4\000Name of data in channel 5" + "\000Name of data in channel 6\000Name of data in channel 7\000Name of " + "data in channel 8"; static const gchar sis_parameters_units[] = "nm\000nm\000nm\000lines/s\000µs\000nN\000kHz\000°\000N/m\000nm\000%" @@ -362,73 +364,73 @@ { 4, G_TYPE_DOUBLE, 101, 6 }, { 5, G_TYPE_DOUBLE, 122, -1 }, { 6, G_TYPE_INT, 144, -1 }, - { 7, G_TYPE_INT, 163, -1 }, - { 8, G_TYPE_INT, 195, -1 }, - { 9, G_TYPE_DOUBLE, 227, 9 }, - { 10, G_TYPE_STRING, 245, -1 }, - { 11, G_TYPE_INT, 257, -1 }, - { 12, G_TYPE_DOUBLE, 273, -1 }, - { 13, G_TYPE_DOUBLE, 316, 17 }, - { 14, G_TYPE_DOUBLE, 355, 21 }, - { 15, G_TYPE_DOUBLE, 377, 24 }, - { 16, G_TYPE_STRING, 415, -1 }, - { 17, G_TYPE_DOUBLE, 439, -1 }, - { 18, G_TYPE_DOUBLE, 448, 28 }, - { 19, G_TYPE_DOUBLE, 467, 31 }, - { 20, G_TYPE_STRING, 483, -1 }, - { 21, G_TYPE_STRING, 516, -1 }, - { 22, G_TYPE_STRING, 555, -1 }, - { 23, G_TYPE_DOUBLE, 598, 35 }, - { 24, G_TYPE_DOUBLE, 631, 38 }, - { 25, G_TYPE_DOUBLE, 702, 40 }, - { 26, G_TYPE_DOUBLE, 761, 42 }, - { 27, G_TYPE_DOUBLE, 823, 46 }, - { 28, G_TYPE_INT, 838, -1 }, - { 100, G_TYPE_STRING, 854, -1 }, - { 101, G_TYPE_STRING, 881, -1 }, - { 102, G_TYPE_STRING, 908, -1 }, - { 103, G_TYPE_STRING, 935, -1 }, - { 104, G_TYPE_STRING, 962, -1 }, - { 105, G_TYPE_STRING, 989, -1 }, - { 106, G_TYPE_STRING, 1016, -1 }, - { 107, G_TYPE_STRING, 1043, -1 }, - { 108, G_TYPE_DOUBLE, 1070, -1 }, - { 109, G_TYPE_DOUBLE, 1100, -1 }, - { 110, G_TYPE_DOUBLE, 1130, -1 }, - { 111, G_TYPE_DOUBLE, 1160, -1 }, - { 112, G_TYPE_DOUBLE, 1190, -1 }, - { 113, G_TYPE_DOUBLE, 1220, -1 }, - { 114, G_TYPE_DOUBLE, 1250, -1 }, - { 115, G_TYPE_DOUBLE, 1280, -1 }, - { 116, G_TYPE_INT, 1310, -1 }, - { 117, G_TYPE_DOUBLE, 1329, 49 }, - { 118, G_TYPE_DOUBLE, 1373, 52 }, - { 119, G_TYPE_DOUBLE, 1417, 55 }, - { 120, G_TYPE_DOUBLE, 1455, 58 }, - { 121, G_TYPE_DOUBLE, 1493, -1 }, - { 122, G_TYPE_DOUBLE, 1531, -1 }, - { 123, G_TYPE_DOUBLE, 1569, -1 }, - { 124, G_TYPE_DOUBLE, 1607, -1 }, - { 125, G_TYPE_DOUBLE, 1645, -1 }, - { 126, G_TYPE_DOUBLE, 1683, -1 }, - { 127, G_TYPE_DOUBLE, 1721, -1 }, - { 128, G_TYPE_DOUBLE, 1759, -1 }, - { 129, G_TYPE_DOUBLE, 1797, -1 }, - { 130, G_TYPE_DOUBLE, 1835, -1 }, - { 131, G_TYPE_DOUBLE, 1873, -1 }, - { 132, G_TYPE_DOUBLE, 1911, -1 }, - { 133, G_TYPE_DOUBLE, 1949, -1 }, - { 134, G_TYPE_DOUBLE, 1987, -1 }, - { 135, G_TYPE_DOUBLE, 2025, -1 }, - { 136, G_TYPE_DOUBLE, 2063, -1 }, - { 137, G_TYPE_STRING, 2101, -1 }, - { 138, G_TYPE_STRING, 2127, -1 }, - { 139, G_TYPE_STRING, 2153, -1 }, - { 140, G_TYPE_STRING, 2179, -1 }, - { 141, G_TYPE_STRING, 2205, -1 }, - { 142, G_TYPE_STRING, 2231, -1 }, - { 143, G_TYPE_STRING, 2257, -1 }, - { 144, G_TYPE_STRING, 2283, -1 }, + { 7, G_TYPE_INT, 164, -1 }, + { 8, G_TYPE_INT, 196, -1 }, + { 9, G_TYPE_DOUBLE, 228, 9 }, + { 10, G_TYPE_STRING, 246, -1 }, + { 11, G_TYPE_INT, 258, -1 }, + { 12, G_TYPE_DOUBLE, 274, -1 }, + { 13, G_TYPE_DOUBLE, 317, 17 }, + { 14, G_TYPE_DOUBLE, 356, 21 }, + { 15, G_TYPE_DOUBLE, 378, 24 }, + { 16, G_TYPE_STRING, 416, -1 }, + { 17, G_TYPE_DOUBLE, 440, -1 }, + { 18, G_TYPE_DOUBLE, 449, 28 }, + { 19, G_TYPE_DOUBLE, 468, 31 }, + { 20, G_TYPE_STRING, 484, -1 }, + { 21, G_TYPE_STRING, 517, -1 }, + { 22, G_TYPE_STRING, 556, -1 }, + { 23, G_TYPE_DOUBLE, 599, 35 }, + { 24, G_TYPE_DOUBLE, 632, 38 }, + { 25, G_TYPE_DOUBLE, 703, 40 }, + { 26, G_TYPE_DOUBLE, 762, 42 }, + { 27, G_TYPE_DOUBLE, 824, 46 }, + { 28, G_TYPE_INT, 839, -1 }, + { 100, G_TYPE_STRING, 855, -1 }, + { 101, G_TYPE_STRING, 882, -1 }, + { 102, G_TYPE_STRING, 909, -1 }, + { 103, G_TYPE_STRING, 936, -1 }, + { 104, G_TYPE_STRING, 963, -1 }, + { 105, G_TYPE_STRING, 990, -1 }, + { 106, G_TYPE_STRING, 1017, -1 }, + { 107, G_TYPE_STRING, 1044, -1 }, + { 108, G_TYPE_DOUBLE, 1071, -1 }, + { 109, G_TYPE_DOUBLE, 1101, -1 }, + { 110, G_TYPE_DOUBLE, 1131, -1 }, + { 111, G_TYPE_DOUBLE, 1161, -1 }, + { 112, G_TYPE_DOUBLE, 1191, -1 }, + { 113, G_TYPE_DOUBLE, 1221, -1 }, + { 114, G_TYPE_DOUBLE, 1251, -1 }, + { 115, G_TYPE_DOUBLE, 1281, -1 }, + { 116, G_TYPE_INT, 1311, -1 }, + { 117, G_TYPE_DOUBLE, 1330, 49 }, + { 118, G_TYPE_DOUBLE, 1374, 52 }, + { 119, G_TYPE_DOUBLE, 1418, 55 }, + { 120, G_TYPE_DOUBLE, 1456, 58 }, + { 121, G_TYPE_DOUBLE, 1494, -1 }, + { 122, G_TYPE_DOUBLE, 1532, -1 }, + { 123, G_TYPE_DOUBLE, 1570, -1 }, + { 124, G_TYPE_DOUBLE, 1608, -1 }, + { 125, G_TYPE_DOUBLE, 1646, -1 }, + { 126, G_TYPE_DOUBLE, 1684, -1 }, + { 127, G_TYPE_DOUBLE, 1722, -1 }, + { 128, G_TYPE_DOUBLE, 1760, -1 }, + { 129, G_TYPE_DOUBLE, 1798, -1 }, + { 130, G_TYPE_DOUBLE, 1836, -1 }, + { 131, G_TYPE_DOUBLE, 1874, -1 }, + { 132, G_TYPE_DOUBLE, 1912, -1 }, + { 133, G_TYPE_DOUBLE, 1950, -1 }, + { 134, G_TYPE_DOUBLE, 1988, -1 }, + { 135, G_TYPE_DOUBLE, 2026, -1 }, + { 136, G_TYPE_DOUBLE, 2064, -1 }, + { 137, G_TYPE_STRING, 2102, -1 }, + { 138, G_TYPE_STRING, 2128, -1 }, + { 139, G_TYPE_STRING, 2154, -1 }, + { 140, G_TYPE_STRING, 2180, -1 }, + { 141, G_TYPE_STRING, 2206, -1 }, + { 142, G_TYPE_STRING, 2232, -1 }, + { 143, G_TYPE_STRING, 2258, -1 }, + { 144, G_TYPE_STRING, 2284, -1 }, }; #endif /* }}} */ @@ -461,7 +463,7 @@ &module_register, N_("Imports SIS (Surface Imaging Systems) data files."), "Yeti ", - "0.16", + "0.17", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -901,14 +903,14 @@ gwy_debug("0x%06x", p - buffer); /* this looks like end-of-data */ if (i == sisfile->nchannels - && channel->nimages == channel->processing_steps) { + && channel && channel->nimages == channel->processing_steps) { gwy_debug("OK!"); return TRUE; } /* we've got out of sync, try to return what we have, if anything */ if (size - (p - buffer) < 6) { - if (i || channel->nimages) { + if (i || (channel && channel->nimages)) { gwy_debug("Got out of sync, but managed to read something"); sisfile->nchannels = i-1; return TRUE; @@ -922,7 +924,7 @@ gwy_debug("id = %u, len = %u", id, len); /* we've got out of sync, try to return what we have, if anything */ if (!len || size - (p - buffer) < len) { - if (i || channel->nimages) { + if (i || (channel && channel->nimages)) { gwy_debug("Got out of sync, but managed to read something"); sisfile->nchannels = i; return TRUE; @@ -938,17 +940,17 @@ break; case SIS_BLOCK_IMAGE: - channel->nimages++; - channel->images = g_renew(SISImage, channel->images, - channel->nimages); - image = channel->images + channel->nimages-1; - gwy_debug("Image #%u of channel %u", channel->nimages, i); if (!i || !channel || len < 26) { g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_DATA, _("Unexpected image block.")); return FALSE; } + channel->nimages++; + channel->images = g_renew(SISImage, channel->images, + channel->nimages); + image = channel->images + channel->nimages-1; + gwy_debug("Image #%u of channel %u", channel->nimages, i); /* This is really a guchar[4], not int32 */ get_CHARARRAY(image->processing_step, &p); procstep = -1; diff -Nru gwyddion-2.46/modules/file/spml.c gwyddion-2.47/modules/file/spml.c --- gwyddion-2.46/modules/file/spml.c 2016-01-28 11:11:55.000000000 +0000 +++ gwyddion-2.47/modules/file/spml.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: spml.c 18238 2016-01-27 21:14:14Z yeti-dn $ + * @(#) $Id: spml.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -475,7 +475,7 @@ if (data_dimension > 0) { *dimensions = g_new(int, data_dimension); for (i = 0; i < data_dimension; i++) { - axis = g_array_index(axes, GArray *, i); + axis = g_array_index(axes, GArray*, i); (*dimensions)[i] = axis[0].len; max_input_len *= axis[0].len; } diff -Nru gwyddion-2.46/modules/file/stpfile.c gwyddion-2.47/modules/file/stpfile.c --- gwyddion-2.46/modules/file/stpfile.c 2015-11-08 11:39:13.000000000 +0000 +++ gwyddion-2.47/modules/file/stpfile.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: stpfile.c 17718 2015-11-06 08:04:04Z pecold $ + * $Id: stpfile.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2005 David Necas (Yeti), Petr Klstptek. * E-mail: yeti@gwyddion.net, klstptek@gwyddion.net. * @@ -213,7 +213,7 @@ expected = header_size; for (i = 0; i < stpfile->n; i++) { if (err_DIMENSION(error, stpfile->buffers[i].xres) - || err_DIMENSION(error, stpfile->buffers[i].xres)) { + || err_DIMENSION(error, stpfile->buffers[i].yres)) { ok = FALSE; break; } diff -Nru gwyddion-2.46/modules/file/wipfile.c gwyddion-2.47/modules/file/wipfile.c --- gwyddion-2.46/modules/file/wipfile.c 2016-10-14 08:13:10.000000000 +0000 +++ gwyddion-2.47/modules/file/wipfile.c 2016-10-31 07:58:49.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wipfile.c 19069 2016-10-13 20:54:08Z dn2010 $ + * $Id: wipfile.c 19130 2016-10-27 20:58:23Z dn2010 $ * Copyright (C) 2010-2011 David Necas (Yeti), Petr Klapetek, * Daniil Bratashov (dn2010) * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, dn2010@gmail.com @@ -497,7 +497,7 @@ sp_transform->x = gwy_get_gdouble_le(&p); else if (!strncmp(tag->name, "f", 1)) sp_transform->f = gwy_get_gdouble_le(&p); - else if (!strncmp(tag->name, "StandardUnit", 11)) { + else if (!strncmp(tag->name, "StandardUnit", 12)) { str_len = gwy_get_gint32_le(&p); str = g_strndup(p, str_len); sp_transform->unitname = g_convert(str, str_len, "UTF-8", @@ -525,7 +525,7 @@ for (i = 0; i < 9; i++) sp_transform->scale[i] = gwy_get_gdouble_le(&p); } - else if (!strncmp(tag->name, "StandardUnit", 11)) { + else if (!strncmp(tag->name, "StandardUnit", 12)) { str_len = gwy_get_gint32_le(&p); str = g_strndup(p, str_len); sp_transform->unitname = g_convert(str, str_len, "UTF-8", @@ -1323,7 +1323,7 @@ GwySIUnit *siunitxy; gdouble xscale, yscale; gint power10xy = 0; - gboolean mirrorx, mirrory; + gboolean mirrorx = FALSE, mirrory = FALSE; header = g_new0(WIPBitmap, 1); diff -Nru gwyddion-2.46/modules/graph/graph_export_ascii.c gwyddion-2.47/modules/graph/graph_export_ascii.c --- gwyddion-2.46/modules/graph/graph_export_ascii.c 2016-09-01 08:37:22.000000000 +0000 +++ gwyddion-2.47/modules/graph/graph_export_ascii.c 2016-11-08 10:24:40.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: graph_export_ascii.c 18879 2016-08-24 17:23:30Z yeti-dn $ + * @(#) $Id: graph_export_ascii.c 19205 2016-11-08 10:24:40Z yeti-dn $ * Copyright (C) 2006,2014-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -36,30 +36,22 @@ gboolean posix; gboolean merged_x; GwyGraphModelExportStyle style; -} ExportParameters; +} ExportArgs; static gboolean module_register (void); static void export (GwyGraph *graph); static void export_dialog (GwyGraph *graph, - ExportParameters *params); + ExportArgs *args); static void export_dialog_save(GwyGraph *graph, - ExportParameters *params); + ExportArgs *args); static void boolean_changed (GtkToggleButton *check, gboolean *value); static void load_args (GwyContainer *settings, - ExportParameters *params); + ExportArgs *args); static void save_args (GwyContainer *settings, - ExportParameters *params); + ExportArgs *args); -static const GwyEnum style_type[] = { - { N_("Plain text"), GWY_GRAPH_MODEL_EXPORT_ASCII_PLAIN, }, - { N_("Gnuplot friendly"), GWY_GRAPH_MODEL_EXPORT_ASCII_GNUPLOT, }, - { N_("Comma separated values"), GWY_GRAPH_MODEL_EXPORT_ASCII_CSV, }, - { N_("Origin friendly"), GWY_GRAPH_MODEL_EXPORT_ASCII_ORIGIN, }, - { N_("Igor Pro text wave"), GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO, }, -}; - -static const ExportParameters load_defaults = { +static const ExportArgs export_defaults = { TRUE, TRUE, TRUE, FALSE, FALSE, GWY_GRAPH_MODEL_EXPORT_ASCII_PLAIN, @@ -94,17 +86,25 @@ export(GwyGraph *graph) { GwyContainer *settings = gwy_app_settings_get(); - ExportParameters params; + ExportArgs args; - load_args(settings, ¶ms); - export_dialog(graph, ¶ms); - save_args(settings, ¶ms); + load_args(settings, &args); + export_dialog(graph, &args); + save_args(settings, &args); } static void export_dialog(GwyGraph *graph, - ExportParameters *params) + ExportArgs *args) { + static const GwyEnum style_types[] = { + { N_("Plain text"), GWY_GRAPH_MODEL_EXPORT_ASCII_PLAIN, }, + { N_("Gnuplot friendly"), GWY_GRAPH_MODEL_EXPORT_ASCII_GNUPLOT, }, + { N_("Comma separated values"), GWY_GRAPH_MODEL_EXPORT_ASCII_CSV, }, + { N_("Origin friendly"), GWY_GRAPH_MODEL_EXPORT_ASCII_ORIGIN, }, + { N_("Igor Pro text wave"), GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO, }, + }; + GtkWidget *dialog, *check, *combo; GtkBox *vbox; @@ -119,40 +119,40 @@ vbox = GTK_BOX(GTK_DIALOG(dialog)->vbox); - combo = gwy_enum_combo_box_new(style_type, G_N_ELEMENTS(style_type), + combo = gwy_enum_combo_box_new(style_types, G_N_ELEMENTS(style_types), G_CALLBACK(gwy_enum_combo_box_update_int), - ¶ms->style, params->style, TRUE); + &args->style, args->style, TRUE); gtk_box_pack_start(vbox, combo, FALSE, FALSE, 0); check = gtk_check_button_new_with_mnemonic(_("POSIX _number format")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), params->posix); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), args->posix); gtk_box_pack_start(vbox, check, FALSE, FALSE, 0); g_signal_connect(check, "toggled", - G_CALLBACK(boolean_changed), ¶ms->posix); + G_CALLBACK(boolean_changed), &args->posix); check = gtk_check_button_new_with_mnemonic(_("Single _merged abscissa")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), params->merged_x); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), args->merged_x); gtk_box_pack_start(vbox, check, FALSE, FALSE, 0); g_signal_connect(check, "toggled", - G_CALLBACK(boolean_changed), ¶ms->merged_x); + G_CALLBACK(boolean_changed), &args->merged_x); check = gtk_check_button_new_with_mnemonic(_("Export _labels")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), params->labels); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), args->labels); gtk_box_pack_start(vbox, check, FALSE, FALSE, 0); g_signal_connect(check, "toggled", - G_CALLBACK(boolean_changed), ¶ms->labels); + G_CALLBACK(boolean_changed), &args->labels); check = gtk_check_button_new_with_mnemonic(_("Export _units")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), params->units); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), args->units); gtk_box_pack_start(vbox, check, FALSE, FALSE, 0); g_signal_connect(check, "toggled", - G_CALLBACK(boolean_changed), ¶ms->units); + G_CALLBACK(boolean_changed), &args->units); check = gtk_check_button_new_with_mnemonic(_("Export _metadata")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), params->metadata); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), args->metadata); gtk_box_pack_start(vbox, check, FALSE, FALSE, 0); g_signal_connect(check, "toggled", - G_CALLBACK(boolean_changed), ¶ms->metadata); + G_CALLBACK(boolean_changed), &args->metadata); gtk_widget_show_all(dialog); switch (gtk_dialog_run(GTK_DIALOG(dialog))) { @@ -164,31 +164,31 @@ case GTK_RESPONSE_OK: gtk_widget_destroy(dialog); - export_dialog_save(graph, params); + export_dialog_save(graph, args); break; default: - g_warning("Unhandled dialog response"); + g_assert_not_reached(); break; } } static void -export_dialog_save(GwyGraph *graph, ExportParameters *params) +export_dialog_save(GwyGraph *graph, ExportArgs *args) { GwyGraphModelExportStyle style; GString *str; - style = params->style; - if (params->posix) + style = args->style; + if (args->posix) style |= GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX; - if (params->merged_x) + if (args->merged_x) style |= GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED; str = gwy_graph_model_export_ascii(gwy_graph_get_model(graph), - params->units, - params->labels, - params->metadata, + args->units, + args->labels, + args->metadata, style, NULL); gwy_save_auxiliary_data(_("Export to Text File"), NULL, str->len, str->str); @@ -208,36 +208,36 @@ static void load_args(GwyContainer *settings, - ExportParameters *params) + ExportArgs *args) { - *params = load_defaults; - gwy_container_gis_boolean_by_name(settings, labels_key, ¶ms->labels); - gwy_container_gis_boolean_by_name(settings, units_key, ¶ms->units); - gwy_container_gis_boolean_by_name(settings, metadata_key, ¶ms->metadata); - gwy_container_gis_enum_by_name(settings, style_key, ¶ms->style); - - params->posix = params->style & GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX; - params->merged_x = params->style & GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED; - params->style = params->style & ~(GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX + *args = export_defaults; + gwy_container_gis_boolean_by_name(settings, labels_key, &args->labels); + gwy_container_gis_boolean_by_name(settings, units_key, &args->units); + gwy_container_gis_boolean_by_name(settings, metadata_key, &args->metadata); + gwy_container_gis_enum_by_name(settings, style_key, &args->style); + + args->posix = args->style & GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX; + args->merged_x = args->style & GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED; + args->style = args->style & ~(GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX | GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED); - params->style = MIN(params->style, GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO); + args->style = MIN(args->style, GWY_GRAPH_MODEL_EXPORT_ASCII_IGORPRO); } static void save_args(GwyContainer *settings, - ExportParameters *params) + ExportArgs *args) { GwyGraphModelExportStyle style; - style = params->style; - if (params->posix) + style = args->style; + if (args->posix) style |= GWY_GRAPH_MODEL_EXPORT_ASCII_POSIX; - if (params->merged_x) + if (args->merged_x) style |= GWY_GRAPH_MODEL_EXPORT_ASCII_MERGED; - gwy_container_set_boolean_by_name(settings, labels_key, params->labels); - gwy_container_set_boolean_by_name(settings, units_key, params->units); - gwy_container_set_boolean_by_name(settings, metadata_key, params->metadata); + gwy_container_set_boolean_by_name(settings, labels_key, args->labels); + gwy_container_set_boolean_by_name(settings, units_key, args->units); + gwy_container_set_boolean_by_name(settings, metadata_key, args->metadata); gwy_container_set_enum_by_name(settings, style_key, style); } diff -Nru gwyddion-2.46/modules/graph/graph_fdfit.c gwyddion-2.47/modules/graph/graph_fdfit.c --- gwyddion-2.46/modules/graph/graph_fdfit.c 2016-09-06 06:27:05.000000000 +0000 +++ gwyddion-2.47/modules/graph/graph_fdfit.c 2016-10-31 16:30:37.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: graph_fdfit.c 18906 2016-09-02 12:41:06Z yeti-dn $ + * @(#) $Id: graph_fdfit.c 19147 2016-10-31 16:30:37Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -767,7 +767,7 @@ gwy_data_line_get_data_const(args->xdata), gwy_data_line_get_data_const(args->ydata), param, error, fixed); - errorknown = (args->fitter->covar != NULL); + errorknown = (gwy_math_nlfit_get_covar(args->fitter) != NULL); for (i = 0; i < nparams; i++) { arg = &g_array_index(args->param, FitParamArg, i); @@ -998,7 +998,7 @@ cntrl = &g_array_index(controls->param, FitParamControl, i); arg = &g_array_index(controls->args->param, FitParamArg, i); - if (!controls->args->fitter->eval) { + if (!gwy_math_nlfit_get_eval(controls->args->fitter)) { gtk_label_set_text(GTK_LABEL(cntrl->value), ""); gtk_label_set_text(GTK_LABEL(cntrl->value_unit), ""); gtk_label_set_text(GTK_LABEL(cntrl->error), ""); @@ -1357,7 +1357,7 @@ fitfunc = args->fitfunc; report = g_string_new(NULL); - g_return_val_if_fail(args->fitter->covar, report); + g_return_val_if_fail(gwy_math_nlfit_get_covar(args->fitter), report); gcmodel = gwy_graph_model_get_curve(args->graph_model, 0); g_string_append(report, _("===== Fit Results =====")); diff -Nru gwyddion-2.46/modules/graph/graph_fit.c gwyddion-2.47/modules/graph/graph_fit.c --- gwyddion-2.46/modules/graph/graph_fit.c 2016-10-10 08:25:25.000000000 +0000 +++ gwyddion-2.47/modules/graph/graph_fit.c 2016-10-31 16:30:37.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: graph_fit.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: graph_fit.c 19147 2016-10-31 16:30:37Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -821,7 +821,7 @@ gwy_data_line_get_data_const(args->xdata), gwy_data_line_get_data_const(args->ydata), param, error, fixed); - errorknown = (args->fitter->covar != NULL); + errorknown = (gwy_math_nlfit_get_covar(args->fitter) != NULL); for (i = 0; i < nparams; i++) { arg = &g_array_index(args->param, FitParamArg, i); @@ -1073,7 +1073,7 @@ cntrl = &g_array_index(controls->param, FitParamControl, i); arg = &g_array_index(controls->args->param, FitParamArg, i); - if (!controls->args->fitter->eval) { + if (!gwy_math_nlfit_get_eval(controls->args->fitter)) { gtk_label_set_text(GTK_LABEL(cntrl->value), ""); gtk_label_set_text(GTK_LABEL(cntrl->value_unit), ""); gtk_label_set_text(GTK_LABEL(cntrl->error), ""); @@ -1494,7 +1494,7 @@ fitfunc = args->fitfunc; report = g_string_new(NULL); - g_return_val_if_fail(args->fitter->covar, report); + g_return_val_if_fail(gwy_math_nlfit_get_covar(args->fitter), report); gcmodel = gwy_graph_model_get_curve(args->graph_model, 0); g_string_append(report, _("===== Fit Results =====")); diff -Nru gwyddion-2.46/modules/graph/graph_logscale.c gwyddion-2.47/modules/graph/graph_logscale.c --- gwyddion-2.46/modules/graph/graph_logscale.c 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/modules/graph/graph_logscale.c 2016-11-14 08:43:05.000000000 +0000 @@ -0,0 +1,366 @@ +/* + * @(#) $Id: graph_logscale.c 19252 2016-11-14 08:43:05Z yeti-dn $ + * Copyright (C) 2016 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 + +typedef enum { + LOGSCALE_AXIS_X = 1, + LOGSCALE_AXIS_Y = 2, + LOGSCALE_AXIS_BOTH = 3, +} LogscaleAxisType; + +typedef enum { + LOGSCALE_NEGATIVE_SKIP = 0, + LOGSCALE_NEGATIVE_ABS = 1, +} LogscaleNegativeType; + +typedef enum { + LOGSCALE_BASE_E = 0, + LOGSCALE_BASE_10 = 1, +} LogscaleBaseType; + +typedef struct { + gdouble base; + LogscaleAxisType axes; + LogscaleNegativeType negative_y; +} LogscaleArgs; + +static gboolean module_register (void); +static void logscale (GwyGraph *graph); +static gchar* logscale_label (const gchar *label, + gdouble base); +static GwyGraphCurveModel* logscale_curve (GwyGraphCurveModel *gcmodel, + const LogscaleArgs *args); +static gboolean logscale_dialogue (LogscaleArgs *args); +static void axes_changed (GtkToggleButton *toggle, + LogscaleArgs *args); +static void negative_y_changed(GtkToggleButton *toggle, + LogscaleArgs *args); +static void base_changed (GtkToggleButton *toggle, + LogscaleArgs *args); +static void load_args (GwyContainer *settings, + LogscaleArgs *args); +static void save_args (GwyContainer *settings, + LogscaleArgs *args); + +static const LogscaleArgs logscale_defaults = { + LOGSCALE_AXIS_BOTH, G_E, LOGSCALE_NEGATIVE_ABS, +}; + +static GwyModuleInfo module_info = { + GWY_MODULE_ABI_VERSION, + &module_register, + N_("Physically transforms graph data to logarithmic scale."), + "Yeti ", + "1.0", + "David Nečas (Yeti)", + "2016", +}; + +GWY_MODULE_QUERY(module_info) + +static gboolean +module_register(void) +{ + gwy_graph_func_register("graph_logscale", + (GwyGraphFunc)&logscale, + N_("/_Logscale transform..."), + NULL, + GWY_MENU_FLAG_GRAPH, + N_("Transform graph axes to logarithmic scale")); + + return TRUE; +} + +static void +logscale(GwyGraph *graph) +{ + GwyContainer *settings = gwy_app_settings_get(); + GwyContainer *container; + GwyGraphModel *gmodel, *newgmodel; + GwyGraphCurveModel *gcmodel; + GwySIUnit *unit; + LogscaleArgs args; + gchar *label, *llabel; + guint n, i; + + gwy_app_data_browser_get_current(GWY_APP_CONTAINER, &container, 0); + load_args(settings, &args); + if (logscale_dialogue(&args)) { + gmodel = gwy_graph_get_model(graph); + newgmodel = gwy_graph_model_new_alike(gmodel); + + if (args.axes & LOGSCALE_AXIS_X) { + g_object_get(gmodel, "axis-label-bottom", &label, NULL); + llabel = logscale_label(label, args.base); + g_free(label); + unit = gwy_si_unit_new(NULL); + g_object_set(newgmodel, + "axis-label-bottom", llabel, + "si-unit-x", unit, + NULL); + g_object_unref(unit); + g_free(llabel); + } + if (args.axes & LOGSCALE_AXIS_Y) { + g_object_get(gmodel, "axis-label-left", &label, NULL); + llabel = logscale_label(label, args.base); + g_free(label); + unit = gwy_si_unit_new(NULL); + g_object_set(newgmodel, + "axis-label-left", llabel, + "si-unit-y", unit, + NULL); + g_object_unref(unit); + g_free(llabel); + } + + n = gwy_graph_model_get_n_curves(gmodel); + for (i = 0; i < n; i++) { + if ((gcmodel = logscale_curve(gwy_graph_model_get_curve(gmodel, i), + &args))) { + gwy_graph_model_add_curve(newgmodel, gcmodel); + g_object_unref(gcmodel); + } + } + + if (gwy_graph_model_get_n_curves(newgmodel)) + gwy_app_data_browser_add_graph_model(newgmodel, container, TRUE); + g_object_unref(newgmodel); + } + save_args(settings, &args); +} + +static gchar* +logscale_label(const gchar *label, gdouble base) +{ + if (fabs(base - G_E)/G_E < 1e-6) + return g_strdup_printf("ln %s", label); + if (fabs(base - 10.0)/10.0 < 1e-6) + return g_strdup_printf("log %s", label); + return g_strdup_printf("log%g %s", base, label); +} + +static GwyGraphCurveModel* +logscale_curve(GwyGraphCurveModel *gcmodel, const LogscaleArgs *args) +{ + GwyGraphCurveModel *newgcmodel = gwy_graph_curve_model_new_alike(gcmodel); + const gdouble *xdata, *ydata; + gdouble *newxydata; + guint ndata, i, n; + gboolean logscale_x = (args->axes & LOGSCALE_AXIS_X); + gboolean logscale_y = (args->axes & LOGSCALE_AXIS_Y); + gboolean logbase = log(args->base); + + xdata = gwy_graph_curve_model_get_xdata(gcmodel); + ydata = gwy_graph_curve_model_get_ydata(gcmodel); + ndata = gwy_graph_curve_model_get_ndata(gcmodel); + newxydata = g_new(gdouble, 2*ndata); + for (i = n = 0; i < ndata; i++) { + gdouble x = xdata[i], y = ydata[i]; + + /* FIXME: We might want an option for negative abscissae too. */ + if (logscale_x && x <= 0.0) + continue; + if (logscale_y && y == 0.0) + continue; + if (logscale_y && y <= 0.0) { + if (args->negative_y == LOGSCALE_NEGATIVE_SKIP) + continue; + y = fabs(y); + } + if (logscale_x) + x = log(x)/logbase; + if (logscale_y) + y = log(y)/logbase; + + newxydata[n++] = x; + newxydata[n++] = y; + } + + if (n) + gwy_graph_curve_model_set_data_interleaved(newgcmodel, newxydata, n/2); + else + GWY_OBJECT_UNREF(newgcmodel); + + g_free(newxydata); + + return newgcmodel; +} + +static gboolean +logscale_dialogue(LogscaleArgs *args) +{ + LogscaleBaseType base_type = LOGSCALE_BASE_E; + GtkWidget *dialogue, *table, *label; + GSList *group; + gint row; + gboolean ok = FALSE; + + if (fabs(args->base - 10.0)/10.0 < 1e-6) + base_type = LOGSCALE_BASE_10; + + dialogue = gtk_dialog_new_with_buttons(_("Logscale Transform"), + NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL); + gwy_help_add_to_graph_dialog(GTK_DIALOG(dialogue), GWY_HELP_DEFAULT); + gtk_dialog_set_default_response(GTK_DIALOG(dialogue), GTK_RESPONSE_OK); + + table = gtk_table_new(4+3+3, 3, FALSE); + gtk_container_set_border_width(GTK_CONTAINER(table), 4); + gtk_table_set_row_spacings(GTK_TABLE(table), 2); + gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogue)->vbox), table, TRUE, TRUE, 0); + row = 0; + + label = gtk_label_new(_("Axes to transform:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, + 0, 3, row, row+1, GTK_FILL, GTK_FILL, 0, 0); + row++; + + group = gwy_radio_buttons_createl(G_CALLBACK(axes_changed), args, + args->axes, + _("_X"), LOGSCALE_AXIS_X, + _("_Y"), LOGSCALE_AXIS_Y, + _("_Both"), LOGSCALE_AXIS_BOTH, + NULL); + row = gwy_radio_buttons_attach_to_table(group, GTK_TABLE(table), 3, row); + + gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); + label = gtk_label_new(_("Negative value handling:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, + 0, 3, row, row+1, GTK_FILL, GTK_FILL, 0, 0); + row++; + + group = gwy_radio_buttons_createl(G_CALLBACK(negative_y_changed), args, + args->negative_y, + _("O_mit"), LOGSCALE_NEGATIVE_SKIP, + _("_Take absolute value"), + LOGSCALE_NEGATIVE_ABS, + NULL); + row = gwy_radio_buttons_attach_to_table(group, GTK_TABLE(table), 3, row); + + gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); + label = gtk_label_new(_("Base:")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(table), label, + 0, 3, row, row+1, GTK_FILL, GTK_FILL, 0, 0); + row++; + + group = gwy_radio_buttons_createl(G_CALLBACK(base_changed), args, + base_type, + _("Natural (e)"), LOGSCALE_BASE_E, + _("10"), LOGSCALE_BASE_10, + NULL); + row = gwy_radio_buttons_attach_to_table(group, GTK_TABLE(table), 3, row); + + gtk_widget_show_all(dialogue); + switch (gtk_dialog_run(GTK_DIALOG(dialogue))) { + case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: + gtk_widget_destroy(dialogue); + case GTK_RESPONSE_NONE: + break; + + case GTK_RESPONSE_OK: + gtk_widget_destroy(dialogue); + ok = TRUE; + break; + + default: + g_assert_not_reached(); + break; + } + + return ok; +} + +static void +axes_changed(GtkToggleButton *toggle, LogscaleArgs *args) +{ + if (gtk_toggle_button_get_active(toggle)) + args->axes = gwy_radio_button_get_value(GTK_WIDGET(toggle)); +} + +static void +negative_y_changed(GtkToggleButton *toggle, LogscaleArgs *args) +{ + if (gtk_toggle_button_get_active(toggle)) + args->negative_y = gwy_radio_button_get_value(GTK_WIDGET(toggle)); +} + +static void +base_changed(GtkToggleButton *toggle, LogscaleArgs *args) +{ + LogscaleBaseType base_type; + + if (!gtk_toggle_button_get_active(toggle)) + return; + + base_type = gwy_radio_button_get_value(GTK_WIDGET(toggle)); + if (base_type == LOGSCALE_BASE_10) + args->base = 10.0; + else if (base_type == LOGSCALE_BASE_E) + args->base = G_E; + else { + g_assert_not_reached(); + } +} + +static const gchar axes_key[] = "/module/graph_logscale/axes"; +static const gchar base_key[] = "/module/graph_logscale/base"; +static const gchar negative_y_key[] = "/module/graph_logscale/negative_y"; + +static void +load_args(GwyContainer *settings, LogscaleArgs *args) +{ + *args = logscale_defaults; + gwy_container_gis_enum_by_name(settings, axes_key, &args->axes); + gwy_container_gis_double_by_name(settings, base_key, &args->base); + gwy_container_gis_enum_by_name(settings, negative_y_key, &args->negative_y); + + args->axes = CLAMP(args->axes, LOGSCALE_AXIS_X, LOGSCALE_AXIS_BOTH); + args->base = CLAMP(fabs(args->base), G_MINDOUBLE, G_MAXDOUBLE); + args->negative_y = MIN(args->negative_y, LOGSCALE_NEGATIVE_ABS); +} + +static void +save_args(GwyContainer *settings, LogscaleArgs *args) +{ + gwy_container_set_enum_by_name(settings, axes_key, args->axes); + gwy_container_set_double_by_name(settings, base_key, args->base); + gwy_container_set_enum_by_name(settings, negative_y_key, args->negative_y); +} + +/* 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.46/modules/graph/Makefile.am gwyddion-2.47/modules/graph/Makefile.am --- gwyddion-2.46/modules/graph/Makefile.am 2016-02-22 06:57:59.000000000 +0000 +++ gwyddion-2.47/modules/graph/Makefile.am 2016-11-08 10:24:40.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 18293 2016-02-18 23:46:53Z yeti-dn $ +# @(#) $Id: Makefile.am 19205 2016-11-08 10:24:40Z yeti-dn $ graphdir = $(pkglibdir)/modules/graph @@ -14,6 +14,7 @@ graph_filter.la \ graph_fit.la \ graph_level.la \ + graph_logscale.la \ graph_peaks.la if OS_MSWIN @@ -46,6 +47,7 @@ graph_filter_la_SOURCES = graph_filter.c graph_fit_la_SOURCES = graph_fit.c graph_level_la_SOURCES = graph_level.c +graph_logscale_la_SOURCES = graph_logscale.c graph_peaks_la_SOURCES = graph_peaks.c clean-local: diff -Nru gwyddion-2.46/modules/graph/Makefile.in gwyddion-2.47/modules/graph/Makefile.in --- gwyddion-2.46/modules/graph/Makefile.in 2016-10-14 09:41:57.000000000 +0000 +++ gwyddion-2.47/modules/graph/Makefile.in 2016-11-18 10:52:40.000000000 +0000 @@ -14,7 +14,7 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 18293 2016-02-18 23:46:53Z yeti-dn $ +# @(#) $Id: Makefile.am 19205 2016-11-08 10:24:40Z yeti-dn $ VPATH = @srcdir@ am__is_gnu_make = { \ @@ -175,6 +175,9 @@ graph_level_la_LIBADD = am_graph_level_la_OBJECTS = graph_level.lo graph_level_la_OBJECTS = $(am_graph_level_la_OBJECTS) +graph_logscale_la_LIBADD = +am_graph_logscale_la_OBJECTS = graph_logscale.lo +graph_logscale_la_OBJECTS = $(am_graph_logscale_la_OBJECTS) graph_peaks_la_LIBADD = am_graph_peaks_la_OBJECTS = graph_peaks.lo graph_peaks_la_OBJECTS = $(am_graph_peaks_la_OBJECTS) @@ -218,14 +221,16 @@ $(graph_export_bitmap_la_SOURCES) \ $(graph_export_vector_la_SOURCES) $(graph_fdfit_la_SOURCES) \ $(graph_filter_la_SOURCES) $(graph_fit_la_SOURCES) \ - $(graph_level_la_SOURCES) $(graph_peaks_la_SOURCES) + $(graph_level_la_SOURCES) $(graph_logscale_la_SOURCES) \ + $(graph_peaks_la_SOURCES) DIST_SOURCES = $(graph_align_la_SOURCES) $(graph_cd_la_SOURCES) \ $(graph_cut_la_SOURCES) $(graph_dos_spectrum_la_SOURCES) \ $(graph_export_ascii_la_SOURCES) \ $(graph_export_bitmap_la_SOURCES) \ $(graph_export_vector_la_SOURCES) $(graph_fdfit_la_SOURCES) \ $(graph_filter_la_SOURCES) $(graph_fit_la_SOURCES) \ - $(graph_level_la_SOURCES) $(graph_peaks_la_SOURCES) + $(graph_level_la_SOURCES) $(graph_logscale_la_SOURCES) \ + $(graph_peaks_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -502,6 +507,7 @@ graph_filter.la \ graph_fit.la \ graph_level.la \ + graph_logscale.la \ graph_peaks.la @OS_MSWIN_TRUE@no_undefined = -no-undefined @@ -528,6 +534,7 @@ graph_filter_la_SOURCES = graph_filter.c graph_fit_la_SOURCES = graph_fit.c graph_level_la_SOURCES = graph_level.c +graph_logscale_la_SOURCES = graph_logscale.c graph_peaks_la_SOURCES = graph_peaks.c all: all-am @@ -631,6 +638,9 @@ graph_level.la: $(graph_level_la_OBJECTS) $(graph_level_la_DEPENDENCIES) $(EXTRA_graph_level_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(graphdir) $(graph_level_la_OBJECTS) $(graph_level_la_LIBADD) $(LIBS) +graph_logscale.la: $(graph_logscale_la_OBJECTS) $(graph_logscale_la_DEPENDENCIES) $(EXTRA_graph_logscale_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) -rpath $(graphdir) $(graph_logscale_la_OBJECTS) $(graph_logscale_la_LIBADD) $(LIBS) + graph_peaks.la: $(graph_peaks_la_OBJECTS) $(graph_peaks_la_DEPENDENCIES) $(EXTRA_graph_peaks_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) -rpath $(graphdir) $(graph_peaks_la_OBJECTS) $(graph_peaks_la_LIBADD) $(LIBS) @@ -651,6 +661,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_filter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_fit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_level.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_logscale.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph_peaks.Plo@am__quote@ .c.o: diff -Nru gwyddion-2.46/modules/process/arithmetic.c gwyddion-2.47/modules/process/arithmetic.c --- gwyddion-2.46/modules/process/arithmetic.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/arithmetic.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: arithmetic.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: arithmetic.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2013 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -139,7 +139,7 @@ &module_register, N_("Simple arithmetic operations with data fields."), "Yeti ", - "3.5", + "3.6", "David Nečas (Yeti)", "2004", }; @@ -721,7 +721,7 @@ /* Free stuff */ GWY_OBJECT_UNREF(void_mask); - for (i = NARGS; i < ARITHMETIC_NVARS; i++) { + for (i = NARGS; i < ARITHMETIC_NARGS; i++) { if (data_fields[i]) g_object_unref(data_fields[i]); } diff -Nru gwyddion-2.46/modules/process/calcoefs_new.c gwyddion-2.47/modules/process/calcoefs_new.c --- gwyddion-2.46/modules/process/calcoefs_new.c 2016-03-30 17:06:43.000000000 +0000 +++ gwyddion-2.47/modules/process/calcoefs_new.c 2016-11-09 10:38:04.000000000 +0000 @@ -242,26 +242,38 @@ gwy_caldata_set_si_unit_z(caldata, gwy_data_field_get_si_unit_z(dfield)); n = 0; - for (i=0; i<2; i++) - { - for (j=0; j<2; j++) - { - for (k=0; k<2; k++) - { - - if (i) x[n] = args.xrange_from; - else x[n] = args.xrange_to; - if (j) y[n] = args.yrange_from; - else y[n] = args.yrange_to; - if (k) z[n] = args.zrange_from; - else z[n] = args.zrange_to; - - if (i) xerr[n] = (args.xrange_to-args.xrange_from)*(args.xmult-1); - else xerr[n] = 0; - if (j) yerr[n] = (args.yrange_to-args.yrange_from)*(args.ymult-1); - else yerr[n] = 0; - if (k) zerr[n] = (args.zrange_to-args.zrange_from)*(args.zmult-1); - else zerr[n] = 0; + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + for (k = 0; k < 2; k++) { + if (i) + x[n] = args.xrange_from; + else + x[n] = args.xrange_to; + + if (j) + y[n] = args.yrange_from; + else + y[n] = args.yrange_to; + + if (k) + z[n] = args.zrange_from; + else + z[n] = args.zrange_to; + + if (i) + xerr[n] = (args.xrange_to - args.xrange_from)*(args.xmult - 1); + else + xerr[n] = 0; + + if (j) + yerr[n] = (args.yrange_to - args.yrange_from)*(args.ymult - 1); + else + yerr[n] = 0; + + if (k) + zerr[n] = (args.zrange_to - args.zrange_from)*(args.zmult - 1); + else + zerr[n] = 0; xunc[n] = args.xunc; yunc[n] = args.yunc; @@ -271,26 +283,33 @@ } } - if (args.duplicate == DUPLICATE_APPEND && (calibration = gwy_inventory_get_item(gwy_calibrations(), args.name))) - { - filename = g_build_filename(gwy_get_user_dir(), "caldata", calibration->filename, NULL); + if (args.duplicate == DUPLICATE_APPEND + && (calibration = gwy_inventory_get_item(gwy_calibrations(), + args.name))) { + filename = g_build_filename(gwy_get_user_dir(), + "caldata", calibration->filename, NULL); if (!g_file_get_contents(filename, - &contents, &len, &err) || !len) - { + &contents, &len, &err) || !len) { g_warning("Error loading file: %s", err->message); + g_free(filename); g_clear_error(&err); return; } else { if (len) - old = GWY_CALDATA(gwy_serializable_deserialize(contents, len, &pos)); + old = GWY_CALDATA(gwy_serializable_deserialize(contents, + len, &pos)); + else + old = NULL; g_free(contents); } - gwy_caldata_append(old, caldata); - g_object_unref(caldata); - caldata = old; - + g_free(filename); + if (old) { + gwy_caldata_append(old, caldata); + g_object_unref(caldata); + caldata = old; + } } gwy_caldata_set_range(caldata, args.xrange_from, args.xrange_to, diff -Nru gwyddion-2.46/modules/process/col_synth.c gwyddion-2.47/modules/process/col_synth.c --- gwyddion-2.46/modules/process/col_synth.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/col_synth.c 2016-10-25 19:12:11.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: col_synth.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: col_synth.c 19124 2016-10-25 19:12:11Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -48,11 +48,12 @@ } RelaxationType; typedef enum { - GRAPH_MAX = 0, - GRAPH_RMS = 1, - GRAPH_NMAX = 2, - GRAPH_SKEW = 3, + GRAPH_MAX = 0, + GRAPH_RMS = 1, + GRAPH_NMAX = 2, + GRAPH_SKEW = 3, GRAPH_KURTOSIS = 4, + GRAPH_CORRLEN = 5, GRAPH_NFLAGS, } GraphFlags; @@ -141,6 +142,8 @@ GwyGraphCurveModel **gcmodels, gdouble preview_time, gdouble zscale); +static gdouble zero_crossing_corrlen (GwyDataField *dfield, + GwyDataLine **pacf); static gboolean col_synth_trace (GwyDataField *dfield, gdouble x, gdouble y, @@ -169,6 +172,7 @@ N_("Number of maxima"), N_("Skew"), N_("Kurtosis"), + N_("Autocorrelation length"), }; static const ColSynthArgs col_synth_defaults = { @@ -189,7 +193,7 @@ &module_register, N_("Generates columnar surfaces by a simple growth algorithm."), "Yeti ", - "1.4", + "1.5", "David Nečas (Yeti)", "2014", }; @@ -354,6 +358,12 @@ g_object_set(gmodel, "si-unit-y", unit, NULL); g_object_unref(unit); } + if (i == GRAPH_CORRLEN) { + unit = gwy_data_field_get_si_unit_xy(newfield); + unit = gwy_si_unit_duplicate(unit); + g_object_set(gmodel, "si-unit-y", unit, NULL); + g_object_unref(unit); + } gwy_app_data_browser_add_graph_model(gmodel, data, TRUE); } @@ -798,6 +808,7 @@ gdouble lasttime = 0.0, lastpreviewtime = 0.0, currtime; GTimer *timer; GwyRandGenSet *rngset; + GwyDataLine *acf = NULL; GArray **evolution = NULL; gboolean any_graphs = FALSE; gboolean finished = FALSE; @@ -911,6 +922,10 @@ nmax = gwy_data_field_count_maxima(dfield); g_array_append_val(evolution[GRAPH_NMAX], nmax); } + if (evolution[GRAPH_CORRLEN]) { + gdouble corrlen = zero_crossing_corrlen(dfield, &acf); + g_array_append_val(evolution[GRAPH_CORRLEN], corrlen); + } nextgraphx = 1.2*nextgraphx + 1.0; } @@ -944,10 +959,32 @@ g_array_free(evolution[i], TRUE); } g_free(evolution); + GWY_OBJECT_UNREF(acf); return finished; } +static gdouble +zero_crossing_corrlen(GwyDataField *dfield, GwyDataLine **pacf) +{ + GwyDataLine *acf; + const gdouble *data; + guint n, i; + + if (!*pacf) + *pacf = gwy_data_line_new(1, 1.0, FALSE); + + acf = *pacf; + gwy_data_field_acf(dfield, acf, GWY_ORIENTATION_HORIZONTAL, + GWY_INTERPOLATION_LINEAR, -1); + n = gwy_data_line_get_res(acf); + data = gwy_data_line_get_data(acf); + for (i = 0; i < n && data[i] > 0.0; i++) + ; + + return gwy_data_field_jtor(dfield, i); +} + static gboolean col_synth_trace(GwyDataField *dfield, gdouble x, gdouble y, gdouble z, diff -Nru gwyddion-2.46/modules/process/convolution_filter.c gwyddion-2.47/modules/process/convolution_filter.c --- gwyddion-2.46/modules/process/convolution_filter.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/convolution_filter.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: convolution_filter.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: convolution_filter.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -341,7 +341,7 @@ hbox2 = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0); - table = gtk_table_new(1 + G_N_ELEMENTS(sizes), 1, FALSE); + table = gtk_table_new(1 + nsizes, 1, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 2); gtk_container_set_border_width(GTK_CONTAINER(table), 4); gtk_box_pack_start(GTK_BOX(hbox2), table, FALSE, FALSE, 0); diff -Nru gwyddion-2.46/modules/process/crosscor.c gwyddion-2.47/modules/process/crosscor.c --- gwyddion-2.46/modules/process/crosscor.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/crosscor.c 2016-10-18 08:13:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: crosscor.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: crosscor.c 19089 2016-10-16 12:47:38Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -156,7 +156,7 @@ &module_register, N_("Calculates cross-correlation of two data fields."), "Petr Klapetek ", - "1.9", + "1.10", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -771,14 +771,13 @@ GwyContainer *data; GwyDataField *dfieldx, *dfieldy, *dfield1, *dfield2, *dfield2b = NULL, *dfield4b = NULL, *dfield3 = NULL, *dfield4 = NULL, - *score, *buffer, *mask, *dir = NULL, + *score, *dir = NULL, *abs = NULL, *corrected; GwyDataField *dfieldx2 = NULL, *dfieldy2 = NULL, *score2 = NULL; GwyXY *coords; - gboolean cancelled; gint newid, xres, yres, i, col, row, leftadd, rightadd, topadd, bottomadd; - gdouble error, *xdata, *ydata; + gdouble *xdata, *ydata; GwyComputationState *state; GwySIUnit *siunit; GQuark quark; @@ -924,8 +923,7 @@ if (args->extend) { - buffer = gwy_data_field_new_alike(dfieldx, FALSE); - mask = gwy_data_field_new_alike(dfieldx, TRUE); + GwyDataField *mask = gwy_data_field_new_alike(dfieldx, TRUE); //crop data if there was a global shift if (args->search_xoffset<0) { @@ -945,70 +943,46 @@ bottomadd = 0; } - gwy_data_field_area_fill(mask, 0, 0, args->window_x/2 + 2 + leftadd, yres, 1); - gwy_data_field_area_fill(mask, 0, 0, xres, args->window_y/2 + 2 + topadd, 1); - gwy_data_field_area_fill(mask, xres - args->window_x/2 - 2 - rightadd, 0, args->window_x/2 + 2 + rightadd, yres, 1); - gwy_data_field_area_fill(mask, 0, yres - args->window_y/2 - 2 - bottomadd, xres, args->window_y/2 + 2 + bottomadd, 1); + gwy_data_field_area_fill(mask, + 0, 0, + args->window_x/2 + 2 + leftadd, yres, 1); + gwy_data_field_area_fill(mask, + 0, 0, + xres, args->window_y/2 + 2 + topadd, 1); + gwy_data_field_area_fill(mask, + xres - args->window_x/2 - 2 - rightadd, 0, + args->window_x/2 + 2 + rightadd, yres, 1); + gwy_data_field_area_fill(mask, + 0, yres - args->window_y/2 - 2 - bottomadd, + xres, args->window_y/2 + 2 + bottomadd, 1); - gwy_data_field_correct_average_unmasked(dfieldx, mask); - gwy_data_field_correct_average_unmasked(dfieldy, mask); + gwy_data_field_laplace_solve(dfieldx, mask, -1, 0.8); + gwy_data_field_laplace_solve(dfieldy, mask, -1, 0.8); - gwy_app_wait_start(gwy_app_find_window_for_channel(data, args->op1.id), - _("Borders extension...")); - - cancelled = FALSE; - for (i = 0; i < 10000; i++) { - gwy_data_field_correct_laplace_iteration(dfieldx, - mask, - buffer, - 0.2, - &error); - if (!gwy_app_wait_set_fraction((gdouble)i/20000.0)) { - cancelled = TRUE; - gwy_app_wait_finish(); - break; - } - - } - if (!cancelled) { - for (i = 0; i < 10000; i++) { - gwy_data_field_correct_laplace_iteration(dfieldy, - mask, - buffer, - 0.2, - &error); - if (!gwy_app_wait_set_fraction((10000.0 + (gdouble)i)/20000.0)) - break; - - } - } - gwy_app_wait_finish(); - - GWY_OBJECT_UNREF(buffer); - GWY_OBJECT_UNREF(mask); + g_object_unref(mask); } if (args->gaussian) { - gwy_data_field_filter_gaussian(dfieldx, args->gaussian_width); - gwy_data_field_filter_gaussian(dfieldy, args->gaussian_width); + gwy_data_field_filter_gaussian(dfieldx, args->gaussian_width); + gwy_data_field_filter_gaussian(dfieldy, args->gaussian_width); } if (args->correct) { - corrected = gwy_data_field_new_alike(dfield2, FALSE); - coords = g_new(GwyXY, xres*yres); + corrected = gwy_data_field_new_alike(dfield2, FALSE); + coords = g_new(GwyXY, xres*yres); - xdata = gwy_data_field_get_data(dfieldx); - ydata = gwy_data_field_get_data(dfieldy); - i = 0; - for (row = 0; row < yres; row++) { - for (col = 0; col < xres; col++) { - coords[i].x = col + gwy_data_field_rtoi(corrected, - xdata[col + xres*row]) + 0.5 - args->search_xoffset; - coords[i].y = row + gwy_data_field_rtoj(corrected, - ydata[col + xres*row]) + 0.5 - args->search_yoffset; - i++; - } - } + xdata = gwy_data_field_get_data(dfieldx); + ydata = gwy_data_field_get_data(dfieldy); + i = 0; + for (row = 0; row < yres; row++) { + for (col = 0; col < xres; col++) { + coords[i].x = col + gwy_data_field_rtoi(corrected, + xdata[col + xres*row]) + 0.5 - args->search_xoffset; + coords[i].y = row + gwy_data_field_rtoj(corrected, + ydata[col + xres*row]) + 0.5 - args->search_yoffset; + i++; + } + } gwy_data_field_sample_distorted(dfield2, corrected, diff -Nru gwyddion-2.46/modules/process/edge.c gwyddion-2.47/modules/process/edge.c --- gwyddion-2.46/modules/process/edge.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/edge.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: edge.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: edge.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2003-2007,2012 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -385,8 +385,8 @@ gdouble m[12], b[4]; gint i; - memset(m, 0, 6*sizeof(gdouble)); - memset(b, 0, 4*sizeof(gdouble)); + gwy_clear(m, 6); + gwy_clear(b, 4); for (i = 0; i < n; i++) { m[1] += xp[i]; m[2] += xp[i]*xp[i]; diff -Nru gwyddion-2.46/modules/process/fit-shape.c gwyddion-2.47/modules/process/fit-shape.c --- gwyddion-2.46/modules/process/fit-shape.c 2016-10-13 10:35:04.000000000 +0000 +++ gwyddion-2.47/modules/process/fit-shape.c 2016-10-31 16:30:37.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: fit-shape.c 19066 2016-10-13 07:04:39Z yeti-dn $ + * @(#) $Id: fit-shape.c 19147 2016-10-31 16:30:37Z yeti-dn $ * Copyright (C) 2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -37,8 +37,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -79,11 +81,6 @@ FIT_SHAPE_FIT_CANCELLED = 8, } FitShapeState; -typedef enum { - FIT_SHAPE_PARAM_ANGLE = 1 << 0, - FIT_SHAPE_PARAM_ABSVAL = 1 << 1, -} FitShapeParamFlags; - typedef struct { const gchar *function; GwyMaskingType masking; @@ -91,71 +88,10 @@ FitShapeOutputType output; gboolean diff_colourmap; gboolean diff_excluded; + gboolean geometric_fit; } FitShapeArgs; -typedef struct { - gboolean have_mean; - gboolean have_circle; - gboolean have_zrange; - gboolean have_zstats; - /* Plain mean values */ - gdouble xm; - gdouble ym; - /* Circumscribed circle. */ - gdouble xc; - gdouble yc; - gdouble r; - /* Value range. */ - gdouble zmin; - gdouble zmax; - /* Simple value stats. */ - gdouble zmean; - gdouble zrms; - gdouble zskew; -} FitShapeEstimateCache; - -typedef gdouble (*FitShapeXYFunc)(gdouble x, gdouble y, - const gdouble *param); - -typedef gboolean (*FitShapeEstimate)(const GwyXYZ *xyz, - guint n, - gdouble *param, - FitShapeEstimateCache *estimcache); - -typedef gdouble (*FitShapeCalcParam)(const gdouble *param); -typedef gdouble (*FitShapeCalcError)(const gdouble *param, - const gdouble *param_err, - const gdouble *correl); - -typedef struct { - const char *name; - gint power_xy; - gint power_z; - FitShapeParamFlags flags; -} FitShapeParam; - -typedef struct { - const char *name; - gint power_xy; - gint power_z; - FitShapeParamFlags flags; - FitShapeCalcParam calc; - FitShapeCalcError calc_err; -} FitShapeSecondary; - -typedef struct { - const gchar *name; - gboolean needs_same_units; - FitShapeXYFunc function; - GwyNLFitIdxFunc fit_function; - FitShapeEstimate estimate; - FitShapeEstimate initialise; - guint nparams; - guint nsecondary; - const FitShapeParam *param; - const FitShapeSecondary *secondary; -} FitShapeFunc; - +/* XXX XXX XXX XXX XXX */ typedef struct { guint nparam; gboolean *param_fixed; @@ -183,12 +119,12 @@ /* These are actually non-GUI and could be separated for some * non-interactive use. */ FitShapeContext *ctx; - FitShapeEstimateCache *estimcache; FitShapeState state; GwyAppPage pageno; + gboolean same_units; gint id; gchar *title; - guint function_id; + GwyShapeFitPreset *preset; gdouble *param; gdouble *alt_param; gdouble *param_err; @@ -204,6 +140,7 @@ GtkWidget *function; GtkWidget *diff_colourmap; GtkWidget *diff_excluded; + GtkWidget *geometric_fit; GtkWidget *output; GSList *display; GSList *masking; @@ -221,324 +158,110 @@ GArray *secondary_controls; } FitShapeControls; -static gboolean module_register (void); -static void fit_shape (GwyContainer *data, - GwyRunType run); -static void fit_shape_xyz (GwyContainer *data, - GwyRunType run); -static void fit_shape_dialogue (FitShapeArgs *args, - GwyContainer *data, - gint id, - GwyDataField *dfield, - GwyDataField *mfield, - GwySurface *surface); -static void create_output_fields (FitShapeControls *controls, - GwyContainer *data); -static void create_output_xyz (FitShapeControls *controls, - GwyContainer *data); -static GtkWidget* basic_tab_new (FitShapeControls *controls, - GwyDataField *dfield, - GwyDataField *mfield); -static gint basic_tab_add_masking (FitShapeControls *controls, - GtkWidget *table, - gint row); -static GtkWidget* parameters_tab_new (FitShapeControls *controls); -static void fit_param_table_resize (FitShapeControls *controls); -static GtkWidget* correl_tab_new (FitShapeControls *controls); -static void fit_correl_table_resize (FitShapeControls *controls); -static GtkWidget* secondary_tab_new (FitShapeControls *controls); -static void fit_secondary_table_resize (FitShapeControls *controls); -static GtkWidget* function_menu_new (const gchar *name, - GwyDataField *dfield, - FitShapeControls *controls); -static void function_changed (GtkComboBox *combo, - FitShapeControls *controls); -static void display_changed (GtkToggleButton *toggle, - FitShapeControls *controls); -static void diff_colourmap_changed (GtkToggleButton *toggle, - FitShapeControls *controls); -static void diff_excluded_changed (GtkToggleButton *toggle, - FitShapeControls *controls); -static void output_changed (GtkComboBox *combo, - FitShapeControls *controls); -static void masking_changed (GtkToggleButton *toggle, - FitShapeControls *controls); -static void update_colourmap_key (FitShapeControls *controls); -static void fix_changed (GtkToggleButton *button, - FitShapeControls *controls); -static void param_value_activate (GtkEntry *entry, - FitShapeControls *controls); -static void update_all_param_values (FitShapeControls *controls); -static void revert_params (FitShapeControls *controls); -static void calculate_secondary_params (FitShapeControls *controls); -static void recalculate_image (FitShapeControls *controls); -static void update_param_table (FitShapeControls *controls, - const gdouble *param, - const gdouble *param_err); -static void update_correl_table (FitShapeControls *controls, - GwyNLFitter *fitter); -static void update_secondary_table (FitShapeControls *controls); -static void fit_shape_estimate (FitShapeControls *controls); -static void fit_shape_reduced_fit (FitShapeControls *controls); -static void fit_shape_full_fit (FitShapeControls *controls); -static void fit_copy_correl_matrix (FitShapeControls *controls, - GwyNLFitter *fitter); -static void update_fields (FitShapeControls *controls); -static void update_diff_gradient (FitShapeControls *controls); -static void update_fit_state (FitShapeControls *controls); -static void update_fit_results (FitShapeControls *controls, - GwyNLFitter *fitter); -static void update_context_data (FitShapeControls *controls); -static void fit_context_resize_params (FitShapeContext *ctx, - guint n_param); -static void fit_context_free (FitShapeContext *ctx); -static GwyNLFitter* fit (const FitShapeFunc *func, - const FitShapeContext *ctx, - guint maxiter, - gdouble *param, - gdouble *rss, - GwySetFractionFunc set_fraction, - GwySetMessageFunc set_message); -static GwyNLFitter* fit_reduced (const FitShapeFunc *func, - const FitShapeContext *ctx, - gdouble *param, - gdouble *rss); -static void calculate_field (const FitShapeFunc *func, - const gdouble *param, - GwyDataField *dfield); -static void calculate_function (const FitShapeFunc *func, - const FitShapeContext *ctx, - const gdouble *param, - gdouble *z); -static void reduce_data_size (const GwyXYZ *xyzsrc, - guint nsrc, - GwySurface *dest); -static GString* create_fit_report (FitShapeControls *controls); -static void fit_shape_load_args (GwyContainer *container, - FitShapeArgs *args); -static void fit_shape_save_args (GwyContainer *container, - FitShapeArgs *args); - -#define DECLARE_SECONDARY(funcname,name) \ - static gdouble funcname##_calc_##name (const gdouble *param); \ - static gdouble funcname##_calc_err_##name(const gdouble *param, \ - const gdouble *param_err, \ - const gdouble *correl); - -#define DECLARE_SHAPE_FUNC(name) \ - static gdouble name##_func(gdouble x, \ - gdouble y, \ - const gdouble *param); \ - static gdouble name##_fitfunc(guint i, \ - const gdouble *param, \ - gpointer user_data, \ - gboolean *fres) \ - { \ - const GwyXYZ *xyz = ((const FitShapeContext*)user_data)->xyz; \ - *fres = TRUE; \ - return name##_func(xyz[i].x, xyz[i].y, param) - xyz[i].z; \ - } \ - static gboolean name##_estimate(const GwyXYZ *xyz, \ - guint n, \ - gdouble *param, \ - FitShapeEstimateCache *estimcache); \ - static gboolean name##_init(const GwyXYZ *xyz, \ - guint n, \ - gdouble *param, \ - FitShapeEstimateCache *estimcache); - -/* XXX: This is a dirty trick assuming sizeof(FitShapeSecondary) > sizeof(NULL) - * so that we get zero nsecondary when name##_secondary is defined to NULL - * and correct array size otherwise. It should be safe because - * FitShapeSecondary is a struct that contains at least two pointers plus other - * stuff, but it is dirty anyway. */ -#define SHAPE_FUNC_ITEM(name) \ - &name##_func, &name##_fitfunc, &name##_estimate, &name##_init, \ - G_N_ELEMENTS(name##_params), \ - sizeof(name##_secondary)/sizeof(FitShapeSecondary), \ - name##_params, \ - name##_secondary - -DECLARE_SHAPE_FUNC(grating); -DECLARE_SHAPE_FUNC(grating3); -DECLARE_SHAPE_FUNC(holes); -DECLARE_SHAPE_FUNC(pring); -DECLARE_SHAPE_FUNC(sphere); -DECLARE_SHAPE_FUNC(cylinder); -DECLARE_SHAPE_FUNC(gaussian); -DECLARE_SHAPE_FUNC(lorentzian); -DECLARE_SHAPE_FUNC(pyramidx); - -DECLARE_SECONDARY(sphere, R); -DECLARE_SECONDARY(cylinder, R); -DECLARE_SECONDARY(gaussian, sigma1); -DECLARE_SECONDARY(gaussian, sigma2); -DECLARE_SECONDARY(lorentzian, b1); -DECLARE_SECONDARY(lorentzian, b2); -DECLARE_SECONDARY(grating3, h); -DECLARE_SECONDARY(grating3, L0); -DECLARE_SECONDARY(grating3, L1); -DECLARE_SECONDARY(grating3, L2); -DECLARE_SECONDARY(grating3, L3); -DECLARE_SECONDARY(holes, wouter); -DECLARE_SECONDARY(holes, winner); -DECLARE_SECONDARY(holes, R); - -static const FitShapeParam grating_params[] = { - { "L", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "h", 0, 1, 0, }, - { "p", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "z0", 0, 1, 0, }, - { "x0", 1, 0, 0, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, - { "c", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, -}; - -#define grating_secondary NULL - -static const FitShapeParam grating3_params[] = { - { "L", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "h1", 0, 1, FIT_SHAPE_PARAM_ABSVAL, }, - { "h2", 0, 1, FIT_SHAPE_PARAM_ABSVAL, }, - { "h3", 0, 1, FIT_SHAPE_PARAM_ABSVAL, }, - { "p", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "q1", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "q2", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "q3", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "z0", 0, 1, 0, }, - { "x0", 1, 0, 0, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, -}; - -static const FitShapeSecondary grating3_secondary[] = { - { "h", 0, 1, 0, grating3_calc_h, grating3_calc_err_h, }, - { "L0", 1, 0, 0, grating3_calc_L0, grating3_calc_err_L0, }, - { "L1", 1, 0, 0, grating3_calc_L1, grating3_calc_err_L1, }, - { "L2", 1, 0, 0, grating3_calc_L2, grating3_calc_err_L2, }, - { "L3", 1, 0, 0, grating3_calc_L3, grating3_calc_err_L3, }, -}; - -static const FitShapeParam holes_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "L", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "p", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "h", 0, 1, 0, }, - { "s", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "r", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, -}; - -static const FitShapeSecondary holes_secondary[] = { - { "wouter", 1, 0, 0, holes_calc_wouter, holes_calc_err_wouter, }, - { "winner", 1, 0, 0, holes_calc_winner, holes_calc_err_winner, }, - { "R", 1, 0, 0, holes_calc_R, holes_calc_err_R, }, -}; - -static const FitShapeParam pring_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "R", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "w", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "h", 0, 1, 0, }, - { "s", 0, 1, 0, }, - { "bx", -1, 1, 0, }, - { "by", -1, 1, 0, }, -}; - -#define pring_secondary NULL - -static const FitShapeParam sphere_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "C", 0, -1, 0, }, -}; - -static const FitShapeSecondary sphere_secondary[] = { - { "R", 0, 1, 0, sphere_calc_R, sphere_calc_err_R, }, -}; - -static const FitShapeParam cylinder_params[] = { - { "x0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "C", 0, -1, 0, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, - { "b∥", -1, 1, 0, }, -}; - -static const FitShapeSecondary cylinder_secondary[] = { - { "R", 0, 1, 0, cylinder_calc_R, cylinder_calc_err_R, }, -}; - -static const FitShapeParam gaussian_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "h", 0, 1, 0, }, - { "σmean", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "a", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, - { "bx", -1, 1, 0, }, - { "by", -1, 1, 0, }, -}; - -static const FitShapeSecondary gaussian_secondary[] = { - { "σ1", 1, 0, 0, gaussian_calc_sigma1, gaussian_calc_err_sigma1, }, - { "σ2", 1, 0, 0, gaussian_calc_sigma2, gaussian_calc_err_sigma2, }, -}; - -static const FitShapeParam lorentzian_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "h", 0, 1, 0, }, - { "βmean", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "a", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, - { "bx", -1, 1, 0, }, - { "by", -1, 1, 0, }, -}; - -static const FitShapeSecondary lorentzian_secondary[] = { - { "β1", 1, 0, 0, lorentzian_calc_b1, lorentzian_calc_err_b1, }, - { "β2", 1, 0, 0, lorentzian_calc_b2, lorentzian_calc_err_b2, }, -}; - -static const FitShapeParam pyramidx_params[] = { - { "x0", 1, 0, 0, }, - { "y0", 1, 0, 0, }, - { "z0", 0, 1, 0, }, - { "h", 0, 1, 0, }, - { "L", 1, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "a", 0, 0, FIT_SHAPE_PARAM_ABSVAL, }, - { "φ", 0, 0, FIT_SHAPE_PARAM_ANGLE, }, - { "bx", -1, 1, 0, }, - { "by", -1, 1, 0, }, -}; - -#define pyramidx_secondary NULL - -static const FitShapeFunc functions[] = { - { N_("Grating (simple)"), FALSE, SHAPE_FUNC_ITEM(grating), }, - { N_("Grating (3-level)"), FALSE, SHAPE_FUNC_ITEM(grating3), }, - { N_("Holes"), FALSE, SHAPE_FUNC_ITEM(holes), }, - { N_("Ring"), FALSE, SHAPE_FUNC_ITEM(pring), }, - { N_("Sphere"), TRUE, SHAPE_FUNC_ITEM(sphere), }, - { N_("Cylinder (lying)"), TRUE, SHAPE_FUNC_ITEM(cylinder), }, - { N_("Gaussian"), FALSE, SHAPE_FUNC_ITEM(gaussian), }, - { N_("Lorentzian"), FALSE, SHAPE_FUNC_ITEM(lorentzian), }, - { N_("Pyramid (diamond)"), FALSE, SHAPE_FUNC_ITEM(pyramidx), }, -}; +static gboolean module_register (void); +static void fit_shape (GwyContainer *data, + GwyRunType run); +static void fit_shape_xyz (GwyContainer *data, + GwyRunType run); +static void fit_shape_dialogue (FitShapeArgs *args, + GwyContainer *data, + gint id, + GwyDataField *dfield, + GwyDataField *mfield, + GwySurface *surface); +static void create_output_fields (FitShapeControls *controls, + GwyContainer *data); +static void create_output_xyz (FitShapeControls *controls, + GwyContainer *data); +static GtkWidget* basic_tab_new (FitShapeControls *controls, + GwyDataField *mfield); +static gint basic_tab_add_masking (FitShapeControls *controls, + GtkWidget *table, + gint row); +static GtkWidget* parameters_tab_new (FitShapeControls *controls); +static void fit_param_table_resize (FitShapeControls *controls); +static GtkWidget* correl_tab_new (FitShapeControls *controls); +static void fit_correl_table_resize (FitShapeControls *controls); +static GtkWidget* secondary_tab_new (FitShapeControls *controls); +static void fit_secondary_table_resize(FitShapeControls *controls); +static GtkWidget* function_menu_new (const gchar *name, + FitShapeControls *controls); +static gboolean preset_is_available (GtkTreeModel *filter_model, + GtkTreeIter *filter_iter, + gpointer user_data); +static void function_changed (GtkComboBox *combo, + FitShapeControls *controls); +static void display_changed (GtkToggleButton *toggle, + FitShapeControls *controls); +static void diff_colourmap_changed (GtkToggleButton *toggle, + FitShapeControls *controls); +static void diff_excluded_changed (GtkToggleButton *toggle, + FitShapeControls *controls); +static void geometric_fit_changed (GtkToggleButton *toggle, + FitShapeControls *controls); +static void output_changed (GtkComboBox *combo, + FitShapeControls *controls); +static void masking_changed (GtkToggleButton *toggle, + FitShapeControls *controls); +static void update_colourmap_key (FitShapeControls *controls); +static void fix_changed (GtkToggleButton *button, + FitShapeControls *controls); +static void param_value_activate (GtkEntry *entry, + FitShapeControls *controls); +static void update_all_param_values (FitShapeControls *controls); +static void revert_params (FitShapeControls *controls); +static void calculate_secondary_params(FitShapeControls *controls); +static void recalculate_image (FitShapeControls *controls); +static void update_param_table (FitShapeControls *controls, + const gdouble *param, + const gdouble *param_err); +static void update_correl_table (FitShapeControls *controls, + GwyNLFitter *fitter); +static void update_secondary_table (FitShapeControls *controls); +static void fit_shape_estimate (FitShapeControls *controls); +static void fit_shape_reduced_fit (FitShapeControls *controls); +static void fit_shape_full_fit (FitShapeControls *controls); +static void fit_copy_correl_matrix (FitShapeControls *controls, + GwyNLFitter *fitter); +static void update_fields (FitShapeControls *controls); +static void update_diff_gradient (FitShapeControls *controls); +static void update_fit_state (FitShapeControls *controls); +static void update_fit_results (FitShapeControls *controls, + GwyNLFitter *fitter); +static void update_context_data (FitShapeControls *controls); +static void fit_context_resize_params (FitShapeContext *ctx, + guint n_param); +static void fit_context_free (FitShapeContext *ctx); +static GwyNLFitter* fit (GwyShapeFitPreset *preset, + const FitShapeContext *ctx, + guint maxiter, + gdouble *param, + gdouble *rss, + GwySetFractionFunc set_fraction, + GwySetMessageFunc set_message, + gboolean geometric_fit); +static GwyNLFitter* fit_reduced (GwyShapeFitPreset *preset, + const FitShapeContext *ctx, + gdouble *param, + gdouble *rss); +static void calculate_field (GwyShapeFitPreset *preset, + const gdouble *params, + GwyDataField *dfield); +static void reduce_data_size (const GwyXYZ *xyzsrc, + guint nsrc, + GwySurface *dest); +static GString* create_fit_report (FitShapeControls *controls); +static void fit_shape_load_args (GwyContainer *container, + FitShapeArgs *args); +static void fit_shape_save_args (GwyContainer *container, + FitShapeArgs *args); /* NB: The default must not require same units because then we could not fall * back to it in all cases. */ static const FitShapeArgs fit_shape_defaults = { "Grating (simple)", GWY_MASK_IGNORE, FIT_SHAPE_DISPLAY_RESULT, FIT_SHAPE_OUTPUT_FIT, - TRUE, TRUE, + TRUE, TRUE, FALSE, }; static GwyModuleInfo module_info = { @@ -546,7 +269,7 @@ &module_register, N_("Fits predefined geometrical shapes to data."), "Yeti ", - "1.0", + "1.1", "David Nečas (Yeti)", "2016", }; @@ -626,20 +349,22 @@ GtkWidget *dialogue, *notebook, *widget, *vbox, *hbox, *alignment, *hbox2, *label; FitShapeControls controls; - FitShapeEstimateCache estimcache; FitShapeContext ctx; GwyDataField *mydfield = NULL; + GwySIUnit *xyunit, *zunit; GString *report; gint response; gwy_clear(&ctx, 1); gwy_clear(&controls, 1); - gwy_clear(&estimcache, 1); controls.args = args; controls.ctx = &ctx; - controls.estimcache = &estimcache; controls.id = id; + xyunit = gwy_data_field_get_si_unit_xy(dfield); + zunit = gwy_data_field_get_si_unit_z(dfield); + controls.same_units = gwy_si_unit_equal(xyunit, zunit); + if (surface) { controls.pageno = GWY_PAGE_XYZS; controls.title = gwy_app_get_surface_title(data, id); @@ -731,7 +456,7 @@ notebook = gtk_notebook_new(); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); - widget = basic_tab_new(&controls, dfield, mfield); + widget = basic_tab_new(&controls, mfield); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, gtk_label_new(gwy_sgettext("adjective|Basic"))); @@ -925,8 +650,7 @@ } static GtkWidget* -basic_tab_new(FitShapeControls *controls, - GwyDataField *dfield, GwyDataField *mfield) +basic_tab_new(FitShapeControls *controls, GwyDataField *mfield) { static const GwyEnum displays[] = { { N_("Data"), FIT_SHAPE_DISPLAY_DATA, }, @@ -945,14 +669,14 @@ hbox = gtk_hbox_new(FALSE, 0); - table = gtk_table_new(8 + 4*(!!mfield), 4, FALSE); + table = gtk_table_new(8 + !!controls->same_units + 4*(!!mfield), 4, FALSE); gtk_container_set_border_width(GTK_CONTAINER(table), 4); 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); row = 0; - controls->function = function_menu_new(args->function, dfield, controls); + controls->function = function_menu_new(args->function, controls); gwy_table_attach_hscale(table, row, _("_Function type:"), NULL, GTK_OBJECT(controls->function), GWY_HSCALE_WIDGET); row++; @@ -991,6 +715,18 @@ G_CALLBACK(diff_colourmap_changed), controls); row++; + if (controls->same_units) { + controls->geometric_fit + = gtk_check_button_new_with_mnemonic(_("Full fit is _geometric")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(controls->geometric_fit), + args->geometric_fit); + gtk_table_attach(GTK_TABLE(table), controls->geometric_fit, + 0, 3, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + g_signal_connect(controls->geometric_fit, "toggled", + G_CALLBACK(geometric_fit_changed), controls); + row++; + } + if (mfield) row = basic_tab_add_masking(controls, table, row); @@ -1088,11 +824,10 @@ fit_param_table_resize(FitShapeControls *controls) { GtkTable *table; - const FitShapeFunc *func = functions + controls->function_id; guint i, row, old_nparams, nparams; old_nparams = controls->param_controls->len; - nparams = func->nparams; + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); gwy_debug("%u -> %u", old_nparams, nparams); for (i = old_nparams; i > nparams; i--) { FitParamControl *cntrl = &g_array_index(controls->param_controls, @@ -1164,9 +899,10 @@ for (i = 0; i < nparams; i++) { FitParamControl *cntrl = &g_array_index(controls->param_controls, FitParamControl, i); - const FitShapeParam *param = func->param + i; + const gchar *name + = gwy_shape_fit_preset_get_param_name(controls->preset, i); - gtk_label_set_markup(GTK_LABEL(cntrl->name), param->name); + gtk_label_set_markup(GTK_LABEL(cntrl->name), name); } gtk_widget_show_all(controls->param_table); @@ -1203,14 +939,12 @@ { GtkTable *table; GtkWidget *label; - const FitShapeFunc *func = functions + controls->function_id; guint i, j, nparams; - const FitShapeParam *param; GPtrArray *vlabels = controls->correl_vlabels, *hlabels = controls->correl_hlabels, *values = controls->correl_values; - nparams = func->nparams; + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); gwy_debug("%u -> %u", hlabels->len, nparams); if (hlabels->len != nparams) { for (i = 0; i < hlabels->len; i++) @@ -1254,9 +988,11 @@ } for (i = 0; i < nparams; i++) { - param = func->param + i; - gtk_label_set_markup(g_ptr_array_index(vlabels, i), param->name); - gtk_label_set_markup(g_ptr_array_index(hlabels, i), param->name); + const gchar *name + = gwy_shape_fit_preset_get_param_name(controls->preset, i); + + gtk_label_set_markup(g_ptr_array_index(vlabels, i), name); + gtk_label_set_markup(g_ptr_array_index(hlabels, i), name); } gtk_widget_show_all(controls->correl_table); @@ -1285,11 +1021,10 @@ fit_secondary_table_resize(FitShapeControls *controls) { GtkTable *table; - const FitShapeFunc *func = functions + controls->function_id; guint i, row, old_nsecondary, nsecondary; old_nsecondary = controls->secondary_controls->len; - nsecondary = func->nsecondary; + nsecondary = gwy_shape_fit_preset_get_nsecondary(controls->preset); gwy_debug("%u -> %u", old_nsecondary, nsecondary); for (i = old_nsecondary; i > nsecondary; i--) { FitParamControl *cntrl = &g_array_index(controls->secondary_controls, @@ -1350,87 +1085,114 @@ for (i = 0; i < nsecondary; i++) { FitParamControl *cntrl = &g_array_index(controls->secondary_controls, FitParamControl, i); - const FitShapeSecondary *secparam = func->secondary + i; + const gchar *name + = gwy_shape_fit_preset_get_secondary_name(controls->preset, i); - gtk_label_set_markup(GTK_LABEL(cntrl->name), secparam->name); + gtk_label_set_markup(GTK_LABEL(cntrl->name), name); } gtk_widget_show_all(controls->secondary_table); } +static void +render_translated_name(G_GNUC_UNUSED GtkCellLayout *layout, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + guint i = GPOINTER_TO_UINT(data); + const gchar *text; + + gtk_tree_model_get(model, iter, i, &text, -1); + g_object_set(renderer, "text", _(text), NULL); +} + static GtkWidget* -function_menu_new(const gchar *name, GwyDataField *dfield, - FitShapeControls *controls) +function_menu_new(const gchar *name, FitShapeControls *controls) { - GwySIUnit *xyunit, *zunit; - gboolean same_units; - GArray *entries = g_array_new(FALSE, FALSE, sizeof(GwyEnum)); + GwyInventory *inventory; + GwyInventoryStore *store; + GtkTreeModel *filter_model; + GtkTreeModelFilter *filter; + GtkTreeIter filter_iter, store_iter; + GtkCellRenderer *renderer; GtkWidget *combo; - GwyEnum *model; - guint i, n; - - xyunit = gwy_data_field_get_si_unit_xy(dfield); - zunit = gwy_data_field_get_si_unit_z(dfield); - same_units = gwy_si_unit_equal(xyunit, zunit); + guint i; - /* First try to find function @name. */ - controls->function_id = G_MAXUINT; - for (i = 0; i < G_N_ELEMENTS(functions); i++) { - GwyEnum entry; + /* First try to find function @name. If it was excluded fall back to the + * default function. */ + inventory = gwy_shape_fit_presets(); + controls->preset = gwy_inventory_get_item_or_default(inventory, name); + if (gwy_shape_fit_preset_needs_same_units(controls->preset) + && !controls->same_units) { + controls->preset = gwy_inventory_get_item(inventory, + fit_shape_defaults.function); + } + name = gwy_resource_get_name(GWY_RESOURCE(controls->preset)); + + store = gwy_inventory_store_new(inventory); + filter_model = gtk_tree_model_filter_new(GTK_TREE_MODEL(store), NULL); + filter = GTK_TREE_MODEL_FILTER(filter_model); + gtk_tree_model_filter_set_visible_func(filter, preset_is_available, + GINT_TO_POINTER(controls->same_units), + NULL); + g_object_unref(store); - if (functions[i].needs_same_units && !same_units) - continue; + combo = gtk_combo_box_new_with_model(filter_model); + g_object_unref(filter_model); - entry.name = functions[i].name; - entry.value = i; - g_array_append_val(entries, entry); - if (gwy_strequal(entry.name, name)) - controls->function_id = i; - } + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + i = gwy_inventory_store_get_column_by_name(store, "name"); + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, + render_translated_name, + GUINT_TO_POINTER(i), NULL); + gwy_inventory_store_get_iter(store, name, &store_iter); + gtk_tree_model_filter_convert_child_iter_to_iter(filter, &filter_iter, + &store_iter); + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &filter_iter); + g_signal_connect(combo, "changed", G_CALLBACK(function_changed), controls); - /* If it was excluded fall back to the default function. */ - if (controls->function_id == G_MAXUINT) { - name = fit_shape_defaults.function; - for (i = 0; i < G_N_ELEMENTS(functions); i++) { - if (functions[i].needs_same_units && !same_units) - continue; - if (gwy_strequal(functions[i].name, name)) - controls->function_id = i; - } - } - g_assert(controls->function_id != G_MAXUINT); + return combo; +} - n = entries->len; - model = (GwyEnum*)g_array_free(entries, FALSE); - combo = gwy_enum_combo_box_new(model, n, - G_CALLBACK(function_changed), controls, - controls->function_id, TRUE); - g_object_set_data(G_OBJECT(combo), "model", model); - g_object_weak_ref(G_OBJECT(combo), (GWeakNotify)g_free, model); +static gboolean +preset_is_available(GtkTreeModel *model, GtkTreeIter *iter, + gpointer user_data) +{ + gboolean same_units = GPOINTER_TO_INT(user_data); + GwyShapeFitPreset *preset; - return combo; + if (!same_units) { + gtk_tree_model_get(model, iter, 0, &preset, -1); + return !gwy_shape_fit_preset_needs_same_units(preset); + } + return TRUE; } static void function_changed(GtkComboBox *combo, FitShapeControls *controls) { - guint i = gwy_enum_combo_box_get_active(combo); FitShapeContext *ctx = controls->ctx; - const FitShapeFunc *func; - guint nparams; - - controls->function_id = i; - func = functions + controls->function_id; - controls->args->function = func->name; - nparams = func->nparams; + GtkTreeModel *model; + GtkTreeIter filter_iter; + guint i, nparams, nsecondary; + + model = gtk_combo_box_get_model(combo); + gtk_combo_box_get_active_iter(combo, &filter_iter); + gtk_tree_model_get(model, &filter_iter, 0, &controls->preset, -1); + controls->args->function + = gwy_resource_get_name(GWY_RESOURCE(controls->preset)); + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); + nsecondary = gwy_shape_fit_preset_get_nsecondary(controls->preset); controls->param = g_renew(gdouble, controls->param, nparams); controls->alt_param = g_renew(gdouble, controls->alt_param, nparams); controls->param_err = g_renew(gdouble, controls->param_err, nparams); - controls->secondary = g_renew(gdouble, controls->secondary, - func->nsecondary); + controls->secondary = g_renew(gdouble, controls->secondary, nsecondary); controls->secondary_err = g_renew(gdouble, controls->secondary_err, - func->nsecondary); + nsecondary); controls->correl = g_renew(gdouble, controls->correl, (nparams + 1)*nparams/2); for (i = 0; i < nparams; i++) @@ -1439,8 +1201,8 @@ fit_correl_table_resize(controls); fit_secondary_table_resize(controls); fit_context_resize_params(ctx, nparams); - func->initialise(ctx->xyz, ctx->n, controls->param, - controls->estimcache); + gwy_shape_fit_preset_setup(controls->preset, ctx->xyz, ctx->n, + controls->param); controls->state = FIT_SHAPE_INITIALISED; fit_copy_correl_matrix(controls, NULL); gwy_assign(controls->alt_param, controls->param, nparams); @@ -1486,6 +1248,13 @@ } static void +geometric_fit_changed(GtkToggleButton *toggle, + FitShapeControls *controls) +{ + controls->args->geometric_fit = gtk_toggle_button_get_active(toggle); +} + +static void output_changed(GtkComboBox *combo, FitShapeControls *controls) { controls->args->output = gwy_enum_combo_box_get_active(combo); @@ -1536,16 +1305,18 @@ static void update_param_value(FitShapeControls *controls, guint i) { - const FitShapeFunc *func = functions + controls->function_id; - FitParamControl *cntrl = &g_array_index(controls->param_controls, - FitParamControl, i); - GtkEntry *entry = GTK_ENTRY(cntrl->value); - + FitParamControl *cntrl; + GwyNLFitParamFlags flags; + GtkEntry *entry; + + cntrl = &g_array_index(controls->param_controls, FitParamControl, i); + entry = GTK_ENTRY(cntrl->value); + flags = gwy_shape_fit_preset_get_param_flags(controls->preset, i); controls->param[i] = g_strtod(gtk_entry_get_text(entry), NULL); controls->param[i] *= cntrl->magnitude; - if (func->param[i].flags & FIT_SHAPE_PARAM_ANGLE) + if (flags & GWY_NLFIT_PARAM_ANGLE) controls->param[i] *= G_PI/180.0; - if (func->param[i].flags & FIT_SHAPE_PARAM_ABSVAL) + if (flags & GWY_NLFIT_PARAM_ABSVAL) controls->param[i] = fabs(controls->param[i]); } @@ -1576,9 +1347,9 @@ static void revert_params(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; - guint i, nparams = func->nparams; + guint i, nparams; + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); update_all_param_values(controls); for (i = 0; i < nparams; i++) GWY_SWAP(gdouble, controls->param[i], controls->alt_param[i]); @@ -1605,12 +1376,12 @@ update_param_table(FitShapeControls *controls, const gdouble *param, const gdouble *param_err) { - const FitShapeFunc *func = functions + controls->function_id; - guint i, nparams = func->nparams; + guint i, nparams; GwyDataField *dfield; GwySIUnit *unit, *xyunit, *zunit; GwySIValueFormat *vf = NULL; + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); dfield = gwy_container_get_object_by_name(controls->mydata, "/0/data"); xyunit = gwy_data_field_get_si_unit_xy(dfield); zunit = gwy_data_field_get_si_unit_z(dfield); @@ -1619,19 +1390,20 @@ for (i = 0; i < nparams; i++) { FitParamControl *cntrl = &g_array_index(controls->param_controls, FitParamControl, i); - const FitShapeParam *fitparam = func->param + i; + GwyNLFitParamFlags flags; guchar buf[32]; gdouble v; + flags = gwy_shape_fit_preset_get_param_flags(controls->preset, i); v = param[i]; - if (fitparam->flags & FIT_SHAPE_PARAM_ANGLE) { + if (flags & GWY_NLFIT_PARAM_ANGLE) { v *= 180.0/G_PI; gwy_si_unit_set_from_string(unit, "deg"); } else { - gwy_si_unit_power_multiply(xyunit, fitparam->power_xy, - zunit, fitparam->power_z, - unit); + g_object_unref(unit); + unit = gwy_shape_fit_preset_get_param_units(controls->preset, i, + xyunit, zunit); } /* If the user enters exact zero, do not update the magnitude because * that means an unexpected reset to base units. */ @@ -1657,7 +1429,7 @@ } v = param_err[i]; - if (fitparam->flags & FIT_SHAPE_PARAM_ANGLE) + if (flags & GWY_NLFIT_PARAM_ANGLE) v *= 180.0/G_PI; vf = gwy_si_unit_get_format(unit, GWY_SI_UNIT_FORMAT_VFMARKUP, v, vf); g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, v/vf->magnitude); @@ -1675,11 +1447,11 @@ GdkColor gdkcolor_bad = { 0, 51118, 0, 0 }; GdkColor gdkcolor_warning = { 0, 45056, 20480, 0 }; - const FitShapeFunc *func = functions + controls->function_id; - guint i, j, nparams = func->nparams; - GPtrArray *values = controls->correl_values; const gboolean *param_fixed = controls->ctx->param_fixed; + GPtrArray *values = controls->correl_values; + guint i, j, nparams; + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); g_assert(values->len == (nparams + 1)*nparams/2); gwy_debug("fitter %p", fitter); @@ -1731,14 +1503,14 @@ static void update_secondary_table(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; - guint i, nsecondary = func->nsecondary; + guint i, nsecondary; GwyDataField *dfield; GwySIUnit *unit, *xyunit, *zunit; GwySIValueFormat *vf = NULL; gboolean is_fitted = (controls->state == FIT_SHAPE_FITTED || controls->state == FIT_SHAPE_QUICK_FITTED); + nsecondary = gwy_shape_fit_preset_get_nsecondary(controls->preset); dfield = gwy_container_get_object_by_name(controls->mydata, "/0/data"); xyunit = gwy_data_field_get_si_unit_xy(dfield); zunit = gwy_data_field_get_si_unit_z(dfield); @@ -1747,19 +1519,20 @@ for (i = 0; i < nsecondary; i++) { FitParamControl *cntrl = &g_array_index(controls->secondary_controls, FitParamControl, i); - const FitShapeSecondary *secparam = func->secondary + i; + GwyNLFitParamFlags flags; guchar buf[32]; gdouble v; + flags = gwy_shape_fit_preset_get_secondary_flags(controls->preset, i); v = controls->secondary[i]; - if (secparam->flags & FIT_SHAPE_PARAM_ANGLE) { + if (flags & GWY_NLFIT_PARAM_ANGLE) { v *= 180.0/G_PI; gwy_si_unit_set_from_string(unit, "deg"); } else { - gwy_si_unit_power_multiply(xyunit, secparam->power_xy, - zunit, secparam->power_z, - unit); + g_object_unref(unit); + unit = gwy_shape_fit_preset_get_secondary_units(controls->preset, i, + xyunit, zunit); } vf = gwy_si_unit_get_format(unit, GWY_SI_UNIT_FORMAT_VFMARKUP, v, vf); g_snprintf(buf, sizeof(buf), "%.*f", vf->precision+3, v/vf->magnitude); @@ -1773,7 +1546,7 @@ } v = controls->secondary_err[i]; - if (secparam->flags & FIT_SHAPE_PARAM_ANGLE) + if (flags & GWY_NLFIT_PARAM_ANGLE) v *= 180.0/G_PI; vf = gwy_si_unit_get_format(unit, GWY_SI_UNIT_FORMAT_VFMARKUP, v, vf); g_snprintf(buf, sizeof(buf), "%.*f", vf->precision, v/vf->magnitude); @@ -1788,15 +1561,15 @@ static void fit_shape_estimate(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; const FitShapeContext *ctx = controls->ctx; - guint i, nparams = func->nparams; + guint i, nparams; gwy_app_wait_cursor_start(GTK_WINDOW(controls->dialogue)); gwy_debug("start estimate"); + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); gwy_assign(controls->alt_param, controls->param, nparams); - if (func->estimate(ctx->xyz, ctx->n, controls->param, - controls->estimcache)) + if (gwy_shape_fit_preset_guess(controls->preset, ctx->xyz, ctx->n, + controls->param)) controls->state = FIT_SHAPE_ESTIMATED; else controls->state = FIT_SHAPE_ESTIMATE_FAILED; @@ -1817,16 +1590,17 @@ static void fit_shape_reduced_fit(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; const FitShapeContext *ctx = controls->ctx; GwyNLFitter *fitter; gdouble rss; + guint nparams; gwy_app_wait_cursor_start(GTK_WINDOW(controls->dialogue)); gwy_debug("start reduced fit"); update_all_param_values(controls); - gwy_assign(controls->alt_param, controls->param, func->nparams); - fitter = fit_reduced(func, ctx, controls->param, &rss); + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); + gwy_assign(controls->alt_param, controls->param, nparams); + fitter = fit_reduced(controls->preset, ctx, controls->param, &rss); if (rss >= 0.0) controls->state = FIT_SHAPE_QUICK_FITTED; else @@ -1835,7 +1609,7 @@ #ifdef DEBUG { guint i; - for (i = 0; i < func->nparams; i++) + for (i = 0; i < nparams; i++) gwy_debug("[%u] %g", i, controls->param[i]); } #endif @@ -1850,17 +1624,19 @@ static void fit_shape_full_fit(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; const FitShapeContext *ctx = controls->ctx; GwyNLFitter *fitter; gdouble rss; + guint nparams; gwy_app_wait_start(GTK_WINDOW(controls->dialogue), _("Fitting...")); gwy_debug("start fit"); + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); update_all_param_values(controls); - gwy_assign(controls->alt_param, controls->param, func->nparams); - fitter = fit(func, ctx, G_MAXUINT, controls->param, &rss, - gwy_app_wait_set_fraction, gwy_app_wait_set_message); + gwy_assign(controls->alt_param, controls->param, nparams); + fitter = fit(controls->preset, ctx, G_MAXUINT, controls->param, &rss, + gwy_app_wait_set_fraction, gwy_app_wait_set_message, + controls->args->geometric_fit); if (rss >= 0.0) controls->state = FIT_SHAPE_FITTED; @@ -1872,7 +1648,7 @@ #ifdef DEBUG { guint i; - for (i = 0; i < func->nparams; i++) + for (i = 0; i < nparams; i++) gwy_debug("[%u] %g", i, controls->param[i]); } #endif @@ -1887,15 +1663,15 @@ static void fit_copy_correl_matrix(FitShapeControls *controls, GwyNLFitter *fitter) { - const FitShapeFunc *func = functions + controls->function_id; - guint i, j, nparams = func->nparams; + guint i, j, nparams; gboolean is_fitted = (controls->state == FIT_SHAPE_FITTED || controls->state == FIT_SHAPE_QUICK_FITTED); + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); gwy_clear(controls->correl, (nparams + 1)*nparams/2); if (is_fitted) { - g_return_if_fail(fitter && fitter->covar); + g_return_if_fail(fitter && gwy_math_nlfit_get_covar(fitter)); for (i = 0; i < nparams; i++) { for (j = 0; j <= i; j++) { @@ -1909,22 +1685,22 @@ static void calculate_secondary_params(FitShapeControls *controls) { - const FitShapeFunc *func = functions + controls->function_id; - guint i, nsecondary = func->nsecondary; + guint i, nsecondary; gboolean is_fitted = (controls->state == FIT_SHAPE_FITTED || controls->state == FIT_SHAPE_QUICK_FITTED); + nsecondary = gwy_shape_fit_preset_get_nsecondary(controls->preset); for (i = 0; i < nsecondary; i++) { - const FitShapeSecondary *secparam = func->secondary + i; - - g_return_if_fail(secparam->calc); - controls->secondary[i] = secparam->calc(controls->param); + controls->secondary[i] + = gwy_shape_fit_preset_get_secondary_value(controls->preset, i, + controls->param); if (is_fitted) { - g_return_if_fail(secparam->calc_err); - controls->secondary_err[i] = secparam->calc_err(controls->param, - controls->param_err, - controls->correl); + controls->secondary_err[i] + = gwy_shape_fit_preset_get_secondary_error(controls->preset, i, + controls->param, + controls->param_err, + controls->correl); } else controls->secondary_err[i] = 0.0; @@ -1980,8 +1756,7 @@ /* Either the input is XYZ or we are using masking. Just recalculate * everything, even values that are in ctx->f. */ gwy_debug("recalculating result field the hard way"); - calculate_field(functions + controls->function_id, - controls->param, resfield); + calculate_field(controls->preset, controls->param, resfield); } gwy_data_field_data_changed(resfield); @@ -2090,11 +1865,10 @@ static void update_fit_results(FitShapeControls *controls, GwyNLFitter *fitter) { - const FitShapeFunc *func = functions + controls->function_id; const FitShapeContext *ctx = controls->ctx; GwyDataField *dfield; - gdouble rss = 0.0; - guint k, n = ctx->n, i, nparams = func->nparams; + gdouble z, rss = 0.0; + guint k, n = ctx->n, i, nparams; GwySIUnit *zunit; GwySIValueFormat *vf; gboolean is_fitted = (controls->state == FIT_SHAPE_FITTED @@ -2105,15 +1879,16 @@ if (is_fitted) g_return_if_fail(fitter); + gwy_shape_fit_preset_calculate_z(controls->preset, xyz, ctx->f, n, + controls->param); for (k = 0; k < n; k++) { - gdouble z = func->function(xyz[k].x, xyz[k].y, controls->param); - ctx->f[k] = z; - z -= xyz[k].z; + z = ctx->f[k] - xyz[k].z; rss += z*z; } controls->rss = sqrt(rss/n); if (is_fitted) { + nparams = gwy_shape_fit_preset_get_nparams(controls->preset); for (i = 0; i < nparams; i++) controls->param_err[i] = gwy_math_nlfit_get_sigma(fitter, i); } @@ -2165,8 +1940,6 @@ ctx->n = gwy_surface_get_npoints(ctx->surface); ctx->f = g_renew(gdouble, ctx->f, ctx->n); ctx->xyz = gwy_surface_get_data_const(ctx->surface); - - gwy_clear(controls->estimcache, 1); } static void @@ -2192,36 +1965,34 @@ } static GwyNLFitter* -fit(const FitShapeFunc *func, const FitShapeContext *ctx, +fit(GwyShapeFitPreset *preset, const FitShapeContext *ctx, guint maxiter, gdouble *param, gdouble *rss, - GwySetFractionFunc set_fraction, GwySetMessageFunc set_message) + GwySetFractionFunc set_fraction, GwySetMessageFunc set_message, + gboolean geometric_fit) { GwyNLFitter *fitter; - guint i; - fitter = gwy_math_nlfit_new_idx(func->fit_function, NULL); + fitter = gwy_shape_fit_preset_create_fitter(preset); if (set_fraction || set_message) gwy_math_nlfit_set_callbacks(fitter, set_fraction, set_message); if (maxiter != G_MAXUINT) gwy_math_nlfit_set_max_iterations(fitter, maxiter); + if (geometric_fit) + gwy_math_nlfit_set_approx_geometric(fitter, TRUE); - *rss = gwy_math_nlfit_fit_idx_full(fitter, ctx->n, func->nparams, - param, ctx->param_fixed, NULL, - (gpointer)ctx); + gwy_shape_fit_preset_fit(preset, fitter, ctx->xyz, ctx->n, + param, ctx->param_fixed, rss); gwy_debug("rss from nlfit %g", *rss); - for (i = 0; i < func->nparams; i++) { - if (func->param[i].flags & FIT_SHAPE_PARAM_ANGLE) - param[i] = fmod(param[i], 2.0*G_PI); - if (func->param[i].flags & FIT_SHAPE_PARAM_ABSVAL) - param[i] = fabs(param[i]); - } - return fitter; } +/* XXX XXX XXX XXX XXX This is duplicated in gwyshapefitpreset.c and it should + * probably go to the library. There we can do something better in the future + * than random choice, for instance a mix of spatially uniform and random + * choice. */ static GwyNLFitter* -fit_reduced(const FitShapeFunc *func, const FitShapeContext *ctx, +fit_reduced(GwyShapeFitPreset *preset, const FitShapeContext *ctx, gdouble *param, gdouble *rss) { GwyNLFitter *fitter; @@ -2229,7 +2000,7 @@ guint nred = (guint)sqrt(ctx->n*(gdouble)NREDLIM); if (nred >= ctx->n) - return fit(func, ctx, 30, param, rss, NULL, NULL); + return fit(preset, ctx, 30, param, rss, NULL, NULL, FALSE); ctxred = *ctx; ctxred.n = nred; @@ -2237,42 +2008,26 @@ ctxred.xyz = gwy_surface_get_data_const(ctxred.surface); reduce_data_size(gwy_surface_get_data_const(ctx->surface), ctx->n, ctxred.surface); - fitter = fit(func, &ctxred, 30, param, rss, NULL, NULL); + fitter = fit(preset, &ctxred, 30, param, rss, NULL, NULL, FALSE); g_object_unref(ctxred.surface); return fitter; } static void -calculate_field(const FitShapeFunc *func, - const gdouble *param, +calculate_field(GwyShapeFitPreset *preset, const gdouble *params, GwyDataField *dfield) { - FitShapeContext ctx; + GwySurface *surface = gwy_surface_new(); - gwy_clear(&ctx, 1); - fit_context_resize_params(&ctx, func->nparams); - ctx.surface = gwy_surface_new(); - gwy_surface_set_from_data_field_mask(ctx.surface, dfield, + gwy_surface_set_from_data_field_mask(surface, dfield, NULL, GWY_MASK_IGNORE); - ctx.n = gwy_surface_get_npoints(ctx.surface); - ctx.f = g_renew(gdouble, ctx.f, ctx.n); - ctx.xyz = gwy_surface_get_data_const(ctx.surface); - calculate_function(func, &ctx, param, gwy_data_field_get_data(dfield)); - fit_context_free(&ctx); -} - -static void -calculate_function(const FitShapeFunc *func, - const FitShapeContext *ctx, - const gdouble *param, - gdouble *z) -{ - guint k, n = ctx->n; - const GwyXYZ *xyz = ctx->xyz; - - for (k = 0; k < n; k++) - z[k] = func->function(xyz[k].x, xyz[k].y, param); + gwy_shape_fit_preset_calculate_z(preset, + gwy_surface_get_data_const(surface), + gwy_data_field_get_data(dfield), + gwy_surface_get_npoints(surface), + params); + g_object_unref(surface); } static void @@ -2291,2187 +2046,174 @@ gwy_rand_gen_set_free(rngset); } -/************************************************************************** - * - * General estimator helpers and math support functions. - * - **************************************************************************/ - -#ifdef HAVE_SINCOS -#define _gwy_sincos sincos -#else -static inline void -_gwy_sincos(gdouble x, gdouble *s, gdouble *c) -{ - *s = sin(x); - *c = cos(x); -} -#endif - -/* cosh(x) - 1, safe for small arguments */ -static inline gdouble -gwy_coshm1(gdouble x) -{ - gdouble x2 = x*x; - if (x2 > 3e-5) - return cosh(x) - 1.0; - return x2*(0.5 + x2/24.0); -} - -#define DEFINE_PHI_CACHE(phi) \ - static gdouble phi##_last = 0.0, cphi_last = 1.0, sphi_last = 0.0 - -#define HANDLE_PHI_CACHE(phi) \ - do { \ - if (phi == phi##_last) { \ - cphi = cphi_last; \ - sphi = sphi_last; \ - } \ - else { \ - sincos(phi, &sphi, &cphi); \ - cphi_last = cphi; \ - sphi_last = sphi; \ - phi##_last = phi; \ - } \ - } while (0) - -/* Mean value of xy point cloud (not necessarily centre, that depends on - * the density). */ -static void -mean_x_y(const GwyXYZ *xyz, guint n, gdouble *pxm, gdouble *pym, - FitShapeEstimateCache *estimcache) +static GString* +create_fit_report(FitShapeControls *controls) { - gdouble xm = 0.0, ym = 0.0; - guint i; - - if (estimcache && estimcache->have_mean) { - gwy_debug("using cache %p", estimcache); - *pxm = estimcache->xm; - *pym = estimcache->ym; - return; - } - - if (!n) { - *pxm = *pym = 0.0; - return; - } + GwyShapeFitPreset *preset = controls->preset; + GwyDataField *dfield; + GwySurface *surface; + GwySIUnit *xyunit, *zunit, *unit; + gchar *s, *unitstr; + GString *report; + guint n, i, j, nparams, nsecondary; + const gboolean *param_fixed = controls->ctx->param_fixed; - for (i = 0; i < n; i++) { - xm += xyz[i].x; - ym += xyz[i].y; + if (controls->pageno == GWY_PAGE_XYZS) { + surface = gwy_container_get_object_by_name(controls->mydata, + "/surface/0"); + xyunit = gwy_surface_get_si_unit_xy(surface); + zunit = gwy_surface_get_si_unit_z(surface); + n = gwy_surface_get_npoints(surface); } - - *pxm = xm/n; - *pym = ym/n; - - if (estimcache) { - gwy_debug("filling cache %p", estimcache); - estimcache->have_mean = TRUE; - estimcache->xm = *pxm; - estimcache->ym = *pym; + else { + dfield = gwy_container_get_object_by_name(controls->mydata, "/0/data"); + xyunit = gwy_data_field_get_si_unit_xy(dfield); + zunit = gwy_data_field_get_si_unit_z(dfield); + n = gwy_data_field_get_xres(dfield)*gwy_data_field_get_yres(dfield); } -} + unit = gwy_si_unit_new(NULL); -/* Minimum and maximum of an array of values. */ -static void -range_z(const GwyXYZ *xyz, guint n, gdouble *pmin, gdouble *pmax, - FitShapeEstimateCache *estimcache) -{ - gdouble min, max; - guint i; + report = g_string_new(NULL); - if (estimcache && estimcache->have_zrange) { - gwy_debug("using cache %p", estimcache); - *pmin = estimcache->zmin; - *pmax = estimcache->zmax; - return; - } + g_string_append(report, _("===== Fit Results =====")); + g_string_append_c(report, '\n'); + g_string_append_printf(report, _("Data: %s\n"), + controls->title); + g_string_append_printf(report, _("Number of points: %d of %d\n"), + controls->ctx->n, n); + g_string_append_printf(report, _("Fitted function: %s\n"), + gwy_resource_get_name(GWY_RESOURCE(preset))); + g_string_append_c(report, '\n'); + g_string_append_printf(report, _("Results\n")); - if (!n) { - *pmin = *pmax = 0.0; - return; - } + nparams = gwy_shape_fit_preset_get_nparams(preset); + for (i = 0; i < nparams; i++) { + const gchar *name = gwy_shape_fit_preset_get_param_name(preset, i); + gdouble param = controls->param[i], err = controls->param_err[i]; + GwyNLFitParamFlags flags; - min = max = xyz[0].z; - for (i = 1; i < n; i++) { - if (xyz[i].z < min) - min = xyz[i].z; - if (xyz[i].z > max) - max = xyz[i].z; - } + if (!pango_parse_markup(name, -1, 0, NULL, &s, NULL, NULL)) { + g_warning("Parameter name is not valid Pango markup"); + s = g_strdup(name); + } + flags = gwy_shape_fit_preset_get_param_flags(preset, i); + if (flags & GWY_NLFIT_PARAM_ANGLE) { + param *= 180.0/G_PI; + err *= 180.0/G_PI; + unitstr = g_strdup("deg"); + } + else { + g_object_unref(unit); + unit = gwy_shape_fit_preset_get_param_units(preset, i, + xyunit, zunit); + unitstr = gwy_si_unit_get_string(unit, GWY_SI_UNIT_FORMAT_PLAIN); + } - *pmin = min; - *pmax = max; + if (param_fixed[i]) { + g_string_append_printf(report, "%6s = %g %s%s %s\n", + s, param, *unitstr ? " " : "", unitstr, + _("(fixed)")); + } + else { + g_string_append_printf(report, "%6s = %g ± %g%s%s\n", + s, param, err, *unitstr ? " " : "", unitstr); + } - if (estimcache) { - gwy_debug("filling cache %p", estimcache); - estimcache->have_zrange = TRUE; - estimcache->zmin = *pmin; - estimcache->zmax = *pmax; + g_free(unitstr); + g_free(s); } -} + g_string_append_c(report, '\n'); -/* Simple stats of an array of values. */ -static void -stat_z(const GwyXYZ *xyz, guint n, - gdouble *zmean, gdouble *zrms, gdouble *zskew, - FitShapeEstimateCache *estimcache) -{ - gdouble s = 0.0, s2 = 0.0, s3 = 0.0; - guint i; + unitstr = gwy_si_unit_get_string(zunit, GWY_SI_UNIT_FORMAT_PLAIN); + g_string_append_printf(report, "%s %g %s\n", + _("Mean square difference:"), + controls->rss, unitstr); + g_free(unitstr); + g_string_append_c(report, '\n'); - if (estimcache && estimcache->have_zstats) { - gwy_debug("using cache %p", estimcache); - if (zmean) - *zmean = estimcache->zmean; - if (zrms) - *zrms = estimcache->zrms; - if (zskew) - *zskew = estimcache->zskew; - return; - } + g_string_append(report, _("Correlation Matrix")); + g_string_append_c(report, '\n'); - if (!n) { - if (zmean) - *zmean = 0.0; - if (zrms) - *zrms = 0.0; - if (zskew) - *zskew = 0.0; - return; + for (i = 0; i < nparams; i++) { + g_string_append(report, " "); + for (j = 0; j <= i; j++) { + if (param_fixed[i] || param_fixed[j]) { + if (i == j) + g_string_append_printf(report, "% .03f", 1.0); + else + g_string_append(report, " ---"); + } + else { + g_string_append_printf(report, "% .03f", + SLi(controls->correl, i, j)); + } + if (j != i) + g_string_append_c(report, ' '); + } + g_string_append_c(report, '\n'); } + g_string_append_c(report, '\n'); - for (i = 0; i < n; i++) - s += xyz[i].z; - s /= n; - - for (i = 0; i < n; i++) { - gdouble d = xyz[i].z - s; - s2 += d*d; - s3 += d*d*d; + nsecondary = gwy_shape_fit_preset_get_nsecondary(preset); + if (nsecondary) { + g_string_append(report, _("Derived Quantities")); + g_string_append_c(report, '\n'); } + for (i = 0; i < nsecondary; i++) { + const gchar *name = gwy_shape_fit_preset_get_secondary_name(preset, i); + gdouble param = controls->secondary[i], + err = controls->secondary_err[i]; + GwyNLFitParamFlags flags; - if (s2) { - s2 = sqrt(s2/n); - s3 /= n*s2*s2*s2; + if (!pango_parse_markup(name, -1, 0, NULL, &s, NULL, NULL)) { + g_warning("Parameter name is not valid Pango markup"); + s = g_strdup(name); + } + flags = gwy_shape_fit_preset_get_secondary_flags(preset, i); + if (flags & GWY_NLFIT_PARAM_ANGLE) { + param *= 180.0/G_PI; + err *= 180.0/G_PI; + unitstr = g_strdup("deg"); + } + else { + g_object_unref(unit); + unit = gwy_shape_fit_preset_get_secondary_units(preset, i, + xyunit, zunit); + unitstr = gwy_si_unit_get_string(unit, GWY_SI_UNIT_FORMAT_PLAIN); + } + g_string_append_printf(report, "%6s = %g ± %g%s%s\n", + s, param, err, *unitstr ? " " : "", unitstr); + g_free(unitstr); + g_free(s); } + if (nsecondary) + g_string_append_c(report, '\n'); - if (zmean) - *zmean = s; - if (zrms) - *zrms = s2; - if (zskew) - *zskew = s3; + g_object_unref(unit); - if (estimcache) { - gwy_debug("filling cache %p", estimcache); - estimcache->have_zstats = TRUE; - estimcache->zmean = s; - estimcache->zrms = s2; - estimcache->zskew = s3; - } + return report; } -/* Approximately cicrumscribe a set of points by finding a containing - * octagon. */ +static const gchar diff_colourmap_key[] = "/module/fit_shape/diff_colourmap"; +static const gchar diff_excluded_key[] = "/module/fit_shape/diff_excluded"; +static const gchar display_key[] = "/module/fit_shape/display"; +static const gchar function_key[] = "/module/fit_shape/function"; +static const gchar geometric_fit_key[] = "/module/fit_shape/geometric_fit"; +static const gchar masking_key[] = "/module/fit_shape/masking"; +static const gchar output_key[] = "/module/fit_shape/output"; + static void -circumscribe_x_y(const GwyXYZ *xyz, guint n, - gdouble *pxc, gdouble *pyc, gdouble *pr, - FitShapeEstimateCache *estimcache) +fit_shape_sanitize_args(FitShapeArgs *args) { - gdouble min[4], max[4], r[4]; - guint i, j; - - if (estimcache && estimcache->have_circle) { - gwy_debug("using cache %p", estimcache); - *pxc = estimcache->xc; - *pyc = estimcache->yc; - *pr = estimcache->r; - return; - } - - if (!n) { - *pxc = *pyc = 0.0; - *pr = 1.0; - return; - } - - for (j = 0; j < 4; j++) { - min[j] = G_MAXDOUBLE; - max[j] = -G_MAXDOUBLE; - } - - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x, y = xyz[i].y; - gdouble t[4] = { x, x+y, y, y-x }; - - for (j = 0; j < 4; j++) { - if (t[j] < min[j]) - min[j] = t[j]; - if (t[j] > max[j]) - max[j] = t[j]; - } - } - - for (j = 0; j < 4; j++) { - r[j] = sqrt(10.0)/3.0*(max[j] - min[j]); - if (j % 2) - r[j] /= G_SQRT2; - } - - i = 0; - for (j = 1; j < 4; j++) { - if (r[j] > r[i]) - i = j; - } - - *pr = 0.5*r[i]; - if (i % 2) { - *pxc = (min[1] - min[3] + max[1] - max[3])/4.0; - *pyc = (min[1] + min[3] + max[1] + max[3])/4.0; - } - else { - *pxc = (min[0] + max[0])/2.0; - *pyc = (min[2] + max[2])/2.0; - } - - if (estimcache) { - gwy_debug("filling cache %p", estimcache); - estimcache->have_circle = TRUE; - estimcache->xc = *pxc; - estimcache->yc = *pyc; - estimcache->r = *pr; - } -} - -/* Project xyz point cloud to a line rotated by angle phi anti-clockwise - * from the horizontal line (x axis). */ -static gdouble -projection_to_line(const GwyXYZ *xyz, - guint n, - gdouble phi, - gdouble xc, gdouble yc, - GwyDataLine *mean_line, - GwyDataLine *rms_line, - guint *counts) -{ - guint res = gwy_data_line_get_res(mean_line); - gdouble *mean = gwy_data_line_get_data(mean_line); - gdouble *rms = rms_line ? gwy_data_line_get_data(rms_line) : NULL; - gdouble dx = gwy_data_line_get_real(mean_line)/res; - gdouble off = gwy_data_line_get_offset(mean_line); - gdouble c = cos(phi), s = sin(phi), total_ms = 0.0; - guint i, total_n = 0; - gint j; - - gwy_data_line_clear(mean_line); - gwy_clear(counts, res); - - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - x = x*c - y*s; - j = (gint)floor((x - off)/dx); - if (j >= 0 && j < res) { - mean[j] += xyz[i].z; - counts[j]++; - } - } - - for (j = 0; j < res; j++) { - if (counts[j]) { - mean[j] /= counts[j]; - } - } - - if (!rms_line) - return 0.0; - - gwy_data_line_clear(rms_line); - - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - x = x*c - y*s; - j = (gint)floor((x - off)/dx); - if (j >= 0 && j < res) - rms[j] += (xyz[i].z - mean[j])*(xyz[i].z - mean[j]); - } - - for (j = 0; j < res; j++) { - if (counts[j]) { - total_ms += rms[j]; - rms[j] = sqrt(rms[j]/counts[j]); - total_n += counts[j]; - } - } - - return sqrt(total_ms/total_n); -} - -/* Find direction along which projections capture best the shape, i.e. most - * variance remains in the line-averaged data. The returned angle is rotation - * of the axis anti-clockwise with respect to the x-axis. */ -static gdouble -estimate_projection_direction(const GwyXYZ *xyz, guint n, - FitShapeEstimateCache *estimcache) -{ - enum { NROUGH = 60, NFINE = 8 }; - - GwyDataLine *mean_line, *rms_line; - guint *counts; - gdouble xc, yc, r, phi, alpha0, alpha_step, rms; - gdouble best_rms = G_MAXDOUBLE, best_alpha = 0.0; - guint iter, i, ni, res; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - res = (guint)floor(0.8*sqrt(n) + 1.0); - - mean_line = gwy_data_line_new(res, 2.0*r, FALSE); - gwy_data_line_set_offset(mean_line, -r); - rms_line = gwy_data_line_new_alike(mean_line, FALSE); - counts = g_new(guint, res); - - for (iter = 0; iter < 6; iter++) { - if (iter == 0) { - ni = NROUGH; - alpha_step = G_PI/ni; - alpha0 = 0.0; - } - else { - /* Choose the fine points so that we do not repeat calculation in - * any of the rough points. */ - ni = NFINE; - alpha0 = best_alpha - alpha_step*(NFINE - 1.0)/(NFINE + 1.0); - alpha_step = 2.0*alpha_step/(NFINE + 1.0); - } - - for (i = 0; i < ni; i++) { - phi = alpha0 + i*alpha_step; - rms = projection_to_line(xyz, n, phi, xc, yc, - mean_line, rms_line, counts); - gwy_debug("[%u] %g %g", iter, phi, rms); - if (rms < best_rms) { - best_rms = rms; - best_alpha = phi; - } - } - } - - g_object_unref(mean_line); - g_object_unref(rms_line); - g_free(counts); - - if (best_alpha > 0.5*G_PI) - best_alpha += G_PI; - - return best_alpha; -} - -/* Estimate projection direction, possibly on reduced data. This is useful - * when the estimator does not need reduced data for anything else. */ -static gdouble -estimate_projection_direction_red(const GwyXYZ *xyz, guint n, - FitShapeEstimateCache *estimcache) -{ - FitShapeEstimateCache estimcachered; - guint nred = (guint)sqrt(n*(gdouble)NREDLIM); - GwySurface *surface; - gdouble phi; - - if (nred >= n) - return estimate_projection_direction(xyz, n, estimcache); - - surface = gwy_surface_new_sized(nred); - reduce_data_size(xyz, n, surface); - - /* Make sure caching still works for the reduced data. */ - gwy_clear(&estimcachered, 1); - phi = estimate_projection_direction(gwy_surface_get_data_const(surface), - nred, &estimcachered); - - g_object_unref(surface); - - return phi; -} - -static void -data_line_shorten(GwyDataLine *dline, const guint *counts, guint threshold) -{ - guint res = gwy_data_line_get_res(dline); - guint from = 0, to = res-1; - gdouble off; - - while (to > from && counts[to] < threshold) - to--; - while (from < to && counts[from] < threshold) - from++; - - off = (from*gwy_data_line_get_real(dline)/res - + gwy_data_line_get_offset(dline)); - - gwy_data_line_resize(dline, from, to+1); - gwy_data_line_set_offset(dline, off); -} - -/* Estimate the period of a periodic structure, knowing already the rotation. - * The returned phase is such that if you subtract it from the rotated abscissa - * value then the projection will have a positive peak (some kind of maximum) - * centered around zero, whatever that means for specific grating-like - * structures. */ -static gboolean -estimate_period_and_phase(const GwyXYZ *xyz, guint n, - gdouble phi, gdouble *pT, gdouble *poff, - FitShapeEstimateCache *estimcache) -{ - GwyDataLine *mean_line, *tmp_line; - gdouble xc, yc, r, T, t, real, off, a_s, a_c, phi0, av, bv; - const gdouble *mean, *tmp; - guint *counts; - guint res, i, ibest; - gboolean found; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - /* Using more sqrt(n) than can make the sampling too sparse, causing noise - * and oscillations. */ - res = (guint)floor(0.8*sqrt(n) + 1.0); - - *pT = r/4.0; - *poff = 0.0; - - mean_line = gwy_data_line_new(res, 2.0*r, FALSE); - gwy_data_line_set_offset(mean_line, -r); - tmp_line = gwy_data_line_new_alike(mean_line, FALSE); - counts = g_new(guint, res); - - projection_to_line(xyz, n, phi, xc, yc, mean_line, NULL, counts); - data_line_shorten(mean_line, counts, 4); - g_free(counts); - - res = gwy_data_line_get_res(mean_line); - gwy_data_line_get_line_coeffs(mean_line, &av, &bv); - gwy_data_line_line_level(mean_line, av, bv); - gwy_data_line_psdf(mean_line, tmp_line, - GWY_WINDOWING_HANN, GWY_INTERPOLATION_LINEAR); - tmp = gwy_data_line_get_data_const(tmp_line); - - found = FALSE; - ibest = G_MAXUINT; - for (i = 3; i < MIN(res/3, res-3); i++) { - if (tmp[i] > tmp[i-2] && tmp[i] > tmp[i-1] - && tmp[i] > tmp[i+1] && tmp[i] > tmp[i+2]) { - if (ibest == G_MAXUINT || tmp[i] > tmp[ibest]) { - found = TRUE; - ibest = i; - } - } - } - if (!found) - goto fail; - - T = *pT = 2.0*G_PI/gwy_data_line_itor(tmp_line, ibest); - gwy_debug("found period %g", T); - - mean = gwy_data_line_get_data_const(mean_line); - real = gwy_data_line_get_real(mean_line); - off = gwy_data_line_get_offset(mean_line); - a_s = a_c = 0.0; - for (i = 0; i < res; i++) { - t = off + real/res*(i + 0.5); - a_s += sin(2*G_PI*t/T)*mean[i]; - a_c += cos(2*G_PI*t/T)*mean[i]; - } - gwy_debug("a_s %g, a_c %g", a_s, a_c); - - phi0 = atan2(a_s, a_c); - *poff = phi0*T/(2.0*G_PI) + xc*cos(phi) - yc*sin(phi); - -fail: - g_object_unref(mean_line); - g_object_unref(tmp_line); - - return found; -} - -/* For a shape that consists of a more or less flat base with some feature - * on it, estimate the base plane (z0) and feature height (h). The height - * can be either positive or negative. */ -static gboolean -estimate_feature_height(const GwyXYZ *xyz, guint n, - gdouble *pz0, gdouble *ph, - gdouble *px, gdouble *py, - FitShapeEstimateCache *estimcache) -{ - gdouble xm, ym, xc, yc, r, zmin, zmax; - gdouble r2_large, r2_small; - gdouble t, zbest, zmean_large = 0.0, zmean_small = 0.0; - guint i, n_large = 0, n_small = 0; - gboolean positive; - - if (!n) { - *pz0 = *ph = 0.0; - return FALSE; - } - - range_z(xyz, n, &zmin, &zmax, estimcache); - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - r2_large = 0.7*r*r; - r2_small = 0.1*r*r; - - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - gdouble r2 = x*x + y*y; - - if (r2 <= r2_small) { - zmean_small += xyz[i].z; - n_small++; - } - else if (r2 >= r2_large) { - zmean_large += xyz[i].z; - n_large++; - } - } - - g_assert(n_large); /* circumscribe_x_y() should ensure this. */ - zmean_large /= n_large; - - if (n_small) { - zmean_small /= n_small; - positive = (zmean_small >= zmean_large); - } - else - positive = (fabs(zmean_large - zmin) <= fabs(zmean_large - zmax)); - - t = zmax - zmin; - if (positive) { - *pz0 = zmin + 0.05*t; - *ph = 0.9*t; - } - else { - *pz0 = zmax - 0.05*t; - *ph = -0.9*t; - } - - xm = 0.0; - ym = 0.0; - if (n_small) { - if (positive) { - zbest = -G_MAXDOUBLE; - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - gdouble r2 = x*x + y*y; - - if (r2 <= r2_small && xyz[i].z > zbest) { - zbest = xyz[i].z; - xm = x; - ym = y; - } - } - } - else { - zbest = G_MAXDOUBLE; - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - gdouble r2 = x*x + y*y; - - if (r2 <= r2_small && xyz[i].z < zbest) { - zbest = xyz[i].z; - xm = x; - ym = y; - } - } - } - } - *px = xc + xm; - *py = yc + ym; - - return TRUE; -} - -static gboolean -common_bump_feature_init(const GwyXYZ *xyz, guint n, - gdouble *xc, gdouble *yc, gdouble *z0, - gdouble *height, gdouble *size, - gdouble *a, gdouble *phi, - FitShapeEstimateCache *estimcache) -{ - gdouble xm, ym, r, zmin, zmax; - - circumscribe_x_y(xyz, n, &xm, &ym, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - *xc = xm; - *yc = ym; - *z0 = zmin; - *height = zmax - zmin; - *size = r/3.0; - *a = 1.0; - *phi = 0.0; - - return TRUE; -} - -static gboolean -common_bump_feature_estimate(const GwyXYZ *xyz, guint n, - gdouble *xc, gdouble *yc, gdouble *z0, - gdouble *height, gdouble *size, - gdouble *a, gdouble *phi, - FitShapeEstimateCache *estimcache) -{ - gdouble xm, ym, r; - - /* Just initialise the shape parameters with some sane defaults. */ - *a = 1.0; - *phi = 0.0; - circumscribe_x_y(xyz, n, &xm, &ym, &r, estimcache); - *size = r/3.0; - - return estimate_feature_height(xyz, n, z0, height, xc, yc, estimcache); -} - -static gdouble -dotprod_with_correl(const gdouble *diff, - const gdouble *param_err, - const gdouble *correl, - guint n) -{ - guint i, j; - gdouble s = 0.0; - - for (i = 0; i < n; i++) { - for (j = 0; j < n; j++) { - if (diff[j] != 0 && diff[j] != 0) { - gdouble c_ij = (j <= i) ? SLi(correl, i, j) : SLi(correl, j, i); - gdouble s_ij = c_ij*param_err[i]*param_err[j]; - s += s_ij*diff[i]*diff[j]; - } - } - } - - return sqrt(fmax(s, 0.0)); -} - -static gdouble -data_line_pearson_coeff(GwyDataLine *dline1, GwyDataLine *dline2) -{ - gdouble avg1 = gwy_data_line_get_avg(dline1); - gdouble avg2 = gwy_data_line_get_avg(dline2); - gdouble rms1 = gwy_data_line_get_rms(dline1); - gdouble rms2 = gwy_data_line_get_rms(dline2); - const gdouble *d1, *d2; - gdouble c = 0.0; - guint res, i; - - if (!rms1 || !rms2) - return 0.0; - - res = gwy_data_line_get_res(dline1); - g_return_val_if_fail(gwy_data_line_get_res(dline2) == res, 0.0); - d1 = gwy_data_line_get_data_const(dline1); - d2 = gwy_data_line_get_data_const(dline2); - for (i = 0; i < res; i++) - c += (d1[i] - avg1)*(d2[i] - avg2); - - c /= res*rms1*rms2; - gwy_debug("%g", c); - return c; -} - -/************************************************************************** - * - * Sphere - * - **************************************************************************/ - -static gdouble -sphere_func(gdouble x, gdouble y, const gdouble *param) -{ - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble kappa = param[3]; - gdouble r2k, t, val; - - x -= xc; - y -= yc; - /* Rewrite R - sqrt(R² - r²) as κ*r²/(1 + sqrt(1 - κ²r²)) where - * r² = x² + y² and κR = 1 to get nice behaviour in the close-to-denegerate - * cases, including completely flat surface. The expression 1.0/kappa - * is safe because we cannot get to this branch for κ → 0 unless - * simultaneously r → ∞. */ - r2k = kappa*(x*x + y*y); - t = 1.0 - kappa*r2k; - if (t > 0.0) - val = z0 + r2k/(1.0 + sqrt(t)); - else - val = z0 + 2.0/kappa; - - return val; -} - -static gboolean -sphere_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax, zmean; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - stat_z(xyz, n, &zmean, NULL, NULL, estimcache); - - param[0] = xc; - param[1] = yc; - if (fabs(zmean - zmin) > fabs(zmean - zmax)) { - param[2] = zmax; - param[3] = 2.0*(zmin - zmax)/(r*r); - } - else { - param[2] = zmin; - param[3] = 2.0*(zmax - zmin)/(r*r); - } - - return TRUE; -} - -/* Fit the data with a rotationally symmetric parabola and use its parameters - * for the spherical surface estimate. */ -static gboolean -sphere_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc; - /* Linear fit with functions 1, x, y and x²+y². */ - gdouble a[10], b[4]; - guint i; - - /* XXX: Handle the surrounding flat area, which can be a part of the - * function, better? */ - - /* Using centered coodinates improves the condition number. */ - mean_x_y(xyz, n, &xc, &yc, estimcache); - gwy_clear(a, 10); - gwy_clear(b, 4); - for (i = 0; i < n; i++) { - gdouble x = xyz[i].x - xc, y = xyz[i].y - yc; - gdouble r2 = x*x + y*y; - - b[0] += xyz[i].z; - b[1] += x*xyz[i].z; - b[2] += y*xyz[i].z; - b[3] += r2*xyz[i].z; - - a[2] += x*x; - a[4] += x*y; - a[5] += y*y; - a[6] += r2; - a[7] += x*r2; - a[8] += y*r2; - a[9] += r2*r2; - } - a[0] = n; - a[1] = a[3] = 0.0; - - param[0] = xc; - param[1] = yc; - param[2] = b[0]/n; - param[3] = 0.0; - - if (!gwy_math_choleski_decompose(4, a)) - return FALSE; - - gwy_math_choleski_solve(4, a, b); - - param[3] = 2.0*b[3]; - if (param[3]) { - param[0] = xc - b[1]/param[3]; - param[1] = yc - b[2]/param[3]; - param[2] = b[0] - 0.5*(b[1]*b[1] + b[2]*b[2])/param[3]; - } - - return TRUE; -} - -static gdouble -sphere_calc_R(const gdouble *param) -{ - return 1.0/param[3]; -} - -static gdouble -sphere_calc_err_R(const gdouble *param, - const gdouble *param_err, - G_GNUC_UNUSED const gdouble *correl) -{ - return param_err[3]/(param[3]*param[3]); -} - -/************************************************************************** - * - * Cylinder (lying) - * - **************************************************************************/ - -/* XXX: We might want - * - finite-size cylinders - * - cylinders cut elsewhere than in the half - * Unfortunately, the derivatives by the corresponding parameters are often - * zero (or something odd) because of the sharp boundaries in the function that - * either catch a data point inside some region or not. */ -static gdouble -cylinder_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble x0 = param[0]; - gdouble z0 = param[1]; - gdouble kappa = param[2]; - gdouble phi = param[3]; - gdouble bparallel = param[4]; - gdouble r2k, t, val, cphi, sphi; - - HANDLE_PHI_CACHE(phi); - z0 += bparallel*(x*sphi + y*cphi); - t = x*cphi - y*sphi - x0; - r2k = kappa*t*t; - t = 1.0 - kappa*r2k; - if (t > 0.0) - val = z0 + r2k/(1.0 + sqrt(t)); - else - val = z0 + 2.0/kappa; - - return val; -} - -static gboolean -cylinder_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax, zmean; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - stat_z(xyz, n, &zmean, NULL, NULL, estimcache); - - param[0] = xc; - if (fabs(zmean - zmin) > fabs(zmean - zmax)) { - param[1] = zmax; - param[2] = 2.0*(zmin - zmax)/(r*r); - } - else { - param[1] = zmin; - param[2] = 2.0*(zmax - zmin)/(r*r); - } - param[3] = 0.0; - param[4] = 0.0; - - return TRUE; -} - -/* Fit the data with a rotationally symmetric parabola and use its parameters - * for the spherical surface estimate. */ -static gboolean -cylinder_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - GwyDataLine *mean_line; - gdouble xc, yc, r, zmin, zmax, t, phi; - guint *counts = NULL; - guint i, mpos, res; - gint d2sign; - const gdouble *d; - - /* First we estimate the orientation (phi). */ - phi = estimate_projection_direction_red(xyz, n, estimcache); - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - res = (guint)floor(0.8*sqrt(n) + 1.0); - mean_line = gwy_data_line_new(res, 2.0*r, FALSE); - counts = g_new(guint, res); - gwy_data_line_set_offset(mean_line, -r); - projection_to_line(xyz, n, phi, xc, yc, mean_line, NULL, counts); - d = gwy_data_line_get_data(mean_line); - - d2sign = 0; - for (i = 1; i < res-1; i++) { - if (d[i] < 0.5*(d[i-1] + d[i+1])) - d2sign += 1; - else if (d[i] > 0.5*(d[i-1] + d[i+1])) - d2sign -= 1; - } - gwy_debug("d2sign %d", d2sign); - - if (d2sign > 0) - gwy_data_line_multiply(mean_line, -1.0); - mpos = 0; - for (i = 1; i < res; i++) { - if (d[i] > d[mpos]) - mpos = i; - } - - t = 2.0*r/res*mpos - r; - param[0] = ((xc + t*cos(phi))*cos(phi) - (yc - t*sin(phi))*sin(phi)); - - if (d2sign > 0) { - param[1] = zmin; - param[2] = 4.0*(zmax - zmin)/(r*r); - } - else { - param[1] = zmax; - param[2] = 4.0*(zmin - zmax)/(r*r); - } - param[3] = phi; - param[4] = 0.0; - - g_free(counts); - g_object_unref(mean_line); - - return TRUE; -} - -static gdouble -cylinder_calc_R(const gdouble *param) -{ - return 1.0/param[2]; -} - -static gdouble -cylinder_calc_err_R(const gdouble *param, - const gdouble *param_err, - G_GNUC_UNUSED const gdouble *correl) -{ - return param_err[2]/(param[2]*param[2]); -} - -/************************************************************************** - * - * Grating (simple) - * - **************************************************************************/ - -static gdouble -grating_func(gdouble x, gdouble y, const gdouble *param) -{ - static gdouble c_last = 0.0, coshm1_c_last = 1.0; - DEFINE_PHI_CACHE(phi); - - gdouble L = fabs(param[0]); - gdouble h = param[1]; - gdouble p = fabs(param[2]); - gdouble z0 = param[3]; - gdouble x0 = param[4]; - gdouble phi = param[5]; - gdouble c = param[6]; - gdouble t, Lp2, val, coshm1_c, cphi, sphi; - - Lp2 = 0.5*L*p; - if (G_UNLIKELY(!Lp2)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi - x0 + Lp2; - t = (t - L*floor(t/L))/Lp2 - 1.0; - if (fabs(t) < 1.0) { - if (c == c_last) - coshm1_c = coshm1_c_last; - else { - coshm1_c = coshm1_c_last = gwy_coshm1(c); - c_last = c; - } - - val = z0 + h*(1.0 - gwy_coshm1(c*t)/coshm1_c); - } - else - val = z0; - - return val; -} - -static gboolean -grating_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - param[0] = r/4.0; - param[1] = zmax - zmin; - param[2] = 0.5; - param[3] = zmin; - param[4] = 0.0; - param[5] = 0.0; - param[6] = 5.0; - - return TRUE; -} - -static gboolean -grating_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble t; - - /* Just initialise the percentage and shape with some sane defaults. */ - param[2] = 0.5; - param[6] = 5.0; - - /* Simple height parameter estimate. */ - range_z(xyz, n, param+3, param+1, estimcache); - t = param[1] - param[3]; - param[1] = 0.9*t; - param[3] += 0.05*t; - - /* First we estimate the orientation (phi). */ - param[5] = estimate_projection_direction_red(xyz, n, estimcache); - - /* Then we extract a representative profile with this orientation. */ - return estimate_period_and_phase(xyz, n, param[5], param + 0, param + 4, - estimcache); -} - -/************************************************************************** - * - * Grating (3-level) - * - **************************************************************************/ - -static gdouble -grating3_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble L = fabs(param[0]); - gdouble h1 = fabs(param[1]); - gdouble h2 = fabs(param[2]); - gdouble h3 = fabs(param[3]); - gdouble p = fmin(fabs(param[4]), 1.0); - gdouble q1 = fabs(param[5]); - gdouble q2 = fabs(param[6]); - gdouble q3 = fabs(param[7]); - gdouble z0 = param[8]; - gdouble x0 = param[9]; - gdouble phi = param[10]; - gdouble t, Lp2, cphi, sphi, Ll, Lu; - - Lp2 = 0.5*L*p; - if (G_UNLIKELY(!Lp2)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi - x0 + Lp2; - t -= L*floor(t/L) + Lp2; - t = fabs(t); - - Lu = Lp2; - if (t >= Lu) - return z0; - - Ll = Lu; - Lu = Ll/(1.0 + q1); - if (t >= Lu) { - if (G_UNLIKELY(Lu == Ll)) - return z0; - return z0 + h1/(Lu - Ll)*(t - Ll); - } - - Ll = Lu; - Lu = Ll/(1.0 + q2); - z0 += h1; - if (t >= Lu) { - if (G_UNLIKELY(Lu == Ll)) - return z0; - return z0 + h2/(Lu - Ll)*(t - Ll); - } - - Ll = Lu; - Lu = Ll/(1.0 + q3); - z0 += h2; - if (t >= Lu) { - if (G_UNLIKELY(Lu == Ll)) - return z0; - return z0 + h3/(Lu - Ll)*(t - Ll); - } - - return z0 + h3; -} - -static gboolean -grating3_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - param[0] = r/4.0; - param[1] = 0.1*(zmax - zmin); - param[2] = 0.8*(zmax - zmin); - param[3] = 0.1*(zmax - zmin); - param[4] = 0.7; - param[5] = 0.5; - param[6] = 0.2; - param[7] = 0.5; - param[8] = zmin; - param[9] = 0.0; - param[10] = 0.0; - - return TRUE; -} - -static gboolean -grating3_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble zmin, zmax; - - /* Just initialise the percentage and shape with some sane defaults. */ - param[4] = 0.7; - param[5] = 0.5; - param[6] = 0.2; - param[7] = 0.5; - - /* Simple height parameter estimate. */ - range_z(xyz, n, &zmin, &zmax, estimcache); - param[1] = 0.1*(zmax - zmin); - param[2] = 0.8*(zmax - zmin); - param[3] = 0.1*(zmax - zmin); - param[8] = zmin; - - /* First we estimate the orientation (phi). */ - param[10] = estimate_projection_direction_red(xyz, n, estimcache); - - /* Then we extract a representative profile with this orientation. */ - return estimate_period_and_phase(xyz, n, param[10], param + 0, param + 9, - estimcache); -} - -static gdouble -grating3_calc_h(const gdouble *param) -{ - return param[1] + param[2] + param[3]; -} - -static gdouble -grating3_calc_err_h(G_GNUC_UNUSED const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble diff[G_N_ELEMENTS(grating3_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[1] = diff[2] = diff[3] = 1.0; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -grating3_calc_L0(const gdouble *param) -{ - return param[0]*param[4]; -} - -static gdouble -grating3_calc_err_L0(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble diff[G_N_ELEMENTS(grating3_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[0] = param[4]; - diff[4] = param[0]; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -grating3_calc_L1(const gdouble *param) -{ - return grating3_calc_L0(param)/(1.0 + param[5]); -} - -static gdouble -grating3_calc_err_L1(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble L1 = grating3_calc_L1(param); - gdouble diff[G_N_ELEMENTS(grating3_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[0] = L1/param[0]; - diff[4] = L1/param[4]; - diff[5] = -L1/(1.0 + param[5]); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -grating3_calc_L2(const gdouble *param) -{ - return grating3_calc_L1(param)/(1.0 + param[6]); -} - -static gdouble -grating3_calc_err_L2(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble L2 = grating3_calc_L2(param); - gdouble diff[G_N_ELEMENTS(grating3_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[0] = L2/param[0]; - diff[4] = L2/param[4]; - diff[5] = -L2/(1.0 + param[5]); - diff[6] = -L2/(1.0 + param[6]); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -grating3_calc_L3(const gdouble *param) -{ - return grating3_calc_L2(param)/(1.0 + param[7]); -} - -static gdouble -grating3_calc_err_L3(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble L3 = grating3_calc_L3(param); - gdouble diff[G_N_ELEMENTS(grating3_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[0] = L3/param[0]; - diff[4] = L3/param[4]; - diff[5] = -L3/(1.0 + param[5]); - diff[6] = -L3/(1.0 + param[6]); - diff[7] = -L3/(1.0 + param[7]); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -/************************************************************************** - * - * Holes - * - **************************************************************************/ - -static inline gdouble -hole_radial_intersection(gdouble q, gdouble A, gdouble R) -{ - gdouble A1q = A*(1.0 - q); - gdouble q21 = 1.0 + q*q; - gdouble D = R*R*q21 - A1q*A1q; - gdouble sqrtD = sqrt(MAX(D, 0.0)); - gdouble x = (1.0 + q)*A + sqrtD; - return x/sqrt(q21); -} - -static gdouble -hole_shape(gdouble x, gdouble y, gdouble size, gdouble slope, gdouble roundness) -{ - gdouble rx, ry, r, rr, rsz; - gdouble v = 0.0; - - if (roundness) { - rsz = roundness*size; - rx = fabs(x) - (size - rsz); - ry = fabs(y) - (size - rsz); - r = MAX(rx, ry); - rr = MIN(rx, ry); - if (r <= 0.0 || (r <= rsz && rr <= 0.0) || rx*rx + ry*ry <= rsz*rsz) - v = -1.0; - else if (slope) { - gdouble ss = size + slope; - rsz = roundness*ss; - rx = fabs(x) - (ss - rsz); - ry = fabs(y) - (ss - rsz); - r = MAX(rx, ry); - rr = MIN(rx, ry); - if (r <= 0.0 || (r <= rsz && rr <= 0.0) - || rx*rx + ry*ry <= rsz*rsz) { - gdouble q = (rr + ss - rsz)/(r + ss - rsz); - if (q <= 1.0 - roundness) - v = (r - rsz)/slope; - else { - r = hole_radial_intersection(q, ss - rsz, rsz); - rr = hole_radial_intersection(q, size - roundness*size, - roundness*size); - v = (sqrt(x*x + y*y) - r)/(r - rr); - } - } - } - } - else { - rx = fabs(x) - size; - ry = fabs(y) - size; - r = MAX(rx, ry); - if (r <= 0.0) - v = -1.0; - else if (r < slope) - v = (r - slope)/slope; - - v = sin(x); - } - - return v; -} - -static gdouble -holes_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble L = fabs(param[3]); - gdouble p = param[4]; - gdouble h = param[5]; - gdouble s = param[6]; - gdouble r = param[7]; - gdouble phi = param[8]; - gdouble t, cphi, sphi; - - x -= xc; - y -= yc; - - if (G_UNLIKELY(L*p == 0.0)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi; - y = x*sphi + y*cphi; - x = t; - - x -= L*floor(x/L) + 0.5*L; - y -= L*floor(y/L) + 0.5*L; - - p = 1.0/(1.0 + fabs(p)); - /* Map zero values to no roundness and no slope. */ - s = fabs(s)/(1.0 + fabs(s)); - r = fabs(r)/(1.0 + fabs(s)); - - return z0 + h*hole_shape(fabs(x), fabs(y), (1.0 - s)*0.5*L*p, s*0.5*L*p, r); -} - -static gboolean -holes_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - param[0] = 0; - param[1] = 0; - param[2] = zmin; - param[3] = r/4.0; - param[4] = 1.0; - param[5] = zmax - zmin; - param[6] = 0.1; - param[7] = 0.1; - param[8] = 0.0; - - return TRUE; -} - -static gboolean -holes_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - GwyDataLine *mean_line, *rms_line; - gdouble xc, yc, r, phi, L1, L2, zmin, zmax, u, v; - guint *counts; - guint res; - gboolean ok1, ok2; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - param[4] = 1.0; - param[6] = 0.1; - param[7] = 0.1; - - param[8] = phi = estimate_projection_direction_red(xyz, n, estimcache); - - ok1 = estimate_period_and_phase(xyz, n, phi, &L1, &u, estimcache); - ok2 = estimate_period_and_phase(xyz, n, phi - 0.5*G_PI, &L2, &v, - estimcache); - param[3] = 0.5*(L1 + L2); - param[0] = u*cos(phi) + v*sin(phi); - param[1] = u*sin(phi) + v*cos(phi); - - /* Estimate h sign: do projection and if smaller values correlate with - * large rms then it is holes (h > 0); if larger values correlate with - * large rms then it is bumps (h < 0). */ - res = (guint)floor(0.8*sqrt(n) + 1.0); - mean_line = gwy_data_line_new(res, 2.0*r, FALSE); - gwy_data_line_set_offset(mean_line, -r); - rms_line = gwy_data_line_new_alike(mean_line, FALSE); - counts = g_new(guint, res); - projection_to_line(xyz, n, phi, xc, yc, mean_line, rms_line, counts); - data_line_shorten(mean_line, counts, 4); - data_line_shorten(rms_line, counts, 4); - g_free(counts); - -#if 0 - { - FILE *fh = fopen("mean.dat", "w"); - GwyDataLine *dl = mean_line; - guint i_; - for (i_ = 0; i_ < dl->res; i_++) { - gdouble t_ = dl->off + dl->real/dl->res*(i_ + 0.5); - fprintf(fh, "%g %g\n", t_, dl->data[i_]); - } - fclose(fh); - } -#endif - - if (data_line_pearson_coeff(mean_line, rms_line) <= 0.0) { - gwy_debug("holes"); - param[2] = zmax; - param[5] = zmax - zmin; - } - else { - gwy_debug("bumps"); - param[2] = zmin; - param[5] = zmin - zmax; - /* estimate_period_and_phase() finds maxima but we want minima here */ - param[0] += 0.5*param[3]; - param[1] += 0.5*param[3]; - } - - g_object_unref(rms_line); - g_object_unref(mean_line); - - return ok1 && ok2; -} - -static gdouble -holes_calc_wouter(const gdouble *param) -{ - return param[3]/(1.0 + fabs(param[4])); -} - -static gdouble -holes_calc_err_wouter(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble diff[G_N_ELEMENTS(holes_params)]; - gdouble wouter = holes_calc_wouter(param); - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[3] = wouter/param[3]; - diff[4] = -wouter/(1.0 + fabs(param[4])); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -holes_calc_winner(const gdouble *param) -{ - return param[3]/(1.0 + fabs(param[4]))/(1.0 + fabs(param[6])); -} - -static gdouble -holes_calc_err_winner(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble diff[G_N_ELEMENTS(holes_params)]; - gdouble winner = holes_calc_winner(param); - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[3] = winner/param[3]; - diff[4] = -winner/(1.0 + fabs(param[4])); - diff[6] = -winner/(1.0 + fabs(param[6])); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -holes_calc_R(const gdouble *param) -{ - return param[3]/(1.0 + fabs(param[4]))/fabs(param[7])/(1.0 + fabs(param[7])); -} - -static gdouble -holes_calc_err_R(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble diff[G_N_ELEMENTS(holes_params)]; - gdouble R = holes_calc_R(param); - gdouble t = 1.0 + fabs(param[7]); - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[3] = R/param[3]; - diff[4] = -R/(1.0 + fabs(param[4])); - diff[7] = -param[3]/(1.0 + fabs(param[4]))/(t*t); - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -/************************************************************************** - * - * Ring - * - **************************************************************************/ - -static gdouble -pring_func(gdouble x, gdouble y, const gdouble *param) -{ - static gdouble s_h_last = 0.0, rinner_last = 1.0, router_last = 1.0; - - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble R = param[3]; - gdouble w = fabs(param[4]); - gdouble h = param[5]; - gdouble s = param[6]; - gdouble bx = param[7]; - gdouble by = param[8]; - gdouble r, r2, s_h, rinner, router; - - x -= xc; - y -= yc; - z0 += bx*x + by*y; - r2 = x*x + y*y; - - if (G_UNLIKELY(w == 0.0)) - return r2 <= R*R ? z0 - 0.5*s : z0 + 0.5*s; - - if (G_UNLIKELY(h == 0.0)) { - if (r2 >= R*R) - return z0 + 0.5*s; - else if (r2 < (R - w)*(R - w)) - return z0 - 0.5*s; - - r = (R - sqrt(r2))/w; - return z0 + s*(0.5 - r*r); - } - - r = sqrt(r2) - R; - s_h = s/h; - if (s_h == s_h_last) { - rinner = rinner_last; - router = router_last; - } - else { - rinner = rinner_last = sqrt(fmax(1.0 + 0.5*s_h, 0.0)); - router = router_last = sqrt(fmax(1.0 - 0.5*s_h, 0.0)); - s_h_last = s_h; - } - - rinner *= -0.5*w; - if (r <= rinner) - return z0 - 0.5*s; - - router *= 0.5*w; - if (r >= router) - return z0 + 0.5*s; - - r *= 2.0/w; - return z0 + h*(1.0 - r*r); -} - -static gboolean -pring_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gdouble xc, yc, r, zmin, zmax; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - - param[0] = xc; - param[1] = yc; - param[2] = zmin; - param[3] = r/3.0; - param[4] = r/12.0; - param[5] = zmax - zmin; - param[6] = (zmax - zmin)/12.0; - param[7] = 0.0; - param[8] = 0.0; - - return TRUE; -} - -static gboolean -pring_estimate_projection(const GwyXYZ *xyz, guint n, - gdouble xc, gdouble yc, gdouble r, - gboolean vertical, gboolean upwards, - GwyDataLine *proj, GwyXY *projdata, guint *counts, - GwyPeaks *peaks, gdouble *param) -{ - guint i, j, res; - const gdouble *d; - gdouble c, real, off, width[2]; - - c = (vertical ? yc : xc); - gwy_data_line_set_real(proj, 2.0*r); - gwy_data_line_set_offset(proj, -r); - projection_to_line(xyz, n, vertical ? -0.5*G_PI : 0.0, - xc, yc, proj, NULL, counts); - data_line_shorten(proj, counts, 4); - - if (!upwards) - gwy_data_line_multiply(proj, -1.0); - - res = gwy_data_line_get_res(proj); - real = gwy_data_line_get_real(proj); - off = gwy_data_line_get_offset(proj); - d = gwy_data_line_get_data(proj); - for (i = j = 0; i < res; i++) { - if (counts[i] > 5) { - projdata[j].x = c + off + (i + 0.5)*real/res; - projdata[j].y = d[i]; - j++; - } - } - if (gwy_peaks_analyze_xy(peaks, projdata, j, 2) != 2) - return FALSE; - - gwy_peaks_get_quantity(peaks, GWY_PEAK_ABSCISSA, param); - gwy_peaks_get_quantity(peaks, GWY_PEAK_WIDTH, width); - param[2] = 0.5*(width[0] + width[1]); - return TRUE; -} - -static gboolean -pring_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - GwyDataLine *proj; - GwyXY *projdata; - GwyPeaks *peaks; - gdouble xc, yc, r, zmin, zmax, zskew; - gdouble xestim[3], yestim[3]; - guint *counts; - gboolean ok1, ok2; - guint res; - - circumscribe_x_y(xyz, n, &xc, &yc, &r, estimcache); - range_z(xyz, n, &zmin, &zmax, estimcache); - stat_z(xyz, n, NULL, NULL, &zskew, estimcache); - res = (guint)floor(0.8*sqrt(n) + 1.0); - if (zskew < 0.0) - GWY_SWAP(gdouble, zmin, zmax); - - proj = gwy_data_line_new(res, 2.0*r, FALSE); - counts = g_new(guint, res); - projdata = g_new(GwyXY, res); - - peaks = gwy_peaks_new(); - gwy_peaks_set_order(peaks, GWY_PEAK_ORDER_ABSCISSA); - gwy_peaks_set_background(peaks, GWY_PEAK_BACKGROUND_MMSTEP); - - gwy_data_line_resample(proj, res, GWY_INTERPOLATION_NONE); - ok1 = pring_estimate_projection(xyz, n, xc, yc, r, FALSE, zskew >= 0.0, - proj, projdata, counts, peaks, xestim); - - gwy_data_line_resample(proj, res, GWY_INTERPOLATION_NONE); - ok2 = pring_estimate_projection(xyz, n, xc, yc, r, TRUE, zskew >= 0.0, - proj, projdata, counts, peaks, yestim); - - g_free(counts); - g_object_unref(proj); - gwy_peaks_free(peaks); - - if (!ok1 || !ok2) - return FALSE; - - param[0] = 0.5*(xestim[0] + xestim[1]); - param[1] = 0.5*(yestim[0] + yestim[1]); - param[2] = zmin; - param[3] = 0.25*(yestim[1] - yestim[0] + xestim[1] - xestim[0]); - /* A bit too high value is OK because at least the estimated function - * does not miss the ring completely. */ - param[4] = 1.5*(xestim[2] + yestim[2]); - param[5] = zmax - zmin; - param[6] = (zmax - zmin)/12.0; - param[7] = 0.0; - param[8] = 0.0; - - return TRUE; -} - -/************************************************************************** - * - * Gaussian - * - **************************************************************************/ - -static gdouble -gaussian_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble h = param[3]; - gdouble sigma = param[4]; - gdouble a = fabs(param[5]); - gdouble phi = param[6]; - gdouble bx = param[7]; - gdouble by = param[8]; - gdouble t, val, cphi, sphi, s2; - - x -= xc; - y -= yc; - z0 += bx*x + by*y; - - s2 = sigma*sigma; - if (G_UNLIKELY(!s2 || !a)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi; - y = x*sphi + y*cphi; - x = t; - - t = 0.5*(x*x*a + y*y/a)/s2; - val = z0 + h*exp(-t); - - return val; -} - -static gboolean -gaussian_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - param[7] = 0.0; - param[8] = 0.0; - return common_bump_feature_init(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); -} - -static gboolean -gaussian_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - param[7] = 0.0; - param[8] = 0.0; - return common_bump_feature_estimate(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); -} - -static gdouble -gaussian_calc_sigma1(const gdouble *param) -{ - return param[4]/sqrt(fabs(param[5])); -} - -static gdouble -gaussian_calc_err_sigma1(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble sigma1 = gaussian_calc_sigma1(param); - gdouble diff[G_N_ELEMENTS(gaussian_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[4] = sigma1/param[4]; - diff[5] = -0.5*sigma1/param[5]; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -gaussian_calc_sigma2(const gdouble *param) -{ - return param[4]*sqrt(fabs(param[5])); -} - -static gdouble -gaussian_calc_err_sigma2(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble sigma1 = gaussian_calc_sigma1(param); - gdouble diff[G_N_ELEMENTS(gaussian_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[4] = sigma1/param[4]; - diff[5] = 0.5*sigma1/param[5]; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -/************************************************************************** - * - * Lorentzian - * - **************************************************************************/ - -static gdouble -lorentzian_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble h = param[3]; - gdouble b = param[4]; - gdouble a = fabs(param[5]); - gdouble phi = param[6]; - gdouble bx = param[7]; - gdouble by = param[8]; - gdouble t, val, cphi, sphi, b2; - - x -= xc; - y -= yc; - z0 += bx*x + by*y; - - b2 = b*b; - if (G_UNLIKELY(!b2 || !a)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi; - y = x*sphi + y*cphi; - x = t; - - t = (x*x*a + y*y/a)/b2; - val = z0 + h/(1.0 + t); - - return val; -} - -static gboolean -lorentzian_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - param[7] = 0.0; - param[8] = 0.0; - return common_bump_feature_init(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); -} - -static gboolean -lorentzian_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - param[7] = 0.0; - param[8] = 0.0; - return common_bump_feature_estimate(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); -} - -static gdouble -lorentzian_calc_b1(const gdouble *param) -{ - return param[4]/sqrt(fabs(param[5])); -} - -static gdouble -lorentzian_calc_err_b1(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble b1 = lorentzian_calc_b1(param); - gdouble diff[G_N_ELEMENTS(lorentzian_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[4] = b1/param[4]; - diff[5] = -0.5*b1/param[5]; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -static gdouble -lorentzian_calc_b2(const gdouble *param) -{ - return param[4]*sqrt(fabs(param[5])); -} - -static gdouble -lorentzian_calc_err_b2(const gdouble *param, - const gdouble *param_err, - const gdouble *correl) -{ - gdouble b1 = lorentzian_calc_b1(param); - gdouble diff[G_N_ELEMENTS(lorentzian_params)]; - - gwy_clear(diff, G_N_ELEMENTS(diff)); - diff[4] = b1/param[4]; - diff[5] = 0.5*b1/param[5]; - return dotprod_with_correl(diff, param_err, correl, G_N_ELEMENTS(diff)); -} - -/************************************************************************** - * - * Pyramid (diamond) - * - **************************************************************************/ - -static gdouble -pyramidx_func(gdouble x, gdouble y, const gdouble *param) -{ - DEFINE_PHI_CACHE(phi); - - gdouble xc = param[0]; - gdouble yc = param[1]; - gdouble z0 = param[2]; - gdouble h = param[3]; - gdouble L = param[4]; - gdouble a = fabs(param[5]); - gdouble phi = param[6]; - gdouble bx = param[7]; - gdouble by = param[8]; - gdouble t, val, cphi, sphi, q; - - x -= xc; - y -= yc; - z0 += bx*x + by*y; - - if (G_UNLIKELY(!L || !a)) - return z0; - - HANDLE_PHI_CACHE(phi); - t = x*cphi - y*sphi; - y = x*sphi + y*cphi; - x = t; - - q = 0.5*L*sqrt(1.0 + a*a); - x /= q; - y *= a/q; - t = fabs(x) + fabs(y); - if (t < 1.0) - val = z0 + h*(1.0 - t); - else - val = z0; - - return val; -} - -static gboolean -pyramidx_init(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gboolean ok; - - param[7] = 0.0; - param[8] = 0.0; - ok = common_bump_feature_init(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); - param[4] *= 2.0; - - return ok; -} - -static gboolean -pyramidx_estimate(const GwyXYZ *xyz, guint n, gdouble *param, - FitShapeEstimateCache *estimcache) -{ - gboolean ok; - - /* XXX: The pyramid has minimum projection when oriented along x and y - * axes. But not very deep. Can we use it to estimate phi? */ - param[7] = 0.0; - param[8] = 0.0; - ok = common_bump_feature_estimate(xyz, n, - param + 0, param + 1, param + 2, - param + 3, param + 4, - param + 5, param + 6, - estimcache); - param[4] *= 2.0; - - return ok; -} - -/************************************************************************** - * - * Misc. - * - **************************************************************************/ - -static GString* -create_fit_report(FitShapeControls *controls) -{ - const FitShapeFunc *func = functions + controls->function_id; - GwyDataField *dfield; - GwySurface *surface; - GwySIUnit *xyunit, *zunit, *unit; - gchar *s, *unitstr; - GString *report; - guint n, i, j, nparams, nsecondary; - const gboolean *param_fixed = controls->ctx->param_fixed; - - if (controls->pageno == GWY_PAGE_XYZS) { - surface = gwy_container_get_object_by_name(controls->mydata, - "/surface/0"); - xyunit = gwy_surface_get_si_unit_xy(surface); - zunit = gwy_surface_get_si_unit_z(surface); - n = gwy_surface_get_npoints(surface); - } - else { - dfield = gwy_container_get_object_by_name(controls->mydata, "/0/data"); - xyunit = gwy_data_field_get_si_unit_xy(dfield); - zunit = gwy_data_field_get_si_unit_z(dfield); - n = gwy_data_field_get_xres(dfield)*gwy_data_field_get_yres(dfield); - } - unit = gwy_si_unit_new(NULL); - - report = g_string_new(NULL); - - g_string_append(report, _("===== Fit Results =====")); - g_string_append_c(report, '\n'); - g_string_append_printf(report, _("Data: %s\n"), - controls->title); - g_string_append_printf(report, _("Number of points: %d of %d\n"), - controls->ctx->n, n); - g_string_append_printf(report, _("Fitted function: %s\n"), func->name); - g_string_append_c(report, '\n'); - g_string_append_printf(report, _("Results\n")); - - nparams = func->nparams; - for (i = 0; i < nparams; i++) { - const FitShapeParam *fitparam = func->param + i; - gdouble param = controls->param[i], err = controls->param_err[i]; - - if (!pango_parse_markup(fitparam->name, -1, 0, NULL, &s, NULL, NULL)) { - g_warning("Parameter name is not valid Pango markup"); - s = g_strdup(fitparam->name); - } - if (fitparam->flags & FIT_SHAPE_PARAM_ANGLE) { - param *= 180.0/G_PI; - err *= 180.0/G_PI; - unitstr = g_strdup("deg"); - } - else { - gwy_si_unit_power_multiply(xyunit, fitparam->power_xy, - zunit, fitparam->power_z, - unit); - unitstr = gwy_si_unit_get_string(unit, GWY_SI_UNIT_FORMAT_PLAIN); - } - - if (param_fixed[i]) { - g_string_append_printf(report, "%6s = %g %s%s %s\n", - s, param, *unitstr ? " " : "", unitstr, - _("(fixed)")); - } - else { - g_string_append_printf(report, "%6s = %g ± %g%s%s\n", - s, param, err, *unitstr ? " " : "", unitstr); - } - - g_free(unitstr); - g_free(s); - } - g_string_append_c(report, '\n'); - - unitstr = gwy_si_unit_get_string(zunit, GWY_SI_UNIT_FORMAT_PLAIN); - g_string_append_printf(report, "%s %g %s\n", - _("Mean square difference:"), - controls->rss, unitstr); - g_free(unitstr); - g_string_append_c(report, '\n'); - - g_string_append(report, _("Correlation Matrix")); - g_string_append_c(report, '\n'); - - for (i = 0; i < nparams; i++) { - g_string_append(report, " "); - for (j = 0; j <= i; j++) { - if (param_fixed[i] || param_fixed[j]) { - if (i == j) - g_string_append_printf(report, "% .03f", 1.0); - else - g_string_append(report, " ---"); - } - else { - g_string_append_printf(report, "% .03f", - SLi(controls->correl, i, j)); - } - if (j != i) - g_string_append_c(report, ' '); - } - g_string_append_c(report, '\n'); - } - g_string_append_c(report, '\n'); - - nsecondary = func->nsecondary; - if (nsecondary) { - g_string_append(report, _("Derived Quantities")); - g_string_append_c(report, '\n'); - } - for (i = 0; i < nsecondary; i++) { - const FitShapeSecondary *secparam = func->secondary + i; - gdouble param = controls->secondary[i], - err = controls->secondary_err[i]; - - if (!pango_parse_markup(secparam->name, -1, 0, NULL, &s, NULL, NULL)) { - g_warning("Parameter name is not valid Pango markup"); - s = g_strdup(secparam->name); - } - if (secparam->flags & FIT_SHAPE_PARAM_ANGLE) { - param *= 180.0/G_PI; - err *= 180.0/G_PI; - unitstr = g_strdup("deg"); - } - else { - gwy_si_unit_power_multiply(xyunit, secparam->power_xy, - zunit, secparam->power_z, - unit); - unitstr = gwy_si_unit_get_string(unit, GWY_SI_UNIT_FORMAT_PLAIN); - } - g_string_append_printf(report, "%6s = %g ± %g%s%s\n", - s, param, err, *unitstr ? " " : "", unitstr); - g_free(unitstr); - g_free(s); - } - if (nsecondary) - g_string_append_c(report, '\n'); - - g_object_unref(unit); - - return report; -} - -static const gchar diff_colourmap_key[] = "/module/fit_shape/diff_colourmap"; -static const gchar diff_excluded_key[] = "/module/fit_shape/diff_excluded"; -static const gchar display_key[] = "/module/fit_shape/display"; -static const gchar function_key[] = "/module/fit_shape/function"; -static const gchar masking_key[] = "/module/fit_shape/masking"; -static const gchar output_key[] = "/module/fit_shape/output"; - -static void -fit_shape_sanitize_args(FitShapeArgs *args) -{ - guint i; - gboolean ok; - args->masking = gwy_enum_sanitize_value(args->masking, GWY_TYPE_MASKING_TYPE); args->display = MIN(args->display, FIT_SHAPE_DISPLAY_DIFF); args->output = MIN(args->output, FIT_SHAPE_OUTPUT_BOTH); args->diff_colourmap = !!args->diff_colourmap; args->diff_excluded = !!args->diff_excluded; - - ok = FALSE; - for (i = 0; i < G_N_ELEMENTS(functions); i++) { - if (gwy_strequal(args->function, functions[i].name)) { - ok = TRUE; - break; - } - } - if (!ok) + args->geometric_fit = !!args->geometric_fit; + if (gwy_inventory_get_item_position(gwy_shape_fit_presets(), + args->function) == (guint)-1) args->function = fit_shape_defaults.function; } @@ -4490,6 +2232,8 @@ &args->diff_colourmap); gwy_container_gis_boolean_by_name(container, diff_excluded_key, &args->diff_excluded); + gwy_container_gis_boolean_by_name(container, geometric_fit_key, + &args->geometric_fit); fit_shape_sanitize_args(args); } diff -Nru gwyddion-2.46/modules/process/flatten_base.c gwyddion-2.47/modules/process/flatten_base.c --- gwyddion-2.46/modules/process/flatten_base.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/flatten_base.c 2016-11-01 08:49:50.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: flatten_base.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: flatten_base.c 19155 2016-11-01 08:49:49Z yeti-dn $ * Copyright (C) 2014 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -123,7 +123,7 @@ gaussian = gwy_inventory_get_item(gwy_nlfit_presets(), "Gaussian"); fitter = gwy_nlfit_preset_fit(gaussian, NULL, ndata, xdata, ydata, param, NULL, NULL); - retval = !!fitter->covar; + retval = !!gwy_math_nlfit_get_covar(fitter); *mean = param[0]; *rms = param[3]/G_SQRT2; diff -Nru gwyddion-2.46/modules/process/immerse.c gwyddion-2.47/modules/process/immerse.c --- gwyddion-2.46/modules/process/immerse.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/immerse.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: immerse.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: immerse.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -519,7 +519,7 @@ return FALSE; if (gwy_data_field_get_xreal(image) < gwy_data_field_get_xreal(detail) - || gwy_data_field_get_xreal(image) < gwy_data_field_get_xreal(detail)) + || gwy_data_field_get_yreal(image) < gwy_data_field_get_yreal(detail)) return FALSE; return TRUE; diff -Nru gwyddion-2.46/modules/process/indent_analyze.c gwyddion-2.47/modules/process/indent_analyze.c --- gwyddion-2.46/modules/process/indent_analyze.c 2016-09-15 21:32:48.000000000 +0000 +++ gwyddion-2.47/modules/process/indent_analyze.c 2016-11-09 10:39:07.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: indent_analyze.c 18960 2016-09-15 21:32:48Z yeti-dn $ + * @(#) $Id: indent_analyze.c 19216 2016-11-09 10:39:06Z yeti-dn $ * Copyright (C) 2006 Lukas Chvatal, David Necas (Yeti), Petr Klapetek. * E-mail: chvatal@physics.muni.cz, yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -1051,7 +1051,7 @@ IndentAnalyzeArgs *args = controls->args; GwyDataLine *derdist; - gint mark_it = 0; + gdouble mark_it = 0.0; gint i, j; gdouble dx, dy, ds; gdouble sx; diff -Nru gwyddion-2.46/modules/process/laplace.c gwyddion-2.47/modules/process/laplace.c --- gwyddion-2.46/modules/process/laplace.c 2016-01-03 17:36:42.000000000 +0000 +++ gwyddion-2.47/modules/process/laplace.c 2016-10-18 08:13:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: laplace.c 17961 2016-01-03 12:09:19Z yeti-dn $ + * @(#) $Id: laplace.c 19089 2016-10-16 12:47:38Z yeti-dn $ * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -41,7 +41,7 @@ N_("Removes data under mask, " "interpolating them with Laplace equation solution."), "Petr Klapetek ", - "1.4", + "2.0", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -67,11 +67,9 @@ static void laplace(GwyContainer *data, GwyRunType run) { - GwyDataField *dfield, *mfield, *buffer; + GwyDataField *dfield, *mfield; GQuark dquark; - gdouble error, cor, maxer, lastfrac, frac, starter; - gint i, id; - gboolean cancelled = FALSE; + gint id; g_return_if_fail(run & LAPLACE_RUN_MODES); gwy_app_data_browser_get_current(GWY_APP_DATA_FIELD_KEY, &dquark, @@ -80,47 +78,10 @@ GWY_APP_DATA_FIELD_ID, &id, 0); g_return_if_fail(dfield && dquark && mfield); - - maxer = gwy_data_field_get_rms(dfield)/1.0e4; - gwy_app_wait_start(gwy_app_find_window_for_channel(data, id), - _("Laplace interpolation...")); - - dfield = gwy_data_field_duplicate(dfield); - buffer = gwy_data_field_new_alike(dfield, TRUE); - gwy_data_field_correct_average_unmasked(dfield, mfield); - - cor = 0.2; - error = 0.0; - lastfrac = 0.0; - starter = 0.0; - for (i = 0; i < 5000; i++) { - gwy_data_field_correct_laplace_iteration(dfield, mfield, buffer, - cor, &error); - if (error < maxer) - break; - if (!i) - starter = error; - - frac = log(error/starter)/log(maxer/starter); - if ((i/(gdouble)(5000)) > frac) - frac = i/(gdouble)(5000); - if (lastfrac > frac) - frac = lastfrac; - - if (!gwy_app_wait_set_fraction(frac)) { - cancelled = TRUE; - break; - } - lastfrac = frac; - } - gwy_app_wait_finish(); - if (!cancelled) { - gwy_app_undo_qcheckpointv(data, 1, &dquark); - gwy_container_set_object(data, dquark, dfield); - gwy_app_channel_log_add_proc(data, id, id); - } - g_object_unref(dfield); - g_object_unref(buffer); + gwy_app_undo_qcheckpointv(data, 1, &dquark); + gwy_data_field_laplace_solve(dfield, mfield, -1, 1.0); + gwy_data_field_data_changed(dfield); + gwy_app_channel_log_add_proc(data, id, id); } /* 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.46/modules/process/lat_synth.c gwyddion-2.47/modules/process/lat_synth.c --- gwyddion-2.46/modules/process/lat_synth.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/lat_synth.c 2016-10-25 07:24:12.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: lat_synth.c 19044 2016-10-08 19:10:46Z yeti-dn $ - * Copyright (C) 2014 David Necas (Yeti). + * @(#) $Id: lat_synth.c 19122 2016-10-24 18:50:48Z yeti-dn $ + * Copyright (C) 2014-2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * * This program is free software; you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include "config.h" #include +#include #include #include #include @@ -38,6 +39,10 @@ #define LAT_SYNTH_RUN_MODES (GWY_RUN_IMMEDIATE | GWY_RUN_INTERACTIVE) #define EPS 0.0000001 +#define PHI 1.6180339887498948482 + +/* How many points a lattice point placing functions can create. */ +#define MAXLATPOINTS 12 /* How larger the squarized grid should be (measured in squares). */ #define SQBORDER 2 @@ -78,10 +83,16 @@ } LatSynthRng; typedef enum { - LAT_SYNTH_RANDOM = 0, - LAT_SYNTH_SQUARE = 1, - LAT_SYNTH_HEXAGONAL = 2, - LAT_SYNTH_TRIANGULAR = 3, + LAT_SYNTH_RANDOM = 0, + LAT_SYNTH_SQUARE = 1, + LAT_SYNTH_HEXAGONAL = 2, + LAT_SYNTH_TRIANGULAR = 3, + LAT_SYNTH_SQTRIG_VERT = 4, + LAT_SYNTH_SQTRIG_CENT = 5, + LAT_SYNTH_TRUNC_SQUARE = 6, + LAT_SYNTH_SI_7X7 = 7, + LAT_SYNTH_PENROSE_VERT = 8, + LAT_SYNTH_PENROSE_CENT = 9, LAT_SYNTH_NTYPES } LatSynthType; @@ -126,10 +137,25 @@ gdouble scale; /* ratio of square side to the average cell size */ } VoronoiState; +typedef guint (*LatPlacePointsFunc)(int i, int j, GwyXY *xy); +typedef void (*LatIteratePointFunc)(int *i, int *j); typedef gdouble (*RenderFunc)(const GwyXY *point, const VoronoiObject *owner, const LatSynthArgs *args); +typedef struct { + LatPlacePointsFunc place_points; + LatIteratePointFunc iterate; + gdouble point_density; +} LatSynthLattice; + +typedef struct { + GwyXY a; + GwyXY b; + GwyXY c; + gboolean is_wide; +} LatSynthPenroseTriangle; + struct _LatSynthArgs { gint active_page; gint seed; @@ -268,6 +294,18 @@ const LatSynthArgs *args, gint xres, gint yres); +static void create_penrose_points (VoronoiState *vstate, + const LatSynthArgs *args, + gint xres, + gint yres); +static guint penrose_double_step (LatSynthPenroseTriangle *triangles, + guint n, + LatSynthPenroseTriangle *buf); +static guint penrose_single_step (const LatSynthPenroseTriangle *coarse, + guint n, + LatSynthPenroseTriangle *fine); +static guint sort_uniq_points (GwyXYZ *points, + guint n); static gboolean place_point_to_square (VoronoiState *vstate, GwyXY *pos, gdouble random); @@ -366,7 +404,7 @@ &module_register, N_("Generates surfaces based on regular or random lattices."), "Yeti ", - "1.0", + "1.1", "David Nečas (Yeti)", "2014", }; @@ -501,10 +539,16 @@ gint id) { static const GwyEnum lattice_types[LAT_SYNTH_NTYPES] = { - { N_("lattice|Random"), LAT_SYNTH_RANDOM, }, - { N_("lattice|Square"), LAT_SYNTH_SQUARE, }, - { N_("lattice|Hexagonal"), LAT_SYNTH_HEXAGONAL, }, - { N_("lattice|Triangular"), LAT_SYNTH_TRIANGULAR, }, + { N_("lattice|Random"), LAT_SYNTH_RANDOM, }, + { N_("lattice|Square"), LAT_SYNTH_SQUARE, }, + { N_("lattice|Hexagonal"), LAT_SYNTH_HEXAGONAL, }, + { N_("lattice|Triangular"), LAT_SYNTH_TRIANGULAR, }, + { N_("lattice|Cairo"), LAT_SYNTH_SQTRIG_VERT, }, + { N_("lattice|Snub square"), LAT_SYNTH_SQTRIG_CENT, }, + { N_("lattice|Truncated square"), LAT_SYNTH_TRUNC_SQUARE, }, + { N_("Silicon 7x7"), LAT_SYNTH_SI_7X7, }, + { N_("lattice|Penrose (vertices)"), LAT_SYNTH_PENROSE_VERT, }, + { N_("lattice|Penrose (centers)"), LAT_SYNTH_PENROSE_CENT, }, }; GtkWidget *dialog, *table, *vbox, *hbox, *notebook, *scwin; @@ -1342,7 +1386,14 @@ extxres = GWY_ROUND(a*extwsq); extyres = GWY_ROUND(a*exthsq); - create_regular_points(vstate, args, extxres, extyres); + if (args->lattice_type == LAT_SYNTH_PENROSE_VERT + || args->lattice_type == LAT_SYNTH_PENROSE_CENT) { + create_penrose_points(vstate, args, extxres, extyres); + } + else { + create_regular_points(vstate, args, extxres, extyres); + } + /* add_dislocations(squares, wsq, hsq, n*interstit, n*vacancies); */ @@ -1434,21 +1485,146 @@ (*j)++; } +static inline guint +place_points_square(int i, int j, GwyXY *xy) +{ + xy[0].x = j; + xy[0].y = -i; + return 1; +} + +static inline guint +place_points_hexagonal(int i, int j, GwyXY *xy) +{ + xy[0].x = j + 0.26794919243112270648*i; + xy[0].y = -i - 0.26794919243112270648*j; + return 1; +} + +static inline guint +place_points_triangular(int i, int j, GwyXY *xy) +{ + if (ABS(j - i) % 3 == 0) + return 0; + + /* Scale factor ensures the same point density as for random (square). */ + xy[0].x = j + 0.26794919243112270648*i; + xy[0].y = -i - 0.26794919243112270648*j; + return 1; +} + +static inline guint +place_points_sqtrig_vert(int i, int j, GwyXY *xy) +{ + xy[0].x = j; + xy[0].y = -i; + xy[1].x = j + 0.5; + xy[1].y = -i + 0.13397459621556135323; + xy[2].x = j + 0.36602540378443864675; + xy[2].y = -i - 0.36602540378443864675; + xy[3].x = j - 0.13397459621556135323; + xy[3].y = -i + 0.5; + return 4; +} + +static inline guint +place_points_sqtrig_cent(int i, int j, GwyXY *xy) +{ + xy[0].x = j + 0.18301270189221932337; + xy[0].y = -i + 0.31698729810778067661; + xy[1].x = j - 0.21132486540518711774; + xy[1].y = -i + 0.21132486540518711774; + xy[2].x = j - 0.31698729810778067661; + xy[2].y = -i - 0.18301270189221932337; + xy[3].x = j + 0.0773502691896257645; + xy[3].y = -i - 0.28867513459481288225; + xy[4].x = j + 0.28867513459481288225; + xy[4].y = -i - 0.0773502691896257645; + xy[5].x = j - 0.42264973081037423548; + xy[5].y = -i + 0.42264973081037423548; + return 6; +} + +static inline guint +place_points_trunc_square(int i, int j, GwyXY *xy) +{ + xy[0].x = j; + xy[0].y = -i - 0.29289321881345254; + xy[1].x = j; + xy[1].y = -i + 0.29289321881345254; + xy[2].x = j - 0.29289321881345254; + xy[2].y = -i; + xy[3].x = j + 0.29289321881345254; + xy[3].y = -i; + return 4; +} + +static inline guint +place_points_si7x7(int i, int j, GwyXY *xy) +{ + gdouble xc = j + 0.26794919243112270648*i; + gdouble yc = -i - 0.26794919243112270648*j; + + xy[0].x = xc + 0.2588190451025209; + xy[0].y = yc - 0.0693503541210148; + xy[1].x = xc + 0.1894686909815061; + xy[1].y = yc + 0.1894686909815061; + xy[2].x = xc + 0.4482877360840269; + xy[2].y = yc + 0.2588190451025209; + xy[3].x = xc + 0.2588190451025209; + xy[3].y = yc + 0.4482877360840269; + xy[4].x = xc - 0.0693503541210148; + xy[4].y = yc + 0.2588190451025209; + xy[5].x = xc; + xy[5].y = yc + 0.5176380902050417; + xy[6].x = xc - 0.2588190451025209; + xy[6].y = yc + 0.4482877360840269; + xy[7].x = xc - 0.2588190451025209; + xy[7].y = yc + 0.06935035412101485; + xy[8].x = xc - 0.4482877360840269; + xy[8].y = yc + 0.2588190451025209; + xy[9].x = xc - 0.5176380902050417; + xy[9].y = yc; + xy[10].x = xc - 0.1894686909815061; + xy[10].y = yc - 0.1894686909815061; + xy[11].x = xc + 0.0693503541210148; + xy[11].y = yc - 0.2588190451025209; + return 12; +} + static void create_regular_points(VoronoiState *vstate, const LatSynthArgs *args, gint xres, gint yres) { + static const LatSynthLattice lattice_types[] = { + { NULL, NULL, 0.0, }, + { place_points_square, iterate_square, 1.0, }, + { place_points_hexagonal, iterate_hexagonal, 1.0379548493020427, }, + { place_points_triangular, iterate_hexagonal, 0.8474865856124707, }, + { place_points_sqtrig_vert, iterate_square, 2.0, }, + { place_points_sqtrig_cent, iterate_square, 2.449489742783178, }, + { place_points_trunc_square, iterate_square, 2.0, }, + { place_points_si7x7, iterate_hexagonal, 3.5955810699072708, }, + { NULL, NULL, 0.0, }, + { NULL, NULL, 0.0, }, + }; + GwyDataField *displacement_x, *displacement_y; guint exthsq = vstate->hsq + 2*SQBORDER; guint extwsq = vstate->wsq + 2*SQBORDER; gdouble limit = MAX(exthsq*exthsq, extwsq*extwsq); GRand *rng = gwy_rand_gen_set_rng(vstate->rngset, RNG_POINTS); - gdouble scale = vstate->scale, cth, sth, t; + gdouble scale = vstate->scale, cth, sth, maxdist2 = 0.0; LatSynthType lattice_type = args->lattice_type; - GwyXY cpos, pos; + LatPlacePointsFunc place_points = lattice_types[lattice_type].place_points; + LatIteratePointFunc iterate = lattice_types[lattice_type].iterate; + GwyXY cpos[MAXLATPOINTS], pos; gint i = 0, j = 0, disp_i, disp_j; const gdouble *dx_data, *dy_data; - G_GNUC_UNUSED guint npts = 0; + guint npts, ipt; + G_GNUC_UNUSED guint total_npts = 0; + + g_return_if_fail(place_points && iterate); displacement_x = make_displacement_map(xres, yres, 0.1*args->sigma, args->tau, @@ -1461,32 +1637,168 @@ dx_data = gwy_data_field_get_data(displacement_x); dy_data = gwy_data_field_get_data(displacement_y); - /* Ensure the point density is always the same as for random. */ - if (lattice_type == LAT_SYNTH_HEXAGONAL) - scale /= 1.0379548493020427; - else if (lattice_type == LAT_SYNTH_TRIANGULAR) - scale /= 0.8474865856124707; - + scale /= lattice_types[lattice_type].point_density; cth = cos(args->angle); sth = sin(args->angle); do { - if (lattice_type == LAT_SYNTH_SQUARE) { - cpos.x = j; - cpos.y = -i; + npts = place_points(i, j, cpos); + for (ipt = 0; ipt < npts; ipt++) { + /* Rotate and scale. */ + pos.x = (cth*cpos[ipt].x + sth*cpos[ipt].y)/scale; + pos.y = (-sth*cpos[ipt].x + cth*cpos[ipt].y)/scale; + maxdist2 = fmax(DOTPROD_SS(pos, pos), maxdist2); + + pos.x += 0.5*extwsq; + pos.y += 0.5*exthsq; + + disp_j = GWY_ROUND(pos.x/extwsq*xres); + disp_j = CLAMP(disp_j, 0, xres-1); + disp_i = GWY_ROUND(pos.y/exthsq*yres); + disp_i = CLAMP(disp_i, 0, yres-1); + + pos.x += dx_data[disp_i*xres + disp_j]; + pos.y += dy_data[disp_i*xres + disp_j]; + + /* The randomisation here is to avoid some numeric troubles when + * there is no displacement. */ + pos.x += 0.0001*(g_rand_double(rng) - 0.00005); + pos.y += 0.0001*(g_rand_double(rng) - 0.00005); + + if (pos.x >= EPS && pos.y >= EPS + && pos.x <= extwsq - 2*EPS && pos.y <= exthsq - 2*EPS) { + place_point_to_square(vstate, &pos, g_rand_double(rng)); + total_npts++; + } + } + iterate(&i, &j); + } while (maxdist2 <= limit); + + gwy_debug("number of points: %u", total_npts); + + g_object_unref(displacement_y); + g_object_unref(displacement_x); +} + +static void +create_penrose_points(VoronoiState *vstate, const LatSynthArgs *args, + gint xres, gint yres) +{ + const gdouble q5 = sqrt(5.0); + + GwyDataField *displacement_x, *displacement_y; + guint exthsq = vstate->hsq + 2*SQBORDER; + guint extwsq = vstate->wsq + 2*SQBORDER; + gdouble limit = hypot(exthsq, extwsq); + GRand *rng = gwy_rand_gen_set_rng(vstate->rngset, RNG_POINTS); + gdouble scale = vstate->scale, cth, sth, t, maxdist2 = 0.0; + GwyXYZ *points; + GwyXY cpos, pos; + gint disp_i, disp_j; + const gdouble *dx_data, *dy_data; + guint i, ntri, n, nsteps, total_npts = 0; + LatSynthPenroseTriangle *triangles, *tribuf; + + /* For a reason not completely clear to me, this is a good point density + * for both types. */ + scale /= G_SQRT2; + nsteps = (guint)ceil(log(0.5*scale*limit/cos(G_PI/10.0))/log(PHI)); + nsteps |= 1; + gwy_debug("number of refinement steps: %u", nsteps); + cth = cos((nsteps + 1)*G_PI/10.0); + sth = sin((nsteps + 1)*G_PI/10.0); + + ntri = (guint)ceil(((5.0 + 3.0*q5)*pow(0.5*(3.0 + q5), nsteps) + + (5.0 - 3.0*q5)*pow(0.5*(3.0 - q5), nsteps))); + gwy_debug("estimated number of triangles: %u", ntri); + + triangles = g_new(LatSynthPenroseTriangle, ntri); + tribuf = g_new(LatSynthPenroseTriangle, ntri); + for (i = 0; i < 10; i++) { + tribuf[i].a.x = tribuf[i].a.y = 0.0; + if (i % 2) { + tribuf[i].b.x = cos((2.0*i - 1.0)*G_PI/10.0); + tribuf[i].b.y = sin((2.0*i - 1.0)*G_PI/10.0); + tribuf[i].c.x = cos((2.0*i + 1.0)*G_PI/10.0); + tribuf[i].c.y = sin((2.0*i + 1.0)*G_PI/10.0); } else { - cpos.x = j + 0.26794919243112270648*i; - cpos.y = -i - 0.26794919243112270648*j; + tribuf[i].b.x = cos((2.0*i + 1.0)*G_PI/10.0); + tribuf[i].b.y = sin((2.0*i + 1.0)*G_PI/10.0); + tribuf[i].c.x = cos((2.0*i - 1.0)*G_PI/10.0); + tribuf[i].c.y = sin((2.0*i - 1.0)*G_PI/10.0); + } + tribuf[i].is_wide = FALSE; + } + n = 10; + + /* Fix the mutual rotation of different refinements. */ + while (nsteps >= 2) { + n = penrose_double_step(tribuf, n, triangles); + nsteps -= 2; + } + g_assert(nsteps == 1); + n = penrose_single_step(tribuf, n, triangles); + nsteps--; + gwy_debug("true number of triangles: %u", n); + g_free(tribuf); + + if (args->lattice_type == LAT_SYNTH_PENROSE_VERT) { + points = g_new(GwyXYZ, 3*n); + for (i = 0; i < n; i++) { + points[3*i + 0].x = triangles[i].a.x; + points[3*i + 0].y = triangles[i].a.y; + points[3*i + 1].x = triangles[i].b.x; + points[3*i + 1].y = triangles[i].b.y; + points[3*i + 2].x = triangles[i].c.x; + points[3*i + 2].y = triangles[i].c.y; + } + n = 3*n; + } + else if (args->lattice_type == LAT_SYNTH_PENROSE_CENT) { + points = g_new(GwyXYZ, n); + for (i = 0; i < n; i++) { + points[i].x = (triangles[i].c.x + triangles[i].a.x/PHI)/PHI; + points[i].y = (triangles[i].c.y + triangles[i].a.y/PHI)/PHI; } + } + else { + g_return_if_reached(); + } + g_free(triangles); + + for (i = 0; i < n; i++) { + t = points[i].x*cth + points[i].y*sth; + points[i].y = -points[i].x*sth + points[i].y*cth; + points[i].x = t; + } + + n = sort_uniq_points(points, n); + gwy_debug("number of unique points: %u", n); + + displacement_x = make_displacement_map(xres, yres, + 0.1*args->sigma, args->tau, + gwy_rand_gen_set_rng(vstate->rngset, + RNG_DISPLAC_X)); + displacement_y = make_displacement_map(xres, yres, + 0.1*args->sigma, args->tau, + gwy_rand_gen_set_rng(vstate->rngset, + RNG_DISPLAC_Y)); + dx_data = gwy_data_field_get_data(displacement_x); + dy_data = gwy_data_field_get_data(displacement_y); - t = cth*cpos.x + sth*cpos.y; - cpos.y = (-sth*cpos.x + cth*cpos.y)/scale; - cpos.x = t/scale; - - /* The randomisation here is to avoid some numeric troubles. - * User-level randomisation is controlled by the deformation map. */ - pos.x = cpos.x + 0.5*extwsq + 0.0001*(g_rand_double(rng) - 0.00005); - pos.y = cpos.y + 0.5*exthsq + 0.0001*(g_rand_double(rng) - 0.00005); + cth = cos(args->angle); + sth = sin(args->angle); + for (i = 0; i < n; i++) { + cpos.x = points[i].x; + cpos.y = points[i].y; + + /* Rotate and scale. */ + pos.x = (cth*cpos.x + sth*cpos.y)/scale; + pos.y = (-sth*cpos.x + cth*cpos.y)/scale; + + pos.x += 0.5*extwsq; + pos.y += 0.5*exthsq; + maxdist2 = fmax(DOTPROD_SS(pos, pos), maxdist2); disp_j = GWY_ROUND(pos.x/extwsq*xres); disp_j = CLAMP(disp_j, 0, xres-1); @@ -1496,29 +1808,158 @@ pos.x += dx_data[disp_i*xres + disp_j]; pos.y += dy_data[disp_i*xres + disp_j]; - if (!(lattice_type == LAT_SYNTH_TRIANGULAR && ABS(j - i) % 3 == 0) - && pos.x >= EPS - && pos.y >= EPS - && pos.x <= extwsq - 2.0*EPS - && pos.y <= exthsq - 2.0*EPS) { + if (pos.x >= 0.0001 && pos.y >= 0.0001 + && pos.x <= extwsq - 0.0001 && pos.y <= exthsq - 0.0001) { + /* The randomisation here is to avoid some numeric troubles + * when there is no displacement. */ + pos.x += 0.0001*(g_rand_double(rng) - 0.00005); + pos.y += 0.0001*(g_rand_double(rng) - 0.00005); place_point_to_square(vstate, &pos, g_rand_double(rng)); - npts++; + total_npts++; } + } - if (lattice_type == LAT_SYNTH_SQUARE) - iterate_square(&i, &j); - else - iterate_hexagonal(&i, &j); - } while (DOTPROD_SS(cpos, cpos) <= limit); - - gwy_debug("Number of points: %u", npts); + gwy_debug("number of points: %u (%g)", + total_npts, + total_npts/(exthsq*extwsq*vstate->scale*vstate->scale)); + gwy_debug("true maxdist: %g (limit %g)", sqrt(maxdist2), limit); g_object_unref(displacement_y); g_object_unref(displacement_x); } +/* Perform always two steps of refinement. The odd and even refinements are + * different. We want the ‘sun’ configuration with a star inside (not a + * decagon). Furthermore, even two refinement steps do not provide the same + * points; the pattern is rotated by pi/5. But we can fix that by an + * explicit final rotation. */ +static guint +penrose_double_step(LatSynthPenroseTriangle *triangles, guint n, + LatSynthPenroseTriangle *buf) +{ + n = penrose_single_step(triangles, n, buf); + n = penrose_single_step(buf, n, triangles); + return n; +} + +static guint +penrose_single_step(const LatSynthPenroseTriangle *coarse, guint n, + LatSynthPenroseTriangle *fine) +{ + guint i, j = 0; + + for (i = 0; i < n; i++) { + GwyXY A, B, C, P, Q, R; + + A.x = PHI*coarse[i].a.x; + A.y = PHI*coarse[i].a.y; + B.x = PHI*coarse[i].b.x; + B.y = PHI*coarse[i].b.y; + C.x = PHI*coarse[i].c.x; + C.y = PHI*coarse[i].c.y; + if (coarse[i].is_wide) { + P.x = coarse[i].b.x + coarse[i].a.x/PHI; + P.y = coarse[i].b.y + coarse[i].a.y/PHI; + + fine[j].a = A; + fine[j].b = P; + fine[j].c = C; + fine[j].is_wide = FALSE; + j++; + + fine[j].a = B; + fine[j].b = C; + fine[j].c = P; + fine[j].is_wide = TRUE; + j++; + } + else { + Q.x = coarse[i].a.x + coarse[i].b.x/PHI; + Q.y = coarse[i].a.y + coarse[i].b.y/PHI; + R.x = coarse[i].c.x + coarse[i].a.x/PHI; + R.y = coarse[i].c.y + coarse[i].a.y/PHI; + + fine[j].a = A; + fine[j].b = R; + fine[j].c = Q; + fine[j].is_wide = TRUE; + j++; + + fine[j].a = B; + fine[j].b = Q; + fine[j].c = R; + fine[j].is_wide = FALSE; + j++; + + fine[j].a = B; + fine[j].b = C; + fine[j].c = R; + fine[j].is_wide = FALSE; + j++; + } + } + + return j; +} + +static int +compare_xyz_z(const void *a, const void *b) +{ + const GwyXYZ *pa = (const GwyXYZ*)a; + const GwyXYZ *pb = (const GwyXYZ*)b; + + if (pa->z < pb->z) + return -1; + if (pa->z > pb->z) + return 1; + return 0; +} + +/* This should be used for undeformed penrose lattice (regular grids are + * already create with stable point order). The z-coordinate is used as + * a scratch space. */ +static guint +sort_uniq_points(GwyXYZ *points, guint n) +{ + guint i, ii, j, start; + gdouble firstval; + + for (i = 0; i < n; i++) + points[i].z = points[i].x*points[i].x + points[i].y*points[i].y; + qsort(points, n, sizeof(GwyXYZ), compare_xyz_z); + + i = ii = 0; + do { + start = i; + firstval = points[start].z; + do { + i++; + } while (i < n && points[i].z - firstval < 1e-9); + + for (j = start; j < i; j++) { + /* Fix angles around the split line. */ + points[j].z = atan2(points[j].y, points[j].x) + 1e-9; + if (points[j].z >= G_PI) + points[j].z -= 2.0*G_PI; + } + qsort(points + start, i-start, sizeof(GwyXYZ), compare_xyz_z); + + do { + j = start; + firstval = points[start].z; + do { + j++; + } while (j < i && points[j].z - firstval < 1e-9); + points[ii++] = points[start]; + start = j; + } while (start < i); + } while (i < n); + + return ii; +} + static gboolean -place_point_to_square(VoronoiState *vstate, GwyXY *pos, gdouble random) +place_point_to_square(VoronoiState *vstate, GwyXY *pos, gdouble prandom) { VoronoiObject *obj; G_GNUC_UNUSED guint exthsq = vstate->hsq + 2*SQBORDER; @@ -1536,7 +1977,7 @@ obj = g_slice_new0(VoronoiObject); obj->pos = *pos; - obj->random = random; + obj->random = prandom; k = extwsq*i + j; if (!vstate->squares[k]) { diff -Nru gwyddion-2.46/modules/process/level_grains.c gwyddion-2.47/modules/process/level_grains.c --- gwyddion-2.46/modules/process/level_grains.c 2016-01-03 17:36:42.000000000 +0000 +++ gwyddion-2.47/modules/process/level_grains.c 2016-10-18 08:13:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: level_grains.c 17961 2016-01-03 12:09:19Z yeti-dn $ + * @(#) $Id: level_grains.c 19089 2016-10-16 12:47:38Z yeti-dn $ * Copyright (C) 2011 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -84,7 +84,7 @@ N_("Levels individual grains, interpolating the shifts between using " "Laplacian interpolation."), "David Nečas ", - "1.2", + "1.3", "David Nečas (Yeti)", "2011", }; @@ -143,12 +143,10 @@ GwyContainer *data, GQuark dquark, gint id, GwyDataField *dfield, GwyDataField *mfield) { - GwyDataField *buffer, *background, *invmask; - gdouble error, cor, maxerr, lastfrac, frac, starterr; + GwyDataField *background, *invmask; gdouble *heights, *bgdata; gint *grains; - gboolean cancelled = FALSE; - gint i, xres, yres, ngrains; + gint newid, i, xres, yres, ngrains; xres = gwy_data_field_get_xres(mfield); yres = gwy_data_field_get_yres(mfield); @@ -172,60 +170,23 @@ invmask = gwy_data_field_duplicate(mfield); gwy_data_field_grains_invert(invmask); - - maxerr = gwy_data_field_get_rms(dfield)/1.0e4; - gwy_app_wait_start(gwy_app_find_window_for_channel(data, id), - _("Laplace interpolation...")); - + gwy_data_field_laplace_solve(background, invmask, -1, 0.8); g_free(heights); g_free(grains); - buffer = gwy_data_field_new_alike(background, TRUE); - gwy_data_field_correct_average_unmasked(background, invmask); - - cor = 0.2; - error = 0.0; - lastfrac = 0.0; - starterr = 0.0; - for (i = 0; i < 5000; i++) { - gwy_data_field_correct_laplace_iteration(background, invmask, buffer, - cor, &error); - if (error < maxerr) - break; - if (!i) - starterr = error; - - frac = log(error/starterr)/log(maxerr/starterr); - if ((i/(gdouble)(5000)) > frac) - frac = i/(gdouble)(5000); - if (lastfrac > frac) - frac = lastfrac; - - if (!gwy_app_wait_set_fraction(frac)) { - cancelled = TRUE; - break; - } - lastfrac = frac; + gwy_data_field_invert(background, FALSE, FALSE, TRUE); + gwy_app_undo_qcheckpointv(data, 1, &dquark); + gwy_data_field_subtract_fields(dfield, dfield, background); + gwy_data_field_data_changed(dfield); + + if (args->do_extract) { + newid = gwy_app_data_browser_add_data_field(background, data, TRUE); + gwy_app_sync_data_items(data, data, id, newid, FALSE, + GWY_DATA_ITEM_GRADIENT, + 0); + gwy_app_set_data_field_title(data, newid, _("Background")); } - gwy_app_wait_finish(); - if (!cancelled) { - gwy_data_field_invert(background, FALSE, FALSE, TRUE); - gwy_app_undo_qcheckpointv(data, 1, &dquark); - gwy_data_field_subtract_fields(dfield, dfield, background); - gwy_data_field_data_changed(dfield); - - if (args->do_extract) { - gint newid; - - newid = gwy_app_data_browser_add_data_field(background, data, TRUE); - gwy_app_sync_data_items(data, data, id, newid, FALSE, - GWY_DATA_ITEM_GRADIENT, - 0); - gwy_app_set_data_field_title(data, newid, _("Background")); - } - } - g_object_unref(buffer); g_object_unref(invmask); g_object_unref(background); } diff -Nru gwyddion-2.46/modules/process/obj_synth.c gwyddion-2.47/modules/process/obj_synth.c --- gwyddion-2.46/modules/process/obj_synth.c 2016-10-10 08:25:26.000000000 +0000 +++ gwyddion-2.47/modules/process/obj_synth.c 2016-11-07 21:13:56.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: obj_synth.c 19044 2016-10-08 19:10:46Z yeti-dn $ + * @(#) $Id: obj_synth.c 19189 2016-11-06 20:09:54Z yeti-dn $ * Copyright (C) 2009-2016 David Necas (Yeti). * E-mail: yeti@gwyddion.net. * @@ -76,6 +76,7 @@ OBJ_SYNTH_TENT = 8, OBJ_SYNTH_DIAMOND = 9, OBJ_SYNTH_GAUSSIAN = 10, + OBJ_SYNTH_PARBUMP = 11, OBJ_SYNTH_NTYPES } ObjSynthType; @@ -252,6 +253,7 @@ DECLARE_OBJECT(tent); DECLARE_OBJECT(diamond); DECLARE_OBJECT(gaussian); +DECLARE_OBJECT(parbump); static const ObjSynthArgs obj_synth_defaults = { PAGE_DIMENSIONS, @@ -269,17 +271,18 @@ static const GwyDimensionArgs dims_defaults = GWY_DIMENSION_ARGS_INIT; static const ObjSynthFeature features[] = { - { OBJ_SYNTH_SPHERE, N_("Spheres"), &create_sphere, &getcov_sphere, }, - { OBJ_SYNTH_BOX, N_("Boxes"), &create_box, &getcov_box, }, - { OBJ_SYNTH_CONE, N_("Cones"), &create_cone, &getcov_cone, }, - { OBJ_SYNTH_PYRAMID, N_("Pyramids"), &create_pyramid, &getcov_pyramid, }, - { OBJ_SYNTH_DIAMOND, N_("Diamonds"), &create_diamond, &getcov_diamond, }, - { OBJ_SYNTH_4HEDRON, N_("Tetrahedrons"), &create_thedron, &getcov_thedron, }, - { OBJ_SYNTH_NUGGET, N_("Nuggets"), &create_nugget, &getcov_nugget, }, - { OBJ_SYNTH_THATCH, N_("Thatches"), &create_thatch, &getcov_thatch, }, - { OBJ_SYNTH_TENT, N_("Tents"), &create_tent, &getcov_tent, }, - { OBJ_SYNTH_GAUSSIAN, N_("Gaussians"), &create_gaussian, &getcov_gaussian, }, - { OBJ_SYNTH_DOUGHNUT, N_("Doughnuts"), &create_doughnut, &getcov_doughnut, }, + { OBJ_SYNTH_SPHERE, N_("Spheres"), &create_sphere, &getcov_sphere, }, + { OBJ_SYNTH_BOX, N_("Boxes"), &create_box, &getcov_box, }, + { OBJ_SYNTH_CONE, N_("Cones"), &create_cone, &getcov_cone, }, + { OBJ_SYNTH_PYRAMID, N_("Pyramids"), &create_pyramid, &getcov_pyramid, }, + { OBJ_SYNTH_DIAMOND, N_("Diamonds"), &create_diamond, &getcov_diamond, }, + { OBJ_SYNTH_4HEDRON, N_("Tetrahedrons"), &create_thedron, &getcov_thedron, }, + { OBJ_SYNTH_NUGGET, N_("Nuggets"), &create_nugget, &getcov_nugget, }, + { OBJ_SYNTH_THATCH, N_("Thatches"), &create_thatch, &getcov_thatch, }, + { OBJ_SYNTH_TENT, N_("Tents"), &create_tent, &getcov_tent, }, + { OBJ_SYNTH_GAUSSIAN, N_("Gaussians"), &create_gaussian, &getcov_gaussian, }, + { OBJ_SYNTH_DOUGHNUT, N_("Doughnuts"), &create_doughnut, &getcov_doughnut, }, + { OBJ_SYNTH_PARBUMP, N_("Parabolic bumps"), &create_parbump, &getcov_parbump, }, }; static GwyModuleInfo module_info = { @@ -287,7 +290,7 @@ &module_register, N_("Generates randomly patterned surfaces by placing objects."), "Yeti ", - "1.7", + "1.8", "David Nečas (Yeti)", "2009", }; @@ -1391,6 +1394,38 @@ } static void +create_parbump(ObjSynthObject *feature, + gdouble size, + gdouble aspect, + gdouble angle) +{ + gdouble a, b, c, s, r, x, y, xc, yc; + gint xres, yres, i, j; + gdouble *z; + + a = size*sqrt(aspect); + b = size/sqrt(aspect); + c = cos(angle); + s = sin(angle); + xres = (gint)ceil(2*hypot(a*c, b*s) + 1) | 1; + yres = (gint)ceil(2*hypot(a*s, b*c) + 1) | 1; + + obj_synth_object_resize(feature, xres, yres); + z = feature->data; + for (i = 0; i < yres; i++) { + y = i - yres/2; + for (j = 0; j < xres; j++) { + x = j - xres/2; + + xc = (x*c - y*s)/a; + yc = (x*s + y*c)/b; + r = 1.0 - xc*xc - yc*yc; + z[i*xres + j] = (r > 0.0) ? r : 0.0; + } + } +} + +static void place_add_min(GwyDataField *surface, ObjSynthObject *object, gint col, @@ -1572,6 +1607,12 @@ return GWY_SQRT3/4.0; } +static gdouble +getcov_parbump(G_GNUC_UNUSED gdouble aspect) +{ + return G_PI/4.0; +} + static const gchar prefix[] = "/module/obj_synth"; static const gchar active_page_key[] = "/module/obj_synth/active_page"; static const gchar angle_key[] = "/module/obj_synth/angle"; diff -Nru gwyddion-2.46/modules/process/tip_model.c gwyddion-2.47/modules/process/tip_model.c --- gwyddion-2.46/modules/process/tip_model.c 2016-03-30 17:06:43.000000000 +0000 +++ gwyddion-2.47/modules/process/tip_model.c 2016-10-18 08:13:26.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: tip_model.c 18537 2016-03-28 18:11:19Z yeti-dn $ - * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: tip_model.c 19080 2016-10-14 13:59:02Z yeti-dn $ + * Copyright (C) 2004-2016 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 @@ -39,9 +39,11 @@ typedef struct { gint nsides; + /* NB: angle is the slope and theta is the rotation angle! */ gdouble angle; gdouble radius; gdouble theta; + gdouble anisotropy; GwyTipType type; GwyAppDataId object; } TipModelArgs; @@ -59,6 +61,7 @@ GtkObject *nsides; GtkWidget *labsize; GtkObject *slope; + GtkObject *anisotropy; GwyDataField *tip; GwyContainer *vtip; gint vxres; @@ -101,7 +104,7 @@ static const TipModelArgs tip_model_defaults = { - 4, 54.73561032, 200e-9, 0, 0, + 4, 54.73561032, 200e-9, 0, 1.0, GWY_TIP_PYRAMID, GWY_APP_DATA_ID_NONE, }; @@ -110,7 +113,7 @@ &module_register, N_("Models SPM tip."), "Petr Klapetek ", - "1.7", + "2.0", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -209,11 +212,11 @@ /* set up tip model controls */ gtk_box_pack_start(GTK_BOX(hbox), controls.view, FALSE, FALSE, 4); - table = gtk_table_new(6, 4, FALSE); + table = gtk_table_new(7, 4, 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, FALSE, FALSE, 4); + gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 4); row = 0; controls.type = create_preset_menu(G_CALLBACK(tip_type_cb), @@ -261,6 +264,13 @@ G_CALLBACK(radius_changed_cb), &controls); row++; + controls.anisotropy = gtk_adjustment_new(args->anisotropy, + 0.1, 10.0, 0.001, 1.0, 0); + spin = gwy_table_attach_hscale(table, row, _("Tip _anisotropy:"), NULL, + controls.anisotropy, 0); + row++; + + gtk_table_set_row_spacing(GTK_TABLE(table), row-1, 8); controls.labsize = gtk_label_new(NULL); gtk_misc_set_alignment(GTK_MISC(controls.labsize), 0.0, 0.5); gtk_table_attach(GTK_TABLE(table), controls.labsize, @@ -296,6 +306,7 @@ args->angle = tip_model_defaults.angle; args->radius = tip_model_defaults.radius; args->theta = tip_model_defaults.theta; + args->anisotropy = tip_model_defaults.anisotropy; args->type = tip_model_defaults.type; tip_model_dialog_update_controls(&controls, args); break; @@ -379,28 +390,51 @@ tip_model_dialog_update_controls(TipModelControls *controls, TipModelArgs *args) { + const GwyTipModelPreset *preset; GwyTipType type = args->type; gboolean nsides_sens = FALSE, slope_sens = FALSE, rotation_sens = FALSE, - radius_sens = FALSE; + radius_sens = FALSE, anisotropy_sens = FALSE; + const GwyTipParamType *paramids; + guint i, nparams; gwy_enum_combo_box_set_active(GTK_COMBO_BOX(controls->type), type); gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->nsides), args->nsides); gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->angle), args->angle); gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->theta), args->theta); + gtk_adjustment_set_value(GTK_ADJUSTMENT(controls->anisotropy), + args->anisotropy); sci_entry_set_value(GTK_ADJUSTMENT(controls->radius), GTK_COMBO_BOX(controls->radius_unit), args->radius); - radius_sens = (type != GWY_TIP_DELTA); - nsides_sens = (type == GWY_TIP_PYRAMID); - rotation_sens = (type == GWY_TIP_PYRAMID - || type == GWY_TIP_CONTACT - || type == GWY_TIP_NONCONTACT); - slope_sens = (type == GWY_TIP_PYRAMID || type == GWY_TIP_CONE); + preset = gwy_tip_model_get_preset(args->type); + g_return_if_fail(preset); + nparams = gwy_tip_model_get_preset_nparams(preset); + paramids = gwy_tip_model_get_preset_params(preset); + for (i = 0; i < nparams; i++) { + GwyTipParamType paramid = paramids[i]; + if (paramid == GWY_TIP_PARAM_HEIGHT) { + /* Pass. */ + } + else if (paramid == GWY_TIP_PARAM_RADIUS) + radius_sens = TRUE; + else if (paramid == GWY_TIP_PARAM_ROTATION) + rotation_sens = TRUE; + else if (paramid == GWY_TIP_PARAM_NSIDES) + nsides_sens = TRUE; + else if (paramid == GWY_TIP_PARAM_SLOPE) + slope_sens = TRUE; + else if (paramid == GWY_TIP_PARAM_ANISOTROPY) + anisotropy_sens = TRUE; + else { + g_warning("Unhandled parameter type %u.", paramid); + } + } gwy_table_hscale_set_sensitive(controls->angle, slope_sens); gwy_table_hscale_set_sensitive(controls->theta, rotation_sens); gwy_table_hscale_set_sensitive(controls->nsides, nsides_sens); + gwy_table_hscale_set_sensitive(controls->anisotropy, anisotropy_sens); gtk_widget_set_sensitive(controls->radius_spin, radius_sens); gtk_widget_set_sensitive(controls->radius_unit, radius_sens); gtk_widget_set_sensitive(controls->radius_label, radius_sens); @@ -412,6 +446,8 @@ args->nsides = gwy_adjustment_get_int(GTK_ADJUSTMENT(controls->nsides)); args->angle = gtk_adjustment_get_value(GTK_ADJUSTMENT(controls->angle)); args->theta = gtk_adjustment_get_value(GTK_ADJUSTMENT(controls->theta)); + args->anisotropy + = gtk_adjustment_get_value(GTK_ADJUSTMENT(controls->anisotropy)); } static void @@ -431,7 +467,6 @@ gwy_data_field_data_changed(vtipfield); } - static void preview(TipModelControls *controls, TipModelArgs *args) @@ -457,6 +492,38 @@ controls->tipdone = TRUE; } +static gdouble* +create_params(const GwyTipModelPreset *preset, + gdouble zrange, + const TipModelArgs *args) +{ + guint i, nparams = gwy_tip_model_get_preset_nparams(preset); + const GwyTipParamType *paramids = gwy_tip_model_get_preset_params(preset); + gdouble *params; + + params = g_new(gdouble, nparams); + for (i = 0; i < nparams; i++) { + GwyTipParamType paramid = paramids[i]; + if (paramid == GWY_TIP_PARAM_HEIGHT) + params[i] = zrange; + else if (paramid == GWY_TIP_PARAM_RADIUS) + params[i] = args->radius; + else if (paramid == GWY_TIP_PARAM_ROTATION) + params[i] = G_PI/180.0 * args->theta; + else if (paramid == GWY_TIP_PARAM_NSIDES) + params[i] = args->nsides; + else if (paramid == GWY_TIP_PARAM_SLOPE) + params[i] = G_PI/180.0 * args->angle; + else if (paramid == GWY_TIP_PARAM_ANISOTROPY) + params[i] = args->anisotropy; + else { + g_warning("Unhandled parameter type %u.", paramid); + } + } + + return params; +} + static void tip_process(TipModelArgs *args, TipModelControls *controls) @@ -466,51 +533,39 @@ GwyDataField *sfield; GwyContainer *data; GQuark quark; - gchar label[64]; - gint xres, yres; + gchar *label; gdouble xstep, ystep, min, max, zrange; - gdouble params[2]; + gdouble *params; preset = gwy_tip_model_get_preset(args->type); g_return_if_fail(preset); tip_model_dialog_update_values(controls, args); - /* estimate x and y size */ dfield = controls->tip; data = gwy_app_data_browser_get(args->object.datano); quark = gwy_app_get_data_key_for_id(args->object.id); sfield = GWY_DATA_FIELD(gwy_container_get_object(data, quark)); + xstep = gwy_data_field_get_xmeasure(sfield); + ystep = gwy_data_field_get_ymeasure(sfield); - gwy_data_field_set_xreal(dfield, - gwy_data_field_get_xmeasure(sfield) - *gwy_data_field_get_xres(dfield)); - gwy_data_field_set_yreal(dfield, - gwy_data_field_get_ymeasure(sfield) - *gwy_data_field_get_yres(dfield)); - - params[0] = args->nsides; - params[1] = args->angle*G_PI/180; gwy_data_field_get_min_max(sfield, &min, &max); zrange = max - min; - preset->guess(sfield, zrange, args->radius, params, &xres, &yres); - - /* process tip */ - /* FIXME: this must be solved within guess functions */ - xres = CLAMP(xres, 10, 1000); - yres = CLAMP(yres, 10, 1000); + params = create_params(preset, zrange, args); - g_snprintf(label, sizeof(label), _("Tip resolution: %d × %d pixels"), - xres, yres); + /* Ensure the tip field has the same pixel size as the data field. */ + gwy_data_field_set_xreal(dfield, gwy_data_field_get_xres(dfield)*xstep); + gwy_data_field_set_yreal(dfield, gwy_data_field_get_yres(dfield)*ystep); + gwy_tip_model_preset_create_for_zrange(preset, dfield, + zrange, FALSE, params); + + label = g_strdup_printf(_("Tip resolution: %d × %d pixels"), + gwy_data_field_get_xres(dfield), + gwy_data_field_get_yres(dfield)); gtk_label_set_text(GTK_LABEL(controls->labsize), label); + g_free(label); + g_free(params); - xstep = gwy_data_field_get_xmeasure(dfield); - ystep = gwy_data_field_get_ymeasure(dfield); - gwy_data_field_resample(dfield, xres, yres, GWY_INTERPOLATION_NONE); - gwy_data_field_set_xreal(dfield, xstep*xres); - gwy_data_field_set_yreal(dfield, ystep*yres); - - preset->func(dfield, zrange, args->radius, args->theta*G_PI/180, params); tip_update(controls, args); } @@ -526,22 +581,24 @@ controls->args->radius = val * pow10(p10); } -static const gchar nsides_key[] = "/module/tip_model/nsides"; -static const gchar angle_key[] = "/module/tip_model/angle"; -static const gchar radius_key[] = "/module/tip_model/radius"; -static const gchar theta_key[] = "/module/tip_model/theta"; -static const gchar type_key[] = "/module/tip_model/tip_type"; +static const gchar angle_key[] = "/module/tip_model/angle"; +static const gchar anisotropy_key[] = "/module/tip_model/anisotropy"; +static const gchar nsides_key[] = "/module/tip_model/nsides"; +static const gchar radius_key[] = "/module/tip_model/radius"; +static const gchar theta_key[] = "/module/tip_model/theta"; +static const gchar type_key[] = "/module/tip_model/tip_type"; static void tip_model_sanitize_args(TipModelArgs *args) { args->nsides = CLAMP(args->nsides, 3, 100); - args->type = MIN(args->type, GWY_TIP_CONE); + args->anisotropy = CLAMP(args->anisotropy, 0.1, 10.0); + args->type = MIN(args->type, GWY_TIP_ELLPARABOLA); } static void tip_model_load_args(GwyContainer *container, - TipModelArgs *args) + TipModelArgs *args) { *args = tip_model_defaults; args->type = 0; @@ -550,6 +607,8 @@ gwy_container_gis_double_by_name(container, angle_key, &args->angle); gwy_container_gis_double_by_name(container, theta_key, &args->theta); gwy_container_gis_double_by_name(container, radius_key, &args->radius); + gwy_container_gis_double_by_name(container, anisotropy_key, + &args->anisotropy); gwy_container_gis_enum_by_name(container, type_key, &args->type); tip_model_sanitize_args(args); @@ -557,13 +616,14 @@ static void tip_model_save_args(GwyContainer *container, - TipModelArgs *args) + TipModelArgs *args) { - gwy_container_set_int32_by_name(container, nsides_key, args->nsides); gwy_container_set_double_by_name(container, angle_key, args->angle); gwy_container_set_double_by_name(container, radius_key, args->radius); gwy_container_set_double_by_name(container, theta_key, args->theta); + gwy_container_set_double_by_name(container, anisotropy_key, + args->anisotropy); gwy_container_set_enum_by_name(container, type_key, args->type); } diff -Nru gwyddion-2.46/modules/pygwy/extra.defs gwyddion-2.47/modules/pygwy/extra.defs --- gwyddion-2.46/modules/pygwy/extra.defs 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/extra.defs 2016-11-13 20:46:22.000000000 +0000 @@ -0,0 +1,74 @@ +(define-boxed XY + (c-name "GwyXY") + (gtype-id "GWY_TYPE_XY") + (fields + '("gdouble" "x") + '("gdouble" "y") + ) +) + +(define-boxed XYZ + (c-name "GwyXYZ") + (gtype-id "GWY_TYPE_XYZ") + (fields + '("gdouble" "x") + '("gdouble" "y") + '("gdouble" "z") + ) +) + +(define-boxed RGBA + (c-name "GwyRGBA") + (gtype-id "GWY_TYPE_RGBA") + (fields + '("gdouble" "r") + '("gdouble" "g") + '("gdouble" "b") + '("gdouble" "a") + ) +) + +(define-boxed AppDataId + (c-name "GwyAppDataId") + (gtype-id "GWY_TYPE_APP_DATA_ID") + (fields + '("gint" "datano") + '("gint" "id") + ) +) + +(define-boxed SIValueFormat + (c-name "GwySIValueFormat") + (gtype-id "GWY_TYPE_SI_VALUE_FORMAT") + (fields + '("gdouble" "magnitude") + '("gint" "precision") + '("const-gchar*" "units") + ) +) + +(define-boxed Peaks + (c-name "GwyPeaks") + (gtype-id "GWY_TYPE_PEAKS") +) + +(define-method set_string_by_name + (of-object "GwyContainer") + (c-name "gwy_container_set_const_string_by_name") + (return-type "none") + (parameters + '("const-gchar*" "name") + '("const-gchar*" "value") + ) +) + +(define-method set_string + (of-object "GwyContainer") + (c-name "gwy_container_set_const_string") + (return-type "none") + (parameters + '("GQuark" "key") + '("const-gchar*" "value") + ) +) + diff -Nru gwyddion-2.46/modules/pygwy/gwy.c gwyddion-2.47/modules/pygwy/gwy.c --- gwyddion-2.46/modules/pygwy/gwy.c 2016-09-20 07:42:53.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/gwy.c 2016-11-18 10:52:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: gwy.c 18973 2016-09-20 07:37:31Z yeti-dn $ + * @(#) $Id: gwy.c 19289 2016-11-18 10:30:23Z yeti-dn $ * Copyright (C) 2012-2016 David Necas (Yeti), Petr Klapetek, Jozef Vesely. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net, vesely@gjh.sk. * @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. */ +#include "config.h" #include #include #include "wrap_calls.h" @@ -30,16 +31,6 @@ #define gwyddion_key "Software\\Gwyddion\\2.0" #endif -/* function to fill list of containers, for gwy_app_data_browser_get_containers - */ -static void -pygwy_create_py_list_of_containers(GwyContainer *data, gpointer list) -{ - if (PyList_Append((PyObject *) list, pygobject_new((GObject *)data)) < 0) { - g_warning("Could not append container to python list of containers."); - } -} - #include "pygwywrap.c" #include "pygwy-console.h" @@ -178,6 +169,7 @@ gtk_init(NULL, NULL); gwy_widgets_type_init(); gwy_undo_set_enabled(FALSE); + gwy_app_data_browser_set_gui_enabled(FALSE); gwy_resource_class_load(g_type_class_peek(GWY_TYPE_GRADIENT)); gwy_resource_class_load(g_type_class_peek(GWY_TYPE_GL_MATERIAL)); gwy_resource_class_load(g_type_class_peek(GWY_TYPE_GRAIN_VALUE)); diff -Nru gwyddion-2.46/modules/pygwy/gwyutils.py gwyddion-2.47/modules/pygwy/gwyutils.py --- gwyddion-2.46/modules/pygwy/gwyutils.py 2015-07-29 08:28:23.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/gwyutils.py 2016-11-07 21:13:56.000000000 +0000 @@ -8,6 +8,14 @@ @param datafield_name: datafield name in string representation (like '/0/data') @param filename: expected filename @param run_type: select of interactive (RUN_INTERACTIVE) or noninteractive mode (RUN_NONINTERACTIVE) + + @deprecated: This function was a workaround for old image export. Nowadays + it is strictly worse than the two lines:: + + gwy.gwy_app_data_browser_select_data_field(container, datafield_num) + gwy.gwy_file_save(container, filename, run_type) + + because it also unnecessarily forces the data field to be shown in a window. """ gwy.gwy_app_data_browser_reset_visibility(container, gwy.VISIBILITY_RESET_SHOW_ALL) datafield_num = int(datafield_name.split('/')[1]) @@ -21,6 +29,11 @@ @param container: gwy.Container with datafields @return: a list of datafields + + @deprecated: This function produces nonsense. It returns all kinds of data + fields in on bag: images, masks, presentations, brick and surface previews, + etc. Instead, use C{L{gwy.gwy_app_data_browser_get_data_ids}(@container)} + and similar functions to get lists of specific data types. """ l = [] for key in container.keys(): @@ -37,6 +50,11 @@ @param container: gwy.Container with datafields @return: a directory of datafields + + @deprecated: This function produces nonsense. It returns all kinds of data + fields in on bag: images, masks, presentations, brick and surface previews, + etc. Instead, use C{L{gwy.gwy_app_data_browser_get_data_ids}(@container)} + and similar functions to get lists of specific data types. """ d = {} for key in container.keys_by_name(): @@ -48,7 +66,8 @@ def get_current_datafield(): """ - Short version of function L{gwy.gwy_app_data_browser_get_current}(gwy.APP_DATA_FIELD) + Shorthand for + C{L{gwy.gwy_app_data_browser_get_current}(gwy.APP_DATA_FIELD)} @return: current datafield """ @@ -56,7 +75,8 @@ def get_current_container(): """ - Short version of function L{gwy.gwy_app_data_browser_get_current}(gwy.APP_CONTAINER) + Shorthand for + C{L{gwy.gwy_app_data_browser_get_current}(gwy.APP_CONTAINER)} @return: current container """ @@ -67,6 +87,30 @@ except ImportError: pass else: + def data_line_data_as_array(line): + """Create a view the DataLine's data as numpy array. + + The array can point to an invalid memory location after using other + gwyddion functions and lead to application crash. Use with care. + + @param line: the L{gwy.DataLine} to view + @return: array viewing the data + """ + class gwydfdatap(): + def __init__(self,addr,shape): + data = (addr, False) + stride = (8,) + self.__array_interface__= { + 'strides' : stride, + 'shape' : shape, + 'data' : data, + 'typestr' : "|f8", + 'version' : 3} + + addr = line.get_data_pointer() + shape = (line.get_res(),) + return np.array(gwydfdatap(addr, shape), copy=False) + def data_field_data_as_array(field): """Create a view the DataField's data as numpy array. @@ -78,8 +122,8 @@ """ class gwydfdatap(): def __init__(self,addr,shape): - data = (addr,False) - stride = (8,shape[0]*8) + data = (addr, False) + stride = (8, shape[0]*8) self.__array_interface__= { 'strides' : stride, 'shape' : shape, @@ -88,8 +132,8 @@ 'version' : 3} addr = field.get_data_pointer() - shape = (field.get_xres(),field.get_yres()) - return np.array(gwydfdatap(addr,shape),copy=False) + shape = (field.get_xres(), field.get_yres()) + return np.array(gwydfdatap(addr, shape), copy=False) def brick_data_as_array(brick): """Create a view the Brick's data as numpy array. @@ -97,13 +141,13 @@ The array can point to an invalid memory location after using other gwyddion functions and lead to application crash. Use with care. - @param field: the L{gwy.Brick} to view + @param brick: the L{gwy.Brick} to view @return: array viewing the data """ class gwydfdatap(): def __init__(self,addr,shape): - data = (addr,False) - stride = (8,shape[0]*8,shape[0]*shape[1]*8) + data = (addr, False) + stride = (8, shape[0]*8, shape[0]*shape[1]*8) self.__array_interface__= { 'strides' : stride, 'shape' : shape, @@ -112,14 +156,18 @@ 'version' : 3} addr = brick.get_data_pointer() - shape = (brick.get_xres(),brick.get_yres(),brick.get_zres()) - return np.array(gwydfdatap(addr,shape),copy=False) + shape = (brick.get_xres(), brick.get_yres(), brick.get_zres()) + return np.array(gwydfdatap(addr, shape), copy=False) def data_field_get_data(datafield): """Gets the data from a data field. The returned array is a copy of the data. But it can be safely stored without ever referring to invalid memory. + + @param datafield: The data field. + @deprecated: This helper function is pointless. Just use + C{numpy.array(@datafield)}. """ return data_field_data_as_array(datafield).copy() @@ -138,6 +186,10 @@ The returned array is a copy of the data. But it can be safely stored without ever referring to invalid memory. + + @param brick: The data brick. + @deprecated: This helper function is pointless. Just use + C{numpy.array(@brick)}. """ return brick_data_as_array(brick).copy() diff -Nru gwyddion-2.46/modules/pygwy/macro-prototypes.h gwyddion-2.47/modules/pygwy/macro-prototypes.h --- gwyddion-2.46/modules/pygwy/macro-prototypes.h 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/macro-prototypes.h 2016-11-07 21:13:56.000000000 +0000 @@ -0,0 +1,78 @@ +/* + * This is not a real header. + * + * It contains prototypes for `functions' that are actually macros in C but are + * used as functions and we want to have them in Python. + */ +gboolean gwy_container_contains_by_name (GwyContainer *container, + const gchar *n); +gboolean gwy_container_remove_by_name (GwyContainer *container, + const gchar *n); +gboolean gwy_container_rename_by_name (GwyContainer *container, + const gchar *n, + const gchar *new_name, + gboolean force); +void gwy_container_set_boolean_by_name(GwyContainer *container, + const gchar *n, + gboolean v); +void gwy_container_set_double_by_name (GwyContainer *container, + const gchar *n, + gdouble v); +void gwy_container_set_enum_by_name (GwyContainer *container, + const gchar *n, + guint v); +void gwy_container_set_int32_by_name (GwyContainer *container, + const gchar *n, + gint32 v); +void gwy_container_set_int64_by_name (GwyContainer *container, + const gchar *n, + gint64 v); +void gwy_container_set_object_by_name (GwyContainer *container, + const gchar *n, + GObject *v); +void gwy_container_set_uchar_by_name (GwyContainer *container, + const gchar *n, + guchar v); +gboolean gwy_container_get_boolean_by_name(GwyContainer *container, + const gchar *n); +gdouble gwy_container_get_double_by_name (GwyContainer *container, + const gchar *n); +guint gwy_container_get_enum_by_name (GwyContainer *container, + const gchar *n); +gint32 gwy_container_get_int32_by_name (GwyContainer *container, + const gchar *n); +gint64 gwy_container_get_int64_by_name (GwyContainer *container, + const gchar *n); +guchar gwy_container_get_uchar_by_name (GwyContainer *container, + const gchar *n); +GObject* gwy_container_get_object_by_name (GwyContainer *container, + const gchar *n); +const gchar* gwy_container_get_string_by_name (GwyContainer *container, + const gchar *n); + +GwyBrick* gwy_brick_duplicate (GwyBrick *brick); +GwyContainer* gwy_container_duplicate (GwyContainer *container); +GwyDataField* gwy_data_field_duplicate (GwyDataField *data_field); +gdouble gwy_data_field_get_xmeasure (GwyDataField *data_field); +gdouble gwy_data_field_get_ymeasure (GwyDataField *data_field); +GwyDataLine* gwy_data_line_duplicate (GwyDataLine *data_line); +GwySpectra* gwy_spectra_duplicate (GwySpectra *spectra); +GwySurface* gwy_surface_duplicate (GwySurface *surface); +GwySIUnit* gwy_si_unit_duplicate (GwySIUnit *siunit); +GwyGraphModel* gwy_graph_model_duplicate (GwyGraphModel *graph_model); +GwyGraphCurveModel* gwy_graph_curve_model_duplicate(GwyGraphCurveModel *graph_curve_model); +GwySelection* gwy_selection_duplicate (GwySelection *selection); +GwyStringList* gwy_string_list_duplicate (GwyStringList *string_list); + +GType gwy_vector_layer_get_selection_type(GwyVectorLayer *layer); + +GType gwy_si_value_format_get_type (void); +GwySIValueFormat* gwy_si_value_format_new (gdouble magnitude, + gint precision, + const gchar *units); +GwySIValueFormat* gwy_si_value_format_copy (GwySIValueFormat *format); +void gwy_si_value_format_free (GwySIValueFormat *format); +GwySIValueFormat* gwy_si_value_format_clone (GwySIValueFormat *source, + GwySIValueFormat *dest); +void gwy_si_value_format_set_units(GwySIValueFormat *format, + const gchar *units); diff -Nru gwyddion-2.46/modules/pygwy/Makefile.am gwyddion-2.47/modules/pygwy/Makefile.am --- gwyddion-2.46/modules/pygwy/Makefile.am 2016-04-25 07:42:57.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/Makefile.am 2016-11-09 08:53:16.000000000 +0000 @@ -1,4 +1,4 @@ -# @(#) $Id: Makefile.am 18646 2016-04-25 07:42:56Z yeti-dn $ +# @(#) $Id: Makefile.am 19213 2016-11-09 08:53:16Z yeti-dn $ moduledir = $(pkglibdir)/modules pygwyutildir = $(pkgdatadir)/pygwy @@ -21,11 +21,13 @@ $(top_srcdir)/libprocess/gwyprocessenums.h \ $(top_srcdir)/libprocess/gwyprocess.h \ $(top_srcdir)/libprocess/gwyprocesstypes.h \ + $(top_srcdir)/libprocess/gwyshapefitpreset.h \ $(top_srcdir)/libprocess/hough.h \ $(top_srcdir)/libprocess/interpolation.h \ $(top_srcdir)/libprocess/inttrans.h \ $(top_srcdir)/libprocess/level.h \ $(top_srcdir)/libprocess/linestats.h \ + $(top_srcdir)/libprocess/peaks.h \ $(top_srcdir)/libprocess/simplefft.h \ $(top_srcdir)/libprocess/spectra.h \ $(top_srcdir)/libprocess/stats.h \ @@ -49,6 +51,7 @@ $(top_srcdir)/libgwyddion/gwyrandgenset.h \ $(top_srcdir)/libgwyddion/gwyserializable.h \ $(top_srcdir)/libgwyddion/gwysiunit.h \ + $(top_srcdir)/libgwyddion/gwysivalueformat.h \ $(top_srcdir)/libgwyddion/gwystringlist.h \ $(top_srcdir)/libgwyddion/gwyutils.h \ $(top_srcdir)/libgwyddion/gwyversion.h \ @@ -76,6 +79,8 @@ $(top_srcdir)/app/validate.h \ $(top_srcdir)/app/wait.h \ $(top_srcdir)/libdraw/gwydraw.h \ + $(top_srcdir)/libdraw/gwydrawenums.h \ + $(top_srcdir)/libdraw/gwydrawtypes.h \ $(top_srcdir)/libdraw/gwyglmaterial.h \ $(top_srcdir)/libdraw/gwygradient.h \ $(top_srcdir)/libdraw/gwypixfield.h \ @@ -143,11 +148,8 @@ $(top_srcdir)/libgwydgets/gwystock.h \ $(top_srcdir)/libgwydgets/gwyvectorlayer.h \ $(top_srcdir)/libgwydgets/gwyvruler.h \ - wrap_calls.h - -# $(top_srcdir)/app/gwytool.h -# $(top_srcdir)/libgwyddion/gwydebugobjects.h -# $(top_srcdir)/libdraw/gwydrawenums.h + wrap_calls.h \ + macro-prototypes.h disabled_sources = @@ -174,19 +176,24 @@ pyexec_LTLIBRARIES = \ $(gwy_pymodule) +noinst_HEADERS = \ + pygwy-console.h \ + pygwy.h \ + macro-prototypes.h \ + wrap_calls.h + EXTRA_DIST = \ $(disabled_sources) \ $(pygwyutil_DATA) \ + extra.defs \ makelang.py \ README.pygwy \ pygwy.override \ + override.defs \ pygwy-codegen.py \ pygwy-generate-doc.py \ pygwy-fix-defs.py \ pygwy-fix-defs.sed \ - wrap_calls.h \ - pygwy-console.h \ - pygwy.h \ gwyutils.py if OS_MSWIN @@ -215,14 +222,14 @@ pygwy_la_CFLAGS = @COMMON_CFLAGS@ @PYTHON_EXTRA_CFLAGS@ @GTKSOURCEVIEW_CFLAGS@ $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) pygwy_la_LIBADD = $(module_libadd) $(PYTHON_LIBS) $(PYGTK_LIBS) @GTKSOURCEVIEW_LIBS@ -pygwy.defs: $(PYGWY_H_FILES) Makefile.am pygwy-fix-defs.py pygwy-fix-defs.sed +pygwy.defs: $(PYGWY_H_FILES) Makefile.am pygwy-fix-defs.py pygwy-fix-defs.sed extra.defs $(AM_V_GEN)$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py $(PYGWY_H_FILES) \ - | sed -f pygwy-fix-defs.sed >pygwy.defs.tmp - $(PYTHON) $(srcdir)/pygwy-fix-defs.py $(PYGTK_CODEGENDIR) >pygwy.defs + | sed -f pygwy-fix-defs.sed >pygwy.defs.tmp + $(PYTHON) $(srcdir)/pygwy-fix-defs.py --codegendir=$(PYGTK_CODEGENDIR) >pygwy.defs rm pygwy.defs.tmp -pygwy.lang: pygwy.defs - $(AM_V_GEN)$(PYTHON) $(srcdir)/makelang.py pygwy.lang +pygwy.lang: pygwy.defs override.defs + $(AM_V_GEN)cat pygwy.defs override.defs | $(PYTHON) $(srcdir)/makelang.py >pygwy.lang # The sed fixes pygwy_add_constants() and pygwy_register_classes() to static # functions, and standardized `generated' line for automated exclusions of @@ -234,9 +241,10 @@ | sed -e 's/^void$$/static void/' -e 's/pygwy\.c/pygwywrap\.c/' \ -e '1s#.*#/* This is a 'GENERATED' file */#' >pygwywrap.c -gwy.py: pygwy.defs pygwywrap.c +gwy.py: pygwy.defs override.defs pygwywrap.c pygwy-generate-doc.py $(PYTHON) ./pygwy-generate-doc.py --codegendir $(PYGTK_CODEGENDIR) >gwy.py -pygwy-doc: gwy.py + +pygwy-doc: gwy.py gwyutils.py $(EPYDOC) -v -o pygwy-doc gwy.py gwyutils.py gwy_la_SOURCES = gwy.c wrap_calls.c @@ -269,7 +277,7 @@ endif endif -CLEANFILES = gwy.py gwy.pyc gwy.pyo pygwy.lang +CLEANFILES = gwy.py gwy.pyc gwy.pyo pygwy.lang boxed.override DISTCLEANFILES = pygwy.defs pygwywrap.c diff -Nru gwyddion-2.46/modules/pygwy/Makefile.in gwyddion-2.47/modules/pygwy/Makefile.in --- gwyddion-2.46/modules/pygwy/Makefile.in 2016-10-14 09:41:58.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/Makefile.in 2016-11-18 10:52:41.000000000 +0000 @@ -14,7 +14,8 @@ @SET_MAKE@ -# @(#) $Id: Makefile.am 18646 2016-04-25 07:42:56Z yeti-dn $ +# @(#) $Id: Makefile.am 19213 2016-11-09 08:53:16Z yeti-dn $ + VPATH = @srcdir@ @@ -108,7 +109,8 @@ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -226,6 +228,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(lang_DATA) $(pygwyutil_DATA) +HEADERS = $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -504,11 +507,13 @@ $(top_srcdir)/libprocess/gwyprocessenums.h \ $(top_srcdir)/libprocess/gwyprocess.h \ $(top_srcdir)/libprocess/gwyprocesstypes.h \ + $(top_srcdir)/libprocess/gwyshapefitpreset.h \ $(top_srcdir)/libprocess/hough.h \ $(top_srcdir)/libprocess/interpolation.h \ $(top_srcdir)/libprocess/inttrans.h \ $(top_srcdir)/libprocess/level.h \ $(top_srcdir)/libprocess/linestats.h \ + $(top_srcdir)/libprocess/peaks.h \ $(top_srcdir)/libprocess/simplefft.h \ $(top_srcdir)/libprocess/spectra.h \ $(top_srcdir)/libprocess/stats.h \ @@ -532,6 +537,7 @@ $(top_srcdir)/libgwyddion/gwyrandgenset.h \ $(top_srcdir)/libgwyddion/gwyserializable.h \ $(top_srcdir)/libgwyddion/gwysiunit.h \ + $(top_srcdir)/libgwyddion/gwysivalueformat.h \ $(top_srcdir)/libgwyddion/gwystringlist.h \ $(top_srcdir)/libgwyddion/gwyutils.h \ $(top_srcdir)/libgwyddion/gwyversion.h \ @@ -559,6 +565,8 @@ $(top_srcdir)/app/validate.h \ $(top_srcdir)/app/wait.h \ $(top_srcdir)/libdraw/gwydraw.h \ + $(top_srcdir)/libdraw/gwydrawenums.h \ + $(top_srcdir)/libdraw/gwydrawtypes.h \ $(top_srcdir)/libdraw/gwyglmaterial.h \ $(top_srcdir)/libdraw/gwygradient.h \ $(top_srcdir)/libdraw/gwypixfield.h \ @@ -626,12 +634,9 @@ $(top_srcdir)/libgwydgets/gwystock.h \ $(top_srcdir)/libgwydgets/gwyvectorlayer.h \ $(top_srcdir)/libgwydgets/gwyvruler.h \ - wrap_calls.h - + wrap_calls.h \ + macro-prototypes.h -# $(top_srcdir)/app/gwytool.h -# $(top_srcdir)/libgwyddion/gwydebugobjects.h -# $(top_srcdir)/libdraw/gwydrawenums.h disabled_sources = $(am__append_1) @ENABLE_PYGWY_FALSE@pygwy_module = @ENABLE_PYGWY_TRUE@pygwy_module = pygwy.la @@ -649,19 +654,24 @@ pyexec_LTLIBRARIES = \ $(gwy_pymodule) +noinst_HEADERS = \ + pygwy-console.h \ + pygwy.h \ + macro-prototypes.h \ + wrap_calls.h + EXTRA_DIST = \ $(disabled_sources) \ $(pygwyutil_DATA) \ + extra.defs \ makelang.py \ README.pygwy \ pygwy.override \ + override.defs \ pygwy-codegen.py \ pygwy-generate-doc.py \ pygwy-fix-defs.py \ pygwy-fix-defs.sed \ - wrap_calls.h \ - pygwy-console.h \ - pygwy.h \ gwyutils.py @OS_MSWIN_TRUE@no_undefined = -no-undefined @@ -697,7 +707,7 @@ @ENABLE_PYGWY_TRUE@ $(am__append_3) @ENABLE_PYGWY_TRUE@gwy_la_LDFLAGS = -avoid-version -module \ @ENABLE_PYGWY_TRUE@ $(no_undefined) $(am__append_2) -CLEANFILES = gwy.py gwy.pyc gwy.pyo pygwy.lang +CLEANFILES = gwy.py gwy.pyc gwy.pyo pygwy.lang boxed.override DISTCLEANFILES = pygwy.defs pygwywrap.c all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1011,7 +1021,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(langdir)" "$(DESTDIR)$(pygwyutildir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1153,14 +1163,14 @@ .PRECIOUS: Makefile -@ENABLE_PYGWY_TRUE@pygwy.defs: $(PYGWY_H_FILES) Makefile.am pygwy-fix-defs.py pygwy-fix-defs.sed +@ENABLE_PYGWY_TRUE@pygwy.defs: $(PYGWY_H_FILES) Makefile.am pygwy-fix-defs.py pygwy-fix-defs.sed extra.defs @ENABLE_PYGWY_TRUE@ $(AM_V_GEN)$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py $(PYGWY_H_FILES) \ -@ENABLE_PYGWY_TRUE@ | sed -f pygwy-fix-defs.sed >pygwy.defs.tmp -@ENABLE_PYGWY_TRUE@ $(PYTHON) $(srcdir)/pygwy-fix-defs.py $(PYGTK_CODEGENDIR) >pygwy.defs +@ENABLE_PYGWY_TRUE@ | sed -f pygwy-fix-defs.sed >pygwy.defs.tmp +@ENABLE_PYGWY_TRUE@ $(PYTHON) $(srcdir)/pygwy-fix-defs.py --codegendir=$(PYGTK_CODEGENDIR) >pygwy.defs @ENABLE_PYGWY_TRUE@ rm pygwy.defs.tmp -@ENABLE_PYGWY_TRUE@pygwy.lang: pygwy.defs -@ENABLE_PYGWY_TRUE@ $(AM_V_GEN)$(PYTHON) $(srcdir)/makelang.py pygwy.lang +@ENABLE_PYGWY_TRUE@pygwy.lang: pygwy.defs override.defs +@ENABLE_PYGWY_TRUE@ $(AM_V_GEN)cat pygwy.defs override.defs | $(PYTHON) $(srcdir)/makelang.py >pygwy.lang # The sed fixes pygwy_add_constants() and pygwy_register_classes() to static # functions, and standardized `generated' line for automated exclusions of @@ -1172,9 +1182,10 @@ @ENABLE_PYGWY_TRUE@ | sed -e 's/^void$$/static void/' -e 's/pygwy\.c/pygwywrap\.c/' \ @ENABLE_PYGWY_TRUE@ -e '1s#.*#/* This is a 'GENERATED' file */#' >pygwywrap.c -@ENABLE_PYGWY_TRUE@gwy.py: pygwy.defs pygwywrap.c +@ENABLE_PYGWY_TRUE@gwy.py: pygwy.defs override.defs pygwywrap.c pygwy-generate-doc.py @ENABLE_PYGWY_TRUE@ $(PYTHON) ./pygwy-generate-doc.py --codegendir $(PYGTK_CODEGENDIR) >gwy.py -@ENABLE_PYGWY_TRUE@pygwy-doc: gwy.py + +@ENABLE_PYGWY_TRUE@pygwy-doc: gwy.py gwyutils.py @ENABLE_PYGWY_TRUE@ $(EPYDOC) -v -o pygwy-doc gwy.py gwyutils.py @ENABLE_PYGWY_TRUE@@OS_MSWIN_TRUE@install-exec-hook: diff -Nru gwyddion-2.46/modules/pygwy/override.defs gwyddion-2.47/modules/pygwy/override.defs --- gwyddion-2.46/modules/pygwy/override.defs 1970-01-01 00:00:00.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/override.defs 2016-11-09 08:29:05.000000000 +0000 @@ -0,0 +1,73 @@ +(define-function gwy_app_data_browser_get_current + (c-name "gwy_app_data_browser_get_current") + (return-type "any") + (parameters + '("GwyAppWhat" "obj_type") + ) +) + +(define-function gwy_app_data_browser_get_containers + (c-name "gwy_app_data_browser_get_containers") + (return-type "list") +) + +(define-method get_data_pointer + (of-object "GwyDataLine") + (c-name "gwy_data_line_get_data_pointer") + (return-type "long") +) + +(define-method get_data_pointer + (of-object "GwyDataField") + (c-name "gwy_data_field_get_data_pointer") + (return-type "long") +) + +(define-method get_data_pointer + (of-object "GwyBrick") + (c-name "gwy_brick_get_data_pointer") + (return-type "long") +) + +(define-method keys_by_name + (of-object "GwyContainer") + (c-name "gwy_container_keys_by_name") + (return-type "list") +) + +(define-method get_value_by_name + (of-object "GwyContainer") + (c-name "gwy_container_get_value_by_name") + (return-type "any") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_value + (of-object "GwyContainer") + (c-name "gwy_container_get_value") + (return-type "any") + (parameters + '("int" "key") + ) +) + +(define-method set_value_by_name + (of-object "GwyContainer") + (c-name "gwy_container_set_value_by_name") + (parameters + '("const-gchar*" "name") + '("any" "value") + ) +) + +(define-method set_value + (of-object "GwyContainer") + (c-name "gwy_container_set_value") + (parameters + '("int" "key") + '("any" "value") + ) +) + diff -Nru gwyddion-2.46/modules/pygwy/pygwy.c gwyddion-2.47/modules/pygwy/pygwy.c --- gwyddion-2.46/modules/pygwy/pygwy.c 2015-12-17 13:37:30.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy.c 2016-11-15 12:22:37.000000000 +0000 @@ -1,6 +1,6 @@ /* - * @(#) $Id: pygwy.c 17802 2015-12-03 15:53:33Z yeti-dn $ - * Copyright (C) 2004 David Necas (Yeti), Petr Klapetek. + * @(#) $Id: pygwy.c 19265 2016-11-15 12:22:37Z yeti-dn $ + * Copyright (C) 2004-2016 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 @@ -21,25 +21,23 @@ /* Only one interpreter is created. After initialization of '__main__' * and 'gwy' module the directory is copied every time the independent - * pseudo-sub-interpreter is needed. So every plugin is called with + * pseudo-sub-interpreter is needed. So every module is called with * own copy of main dictionary created by create_environment() function * and destroyed by destroy_environment() which deallocate created copy. */ #include "config.h" - /* include this first, before NO_IMPORT_PYGOBJECT is defined */ #include #include #include "wrap_calls.h" +#include #include #include "pygwy.h" - -static void pygwy_create_py_list_of_containers (GwyContainer *data, gpointer list); #include "pygwywrap.c" #include "pygwy-console.h" -#line 43 "pygwy.c" +#line 41 "pygwy.c" #ifdef G_OS_WIN32 #include @@ -48,56 +46,81 @@ #define python_key "Software\\Python\\PythonCore\\" python_version "\\InstallPath" #endif +typedef enum { + PYGWY_UNDEFINED = -1, + PYGWY_PROCESS, + PYGWY_FILE, + PYGWY_GRAPH, + PYGWY_LAYER, + PYGWY_TOOL, + PYGWY_VOLUME, + PYGWY_XYZ, +} PygwyModuleType; + typedef struct { gchar *name; - gchar *filename; + gchar *fullpath; PyObject *code; time_t m_time; -} PygwyPluginInfo; - - -typedef enum { - PYGWY_PROCESS, PYGWY_FILE, PYGWY_GRAPH, PYGWY_LAYER, PYGWY_TOOL, PYGWY_VOLUME, PYGWY_UNDEFINED -} PygwyPluginType; - -static gboolean module_register (void); -static gboolean check_pygtk_availability(void); -static void pygwy_proc_run (GwyContainer *data, - GwyRunType run, - const gchar *name); -static void pygwy_graph_run (GwyGraph *graph, - const gchar *name); -static PygwyPluginInfo* pygwy_find_plugin (const gchar* name); -static gboolean pygwy_file_save_run (GwyContainer *data, - const gchar *filename, - GwyRunType mode, - GError **error, - const gchar *name); -static GwyContainer* pygwy_file_load_run (const gchar *filename, - GwyRunType mode, - GError **error, - const gchar *name); -static gint pygwy_file_detect_run (const GwyFileDetectInfo - *fileinfo, - gboolean only_name, - gchar *name); -static void pygwy_register_plugins(void); - -typedef struct { - GList *plugins; - PyObject *dict; - PyObject *main_module; + PygwyModuleType type; + /* Used dynamically during execution */ + PyObject *module; + PyObject *dict; + PyObject *func; } PygwyModuleInfo; -static PygwyModuleInfo s_pygwy; +static gboolean module_register (void); +static gboolean check_pygtk_availability (void); +static void pygwy_procvolxyz_run (GwyContainer *data, + GwyRunType run, + const gchar *name); +static void pygwy_graph_run (GwyGraph *graph, + const gchar *name); +static gboolean pygwy_file_save_run (GwyContainer *data, + const gchar *filename, + GwyRunType mode, + GError **error, + const gchar *name); +static GwyContainer* pygwy_file_load_run (const gchar *filename, + GwyRunType mode, + GError **error, + const gchar *name); +static gint pygwy_file_detect_run (const GwyFileDetectInfo *fileinfo, + gboolean only_name, + const gchar *name); +static void pygwy_register_modules (void); +static void free_module_info (PygwyModuleInfo *info); +static gboolean update_module_code (PygwyModuleInfo *info); +static PygwyModuleInfo* pygwy_find_module (const gchar* name); +static PygwyModuleInfo* prepare_to_run_module_function(const gchar *name, + const gchar *funcname); +static void finalize_module_function (PygwyModuleInfo *info); +static PyObject* get_attribute_recursive (PyObject *obj, + ...); +static gint find_out_number_of_arguments (PyObject *func); +static gchar* find_out_class_name (PyObject *obj); + +static PyObject *pygwy_module = NULL; +static PyObject *pygwy_dict = NULL; +static GList *registered_modules = NULL; + +static const GwyEnum module_types[] = { + { "PROCESS", PYGWY_PROCESS, }, + { "FILE", PYGWY_FILE, }, + { "GRAPH", PYGWY_GRAPH, }, +/* { "LAYER", PYGWY_LAYER, }, */ +/* { "TOOL", PYGWY_TOOL, }, */ + { "VOLUME", PYGWY_VOLUME, }, + { "XYZ", PYGWY_XYZ, }, +}; static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, &module_register, N_("Pygwy, the Gwyddion Python wrapper."), - "Jan Hořák ", - "0.7", - "Jan Hořák", + "Jan Hořák , Yeti ", + "2.0", + "Jan Hořák & David Nečas (Yeti)", "2007" }; @@ -109,7 +132,7 @@ if (!check_pygtk_availability()) return FALSE; - pygwy_register_plugins(); + pygwy_register_modules(); pygwy_register_console(); return TRUE; } @@ -208,50 +231,37 @@ /* Do not register signal handlers */ Py_InitializeEx(0); gwy_debug("Add main module"); - s_pygwy.main_module = PyImport_AddModule("__main__"); + pygwy_module = PyImport_AddModule("__main__"); gwy_debug("Init pygobject"); init_pygobject(); gwy_debug("Init module gwy"); m = Py_InitModule("gwy", (PyMethodDef*) pygwy_functions); gwy_debug("Get dict"); - s_pygwy.dict = PyModule_GetDict(m); + pygwy_dict = PyModule_GetDict(m); gwy_debug("Register classes"); - pygwy_register_classes(s_pygwy.dict); + pygwy_register_classes(pygwy_dict); gwy_debug("Register constaints"); pygwy_add_constants(m, "GWY_"); - } else { - gwy_debug("Python interpreter already initialized"); - } -} - -void -pygwy_run_string(const char *cmd, int type, PyObject *g, PyObject *l) { - PyObject *ret = PyRun_String(cmd, type, g, l); - if (!ret) { - PyErr_Print(); } else { - Py_DECREF(ret); + gwy_debug("Python interpreter already initialized"); } } static void pygwy_show_stderr(gchar *str) { - GtkWidget *dlg, *scroll, *frame, *b_close, *text; + GtkWidget *dlg, *scroll, *text; - dlg = gtk_dialog_new(); + dlg = gtk_dialog_new_with_buttons(_("Python Interpreter Errors"), NULL, 0, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + NULL); gtk_window_set_default_size(GTK_WINDOW(dlg), 600, 350); - gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_title(GTK_WINDOW(dlg), "Python interpreter result"); - - frame = gtk_frame_new(NULL); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, TRUE, TRUE, 0); scroll = gtk_scrolled_window_new(NULL, NULL); - gtk_container_add(GTK_CONTAINER(frame), scroll); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), scroll, TRUE, TRUE, 0); text = gtk_text_view_new(); gtk_container_add(GTK_CONTAINER(scroll), text); @@ -260,9 +270,6 @@ str, -1); - b_close = gtk_button_new_from_stock("gtk-close"); - gtk_dialog_add_action_widget(GTK_DIALOG(dlg), b_close, 0); - gtk_widget_show_all(dlg); gtk_dialog_run(GTK_DIALOG(dlg)); gtk_widget_destroy(dlg); @@ -272,33 +279,24 @@ pygwy_initialize_stderr_redirect(PyObject *d) { /* redirect stderr to temporary file */ - pygwy_run_string("import sys, tempfile\n" - "_stderr_redir = tempfile.TemporaryFile()\n" - "_stderr_orig = sys.stderr\n" - "sys.stderr = _stderr_redir\n", - Py_file_input, - d, - d); + pygwy_run_string(pygwy_stderr_redirect_setup_code, Py_file_input, d, d); } +/* rewind redirected stderr file, read its content and display it in error + * window */ static void pygwy_finalize_stderr_redirect(PyObject *d) { PyObject *py_stderr; gchar *buf; - /* rewind redirected stderr file, read its content and display it in error window */ - pygwy_run_string("_stderr_redir.seek(0)\n" - "_stderr_str = _stderr_redir.read()\n" - "_stderr_redir.close()\n" - "sys.stderr = _stderr_orig", - Py_file_input, - d, - d); - py_stderr = PyDict_GetItemString(d, "_stderr_str"); + + pygwy_run_string(pygwy_stderr_redirect_restore_code, Py_file_input, d, d); + py_stderr = PyDict_GetItemString(d, "_pygwy_stderr_string"); if (py_stderr && PyString_Check(py_stderr)) { buf = PyString_AsString(py_stderr); - gwy_debug("Pygwy plugin stderr output:\n%s", buf); - if (buf[0] != '\0') /* show stderr only when it is not empty string */ + gwy_debug("Pygwy module stderr output:\n%s", buf); + /* show stderr only when it is not empty string */ + if (buf[0] != '\0') pygwy_show_stderr(buf); } } @@ -324,991 +322,706 @@ augment_sys_path(PyObject *d) { const gchar *userdir; - gchar *plugin_dir_name, *datadir; + gchar *module_dir_name, *datadir; - /* add .gwyddion/pygwy to sys.path */ + /* add ~/.gwyddion/pygwy to sys.path */ userdir = gwy_get_user_dir(); - plugin_dir_name = g_build_filename(userdir, pygwy_plugin_dir_name, NULL); - pygwy_add_sys_path(d, plugin_dir_name); - g_free(plugin_dir_name); + module_dir_name = g_build_filename(userdir, pygwy_module_dir_name, NULL); + pygwy_add_sys_path(d, module_dir_name); + g_free(module_dir_name); /* add /usr/local/share/gwyddion/pygwy to sys.path */ datadir = gwy_find_self_dir("data"); - plugin_dir_name = g_build_filename(datadir, pygwy_plugin_dir_name, NULL); - pygwy_add_sys_path(d, plugin_dir_name); - g_free(plugin_dir_name); + module_dir_name = g_build_filename(datadir, pygwy_module_dir_name, NULL); + pygwy_add_sys_path(d, module_dir_name); + g_free(module_dir_name); } PyObject* pygwy_create_environment(const gchar *filename, gboolean show_errors) { - PyObject *d, *plugin_filename; + PyObject *d, *module_filename; char *argv[1]; argv[0] = NULL; - d = PyDict_Copy(PyModule_GetDict(s_pygwy.main_module)); + d = PyDict_Copy(PyModule_GetDict(pygwy_module)); + if (!d) { + g_warning("Cannot create copy of Python dictionary."); + return NULL; + } + /* set __file__ variable for clearer error reporting */ - plugin_filename = Py_BuildValue("s", filename); - PyDict_SetItemString(d, "__file__", plugin_filename); + module_filename = Py_BuildValue("s", filename); + PyDict_SetItemString(d, "__file__", module_filename); PySys_SetArgv(0, argv); + Py_DECREF(module_filename); /* redirect stderr and stdout of python script to temporary file */ if (show_errors) - pygwy_initialize_stderr_redirect(d); + pygwy_initialize_stderr_redirect(d); augment_sys_path(d); return d; } +/* show content of temporary file which contains stderr and stdout of python + * script and close it */ static void -destroy_environment(PyObject *d, gboolean show_errors) { - /* show content of temporary file which contains stderr and stdout of python */ - /* script and close it */ +destroy_environment(PyObject *d, gboolean show_errors) +{ + if (!d) + return; if (show_errors) - pygwy_finalize_stderr_redirect(d); + pygwy_finalize_stderr_redirect(d); PyDict_Clear(d); Py_DECREF(d); } +static void +err_PYTHON(GError **error) +{ + g_set_error(error, GWY_MODULE_FILE_ERROR, GWY_MODULE_FILE_ERROR_SPECIFIC, + _("Python interpreter error occurred.")); +} + static const gchar* -pygwy_read_val_from_dict(PyObject *d, char *v, const gchar *f) +pygwy_read_val_from_dict(PyObject *dict, char *v, const gchar *f) { - const char *ret = NULL; + const char *ret; PyObject *py_str; - py_str = PyDict_GetItemString(d, v); - if (py_str) { - if (!PyArg_Parse(py_str, "s", &ret)) { - ret = NULL; + if ((py_str = PyDict_GetItemString(dict, v))) { + if (PyArg_Parse(py_str, "s", &ret)) { + gwy_debug("Read value '%s' from '%s': %s", v, f, ret); + return ret; } } - if (!ret) { - g_warning("Value '%s' not found in '%s' dict.", v, f); - } else { - gwy_debug("Read value '%s' from '%s': %s", v, f, ret); - } - return ret; + g_warning("Value '%s' not found in '%s'.", v, f); + return NULL; } -static void -pygwy_get_plugin_metadata(const gchar *filename, - const gchar *module, - PyObject **code, - gchar **name, - const gchar **desc, - const gchar **menu_path, - PygwyPluginType *type) +/* Contract: It must either return NULL or PygwyModuleInfo that is correct + * for given module type with all required fields filled. */ +static PygwyModuleInfo* +pygwy_get_module_info(const gchar *fullpath, const gchar *filename, + const gchar **desc, const gchar **menu_path) { - gchar *plugin_file_content, *suffix; + PygwyModuleInfo *info = NULL; + gchar *suffix; const gchar *type_str; - PyObject *plugin_module = NULL, *d, *plugin_dict; - GError *err = NULL; - gboolean error = FALSE; + PyObject *module = NULL, *d, *module_dict; - *code = NULL; - *name = NULL; - *menu_path = NULL; - *type = PYGWY_UNDEFINED; - - if (!g_file_get_contents(filename, - &plugin_file_content, - NULL, - &err)) { - g_warning("Cannot read content of file '%s'", filename); - return; - } - d = pygwy_create_environment(filename, TRUE); + info = g_new0(PygwyModuleInfo, 1); + info->fullpath = g_strdup(fullpath); + info->type = PYGWY_UNDEFINED; + + info->name = g_path_get_basename(fullpath); + suffix = g_strrstr(info->name, "."); + if (suffix) + *suffix = '\0'; + gwy_debug("module name: %s", info->name); - /* clear read values */ + if (!(d = pygwy_create_environment(fullpath, TRUE))) + goto fail; + + if (!update_module_code(info)) + goto fail; - if (!d) { - g_warning("Cannot create copy of Python dictionary."); - PyErr_Print(); - error = TRUE; - goto error; - } - /* compile file of given filename to module */ - *code = Py_CompileString((char*)plugin_file_content, - module, - Py_file_input); /* new ref */ - if (!(*code)) { - g_warning("Cannot compile plugin file '%s'", filename); - PyErr_Print(); - error = TRUE; - goto error; - } /* Execute compiled module */ - plugin_module = PyImport_ExecCodeModule("get_data", *code); /* new ref */ - if (!plugin_module) { - g_warning("Cannot exec plugin code in file '%s'", filename); - PyErr_Print(); - error = TRUE; - goto error; + module = PyImport_ExecCodeModule("get_data", info->code); /* new ref */ + if (!module) { + g_warning("Cannot exec module code in file '%s'", fullpath); + goto fail; } - plugin_dict = PyModule_GetDict(plugin_module); + /* Get parameters from dict */ - *name = g_path_get_basename(filename); - suffix = g_strrstr(*name, "."); - suffix[0] = '\0'; - gwy_debug("plugin name: %s", *name); - type_str = pygwy_read_val_from_dict(plugin_dict, "plugin_type", filename); - gwy_debug("read values: %s %p", *type_str, type_str); + module_dict = PyModule_GetDict(module); + type_str = pygwy_read_val_from_dict(module_dict, "plugin_type", fullpath); + gwy_debug("read values: %s %p", type_str, type_str); if (!type_str) { - g_warning("Undefined plugin type, cannot load."); - *type = PYGWY_UNDEFINED; - error = TRUE; - goto error; - } - /* FIXME: move string somewhere else */ - if (g_ascii_strcasecmp("PROCESS", type_str) == 0) { - *type = PYGWY_PROCESS; - } else if (g_ascii_strcasecmp("FILE", type_str) == 0) { - *type = PYGWY_FILE; - } else if (g_ascii_strcasecmp("GRAPH", type_str) == 0) { - *type = PYGWY_GRAPH; - } else if (g_ascii_strcasecmp("LAYER", type_str) == 0) { - *type = PYGWY_LAYER; - } else if (g_ascii_strcasecmp("TOOL", type_str) == 0) { - *type = PYGWY_TOOL; - } else if (g_ascii_strcasecmp("VOLUME", type_str) == 0) { - *type = PYGWY_VOLUME; - } else { - g_warning("Unknown type '%s' in '%s'", type_str, filename); - *type = PYGWY_UNDEFINED; - } - *desc = pygwy_read_val_from_dict(plugin_dict, "plugin_desc", filename); - if (*type == PYGWY_PROCESS || *type == PYGWY_GRAPH || *type == PYGWY_VOLUME) - *menu_path = pygwy_read_val_from_dict(plugin_dict, "plugin_menu", - filename); - gwy_debug("read values: %s %s %p %p", *desc, *menu_path, *desc, *menu_path); - -error: - if (error) { - Py_XDECREF(*code); - *code = NULL; - } - Py_XDECREF(plugin_module); - g_free(plugin_file_content); - destroy_environment(d, TRUE); -} - -static PygwyPluginInfo* -pygwy_create_plugin_info(gchar *filename, gchar *name, PyObject *code) -{ - PygwyPluginInfo *info; - struct stat file_stat; - - info = g_new(PygwyPluginInfo, 1); - info->name = name; - info->filename = filename; - info->code = code; - g_stat(filename, &file_stat); - info->m_time = file_stat.st_mtime; - return info; -} - -static gboolean -pygwy_register_file_plugin(gchar *filename, - PyObject *code, - gchar *name, - const gchar *desc) -{ - PygwyPluginInfo *info; - gwy_debug("%s, %s, %s", filename, name, desc); - if (!code) { - g_warning("Cannot create code object for file '%s'", filename); - return FALSE; - } - if (!name) { - g_warning("Cannot register. Undefined 'plugin_name' variable in '%s'", - filename); - return FALSE; - } - if (!desc) { - g_warning("Cannot register. Undefined 'plugin_desc' variable in '%s'", - filename); - return FALSE; - } - info = pygwy_create_plugin_info(filename, name, code); - - gwy_debug("Registering file func."); - if (gwy_file_func_register(info->name, - desc, - (GwyFileDetectFunc)&pygwy_file_detect_run, - (GwyFileLoadFunc)&pygwy_file_load_run, - NULL, - (GwyFileSaveFunc)&pygwy_file_save_run)) { - s_pygwy.plugins = g_list_append(s_pygwy.plugins, info); - } - else { - g_warning("Cannot register plugin '%s'", filename); - gwy_debug("Free: %s %s", info->name, info->filename); - g_free(info->name); - g_free(info->filename); - g_free(info); - return FALSE; - } - return TRUE; -} - -static gboolean -pygwy_register_proc_plugin(gchar *filename, - PyObject *code, - gchar *name, - const gchar *menu_path) -{ - PygwyPluginInfo *info; - - if (!code) { - g_warning("Cannot create code object for file '%s'", filename); - return FALSE; - } - if (!name) { - g_warning("Cannot register. Undefined 'plugin_name' variable in '%s'", - filename); - return FALSE; - } - if (!menu_path) { - g_warning("Cannot register. Undefined 'menu_path' variable in '%s'", - filename); - return FALSE; - } - info = pygwy_create_plugin_info(filename, name, code); - - gwy_debug("Registering proc func."); - if (gwy_process_func_register(info->name, - pygwy_proc_run, - menu_path, - NULL, - GWY_RUN_IMMEDIATE, - GWY_MENU_FLAG_DATA, /* TODO: determine correct flag */ - N_("Function written in Python")) ) { /* not very descriptive */ - /* append plugin to list of plugins */ - s_pygwy.plugins = g_list_append(s_pygwy.plugins, info); - } - else { - g_warning("Cannot register plugin '%s'", filename); - g_free(info->name); - g_free(info->filename); - g_free(info); - return FALSE; - } - return TRUE; - -} - -static gboolean -pygwy_register_graph_plugin(gchar *filename, - PyObject *code, - gchar *name, - const gchar *menu_path) -{ - PygwyPluginInfo *info; - - if (!code) { - g_warning("Cannot create code object for file '%s'", filename); - return FALSE; - } - if (!name) { - g_warning("Cannot register. Undefined 'plugin_name' variable in '%s'", - filename); - return FALSE; + g_warning("Undefined module type, cannot load."); + goto fail; } - if (!menu_path) { - g_warning("Cannot register. Undefined 'plugin_desc' variable in '%s'", - filename); - return FALSE; + info->type = gwy_string_to_enum(type_str, + module_types, G_N_ELEMENTS(module_types)); + if (info->type == PYGWY_UNDEFINED) { + g_warning("Unrecognised module type %s, cannot load.", type_str); + goto fail; + } + + /* plugin_desc is required for file modules (as the file type) */ + *desc = pygwy_read_val_from_dict(module_dict, "plugin_desc", fullpath); + if (info->type == PYGWY_FILE && !*desc) { + info->type = PYGWY_UNDEFINED; + goto fail; + } + else if (!*desc) + *desc = N_("Function written in Python"); /* Not very descriptive. */ + + /* menu path is required for all something-processing modules */ + if (info->type == PYGWY_PROCESS || info->type == PYGWY_GRAPH + || info->type == PYGWY_VOLUME || info->type == PYGWY_XYZ) { + *menu_path = pygwy_read_val_from_dict(module_dict, "plugin_menu", + fullpath); + if (!*menu_path) { + info->type = PYGWY_UNDEFINED; + goto fail; + } } - info = pygwy_create_plugin_info(filename, name, code); + gwy_debug("read values: %s %s", *desc, *menu_path); - gwy_debug("Registering proc func."); - if (gwy_graph_func_register(info->name, - pygwy_graph_run, - menu_path, - GWY_STOCK_GRAPH_FUNCTION, - GWY_MENU_FLAG_GRAPH, /* TODO: determine correct flag */ - N_("Graph function written in Python")) ) { /* not very descriptive */ - /* append plugin to list of plugins */ - s_pygwy.plugins = g_list_append(s_pygwy.plugins, info); - } - else { - g_warning("Cannot register plugin '%s'", filename); - g_free(info->name); - g_free(info->filename); - g_free(info); - return FALSE; +fail: + if (info->type == PYGWY_UNDEFINED) { + PyErr_Print(); + free_module_info(info); + info = NULL; } - return TRUE; + Py_XDECREF(module); + destroy_environment(d, TRUE); + return info; } -static gboolean -pygwy_register_volume_plugin(gchar *filename, - PyObject *code, - gchar *name, - const gchar *menu_path) +static void +free_module_info(PygwyModuleInfo *info) { - PygwyPluginInfo *info; - - if (!code) { - g_warning("Cannot create code object for file '%s'", filename); - return FALSE; - } - if (!name) { - g_warning("Cannot register. Undefined 'plugin_name' variable in '%s'", - filename); - return FALSE; - } - if (!menu_path) { - g_warning("Cannot register. Undefined 'menu_path' variable in '%s'", - filename); - return FALSE; - } - info = pygwy_create_plugin_info(filename, name, code); - - gwy_debug("Registering volume func."); - if (gwy_volume_func_register(info->name, - pygwy_proc_run, - menu_path, - NULL, - GWY_RUN_IMMEDIATE, - GWY_MENU_FLAG_VOLUME, - N_("Function written in Python")) ) { /* not very descriptive */ - /* append plugin to list of plugins */ - s_pygwy.plugins = g_list_append(s_pygwy.plugins, info); - } - else { - g_warning("Cannot register plugin '%s'", filename); - g_free(info->name); - g_free(info->filename); - g_free(info); - return FALSE; - } - return TRUE; + if (!info) + return; + g_free(info->name); + g_free(info->fullpath); + Py_XDECREF(info->code); + g_free(info); } static void -pygwy_register_plugins(void) +pygwy_register_modules(void) { - /* FIXME: maybe place somewhere else */ - GDir *plugin_dir; - const gchar *plugin_filename; - gchar *plugin_fullpath_filename, *plugin_dir_name, *plugin_name; - const gchar *plugin_desc = NULL, *plugin_menu_path = NULL; - PygwyPluginType plugin_type = PYGWY_UNDEFINED; + GDir *module_dir; + gchar *fullpath, *module_dir_name; + const gchar *desc, *menu_path, *filename; + PygwyModuleInfo *info; GError *err = NULL; - PyObject *plugin_code, *dict; - - /* reset static list */ - s_pygwy.plugins = NULL; + gboolean ok; - plugin_dir_name = g_build_filename(gwy_get_user_dir(), - pygwy_plugin_dir_name, + module_dir_name = g_build_filename(gwy_get_user_dir(), + pygwy_module_dir_name, NULL); - gwy_debug("Plugin path: %s", plugin_dir_name); + gwy_debug("Module path: %s", module_dir_name); - plugin_dir = g_dir_open(plugin_dir_name, 0, &err); - if (plugin_dir == NULL && err) { + module_dir = g_dir_open(module_dir_name, 0, &err); + if (module_dir == NULL && err) { if (err->code == G_FILE_ERROR_NOENT) { /* directory not found/does not exist */ - if (g_mkdir(plugin_dir_name, 0700)) { - g_warning("Cannot create pygwy plugin directory %s", - plugin_dir_name); - } else { - gwy_debug("Pygwy directory created: %s", plugin_dir_name); + if (g_mkdir(module_dir_name, 0700)) { + g_warning("Cannot create pygwy module directory %s", + module_dir_name); } - } else { + else { + gwy_debug("Pygwy directory created: %s", module_dir_name); + } + } + else { g_warning("Cannot open pygwy directory: %s, reason: %s", - plugin_dir_name, - err->message); + module_dir_name, err->message); } - g_free(plugin_dir_name); - /* Whenever the directory has been created or not, there is no reason + g_free(module_dir_name); + /* Whether the directory has been created or not, there is no reason to continue by reading scripts as long as no script is available */ return; } - /* initialize python iterpret and init gwy module */ + + /* Initialize python iterpret and init gwy module */ pygwy_initialize(); - /* try to register each file with python extension in pygwy plugin directory */ - while ((plugin_filename = g_dir_read_name(plugin_dir))) { - if (g_str_has_suffix(plugin_filename, ".py") - || g_str_has_suffix(plugin_filename, ".PY") - || g_str_has_suffix(plugin_filename, ".Py") ) { - /* Read content of plugin file */ - plugin_fullpath_filename = g_build_filename(plugin_dir_name, - plugin_filename, - NULL); - /* get plugin's metadata */ - pygwy_get_plugin_metadata(plugin_fullpath_filename, - plugin_filename, - &plugin_code, - &plugin_name, - &plugin_desc, - &plugin_menu_path, - &plugin_type); - gwy_debug("plugin_type: %d", plugin_type); - switch(plugin_type) { - case PYGWY_PROCESS: - if (plugin_code != NULL - && plugin_name != NULL - && plugin_menu_path != NULL) - { - pygwy_register_proc_plugin(plugin_fullpath_filename, - plugin_code, - plugin_name, - plugin_menu_path); - } else { - g_warning("Could not register process module: " - "variables plugin_menu, " - "plugin_type and plugin_name not defined."); - } - break; - case PYGWY_FILE: - if (plugin_code != NULL - && plugin_name != NULL - && plugin_desc != NULL) - { - pygwy_register_file_plugin(plugin_fullpath_filename, - plugin_code, - plugin_name, - plugin_desc); - } else { - g_warning("Could not register file module:" - " variables plugin_desc, plugin_type" - " and plugin_name not defined."); - } - break; - case PYGWY_GRAPH: - printf("%s %s\n", plugin_name, plugin_desc); - if (plugin_code && plugin_name && plugin_desc) { - pygwy_register_graph_plugin(plugin_fullpath_filename, - plugin_code, - plugin_name, - plugin_desc); - - } else { - g_warning("Could not register graph module:" - " variables plugin_desc, plugin_type" - " and plugin_name not defined."); - } - - break; - case PYGWY_VOLUME: - if (plugin_code != NULL - && plugin_name != NULL - && plugin_menu_path != NULL) - { - pygwy_register_volume_plugin(plugin_fullpath_filename, - plugin_code, - plugin_name, - plugin_menu_path); - } else { - g_warning("Could not register volume module: " - "variables plugin_menu, " - "plugin_type and plugin_name not defined."); - } - break; - case PYGWY_UNDEFINED: - g_warning("Cannot register plugin without defined " - "'plugin_type' variable ('%s')", - plugin_fullpath_filename); - break; - default: - g_warning("Rest of plugin types not yet implemented"); /*TODO: PYGWY_LAYER, PYGWY_TOOL */ - } /* switch */ - /* reset plugin_code, plugin_name, plugin_desc, plugin_menu_path, plugin_type */ - plugin_name = NULL; - plugin_desc = NULL; - plugin_menu_path = NULL; - plugin_type = PYGWY_UNDEFINED; - /* remove variables from dictionary */ - dict = PyModule_GetDict(s_pygwy.main_module); - if (dict && PyDict_GetItemString(dict, "plugin_desc")) { - gwy_debug("remove plugin_desc"); - PyDict_DelItemString(dict, "plugin_desc"); - } - if (dict && PyDict_GetItemString(dict, "plugin_menu")) { - gwy_debug("remove plugin_menu"); - PyDict_DelItemString(dict, "plugin_menu"); - } - if (dict && PyDict_GetItemString(dict, "plugin_type")) { - gwy_debug("remove plugin_type"); - PyDict_DelItemString(dict, "plugin_type"); - } - } else { /* if (check suffix) */ - gwy_debug("wrong extension for file: %s", plugin_filename); + while ((filename = g_dir_read_name(module_dir))) { + if (!g_str_has_suffix(filename, ".py") + && !g_str_has_suffix(filename, ".PY") + && !g_str_has_suffix(filename, ".Py")) { + gwy_debug("Skipping file with wrong extension: %s", filename); + continue; + } + + /* Read content of module file */ + fullpath = g_build_filename(module_dir_name, filename, NULL); + + /* get module's metadata */ + desc = NULL; + menu_path = NULL; + info = pygwy_get_module_info(fullpath, filename, &desc, &menu_path); + g_free(fullpath); + if (!info) + continue; + + gwy_debug("module type: %d", info->type); + if (info->type == PYGWY_PROCESS) { + gwy_debug("Registering proc func."); + ok = gwy_process_func_register(info->name, pygwy_procvolxyz_run, + menu_path, + NULL, + GWY_RUN_INTERACTIVE | GWY_RUN_IMMEDIATE, + GWY_MENU_FLAG_DATA, desc); } - } - g_dir_close(plugin_dir); - g_free(plugin_dir_name); + else if (info->type == PYGWY_FILE) { + gwy_debug("Registering file func."); + ok = gwy_file_func_register(info->name, + desc, + pygwy_file_detect_run, + pygwy_file_load_run, + NULL, + pygwy_file_save_run); + } + else if (info->type == PYGWY_GRAPH) { + gwy_debug("Registering graph func."); + ok = gwy_graph_func_register(info->name, + pygwy_graph_run, + menu_path, + GWY_STOCK_GRAPH_FUNCTION, + GWY_MENU_FLAG_GRAPH, + desc); + } + else if (info->type == PYGWY_VOLUME) { + gwy_debug("Registering volume func."); + ok = gwy_volume_func_register(info->name, + pygwy_procvolxyz_run, + menu_path, + NULL, + GWY_RUN_IMMEDIATE, + GWY_MENU_FLAG_VOLUME, + desc); + } + else if (info->type == PYGWY_XYZ) { + gwy_debug("Registering xyz func."); + ok = gwy_volume_func_register(info->name, + pygwy_procvolxyz_run, + menu_path, + NULL, + GWY_RUN_IMMEDIATE, + GWY_MENU_FLAG_XYZ, + desc); + } + else { + g_assert_not_reached(); + } + + if (ok) + registered_modules = g_list_append(registered_modules, info); + else + free_module_info(info); + } + g_dir_close(module_dir); + g_free(module_dir_name); } -static void -pygwy_reload_code(PygwyPluginInfo **info) +/* (Re)load module code. The function succeeds if, after finishing, we have + * any module code at all. So when the module has been loaded once but then + * cannot be reloaded we just keep the old version and succeed. */ +static gboolean +update_module_code(PygwyModuleInfo *info) { struct stat file_stat; - gchar *plugin_file_content; + gchar *module_file_content, *s; PyObject *code_obj; GError *err; - gwy_debug("Reloading code from '%s'", (*info)->filename); - if (!g_stat((*info)->filename, &file_stat)) { - if (file_stat.st_mtime != (*info)->m_time) { - gwy_debug("File '%s' has been changed. Re-reading file.", - (*info)->filename); - if (!g_file_get_contents((*info)->filename, - &plugin_file_content, - NULL, - &err)) { - g_warning("Cannot read content of file '%s'", - (*info)->filename); - } - code_obj = Py_CompileString((char *)plugin_file_content, - (*info)->name, - Py_file_input); /* new ref */ - if (!code_obj) { - g_warning("Cannot create code object for file '%s'", - (*info)->filename); - PyErr_Print(); - return; - } - (*info)->code = code_obj; /* XXX: override info->code without Py_DECREF is ok? */ - (*info)->m_time = file_stat.st_mtime; - } else { - gwy_debug("No changes in '%s' since last run.", (*info)->filename); - } - } else { + gwy_debug("Updating module code from '%s'", info->fullpath); + if (g_stat(info->fullpath, &file_stat)) { g_warning("Cannot get last modification time for file '%s'", - (*info)->filename); + info->fullpath); + return !!info->code; } -} - -static gboolean -pygwy_check_func(PyObject *m, gchar *name, gchar *filename) -{ - gboolean ret; - PyObject *func; - - if (!m) { - g_warning("Undefined pygwy module == NULL ('%s')", filename); - return FALSE; + if (info->code && file_stat.st_mtime == info->m_time) { + gwy_debug("No changes in '%s' since last run.", info->fullpath); + return TRUE; } - func = PyDict_GetItemString(PyModule_GetDict(m), name); - if (!func) { - g_warning("Function '%s' not found in '%s'", name, filename); - return FALSE; + gwy_debug("File '%s' has to be loaded.", info->fullpath); + if (!g_file_get_contents(info->fullpath, &module_file_content, NULL, + &err)) { + g_warning("Cannot read content of file '%s'", info->fullpath); + return !!info->code; } - if (!PyCallable_Check(func)) { - g_warning("Function '%s' in '%s' is not defined.", name, filename); - ret = FALSE; - } else { - ret = TRUE; + /* Ensure gwy is always available as we promised. */ + s = g_strconcat("import gwy\n\n", module_file_content, NULL); + g_free(module_file_content); + module_file_content = s; + + code_obj = Py_CompileString(module_file_content, info->name, Py_file_input); + if (!code_obj) { + g_free(module_file_content); + g_warning("Cannot create code object for file '%s'", info->fullpath); + PyErr_Print(); + return !!info->code; } - return ret; + + g_free(module_file_content); + GWY_SWAP(PyObject*, info->code, code_obj); + Py_XDECREF(code_obj); + info->m_time = file_stat.st_mtime; + return TRUE; } static void -pygwy_proc_run(GwyContainer *data, GwyRunType run, const gchar *name) +pygwy_procvolxyz_run(GwyContainer *data, GwyRunType run, const gchar *name) { - PygwyPluginInfo *info; - PyObject *py_container, *module, *d; - gchar *cmd; - - /* find plugin */ - if (!(info = pygwy_find_plugin(name))) { - g_warning("Cannot find plugin '%s'.", name); - return; - } - gwy_debug("Running plugin '%s', filename '%s'", - info->name, - info->filename); - - /* create new environment */ - d = pygwy_create_environment(info->filename, TRUE); - if (!d) { - g_warning("Cannot create copy of Python dictionary."); - return; - } + PygwyModuleInfo *info; + PyObject *py_container = NULL, *res = NULL; + gint nargs; - /* check last and current file modification time and override */ - /* the code if required */ - pygwy_reload_code(&info); - gwy_debug("Import module and check for 'run' func"); - /* import, execute the module and check for 'run' func */ - module = PyImport_ExecCodeModule(info->name, info->code); - if (!pygwy_check_func(module, "run", info->filename)) { - destroy_environment(d, TRUE); + if (!(info = prepare_to_run_module_function(name, "run"))) return; - } - - gwy_debug("Running plugin '%s', filename '%s'", info->name, info->filename); - /* create container named 'data' to allow access the container from python */ py_container = pygobject_new((GObject*)data); - if (!py_container) { - g_warning("Variable 'gwy.data' was not inicialized."); + nargs = find_out_number_of_arguments(info->func); + if (nargs == 0) { + /* Legacy API; module expects a global variable "data" */ + PyDict_SetItemString(pygwy_dict, "data", py_container); + res = PyObject_CallFunction(info->func, NULL); + PyDict_DelItemString(pygwy_dict, "data"); + } + else if (nargs == 1) + res = PyObject_CallFunction(info->func, "O", py_container); + else if (nargs == 2) + res = PyObject_CallFunction(info->func, "Oi", py_container, run); + else { + g_warning("Function run() has wrong number of arguments: %d.", nargs); + goto fail; } - PyDict_SetItemString(s_pygwy.dict, "data", py_container); - - /* import module using precompiled code and run its 'run()' function */ - cmd = g_strdup_printf("import %s\n" - "%s.run()", - info->name, - info->name); - pygwy_run_string(cmd, Py_file_input, d, d); - g_free(cmd); + if (!res) + PyErr_Print(); - Py_DECREF(module); - Py_DECREF(py_container); /*FIXME */ - destroy_environment(d, TRUE); +fail: + Py_XDECREF(res); + Py_XDECREF(py_container); + finalize_module_function(info); } static void pygwy_graph_run(GwyGraph *graph, const gchar *name) { - PygwyPluginInfo *info; - PyObject *py_graph, *module, *d; - gchar *cmd; - - /* find plugin */ - if (!(info = pygwy_find_plugin(name))) { - g_warning("Cannot find plugin '%s'.", name); - return; - } - gwy_debug("Running plugin '%s', filename '%s'", - info->name, - info->filename); + PygwyModuleInfo *info; + PyObject *py_graph = NULL, *res = NULL; + gint nargs; - /* create new environment */ - d = pygwy_create_environment(info->filename, TRUE); - if (!d) { - g_warning("Cannot create copy of Python dictionary."); + if (!(info = prepare_to_run_module_function(name, "run"))) return; - } - - /* check last and current file modification time and override */ - /* the code if required */ - pygwy_reload_code(&info); - gwy_debug("Import module and check for 'run' func"); - /* import, execute the module and check for 'run' func */ - module = PyImport_ExecCodeModule(info->name, info->code); - if (!pygwy_check_func(module, "run", info->filename)) { - destroy_environment(d, TRUE); - return; - } - - gwy_debug("Running plugin '%s', filename '%s'", info->name, info->filename); - /* create graph named 'graph' to allow access the graph object from python */ py_graph = pygobject_new((GObject*)graph); - if (!py_graph) { - g_warning("Variable 'gwy.data' was not inicialized."); + nargs = find_out_number_of_arguments(info->func); + if (nargs == 0) { + /* Legacy API; module expects a global variable "graph" */ + PyDict_SetItemString(pygwy_dict, "graph", py_graph); + res = PyObject_CallFunction(info->func, NULL); + PyDict_DelItemString(pygwy_dict, "graph"); } - PyDict_SetItemString(s_pygwy.dict, "graph", py_graph); - - /* import module using precompiled code and run its 'run()' function */ - cmd = g_strdup_printf("import %s\n" - "%s.run()", - info->name, - info->name); - pygwy_run_string(cmd, Py_file_input, d, d); - g_free(cmd); + else if (nargs == 1) + res = PyObject_CallFunction(info->func, "O", py_graph); + else { + g_warning("Function run() has wrong number of arguments: %d.", nargs); + goto fail; + } + if (!res) + PyErr_Print(); - Py_DECREF(module); - Py_DECREF(py_graph); /*FIXME */ - destroy_environment(d, TRUE); +fail: + Py_XDECREF(res); + Py_XDECREF(py_graph); + finalize_module_function(info); } - static gboolean -pygwy_file_save_run(GwyContainer *data, - const gchar *filename, - GwyRunType mode, +pygwy_file_save_run(GwyContainer *data, const gchar *filename, GwyRunType mode, GError **error, const gchar *name) { - PyObject *py_filename, *module, *py_res, *d; - PyObject *py_container; - PygwyPluginInfo *info; - gchar *cmd; - gboolean res; - - /* find plugin */ - if (!(info = pygwy_find_plugin(name))) { - g_warning("Cannot find plugin '%s'.", name); - return FALSE; - } - gwy_debug("Running plugin '%s', filename '%s'", - info->name, - info->filename); - /* create new environment */ - d = pygwy_create_environment(info->filename, TRUE); - if (!d) { - g_warning("Cannot create copy of Python dictionary."); - return FALSE; - } - /* check last and current file modification time and override */ - /* the code if required */ - pygwy_reload_code(&info); - /* import module using precompiled code and check for 'save()' */ - module = PyImport_ExecCodeModule(info->name, info->code); - /* check if load function is defined */ - if (!pygwy_check_func(module, "save", info->filename)) { - destroy_environment(d, TRUE); + PyObject *py_container = NULL, *res = NULL; + PygwyModuleInfo *info; + gboolean ok = FALSE; + gint nargs; + + if (!(info = prepare_to_run_module_function(name, "save"))) { + err_PYTHON(error); return FALSE; } - /* create input container and put it into __main__ module dictionary */ - py_container = pygobject_new((GObject*)data); - /*py_container->obj = GOBJECT(data); */ - PyDict_SetItemString(d, "data", py_container); - /* create filename variable and put it into __main__ module dictionary */ - py_filename = Py_BuildValue("s", filename); - PyDict_SetItemString(d, "filename", py_filename); - - /* import and execute the 'save' method. maintain backward compatibility, */ - /* the 'save()' function might not support the 'mode' argument */ - cmd = g_strdup_printf("import %s\n" - "import inspect\n" - "import gwy\n" - "func = %s.save\n" - "mode = gwy.%s\n" - "args, varargs, keywords, defaults = " - "inspect.getargspec(func)\n" - "if len(args) == 2:\n" - " result = func(data, filename)\n" - "else:\n" - " result = func(data, filename, mode)\n", - info->name, - info->name, - (mode == GWY_RUN_INTERACTIVE) - ? "RUN_INTERACTIVE" : "RUN_NONINTERACTIVE"); - pygwy_run_string(cmd, Py_file_input, d, d); - g_free(cmd); - /* get result */ - py_res = PyDict_GetItemString(d, "result"); - if (py_res && PyInt_Check(py_res) && PyInt_AsLong(py_res)) { - res = TRUE; - } else { - /* FIXME: show python traceback */ - g_set_error(error, - GWY_MODULE_FILE_ERROR, - GWY_MODULE_FILE_ERROR_IO, - _("Pygwy plugin: %s (%s)\nExport failed."), - info->name, info->filename); - res = FALSE; + py_container = pygobject_new((GObject*)data); + nargs = find_out_number_of_arguments(info->func); + if (nargs == 1) + res = PyObject_CallFunction(info->func, "Os", py_container, filename); + else if (nargs == 2) + res = PyObject_CallFunction(info->func, "Osi", py_container, filename, mode); + else { + g_warning("Function save() has wrong number of arguments: %d.", nargs); + goto fail; } - Py_XDECREF(module); - Py_XDECREF(py_container); /*FIXME */ - Py_XDECREF(py_filename); - destroy_environment(d, TRUE); - return res; + if (!res) + PyErr_Print(); + if (res && PyInt_Check(res)) + ok = !!PyInt_AsLong(res); + +fail: + Py_XDECREF(res); + Py_XDECREF(py_container); + finalize_module_function(info); + if (!ok) + err_PYTHON(error); + return ok; } static GwyContainer* -pygwy_file_load_run(const gchar *filename, - GwyRunType mode, - GError **error, +pygwy_file_load_run(const gchar *filename, GwyRunType mode, GError **error, const gchar *name) { - GwyContainer *res = NULL; - PyObject *o, *module = NULL, *type = NULL, *py_res, *d, *class_name = NULL; - PyGObject *pyg_res; - PygwyPluginInfo *info; - gchar *cmd, *class_str; - - /* find plugin */ - if (!(info = pygwy_find_plugin(name))) { - g_warning("Cannot find plugin '%s'.", name); + GwyContainer *container = NULL; + PyObject *res = NULL; + PygwyModuleInfo *info; + gchar *class_name; + gint nargs; + + if (!(info = prepare_to_run_module_function(name, "load"))) { + err_PYTHON(error); return NULL; } - gwy_debug("Running plugin '%s', filename '%s'", - info->name, - info->filename); - /* create new environment */ - d = pygwy_create_environment(info->filename, TRUE); - if (!d) { - g_warning("Cannot create copy of Python dictionary."); - goto error; + nargs = find_out_number_of_arguments(info->func); + if (nargs == 1) + res = PyObject_CallFunction(info->func, "s", filename); + else if (nargs == 2) + res = PyObject_CallFunction(info->func, "si", filename, mode); + else { + g_warning("Function load() has wrong number of arguments: %d.", nargs); + goto fail; + } + if (!res) { + PyErr_Print(); + goto fail; } - /* check last and current file modification time and override */ - /* the code if required */ - pygwy_reload_code(&info); - - /* import module using precompiled code and check for 'load()' */ - module = PyImport_ExecCodeModule(info->name, info->code); - /* check if load function is defined */ - if (!pygwy_check_func(module, "load", info->filename)) { - goto error; - } - - /* create filename variable and put it into __main__ module dictionary */ - o = Py_BuildValue("s", filename); - if (!o) - goto error; - PyDict_SetItemString(d, "filename", o); - /* maintain backward compatibility, the 'load()' function might not */ - /* support the 'mode' argument */ - cmd = g_strdup_printf("import %s\n" - "import inspect\n" - "import gwy\n" - "func = %s.load\n" - "mode = gwy.%s\n" - "args, varargs, keywords, defaults = " - "inspect.getargspec(func)\n" - "if len(args) == 1:\n" - " result = func(filename)\n" - "else:\n" - " result = func(filename, mode)\n" - /*"print result"*/, - info->name, - info->name, - (mode == GWY_RUN_INTERACTIVE) - ? "RUN_INTERACTIVE" : "RUN_NONINTERACTIVE"); - pygwy_run_string(cmd, Py_file_input, d, d); - g_free(cmd); - py_res = PyDict_GetItemString(d, "result"); - if (!py_res) - goto error; - /* check result's class */ - type = PyObject_GetAttrString(py_res, "__class__"); - if (!type) - goto error; - class_name = PyObject_GetAttrString(type, "__name__"); - if (!class_name) - goto error; - class_str = PyString_AsString(class_name); - if (!strcmp(class_str, "Container")) { - pyg_res = (PyGObject *)PyDict_GetItemString(d, "result"); /*XXX cast */ - res = gwy_container_duplicate(GWY_CONTAINER(pyg_res->obj)); - /*g_object_ref(res); */ - } -error: - Py_XDECREF(class_name); - Py_XDECREF(type); - Py_XDECREF(module); - destroy_environment(d, TRUE); - gwy_debug("Return value %p", res); - return res; + class_name = find_out_class_name(res); + if (class_name && gwy_strequal(class_name, "Container")) { + PyGObject *pyg_res = (PyGObject*)res; + container = g_object_ref(pyg_res->obj); + } + g_free(class_name); + +fail: + Py_XDECREF(res); + finalize_module_function(info); + if (!container) + err_PYTHON(error); + gwy_debug("Return value %p", container); + return container; +} + +static gint +pygwy_file_detect_by_name_run(const GwyFileDetectInfo *fileinfo, + const gchar *name) +{ + PyObject *res = NULL; + PygwyModuleInfo *info; + gint score = 0; + + if (!(info = prepare_to_run_module_function(name, "detect_by_name"))) + return 0; + + res = PyObject_CallFunction(info->func, "s", fileinfo->name); + if (!res) + PyErr_Print(); + if (res && PyInt_Check(res)) + score = PyInt_AsLong(res); + gwy_debug("Score for %s is %d (module %s)", + fileinfo->name, score, info->name); + + Py_XDECREF(res); + finalize_module_function(info); + return score; +} + +static gint +pygwy_file_detect_by_content_run(const GwyFileDetectInfo *fileinfo, + const gchar *name) +{ + PyObject *res = NULL; + PygwyModuleInfo *info; + gint score = 0; + + if (!(info = prepare_to_run_module_function(name, "detect_by_content"))) + return 0; + + /* FIXME: This might not still be good enough for binary files. */ + res = PyObject_CallFunction(info->func, "ss#s#n", + fileinfo->name, + fileinfo->head, + (Py_ssize_t)fileinfo->buffer_len, + fileinfo->tail, + (Py_ssize_t)fileinfo->buffer_len, + (Py_ssize_t)fileinfo->file_size); + if (!res) + PyErr_Print(); + if (res && PyInt_Check(res)) + score = PyInt_AsLong(res); + gwy_debug("Score for %s is %d (module %s)", + fileinfo->name, score, info->name); + + Py_XDECREF(res); + finalize_module_function(info); + return score; } static gint pygwy_file_detect_run(const GwyFileDetectInfo *fileinfo, gboolean only_name, - gchar *name) + const gchar *name) { - PyObject *module, *py_res, *d, *o; - PygwyPluginInfo *info; - gchar *cmd; - gboolean res; - - /* find plugin */ - if (!(info = pygwy_find_plugin(name))) { - g_warning("Cannot find plugin '%s'.", name); - return FALSE; - } - gwy_debug("Running plugin '%s', filename '%s'", - info->name, - info->filename); - /* create new environment */ - d = pygwy_create_environment(info->filename, TRUE); - if (!d) { - g_warning("Cannot create copy of Python dictionary."); - return FALSE; - } - /* check last and current file modification time and override */ - /* the code if required */ - pygwy_reload_code(&info); - /* import module using precompiled code and check for 'detect_by_name()' */ - /* and 'detect_by_content()' functions */ - module = PyImport_ExecCodeModule(info->name, info->code); - /* check if load function is defined */ - if (!pygwy_check_func(module, "detect_by_name", info->filename) - || !pygwy_check_func(module, "detect_by_content", info->filename)) { - destroy_environment(d, TRUE); - return FALSE; + if (only_name) + return pygwy_file_detect_by_name_run(fileinfo, name); + return pygwy_file_detect_by_content_run(fileinfo, name); +} + +static PygwyModuleInfo* +pygwy_find_module(const gchar* name) +{ + GList *l = registered_modules; + PygwyModuleInfo *info; + + for (l = registered_modules; l; l = l->next) { + info = (PygwyModuleInfo*)(l->data); + if (gwy_strequal(info->name, name)) + return info; } + g_warning("Cannot find record for Python module '%s'", name); + return NULL; +} - /* create filename variable and put it into __main__ module dictionary */ - if (only_name) { - o = Py_BuildValue("s", fileinfo->name); - PyDict_SetItemString(d, "filename", o); - } else { - o = Py_BuildValue("s", fileinfo->head); - PyDict_SetItemString(d, "head", o); - o = Py_BuildValue("s", fileinfo->tail); - PyDict_SetItemString(d, "tail", o); - o = Py_BuildValue("s", fileinfo->name); - PyDict_SetItemString(d, "filename", o); - o = Py_BuildValue("i", fileinfo->file_size); - PyDict_SetItemString(d, "filesize", o); - o = Py_BuildValue("i", fileinfo->buffer_len); - PyDict_SetItemString(d, "buffer_len", o); - } - - /* import and execute the 'save' method */ - if (only_name) { - cmd = g_strdup_printf("import %s\n" - "result = %s.detect_by_name(filename)", - info->name, - info->name); - } else { - cmd = g_strdup_printf("import %s\n" - "result = %s.detect_by_content(filename, head, tail, filesize)", - info->name, - info->name); - } - pygwy_run_string(cmd, Py_file_input, d, d); - g_free(cmd); - /* get result */ - py_res = PyDict_GetItemString(d, "result"); - if (py_res && PyInt_Check(py_res) && PyInt_AsLong(py_res)) { - res = PyInt_AsLong(py_res); - } else { - res = 0; - } - gwy_debug("Score for %s is %d (fileplugin %s)", - fileinfo->name, - res, - info->name); - Py_DECREF(module); - destroy_environment(d, TRUE); - return res; +static PyObject* +pygwy_check_func(PyObject *module, const gchar *name, gchar *filename) +{ + PyObject *func; + if (!module) { + g_warning("Undefined pygwy module == NULL ('%s')", filename); + return NULL; + } + func = PyDict_GetItemString(PyModule_GetDict(module), name); + if (!func) { + g_warning("Function '%s' not found in '%s'", name, filename); + return NULL; + } + if (!PyCallable_Check(func)) { + g_warning("Function '%s' in '%s' is not callable.", name, filename); + return NULL; + } + return func; } -static PygwyPluginInfo* -pygwy_find_plugin(const gchar* name) +/* Conract: ensure info has valid code, dict, module and func, or we return + * NULL and dict, module and func are unset in the info (if it exists). */ +static PygwyModuleInfo* +prepare_to_run_module_function(const gchar *name, const gchar *funcname) { - GList *l = s_pygwy.plugins; - PygwyPluginInfo *info; + PygwyModuleInfo *info; - while (l) { - info = (PygwyPluginInfo*)(l->data); + if (!(info = pygwy_find_module(name))) { + g_warning("Cannot find module '%s'.", name); + return NULL; + } + gwy_debug("Preparing to run function `%s' in module '%s', filename '%s'", + funcname, info->name, info->fullpath); - if (gwy_strequal(info->name, name)) - break; - l = g_list_next(l); + if (!(info->dict = pygwy_create_environment(info->fullpath, TRUE))) + return NULL; + + if (!update_module_code(info)) { + finalize_module_function(info); + return NULL; } - if (!l) { - g_warning("Cannot find record for Python plugin '%s'", name); + + if (!(info->module = PyImport_ExecCodeModule(info->name, info->code))) { + PyErr_Print(); + finalize_module_function(info); return NULL; } + + if (!(info->func = pygwy_check_func(info->module, funcname, + info->fullpath))) { + finalize_module_function(info); + return NULL; + } + gwy_debug("Running function `%s' in module '%s', filename '%s'", + funcname, info->name, info->fullpath); + return info; } -/* function to fill list of containers, for gwy_app_data_browser_get_containers */ static void -pygwy_create_py_list_of_containers(GwyContainer *data, gpointer list) +finalize_module_function(PygwyModuleInfo *info) +{ + Py_XDECREF(info->module); + destroy_environment(info->dict, TRUE); + info->module = info->func = info->dict = NULL; +} + +/* Obtain obj.attr1.attr2, etc. */ +static PyObject* +get_attribute_recursive(PyObject *obj, ...) +{ + PyObject *attrobj; + GSList *l, *to_free = NULL; + va_list ap; + const gchar *attrname; + + if (!obj) + return NULL; + + va_start(ap, obj); + while ((attrname = va_arg(ap, const gchar*))) { + attrobj = PyObject_GetAttrString(obj, attrname); + /* If we fail, unref the entire list in reverse order. */ + if (!attrobj) { + va_end(ap); + for (l = to_free; l; l = l->next) + Py_XDECREF((PyObject*)l->data); + g_slist_free(to_free); + return NULL; + } + to_free = g_slist_prepend(to_free, attrobj); + obj = attrobj; + } + va_end(ap); + /* We succeeded; unref everything execpt the object we want to return. */ + for (l = to_free; l; l = l->next) { + if ((PyObject*)l->data != obj) + Py_XDECREF((PyObject*)l->data); + } + g_slist_free(to_free); + return obj; +} + +/* This does not work with anonymous arguments but anonymous arguments are + * module API violation so who cares. */ +static gint +find_out_number_of_arguments(PyObject *func) +{ + PyObject *nargs = get_attribute_recursive(func, + "func_code", "co_argcount", NULL); + gint n = -1; + + if (nargs && PyInt_Check(nargs)) + n = PyInt_AsLong(nargs); + Py_XDECREF(nargs); + return n; +} + +static gchar* +find_out_class_name(PyObject *obj) { + PyObject *name = get_attribute_recursive(obj, + "__class__", "__name__", NULL); + gchar *s = NULL; - if (PyList_Append((PyObject *) list, pygobject_new((GObject *)data)) < 0) { - g_warning("Could not append container to python list of containers."); - } + if (name && PyString_Check(name)) + s = g_strdup(PyString_AsString(name)); + Py_XDECREF(name); + 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 : */ diff -Nru gwyddion-2.46/modules/pygwy/pygwy-codegen.py gwyddion-2.47/modules/pygwy/pygwy-codegen.py --- gwyddion-2.46/modules/pygwy/pygwy-codegen.py 2015-10-25 21:15:34.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy-codegen.py 2016-11-03 20:57:03.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/python -# Runtime for pygtk module codegen.py and overriden functions for Gwyddion data types. +# $Id: pygwy-codegen.py 19172 2016-11-03 15:37:05Z yeti-dn $ +# Runtime for pygtk module codegen.py and overriden functions for Gwyddion data +# types. # Public domain import sys @@ -27,33 +29,74 @@ # Load it from codegen import * -# override function_wrapper to deal with output arguments +# Override function_wrapper to deal with output arguments. class RetTupleHandler(): - def __init__(self,handler,returns): - self.returns=returns - self.handler=handler - - def write_return(self,ptype, caller_owns_return, info): - info.varlist.add("PyObject", '*py_tuple_ret') - info.varlist.add("int", 'py_tuple_index') - info.codebefore.append('\n'); - info.codeafter.append('\n'); - if ptype == None or ptype == "none": - info.codebefore.append(' py_tuple_ret = PyTuple_New(%d);\n' % (self.returns)) - info.codebefore.append(' py_tuple_index = 0;\n') - else: - self.handler.write_return(ptype,caller_owns_return,info) + def __init__(self, handler, returns): + self.returns = returns + self.handler = handler + + def write_return(self, ptype, caller_owns_return, info): + def rewrite_fake_retvals(self, ptype, caller_owns_return, info): + # Handle GwyArrayFuncStatus specially. We need the check to happen + # before anything else (so that an exception is raised and we do + # not access the arrays that the callee freed for us). But we do + # not want the rest of the return code for GwyArrayFuncStatus. + if ptype != 'GwyArrayFuncStatus': + return + + n = len(info.codeafter) + self.handler.write_return(ptype, caller_owns_return, info) + added_lines = info.codeafter[n:] + for i, text in enumerate(added_lines): + # Kill the return code from GwyArrayFuncStatus + text = re.sub(r'Py_RETURN_NONE;', r'', text) + added_lines[i] = text + # Move the remaining part (exception raising) before the actual + # value returning code. + del info.codeafter[n:] + info.codeafter[0:0] = added_lines + + ignored_returns = ('none', 'GwyArrayFuncStatus') + has_orig_retval = int(not (ptype is None or ptype in ignored_returns)) + actual_returns = self.returns + has_orig_retval + # We should not get here when there are no out-arguments. + # If there is exactly one out-argument we do not want to return a + # single-item tuple. Convert the tuple back to a plain return value. + # We could do that more easily by checking the tuple length at the + # end but this way we generate a direct code that avoid any tuple + # construction completely. This is most useful for struct + # out-arguments such as GwyXYZ, GwyRGBA, ... + assert actual_returns > 0 + if actual_returns == 1: + assert not has_orig_retval + for i, text in enumerate(info.codeafter): + text = re.sub(r'PyTuple_SetItem\(py_tuple_ret,\s*py_tuple_index\+\+,\s*(.*)\);', + r'return \1;', + text) + info.codeafter[i] = text + rewrite_fake_retvals(self, ptype, caller_owns_return, info) + return + + # The typical case why we get here, actual multiple return values. + # Must distinguish the cases when we have a original retval and when + # we do not. Furthermore, if the original return value is + # GwyArrayFuncStatus we must rewrite its code. + info.varlist.add('PyObject', '*py_tuple_ret') + info.varlist.add('int', 'py_tuple_index') + + info.codebefore.append(' py_tuple_ret = PyTuple_New(%d);\n' % actual_returns) + info.codebefore.append(' py_tuple_index = %d;\n' % has_orig_retval) + if has_orig_retval: + self.handler.write_return(ptype, caller_owns_return, info) info.varlist.add("PyObject", '*py_original_ret') - info.codebefore.append(' py_tuple_ret = PyTuple_New(%d);\n' % (self.returns+1)) - info.codebefore.append(' py_tuple_index = 1;\n') - for i in range(len(info.codeafter)): - newc = re.sub(r'return\s+(?!NULL)(.*)', - r'py_original_ret = \1',info.codeafter[i]) - info.codeafter[i] = newc+'\n' - - info.codeafter.append(' PyTuple_SetItem(py_tuple_ret,0,py_original_ret);\n') + for i, text in enumerate(info.codeafter): + info.codeafter[i] = re.sub(r'return\s+(?!NULL)(.*)', + r'py_original_ret = \1', + text) + '\n' + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, 0, py_original_ret);\n') info.codeafter.append(' return py_tuple_ret;\n') + rewrite_fake_retvals(self, ptype, caller_owns_return, info) def write_function_wrapper(self, function_obj, template, handle_return=0, is_method=0, kwargs_needed=0, @@ -61,7 +104,8 @@ '''This function is the guts of all functions that generate wrappers for functions, methods and constructors.''' - if not substdict: substdict = {} + if substdict is None: + substdict = {} info = argtypes.WrapperInfo() returns = 0 @@ -79,8 +123,9 @@ if param.pdflt != None and '|' not in info.parsestr: info.add_parselist('|', [], []) handler = argtypes.matcher.get(param.ptype) - if param.ptype.endswith("Value"): - returns=returns+1 + if (param.ptype.startswith('Gwy') and param.ptype.endswith('OutArg') + or param.ptype.endswith('Value')): + returns += 1 handler.write_param(param.ptype, param.pname, param.pdflt, param.pnull, info) @@ -89,15 +134,16 @@ if function_obj.ret not in ('none', None): substdict['setreturn'] = 'ret = ' handler = argtypes.matcher.get(function_obj.ret) - if returns>0: - handler = RetTupleHandler(handler,returns) + if returns > 0: + handler = RetTupleHandler(handler, returns) handler.write_return(function_obj.ret, function_obj.caller_owns_return, info) if function_obj.deprecated != None: deprecated = self.deprecated_tmpl % { 'deprecationmsg': function_obj.deprecated, - 'errorreturn': substdict['errorreturn'] } + 'errorreturn': substdict['errorreturn'] + } else: deprecated = '' @@ -121,11 +167,12 @@ substdict['codebefore'] = deprecated + ( string.replace(info.get_codebefore(), 'return NULL', 'return ' + substdict['errorreturn']) - ) + ) substdict['codeafter'] = ( string.replace(info.get_codeafter(), 'return NULL', - 'return ' + substdict['errorreturn'])) + 'return ' + substdict['errorreturn']) + ) if info.parsestr or kwargs_needed: substdict['parseargs'] = self.parse_tmpl % substdict @@ -141,266 +188,196 @@ return template % substdict, flags -Wrapper.write_function_wrapper=write_function_wrapper +Wrapper.write_function_wrapper = write_function_wrapper -# New argument types: -class GwyRGBAArg(argtypes.ArgType): +# Skipped arguments +# We just write the `default' value as the C function argument. +class GwySkipArg(argtypes.ArgType): def write_param(self, ptype, pname, pdflt, pnull, info): - info.varlist.add('GwyRGBA', pname) - info.arglist.append(pname) - info.add_parselist('[dddd]', ['&' + pname + '.r', '&' + pname + '.g','&' + pname + '.b' , '&' + pname + '.a'], [pname]) - def write_return(self, ptype, ownsreturn, info): - info.varlist.add('GwyRGBA', 'ret'); - info.varlist.add('PyObject', '*color_tuple'); - codeafter_template = '''\ - color_tuple = PyTuple_New(4); - PyTuple_SetItem(color_tuple, 0, PyFloat_FromDouble(ret.r)); - PyTuple_SetItem(color_tuple, 1, PyFloat_FromDouble(ret.g)); - PyTuple_SetItem(color_tuple, 2, PyFloat_FromDouble(ret.b)); - PyTuple_SetItem(color_tuple, 3, PyFloat_FromDouble(ret.a)); - return color_tuple; -''' - info.codeafter.append(codeafter_template) - -class GwyRGBAArgPtr(argtypes.ArgType): - def write_param(self, ptype, pname, pdflt, pnull, info): - # info.varlist.add('GwyRGBA', '*p_' + pname + ' = ' + pname) - info.kwlist = ['"red"', '"green"', '"blue"' ] - info.varlist.add('GwyRGBA', 's_' + pname) - info.varlist.add('GwyRGBA', '*' + pname + ' = &s_' + pname) - info.arglist.append(pname) - info.add_parselist('dddd', ['&' + pname + '->r', '&' + pname + '->g', '&' + pname + '->b' , '&' + pname + '->a'], [pname]) - info.codebefore.append(' gwy_debug("color: %f %f %f %f", '+pname+'->r, '+pname+'->g, '+pname+'->b, '+pname+'->a);') - def write_return(self, ptype, ownsreturn, info): - info.varlist.add('GwyRGBA', '*ret'); - info.varlist.add('PyObject', '*color_tuple'); - codeafter_template = '''\ - color_tuple = PyTuple_New(4); - PyTuple_SetItem(color_tuple, 0, PyFloat_FromDouble(ret->r)); - PyTuple_SetItem(color_tuple, 1, PyFloat_FromDouble(ret->g)); - PyTuple_SetItem(color_tuple, 2, PyFloat_FromDouble(ret->b)); - PyTuple_SetItem(color_tuple, 3, PyFloat_FromDouble(ret->a)); - return color_tuple; -''' - info.codeafter.append(codeafter_template) + info.arglist.append(pdflt) -class GDoubleValue(argtypes.ArgType): +# Atomic (kind-of) output argument types +# The main handler write_function_wrapper() looks for things called +# Gwy.*OutArg and adds them to the list of out-args. If there are any the +# RetTupleHandler() is invoked to produce a tuple for the return value. +class GwyBooleanOutArg(argtypes.ArgType): def write_param(self, ptype, pname, pdflt, pnull, info): info.varlist.add(ptype, pname) info.arglist.append('&'+pname) - info.codebefore.append(' '+pname+' = 0;\n') - info.codeafter.append(' PyTuple_SetItem(py_tuple_ret,py_tuple_index++,PyFloat_FromDouble('+pname+'));\n') + info.codebefore.append(' '+pname+' = FALSE;\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, PyBool_FromLong('+pname+'));\n') -class GIntValue(argtypes.ArgType): +class GwyIntOutArg(argtypes.ArgType): def write_param(self, ptype, pname, pdflt, pnull, info): info.varlist.add(ptype, pname) info.arglist.append('&'+pname) info.codebefore.append(' '+pname+' = 0;\n') - info.codeafter.append(' PyTuple_SetItem(py_tuple_ret,py_tuple_index++,PyInt_FromLong('+pname+'));\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, PyInt_FromLong('+pname+'));\n') -class GConstDoubleArray(argtypes.ArgType): +class GwyDoubleOutArg(argtypes.ArgType): def write_param(self, ptype, pname, pdflt, pnull, info): - ptype = ptype.replace('*', '') - ptype = ptype.replace('const-', '') - pdict = {'name': pname, 'type': ptype} - info.varlist.add(ptype, '*'+pname); - info.varlist.add('int', 'i_'+pname); - info.varlist.add('int', 'n_'+pname); - info.varlist.add('PyObject', '*'+pname+'_pyobj') - info.add_parselist("O", ['&'+pname+'_pyobj'], [pname]) - info.arglist.append(pname) - codebefore_template = string.Template('''\ - if (!PyList_Check(${name}_pyobj)) { - PyErr_SetString(PyExc_TypeError, "Parameter \'${name}\' must be a list of floats"); - return NULL; - } - n_${name} = PyList_Size(${name}_pyobj); - ${name} = g_new(${type}, n_${name}); - for (i_${name} = 0; i_${name} < n_${name}; i_${name}++) { - if (!PyFloat_Check(PyList_GetItem(${name}_pyobj, i_${name}))) { - g_free(${name}); - PyErr_SetString(PyExc_TypeError, "Parameter \'${name}\' must be a list of floats"); - return NULL; - } - ${name}[i_${name}] = PyFloat_AsDouble(PyList_GetItem(${name}_pyobj, i_${name})); - } -''') - codeafter_template = string.Template(' g_free(${name});\n') - info.codebefore.append(codebefore_template.substitute(pdict)) - info.codeafter.append(codeafter_template.substitute(pdict)) - def write_return(self, ptype, ownsreturn, info): - info.codeafter.append(' PyErr_SetString(PyExc_NotImplementedError, "Return type \''+ptype+'\' not supported");\n') - ptype = ptype.replace('*', '') - ptype = ptype.replace('const-', '') - info.varlist.add(ptype, '*ret') - info.codeafter.append(' return NULL;') + info.varlist.add(ptype, pname) + info.arglist.append('&'+pname) + info.codebefore.append(' '+pname+' = 0.0;\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, PyFloat_FromDouble('+pname+'));\n') -class GArrayDouble(argtypes.ArgType): +class GwyRGBAOutArg(argtypes.ArgType): + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add(ptype, pname) + info.arglist.append('&'+pname) + info.codebefore.append(' gwy_clear(&'+pname+', 1);\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, pyg_boxed_new(GWY_TYPE_RGBA, (GwyRGBA*)&'+pname+', TRUE, TRUE));\n') + +class GwyIntInOutArg(argtypes.ArgType): + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add(ptype, pname) + info.arglist.append('&'+pname) + info.add_parselist('i', ['&'+pname], [pname]) + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, PyInt_FromLong('+pname+'));\n') + +class GwyDoubleInOutArg(argtypes.ArgType): + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add(ptype, pname) + info.arglist.append('&'+pname) + info.add_parselist('i', ['&'+pname], [pname]) + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, PyFloat_FromDouble('+pname+'));\n') + +# Strings +class GwyGString(argtypes.ArgType): def write_return(self, ptype, ownsreturn, info): - ptype = ptype.replace('*', '') - info.varlist.add(ptype, '*ret') - info.varlist.add("PyObject", '*py_ret') - info.varlist.add("gint", 'i_ret') - codeafter_template = '''\ - py_ret = PyList_New(ret->len); - for (i_ret = 0; i_ret < ret->len; i_ret++) { - PyList_SetItem(py_ret, i_ret, PyFloat_FromDouble(g_array_index(ret, gdouble, i_ret))); - } - g_array_free(ret, TRUE); - return py_ret; -''' - info.codeafter.append(codeafter_template) + info.varlist.add('GString', '*ret') + info.codeafter.append(' return create_string_consume_gstring(ret);\n') -class GArrayInt(argtypes.ArgType): +# Fake argument types +class GwyArrayFuncStatus(argtypes.ArgType): + "Boolean indicating if the arrays passed to the function had sane sizes." def write_return(self, ptype, ownsreturn, info): - ptype = ptype.replace('*', '') - info.varlist.add(ptype, '*ret') - info.varlist.add("PyObject", '*py_ret') - info.varlist.add("gint", 'i_ret') - codeafter_template = '''\ - py_ret = PyList_New(ret->len); - for (i_ret = 0; i_ret < ret->len; i_ret++) { - PyList_SetItem(py_ret, i_ret, PyInt_FromLong(g_array_index(ret, gint, i_ret))); - } - g_array_free(ret, TRUE); - return py_ret; -''' - info.codeafter.append(codeafter_template) - def write_param(self, ptype, pname, pdflt, pnull, info): - ptype = ptype.replace('*', '') - ptype = ptype.replace('const-', '') - pdict = {'name': pname, 'type': ptype} - info.varlist.add(ptype, '*'+pname); - info.varlist.add('int', 'i_'+pname); - info.varlist.add('int', 'n_'+pname); - info.varlist.add('gint', pname+'_value') + # This is the simple case when there are no out-args. + # When there are out-args RetTupleHandler.write_return() has to rewrite + # this code. + info.varlist.add('gboolean', 'ret') + info.codeafter.append(' if (!ret) {\n') + info.codeafter.append(' PyErr_SetString(PyExc_ValueError, "Incompatible sequence length (not a multiple or does not match other arguments)");\n') + info.codeafter.append(' return NULL;\n') + info.codeafter.append(' }\n') + info.codeafter.append(' Py_RETURN_NONE;\n') + +# Array argument types +class GwyDoubleArray(argtypes.ArgType): + "Array of doubles passed by value." + def write_param(self, ptype, pname, pdflt, pnull, info): + # NB: We do not free the GArray. The callee must always do it. This + # makes memory leaks less likely when we raise exceptions and have + # multiple arrays. + info.varlist.add('GArray', '*'+pname + ' = NULL'); info.varlist.add('PyObject', '*'+pname+'_pyobj') - info.add_parselist("O", ['&'+pname+'_pyobj'], [pname]) - info.arglist.append(pname) - codebefore_template = string.Template('''\ - if (!PyList_Check(${name}_pyobj)) { - PyErr_SetString(PyExc_TypeError, "Parameter \'${name}\' must be a list of integers"); - return NULL; - } - n_${name} = PyList_Size(${name}_pyobj); - ${name} = g_array_sized_new(FALSE, FALSE, sizeof(gint), n_${name}); - for (i_${name} = 0; i_${name} < n_${name}; i_${name}++) { - if (!PyInt_Check(PyList_GetItem(${name}_pyobj, i_${name}))) { - g_array_free(${name},TRUE); - PyErr_SetString(PyExc_TypeError, "Parameter \'${name}\' must be a list of integers"); - return NULL; - } - ${name}_value = PyInt_AsLong(PyList_GetItem(${name}_pyobj, i_${name})); - g_array_append_val(${name}, ${name}_value); - } -''') - codeafter_template = string.Template(' g_array_free(${name}, TRUE);\n') - info.codebefore.append(codebefore_template.substitute(pdict)) - info.codeafter.append(codeafter_template.substitute(pdict)) - -class StringPassArg(argtypes.ArgType): - def write_param(self, ptype, pname, pdflt, pnull, info): - if pdflt != None: - if pdflt != 'NULL': pdflt = '"' + pdflt + '"' - info.varlist.add('char', '*' + pname + ' = ' + pdflt) - else: - info.varlist.add('char', '*' + pname) - info.arglist.append(pname+'_dup') if pnull: - info.add_parselist('z', ['&' + pname], [pname]) + info.add_parselist('|O', ['&'+pname+'_pyobj'], [pname]) else: - info.add_parselist('s', ['&' + pname], [pname]) - info.varlist.add('char', '*' + pname+"_dup") - info.codebefore.append(' '+pname+'_dup = g_strdup('+pname+');\n') + info.add_parselist('O', ['&'+pname+'_pyobj'], [pname]) + info.arglist.append(pname) + xnull = pname + '_pyobj && ' if pnull else '' + info.codebefore.append(' if ('+xnull+'!('+pname+' = create_double_garray_from_sequence('+pname+'_pyobj))) {\n') + info.codebefore.append(' PyErr_SetString(PyExc_TypeError, "Parameter \''+pname+'\' must be a sequence of floats");\n') + info.codebefore.append(' return NULL;\n') + info.codebefore.append(' }\n') def write_return(self, ptype, ownsreturn, info): - if ownsreturn: - # have to free result ... - info.varlist.add('gchar', '*ret') - info.codeafter.append(' if (ret) {\n' + - ' PyObject *py_ret = PyString_FromString(ret);\n' + - ' g_free(ret);\n' + - ' return py_ret;\n' + - ' }\n' + - ' Py_INCREF(Py_None);\n' + - ' return Py_None;') + info.varlist.add('GArray', '*ret') + info.codeafter.append(' return create_list_consume_double_garray(ret);\n') + +class GwyDoubleArrayOutArg(argtypes.ArgType): + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add('GArray', '*'+pname) + info.arglist.append(pname) + info.codebefore.append(' '+pname+' = g_array_new(FALSE, FALSE, sizeof(gdouble));\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, create_list_consume_double_garray('+pname+'));\n') + +class GwyIntArray(argtypes.ArgType): + def write_param(self, ptype, pname, pdflt, pnull, info): + # NB: We do not free the GArray. The callee must always do it. This + # makes memory leaks less likely when we raise exceptions and have + # multiple arrays. + info.varlist.add('GArray', '*'+pname + ' = NULL'); + info.varlist.add('PyObject', '*'+pname+'_pyobj') + if pnull: + info.add_parselist('|O', ['&'+pname+'_pyobj'], [pname]) else: - info.varlist.add('const gchar', '*ret') - info.codeafter.append(' if (ret)\n' + - ' return PyString_FromString(ret);\n'+ - ' Py_INCREF(Py_None);\n' + - ' return Py_None;') + info.add_parselist('O', ['&'+pname+'_pyobj'], [pname]) + info.arglist.append(pname) + xnull = pname + '_pyobj && ' if pnull else '' + info.codebefore.append(' if ('+xnull+'!('+pname+' = create_int_garray_from_sequence('+pname+'_pyobj))) {\n') + info.codebefore.append(' PyErr_SetString(PyExc_TypeError, "Parameter \''+pname+'\' must be a sequence of integers");\n') + info.codebefore.append(' return NULL;\n') + info.codebefore.append(' }\n') + def write_return(self, ptype, ownsreturn, info): + info.varlist.add('GArray', '*ret') + info.codeafter.append(' return create_list_consume_int_garray(ret);\n') +class GwyIntArrayOutArg(argtypes.ArgType): + "Array of integers passed by value." + def write_param(self, ptype, pname, pdflt, pnull, info): + info.varlist.add('GArray', '*'+pname) + info.arglist.append(pname) + info.codebefore.append(' '+pname+' = g_array_new(FALSE, FALSE, sizeof(gdouble));\n') + info.codeafter.append(' PyTuple_SetItem(py_tuple_ret, py_tuple_index++, create_list_consume_int_garray('+pname+'));\n') -# Extend argtypes -arg = GArrayInt() -argtypes.matcher.register('GArrayInt*', arg) -argtypes.matcher.register('const-GArrayInt*', arg) -del arg - -arg = GArrayDouble() -argtypes.matcher.register('GArrayDouble*', arg) -del arg - -arg = argtypes.IntArg() -argtypes.matcher.register('GQuark', arg) -del arg - -arg = GwyRGBAArg() -argtypes.matcher.register('GwyRGBA', arg) -del arg - -arg = GwyRGBAArgPtr() -argtypes.matcher.register('GwyRGBA*', arg) -argtypes.matcher.register('const-GwyRGBA*', arg) -del arg - -arg = GDoubleValue() -argtypes.matcher.register('GDoubleValue', arg) -del arg - -arg = GIntValue() -argtypes.matcher.register('GIntValue', arg) -del arg - -arg = GConstDoubleArray() -argtypes.matcher.register('const-gdouble*', arg) -del arg - -arg = argtypes.StringArg() -argtypes.matcher.register('keep_gchar*', arg) -del arg - -arg = StringPassArg() -argtypes.matcher.register('pass_owner_gchar*', arg) -del arg - -arg = argtypes.EnumArg("GtkOrientation", 'GTK_TYPE_ORIENTATION') -argtypes.matcher.register("GtkOrientation", arg) -del arg -arg = argtypes.EnumArg("GtkUpdateType", 'GTK_TYPE_UPDATE_TYPE') -argtypes.matcher.register("GtkUpdateType", arg) -del arg -arg = argtypes.EnumArg("GtkPositionType", 'GTK_TYPE_POSITION_TYPE') -argtypes.matcher.register("GtkPositionType", arg) -del arg +# GTK+ types we need because they appear as arguments? +# We certainly get `No ArgType' messages for types we do not list here. +argtypes.matcher.register_object('GdkGC', None, 'GDK_TYPE_GC') +argtypes.matcher.register_object('GdkEvent', None, 'GDK_TYPE_EVENT') +argtypes.matcher.register_object('GdkGLConfig', None, 'GDK_TYPE_GL_CONFIG') +argtypes.matcher.register_object('GdkPixbuf', None, 'GDK_TYPE_PIXBUF') +argtypes.matcher.register_object('GdkDrawable', None, 'GDK_TYPE_DRAWABLE') argtypes.matcher.register_object('GtkWidget', None, 'GTK_TYPE_WIDGET') +argtypes.matcher.register_object('GtkDialog', None, 'GTK_TYPE_DIALOG') argtypes.matcher.register_object('GtkObject', None, 'GTK_TYPE_OBJECT') argtypes.matcher.register_object('GtkListStore', None, 'GTK_TYPE_LIST_STORE') argtypes.matcher.register_object('GtkWindow', None, 'GTK_TYPE_WINDOW') argtypes.matcher.register_object('GtkTooltips', None, 'GTK_TYPE_TOOLTIPS') argtypes.matcher.register_object('GtkComboBox', None, 'GTK_TYPE_COMBO_BOX') - -argtypes.matcher.register_object('GdkGC', None, 'GDK_TYPE_GC') -argtypes.matcher.register_object('GdkGLConfig', None, 'GDK_TYPE_GL_CONFIG') -argtypes.matcher.register_object('GdkPixbuf', None, 'GDK_TYPE_PIXBUF') -argtypes.matcher.register_object('GdkDrawable', None, 'GDK_TYPE_DRAWABLE') -argtypes.matcher.register_object('GdkLineStyle', None, 'GDK_TYPE_LINE_STYLE') - - -#definitions.MethodDefBase.__init__ = method_def_base_constructor +argtypes.matcher.register_object('GtkTreeView', None, 'GTK_TYPE_TREE_VIEW') +argtypes.matcher.register_object('GtkTable', None, 'GTK_TYPE_TABLE') +argtypes.matcher.register_object('GtkButton', None, 'GTK_TYPE_BUTTON') +argtypes.matcher.register_object('GtkTextBuffer', None, 'GTK_TYPE_TEXT_BUFFER') +argtypes.matcher.register_object('GtkAccelGroup', None, 'GTK_TYPE_ACCEL_GROUP') + +def preregister_plain(argfunc, mixed_name, uppercase_type_name): + argtypes.matcher.register(mixed_name, + argfunc(mixed_name, uppercase_type_name)) + +preregister_plain(argtypes.EnumArg, 'GdkLineStyle', 'GDK_TYPE_LINE_STYLE') +preregister_plain(argtypes.EnumArg, 'GtkOrientation', 'GTK_TYPE_ORIENTATION') +preregister_plain(argtypes.EnumArg, 'GtkPositionType', 'GTK_TYPE_POSITION_TYPE') +preregister_plain(argtypes.EnumArg, 'GtkUpdateType', 'GTK_TYPE_UPDATE_TYPE') +preregister_plain(argtypes.BoxedArg, 'GtkTreePath', 'GTK_TYPE_TREE_PATH') +preregister_plain(argtypes.BoxedArg, 'GtkTreeIter', 'GTK_TYPE_TREE_ITER') +preregister_plain(argtypes.BoxedArg, 'GString', 'G_TYPE_STRING') +del preregister_plain + +# Gwyddion arg types +argtypes.matcher.register('GwySkipArg', GwySkipArg()) +argtypes.matcher.register('GQuark', argtypes.IntArg()) + +# Simple out-arguments and in-out-arguments +argtypes.matcher.register('GwyDoubleOutArg', GwyDoubleOutArg()) +argtypes.matcher.register('GwyIntOutArg', GwyIntOutArg()) +argtypes.matcher.register('GwyBooleanOutArg', GwyBooleanOutArg()) +argtypes.matcher.register('GwyRGBAOutArg', GwyRGBAOutArg()) +argtypes.matcher.register('GwyDoubleInOutArg', GwyDoubleInOutArg()) +argtypes.matcher.register('GwyIntInOutArg', GwyIntInOutArg()) + +# Strings +argtypes.matcher.register('GString*', GwyGString()) + +# Arrays +argtypes.matcher.register('GwyArrayFuncStatus', GwyArrayFuncStatus()) +argtypes.matcher.register('GwyDoubleArray*', GwyDoubleArray()) +argtypes.matcher.register('GwyDoubleArrayOutArg', GwyDoubleArrayOutArg()) +argtypes.matcher.register('GwyIntArray*', GwyIntArray()) +argtypes.matcher.register('GwyIntArrayOutArg', GwyIntArrayOutArg()) # Run codegen sys.exit(main(sys.argv)) diff -Nru gwyddion-2.46/modules/pygwy/pygwy-console.c gwyddion-2.47/modules/pygwy/pygwy-console.c --- gwyddion-2.46/modules/pygwy/pygwy-console.c 2015-11-08 11:39:13.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy-console.c 2016-11-16 11:24:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: pygwy-console.c 17718 2015-11-06 08:04:04Z pecold $ + * @(#) $Id: pygwy-console.c 19265 2016-11-15 12:22:37Z yeti-dn $ * Copyright (C) 2008 Jan Horak * E-mail: xhorak@gmail.com * @@ -71,21 +71,18 @@ g_warning("Console setup structure is not defined!"); return NULL; } - /* store _stderr_redir location */ + /* store _pygwy_stderr_redir location */ pygwy_run_string(cmd, mode, console_setup->dictionary, console_setup->dictionary); - pygwy_run_string("_stderr_redir_pos = _stderr_redir.tell()\n" - "_stderr_redir.seek(0)\n" - "_stderr_redir_string = _stderr_redir.read(_stderr_redir_pos)\n" - "_stderr_redir.seek(0)", + pygwy_run_string(pygwy_stderr_redirect_readstr_code, Py_file_input, console_setup->dictionary, console_setup->dictionary); return PyString_AsString(PyDict_GetItemString(console_setup->dictionary, - "_stderr_redir_string")); + "_pygwy_stderr_string")); } static void @@ -478,17 +475,15 @@ } /* redirect stdout & stderr to temporary file */ - pygwy_run_string("import sys, gwy, tempfile\n" - "from gwy import *\n" - "_stderr_redir = tempfile.TemporaryFile()\n" - "sys.stderr = _stderr_redir\n" - "sys.stdout = _stderr_redir\n", + pygwy_run_string(pygwy_stderr_redirect_setup_code + "import gwy\n" + "from gwy import *\n", Py_file_input, d, d); /* store values for closing console */ - console_setup->std_err = PyDict_GetItemString(d, "_stderr_redir"); + console_setup->std_err = PyDict_GetItemString(d, "_pygwy_stderr_redir"); Py_INCREF(console_setup->std_err); console_setup->dictionary = d; } diff -Nru gwyddion-2.46/modules/pygwy/pygwy-fix-defs.py gwyddion-2.47/modules/pygwy/pygwy-fix-defs.py --- gwyddion-2.46/modules/pygwy/pygwy-fix-defs.py 2015-12-17 13:37:30.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy-fix-defs.py 2016-11-15 12:48:19.000000000 +0000 @@ -1,143 +1,560 @@ +#!/usr/bin/python +# $Id: pygwy-fix-defs.py 19268 2016-11-15 12:48:19Z yeti-dn $ # alter defs, fix parameters and return types import sys, re +from optparse import OptionParser + +parser = OptionParser(usage='''\ +pygwy-fix-defs.py --codegendir=DIR +Reads pygwy.defs.tmp. +Generated pygwy.defs and boxed.override.''') + +parser.add_option('-c', '--codegendir', dest='codegendir', type='string', + default='', metavar='DIR', + help='Directory with codegen python modules') + +(options, args) = parser.parse_args() +if options.codegendir: + sys.path.insert(0, options.codegendir) +assert not args + +import defsparser, definitions + +# Arguments we need to fix for various functions. The syntax is natural: +# in each fix-list we list the affected arguments as the function arguments. +# Note original C names (func.c_name) are used even for foo_pygwy functions. +GwyDoubleOut_args = ''' +gwy_3d_view_get_scale_range(min_scale, max_scale) +gwy_cdline_get_value(value) +gwy_axis_get_range(min, max) +gwy_axis_get_requested_range(min, max) +gwy_color_axis_get_range(min, max) +gwy_container_gis_double(value) +gwy_data_field_area_fit_plane(pa, pbx, pby) +gwy_data_field_area_get_inclination(theta, phi) +gwy_data_field_area_get_min_max_mask(min, max) +gwy_data_field_area_get_min_max(min, max) +gwy_data_field_area_get_normal_coeffs(nx, ny, nz) +gwy_data_field_area_get_stats(avg, ra, rms, skew, kurtosis) +gwy_data_field_area_get_stats_mask(avg, ra, rms, skew, kurtosis) +gwy_data_field_correct_laplace_iteration(error) +gwy_data_field_fit_facet_plane(pa, pbx, pby) +gwy_data_field_fit_plane(pa, pbx, pby) +gwy_data_field_fractal_cubecounting_dim(a, b) +gwy_data_field_fractal_partitioning_dim(a, b) +gwy_data_field_fractal_psdf_dim(a, b) +gwy_data_field_fractal_triangulation_dim(a, b) +gwy_data_field_get_autorange(from_, to) +gwy_data_field_get_inclination(theta, phi) +gwy_data_field_get_min_max(min, max) +gwy_data_field_get_normal_coeffs(nx, ny, nz) +gwy_data_field_get_stats(avg, ra, rms, skew, kurtosis) +gwy_data_field_hough_datafield_line_to_polar(rho, theta) +gwy_data_line_get_line_coeffs(av, bv) +gwy_data_line_get_min_max(min, max) +gwy_data_line_part_get_min_max(min, max) +gwy_data_view_coords_real_to_xy_float(xscr, yscr) +gwy_data_view_coords_xy_to_real(xreal, yreal) +gwy_data_view_get_real_data_offsets(xoffset, yoffset) +gwy_data_view_get_real_data_sizes(xreal, yreal) +gwy_data_view_get_real_data_sizes(xreal, yreal) +gwy_graph_area_get_cursor(x_cursor, y_cursor) +gwy_graph_curve_model_get_ranges(x_min, y_min, x_max, y_max) +gwy_graph_curve_model_get_x_range(x_min, x_max) +gwy_graph_curve_model_get_y_range(y_min, y_max) +gwy_graph_model_get_ranges(x_min, y_min, x_max, y_max) +gwy_graph_model_get_x_range(x_min, x_max) +gwy_graph_model_get_y_range(y_min, y_max) +gwy_layer_basic_get_range(min, max) +gwy_math_curvature(kappa1, kappa2, phi1, phi2, xc, yc, zc) +gwy_math_refine_maximum(x, y) +gwy_ruler_get_range(lower, upper, position, max_size) +gwy_ruler_get_range(lower, upper, position, max_size) +gwy_spectra_itoxy(x, y) +gwy_surface_get_min_max(min, max) +gwy_surface_get_xrange(min, max) +gwy_surface_get_yrange(min, max) +gwy_math_find_nearest_line(d2min) +gwy_math_find_nearest_point(d2min) +''' + +GwyIntOut_args = ''' +gwy_container_gis_enum(value) +gwy_container_gis_int32(value) +gwy_container_gis_int64(value) +gwy_data_chooser_get_active(id) +gwy_data_field_area_count_in_range(nbelow, nabove) +gwy_data_field_circular_area_extract_with_pos(xpos, ypos) +gwy_data_field_grains_autocrop(left, right, up, down) +gwy_data_field_hough_polar_line_to_datafield(px1, px2, py1, py2) +gwy_data_view_coords_real_to_xy(xscr, yscr) +gwy_data_view_coords_xy_clamp(xscr, yscr) +gwy_data_view_get_pixel_data_sizes(xres, yres) +gwy_enum_combo_box_update_int(integer) +gwy_file_detect_with_score(score) +gwy_gradient_get_points(npoints) +gwy_gradient_get_samples(nsamples) +gwy_math_curvature(dimen) +gwy_math_humanize_numbers(precision) +gwy_si_unit_new_parse(power10) +gwy_si_unit_set_from_string_parse(power10) +gwy_tip_estimate_full(count) +gwy_tip_estimate_partial(count) +gwy_peaks_analyze(npeaks) +gwy_math_find_nearest_line(idx) +gwy_math_find_nearest_point(idx) +''' + +GwyBooleanOut_args = ''' +gwy_cdline_get_value(fres) +gwy_nlfit_preset_guess(fres) +gwy_math_is_in_polygon(is_inside) +gwy_math_refine_maximum(refined) +''' + +GwyRGBAOut_args = ''' +gwy_color_button_get_color(color) +''' + +GwyIntInOut_args = ''' +gwy_data_view_coords_xy_clamp(xscr, yscr) +gwy_data_view_coords_xy_cut_line(x0scr, y0scr, x1scr, y1scr) +''' + +GObject_args = ''' +gwy_container_set_object(value) +gwy_container_get_object(return) +''' + +constgchar_args = ''' +gwy_container_get_string(return) +gwy_container_set_const_string(value) +gwy_container_set_const_string_by_name(value) +''' + +nullable_args = ''' +gwy_app_data_browser_add_brick(data, preview) +gwy_app_data_browser_add_data_field(data) +gwy_app_data_browser_add_spectra(data) +gwy_app_data_browser_add_graph_model(data) +gwy_app_data_browser_add_surface(data) +gwy_math_find_nearest_line(metric) +gwy_math_find_nearest_point(metric) +gwy_app_file_load(name) +gwy_app_file_write(name) +''' + +skip_args = ''' +gwy_app_file_load(filename_sys=NULL) +gwy_app_file_write(filename_sys=NULL) +gwy_tip_estimate_partial(set_fraction=NULL, set_message=NULL) +gwy_tip_estimate_full(set_fraction=NULL, set_message=NULL) +gwy_graph_export_postscript(str=NULL) +gwy_graph_model_export_ascii(string=NULL) +gwy_data_field_get_profile(data_line=NULL) +gwy_brick_get_value_format_x(format=NULL) +gwy_brick_get_value_format_y(format=NULL) +gwy_brick_get_value_format_z(format=NULL) +gwy_brick_get_value_format_w(format=NULL) +gwy_data_field_get_value_format_xy(format=NULL) +gwy_data_field_get_value_format_z(format=NULL) +gwy_data_line_get_value_format_x(format=NULL) +gwy_data_line_get_value_format_y(format=NULL) +gwy_surface_get_value_format_xy(format=NULL) +gwy_surface_get_value_format_z(format=NULL) +''' + +default_args = ''' +gwy_data_field_affine(fill_value=0.0) +gwy_data_line_new(nullme=TRUE) +gwy_data_line_new_alike(nullme=TRUE) +gwy_data_field_new(nullme=TRUE) +gwy_data_field_new_alike(nullme=TRUE) +gwy_brick_new(nullme=TRUE) +gwy_brick_new_alike(nullme=TRUE) +''' + +# Lists of functions that should have various attributes +caller_owns_return_funcs = ''' +gwy_app_file_load +gwy_brick_duplicate +gwy_brick_new_alike +gwy_brick_new_part +gwy_construct_grain_quantity_units +gwy_container_duplicate +gwy_container_duplicate_by_prefix +gwy_data_chooser_new_channels +gwy_data_chooser_new_graphs +gwy_data_chooser_new_volumes +gwy_data_chooser_new_xyzs +gwy_data_field_duplicate +gwy_data_field_new_alike +gwy_data_field_new_resampled +gwy_data_field_new_rotated +gwy_data_field_new_rotated_90 +gwy_data_line_duplicate +gwy_data_line_new_alike +gwy_data_line_new_resampled +gwy_file_load +gwy_graph_curve_model_duplicate +gwy_graph_curve_model_new_alike +gwy_graph_model_duplicate +gwy_graph_model_new_alike +gwy_si_unit_duplicate +gwy_si_unit_new_parse +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_spectra_duplicate +gwy_spectra_new_alike +gwy_surface_duplicate +gwy_surface_new_alike +gwy_surface_new_part +gwy_nlfit_preset_get_param_units +gwy_nlfit_preset_create_fitter +gwy_cdline_get_param_units +gwy_shape_fit_preset_get_param_units +gwy_shape_fit_preset_get_secondary_units +gwy_shape_fit_preset_create_fitter +gwy_brick_get_value_format_x +gwy_brick_get_value_format_y +gwy_brick_get_value_format_z +gwy_brick_get_value_format_w +gwy_data_field_get_value_format_xy +gwy_data_field_get_value_format_z +gwy_data_line_get_value_format_x +gwy_data_line_get_value_format_y +gwy_surface_get_value_format_xy +gwy_surface_get_value_format_z +''' + +remove_funcs = ''' +gwy_math_lin_solve_rewrite +gwy_gradient_get_samples +gwy_gradient_sample +gwy_vector_layer_button_press +gwy_vector_layer_button_release +gwy_vector_layer_motion_notify +gwy_vector_layer_key_press +gwy_vector_layer_key_release +gwy_md5_get_digest +gwy_gstring_replace +gwy_gstring_to_native_eol +gwy_app_data_browser_get_current +gwy_container_set_string +gwy_container_keys_by_name +gwy_container_get_value +gwy_container_set_value +gwy_container_set_value_by_name +gwy_si_value_format_set_units +gwy_si_unit_value_format_set_units +''' + +pygwy_added_funcs = ''' +gwy_key_from_name +gwy_name_from_key +gwy_data_line_set_data +gwy_data_field_set_data +gwy_brick_set_data +gwy_data_field_create_full_mask +gwy_get_grain_quantity_needs_same_units +gwy_construct_grain_quantity_units +''' + +boxed_sequence_likes = ''' +XY +XYZ +RGBA +AppDataId +''' + +# This is a hack; functions that are renamed to other functions and we want to +# remove the originals because they would be generated too. +remove_methods = ''' +GwyContainer.set_const_string +GwyContainer.set_const_string_by_name +''' + +def unwrap_name(fname, fail_if_not_wrapped=False): + if fname.endswith('_pygwy'): + return fname[:-6] + if fail_if_not_wrapped: + assert fname.endswith('_pygwy') + return fname def get_python_name(c_name): - py_name = c_name.capitalize() - letters = list(re.findall("_[a-z]", c_name)) - for match in letters: - py_name = py_name.replace(match, match.upper()[1]) - return py_name.replace("_", "") - -#for macro functions -new_methods = [] - -new_methods.append([ "gwy_container", "contains_by_name", [("gchar*", "name")], "gboolean" ]) -new_methods.append([ "gwy_container", "remove_by_name", [("gchar*", "name")], "none" ]) -new_methods.append([ "gwy_container", "rename_by_name", [("gchar*", "name"), ("gchar*", "new_name"), ("gboolean", "delete")], "none" ]) -new_methods.append([ "gwy_container", "set_boolean_by_name", [("gchar*", "name"), ("gboolean", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_double_by_name", [("gchar*", "name"), ("gdouble", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_enum_by_name", [("gchar*", "name"), ("guint", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_int32_by_name", [("gchar*", "name"), ("gint32", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_int64_by_name", [("gchar*", "name"), ("gint64", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_object_by_name", [("gchar*", "name"), ("GObject*", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_uchar_by_name", [("gchar*", "name"), ("guchar", "value")], "none" ]) -new_methods.append([ "gwy_container", "set_string_by_name", [("gchar*", "name"), ("pass_owner_gchar*", "value")], "none" ]) -new_methods.append([ "gwy_container", "get_boolean_by_name", [("gchar*", "name")], "gboolean" ]) -new_methods.append([ "gwy_container", "get_double_by_name", [("gchar*", "name")], "double" ]) -new_methods.append([ "gwy_container", "get_enum_by_name", [("gchar*", "name")], "guint" ]) -new_methods.append([ "gwy_container", "get_int32_by_name", [("gchar*", "name")], "gint32" ]) -new_methods.append([ "gwy_container", "get_int64_by_name", [("gchar*", "name")], "gint64" ]) -new_methods.append([ "gwy_container", "get_object_by_name", [("gchar*", "name")], "GObject*" ]) -new_methods.append([ "gwy_container", "get_uchar_by_name", [("gchar*", "name")], "guchar" ]) -new_methods.append([ "gwy_container", "get_value_by_name", [("gchar*", "name")], "GValue" ]) -new_methods.append([ "gwy_container", "get_string_by_name", [("gchar*", "name")], "keep_gchar*" ]) - -extra_method_type = {} -extra_method_type['gwy_data_field_get_normal_coeffs'] = [['nx', 'ny', 'nz'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_correct_laplace_iteration'] = [['error'], ['GDoubleValue']] #TEST ...V -extra_method_type['gwy_data_line_get_normal_coeffs'] = [['av', 'bv'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_fractal_cubecounting_dim'] = [['a', 'b'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_fractal_triangulation_dim'] = [['a', 'b'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_fractal_partitioning_dim'] = [['a', 'b'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_fractal_psdf_dim'] = [['a', 'b'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_area_fit_plane'] = [['pa', 'pbx', 'pby'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_fit_plane'] = [['pa', 'pbx', 'pby'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_spectra_itoxy'] = [['x', 'y'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_get_min_max'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_get_autorange'] = [['from', 'to'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_spectra_itoxy'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_get_stats'] = [['avg', 'ra', 'rms', 'skew', 'kurtosis'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_area_get_stats'] = [['avg', 'ra', 'rms', 'skew', 'kurtosis'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_area_get_inclination'] = [['theta', 'phi'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_container_gis_double'] = [['value'], ['GDoubleValue']] -extra_method_type['gwy_3d_view_get_scale_range'] = [['min_scale', 'max_scale'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_axis_get_range'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_axis_get_requested_range'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_color_axis_get_range'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_view_coords_xy_to_real'] = [['xreal', 'yreal'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_view_get_real_data_sizes'] = [['xreal', 'yreal'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_area_get_cursor'] = [['x_cursor', 'y_cursor'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_curve_model_get_x_range'] = [['x_min', 'x_max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_curve_model_get_y_range'] = [['y_min', 'y_max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_curve_model_get_ranges'] = [['x_min', 'y_min', 'x_max', 'y_max'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_model_get_x_range'] = [['x_min', 'x_max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_model_get_y_range'] = [['y_min', 'y_max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_graph_model_get_ranges'] = [['x_min', 'y_min', 'x_max', 'y_max'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_layer_basic_get_range'] = [['min', 'max'], ['GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_ruler_get_range'] = [['lower', 'upper', 'position', 'max_size'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_ruler_get_range'] = [['lower', 'upper', 'position', 'max_size'], ['GDoubleValue', 'GDoubleValue', 'GDoubleValue', 'GDoubleValue']] -extra_method_type['gwy_data_field_circular_area_extract_with_pos'] = [ ['xpos', 'ypos'], ['GIntValue', 'GIntValue'] ] -extra_method_type['gwy_data_field_hough_polar_line_to_datafield'] = [ ['px1', 'px2', 'py1', 'py2'], ['GIntValue', 'GIntValue', 'GIntValue', 'GIntValue' ] ] -extra_method_type['gwy_data_field_area_count_in_range'] = [ ['nbelow', 'nabove'], ['GIntValue', 'GIntValue'] ] -extra_method_type['gwy_tip_estimate_partial'] = [ ['count'], ['GIntValue'] ] -extra_method_type['gwy_tip_estimate_full'] = [ ['count'], ['GIntValue'] ] -extra_method_type['gwy_container_gis_int32'] = [ ['value'], ['GIntValue'] ] -extra_method_type['gwy_container_gis_int64'] = [ ['value'], ['GIntValue'] ] -extra_method_type['gwy_math_humanize_numbers'] = [ ['value'], ['GIntValue'] ] -extra_method_type['gwy_si_unit_new_parse'] = [ ['power10'], ['GIntValue'] ] -extra_method_type['gwy_si_unit_set_from_string_parse'] = [ ['power10'], ['GIntValue'] ] -extra_method_type['gwy_data_chooser_get_active'] = [ ['id'], ['GIntValue'] ] -extra_method_type['gwy_gradient_get_samples'] = [ ['nsamples'], ['GIntValue'] ] -extra_method_type['gwy_gradient_get_points'] = [ ['npoints'], ['GIntValue'] ] -extra_method_type['gwy_file_detect_with_score'] = [ ['score'], ['GIntValue'] ] -extra_method_type['gwy_enum_combo_box_update_int'] = [ ['integer'], ['GIntValue'] ] -extra_method_type['gwy_data_view_coords_xy_clamp'] = [ ['xsrc', 'ysrc'], ['GIntValue', 'GIntValue'] ] -extra_method_type['gwy_data_view_coords_real_to_xy'] = [ ['xsrc', 'ysrc'], ['GIntValue', 'GIntValue'] ] -extra_method_type['gwy_data_view_get_pixel_data_sizes'] = [ ['xres', 'yres'], ['GIntValue', 'GIntValue'] ] -extra_method_type['gwy_container_gis_enum'] = [ ['value' ], ['GIntValue'] ] -extra_method_type['gwy_axis_get_major_ticks'] = [ ['nticks'], ['GIntValue'] ] -extra_method_type['gwy_graph_area_get_x_grid_data'] = [ ['ndata'], ['GIntValue'] ] -extra_method_type['gwy_graph_area_get_y_grid_data'] = [ ['ndata'], ['GIntValue'] ] -#extra_method_type['gwy_selection_get_data'] = [['data'],['GDoubleArrayToFill']] -extra_method_type['gwy_selection_get_data_wrap'] = [['len'],['GIntValue']] -extra_method_type['gwy_app_data_browser_add_brick'] = (['preview', 'data'],['GwyDataField*', 'GwyContainer*'], [True, True]) -extra_method_type['gwy_app_data_browser_add_data_field'] = (['data'],['GwyContainer*'], [True]) -extra_method_type['gwy_app_data_browser_add_spectra'] = (['data'],['GwyContainer*'], [True]) -extra_method_type['gwy_app_data_browser_add_graph_model'] = (['data'],['GwyContainer*'], [True]) - -extended_parameters = {} -#extended_parameters['gwy_interpolation_resolve_coeffs_1d'] = [['data'],['data|n']] -#extended_parameters['gwy_selection_get_data'] = [['data'],['data|ret']] - -if len(sys.argv) < 2: - sys.stderr.write("pygwy-fix-defs.py: Codegen location required as first parameter and first parameter not provided. Exiting.\n") - exit(1) + py_name = c_name.capitalize() + letters = list(re.findall(r'_[a-z]', c_name)) + for match in letters: + py_name = py_name.replace(match, match.upper()[1]) + return py_name.replace('_', '') + +def parse_fix_args_spec(ffargs, spec, argattr): + re_fnmatch = re.compile(r'(?m)^(?P[a-zA-Z0-9_]+)' + r'\((?P[^)]+)\)$') + re_argsplit = re.compile(r'\s*,\s*').split + for m in re_fnmatch.finditer(spec): + name = m.group('cname') + if name not in ffargs: + ffargs[name] = {} + for arg in re_argsplit(m.group('args')): + # skip(foobar=NULL), default(foobar=1) or whatever + argval = None + if '=' in arg: + arg, argval = arg.split('=') + + if arg not in ffargs[name]: + ffargs[name][arg] = set() + + if argval is None: + ffargs[name][arg].add(argattr) + else: + ffargs[name][arg].add(argattr + argval) + +def parse_fix_func_props(ffprops, spec, argattr): + for m in re.finditer(r'\w+', spec): + name = m.group() + if name not in ffprops: + ffprops[name] = set() + ffprops[name].add(argattr) + +fix_function_args = {} +parse_fix_args_spec(fix_function_args, GwyBooleanOut_args, 'type:GwyBooleanOutArg') +parse_fix_args_spec(fix_function_args, GwyIntOut_args, 'type:GwyIntOutArg') +parse_fix_args_spec(fix_function_args, GwyDoubleOut_args, 'type:GwyDoubleOutArg') +parse_fix_args_spec(fix_function_args, GwyRGBAOut_args, 'type:GwyRGBAOutArg') +parse_fix_args_spec(fix_function_args, GwyIntInOut_args, 'type:GwyIntInOutArg') +parse_fix_args_spec(fix_function_args, GObject_args, 'type:GObject*') +parse_fix_args_spec(fix_function_args, constgchar_args, 'type:const-gchar*') +parse_fix_args_spec(fix_function_args, skip_args, 'skip:') +parse_fix_args_spec(fix_function_args, default_args, 'default:') +parse_fix_args_spec(fix_function_args, nullable_args, 'nullable') + +fix_function_props = {} +parse_fix_func_props(fix_function_props, caller_owns_return_funcs, 'caller-owns-return') +parse_fix_func_props(fix_function_props, remove_funcs, 'remove') -sys.path.insert(0, sys.argv[1]) # fix: "/usr/share/pygtk/2.0/codegen") +added_functions_in_wrap_calls = {} +parse_fix_func_props(added_functions_in_wrap_calls, pygwy_added_funcs, 'pygwy-added') + +remove_methods = set([x for x in remove_methods.split() if x]) +boxed_sequence_likes = set([x for x in boxed_sequence_likes.split() if x]) -import defsparser, definitions parser = defsparser.DefsParser("pygwy.defs.tmp") parser.startParsing() +parser.include('extra.defs') +# We want to discard the originals of wrapped functions so that we do not see +# `could-not-write-method messages' in the log for functions we did wrap. +wrapped_funcs = {} for f in parser.functions: - if f.name.endswith("_wrap"): - f.name = f.name.replace("_wrap", "") - #function name cannot start by number in Python - if f.name[0] in '0123456789': - f.name = "a_"+f.name - if extra_method_type.has_key(f.c_name): - for p in f.params: - for i in range(len(extra_method_type[f.c_name][0])): - if p.pname == extra_method_type[f.c_name][0][i]: - p.ptype = extra_method_type[f.c_name][1][i] - if len(extra_method_type[f.c_name]) == 3: - p.pnull = extra_method_type[f.c_name][2][i] - if p.pname == "from": - p.pname = "_from" - if extended_parameters.has_key(f.c_name): - for p in f.params: - for i in range(len(extended_parameters[f.c_name][0])): - if p.pname == extended_parameters[f.c_name][0][i]: - p.pname = extended_parameters[f.c_name][1][i] -#print dir(parser.methods) -for m in new_methods: - args = list() - args.append( ("of-object", get_python_name(m[0]) ) ) - args.append( ("c-name", m[0]+"_"+m[1]) ) - args.append( ("return-type", m[3]) ) - for p in m[2]: - args.append( ("parameters", (p)) ) - parser.define_method(m[1], *args) + assert not f.name[0].isdigit() + if f.name.endswith('_pygwy'): + wrapped_funcs[unwrap_name(f.c_name, True)] = None + +for i, f in enumerate(parser.functions): + if f.c_name in wrapped_funcs: + assert wrapped_funcs[f.c_name] is None + wrapped_funcs[f.c_name] = i + continue + + f.name = unwrap_name(f.name) + c_name = unwrap_name(f.c_name) + if c_name in fix_function_props: + for funcprop in fix_function_props[c_name]: + if funcprop == 'caller-owns-return': + f.caller_owns_return = True + elif funcprop == 'remove': + wrapped_funcs[f.c_name] = i + else: + assert not 'Reached' + + del fix_function_props[c_name] + + if hasattr(f, 'of_object'): + qname = f.of_object + '.' + f.name + if qname in remove_methods: + wrapped_funcs[qname] = i + + if c_name in fix_function_args: + to_fix = fix_function_args[c_name] + for p in f.params: + if p.pname not in to_fix: + continue + for argattr in to_fix[p.pname]: + if argattr == 'nullable': + p.pnull = True + p.pdflt = 'NULL' + elif argattr.startswith('default:'): + p.pdflt = argattr.split(':')[1] + elif argattr.startswith('skip:'): + # To skip a parameter completely we define it to be of + # GwySkipArg and provide a default value. The codegen + # handler for that type then just passed this value without + # putting any correspding arg into the Python protptype. + p.ptype = 'GwySkipArg' + p.pdflt = argattr.split(':')[1] + elif argattr.startswith('type:'): + p.ptype = argattr.split(':')[1] + else: + assert not 'Reached' + del to_fix[p.pname] + if 'return' in to_fix: + for argattr in to_fix['return']: + if argattr.startswith('type:'): + f.ret = argattr.split(':')[1] + else: + assert not 'Reached' + del to_fix['return'] + + if not fix_function_args[c_name]: + del fix_function_args[c_name] + +# Unused fix items mean potential errors. +for f in fix_function_args.items(): + sys.stderr.write('Warning: unused fixarg %s: %s\n' % (f[0], str(f[1]))) +for f in fix_function_props.items(): + sys.stderr.write('Warning: unused fixfunc %s: %s\n' % (f[0], str(f[1]))) +for f, i in wrapped_funcs.items(): + if f in added_functions_in_wrap_calls: + continue + if i is None: + sys.stderr.write('Warning: wrapper for %s does not wrap existing function\n' % f) + +for i in reversed(sorted(wrapped_funcs.values())): + if i is not None: + del parser.functions[i] parser.write_defs() +# Generate setters and sequence-like wrappers for boxed types. Generally, if +# we declare something as boxed type with some fields we want it work as a +# plain C struct. +boxed_setter_template = '''\ +%%%% +override-attr %(cname)s.%(attr)s +static int +_wrap_%(lcname)s__set_%(attr)s(PyGBoxed *self, PyObject *value, void *closure) +{ + return assign_%(convertor)s(value, &pyg_boxed_get(self, %(cname)s)->%(attr)s, "%(pyname)s.%(attr)s"); +} +''' + +boxed_sequence_template = '''\ +%%%% +override-slot %(cname)s.tp_as_sequence + +static ssize_t +_sq_%(lcname)s_length(G_GNUC_UNUSED PyGObject *self) +{ + return %(nfields)u; +} + +static PyObject* +_sq_%(lcname)s_item(PyGObject *self, Py_ssize_t i) +{ + const %(cname)s *%(name)s = pyg_boxed_get(self, %(cname)s); + +%(get_fields)s + PyErr_SetString(PyExc_IndexError, "%(pyname)s index out of range"); + return NULL; +} + +static int +_sq_%(lcname)s_ass_item(PyGObject *self, Py_ssize_t i, PyObject *item) +{ + %(cname)s *%(name)s = pyg_boxed_get(self, %(cname)s); + +%(set_fields)s + PyErr_SetString(PyExc_IndexError, "%(pyname)s index out of range"); + return -1; +} + +static const PySequenceMethods _wrap_%(lcname)s_tp_as_sequence = { + (lenfunc)_sq_%(lcname)s_length, + NULL, + NULL, + (ssizeargfunc)_sq_%(lcname)s_item, + NULL, + (ssizeobjargproc)_sq_%(lcname)s_ass_item, + NULL, + NULL, + NULL, + NULL, +}; +''' + +boxed_sequence_get_field_template = '''\ + if (i == %(i)u) + return %(convertor)s(%(name)s->%(attr)s); +''' + +boxed_sequence_set_field_template = '''\ + if (i == %(i)u) + return assign_%(convertor)s(item, &%(name)s->%(attr)s, "%(pyname)s %(attr)s item"); +''' + +extract_convertors = { + 'gdouble': 'PyFloat_FromDouble', + 'gint': 'PyInt_FromLong', +} + +assign_convertors = { + 'gdouble': 'number_as_double', + 'gint': 'number_as_int', +} + +boxed_overrides = ['/* This is a %s file */' % 'GENERATED'] +for b in parser.boxes: + if not b.fields: + continue + + substdict = { + 'cname': b.c_name, + 'pyname': b.name, + 'lcname': b.typecode.lower().replace('_type_', '_', 1), + 'name': b.name.lower(), + } + for typ, attr in b.fields: + if typ not in assign_convertors: + continue + + substdict['attr'] = attr + substdict['convertor'] = assign_convertors[typ] + setter = boxed_setter_template % substdict + boxed_overrides.append(setter) + + if b.name not in boxed_sequence_likes: + continue + + sq_getters = [] + sq_setters = [] + i = 0 + for typ, attr in b.fields: + if typ not in extract_convertors or typ not in assign_convertors: + continue + + substdict['attr'] = attr + substdict['i'] = i + substdict['convertor'] = extract_convertors[typ] + sq_getters.append(boxed_sequence_get_field_template % substdict) + substdict['convertor'] = assign_convertors[typ] + sq_setters.append(boxed_sequence_set_field_template % substdict) + boxed_overrides.append(setter) + i += 1 + + if not i: + continue + + del substdict['attr'] + del substdict['convertor'] + del substdict['i'] + substdict['get_fields'] = '\n'.join(sq_getters) + substdict['set_fields'] = '\n'.join(sq_setters) + substdict['nfields'] = i + sq_override = boxed_sequence_template % substdict + boxed_overrides.append(sq_override) + +file('boxed.override', 'w').write('\n'.join(boxed_overrides)) + diff -Nru gwyddion-2.46/modules/pygwy/pygwy-fix-defs.sed gwyddion-2.47/modules/pygwy/pygwy-fix-defs.sed --- gwyddion-2.46/modules/pygwy/pygwy-fix-defs.sed 2015-12-17 13:37:30.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy-fix-defs.sed 2016-11-07 21:13:56.000000000 +0000 @@ -1,5 +1,18 @@ #!/bin/sed -f s/define-object Serializable/define-interface Serializable/ -s/GWY_TYPE_SELECTION_GRAPH1_DAREA/GWY_TYPE_SELECTION_GRAPH_1DAREA/ -s/GWY_TYPE_NL_FIT_PRESET/GWY_TYPE_NLFIT_PRESET/ -s/GWY_TYPE_CD_LINE/GWY_TYPE_CDLINE/ +s/GWY_TYPE_SELECTION_GRAPH1_DAREA\>/GWY_TYPE_SELECTION_GRAPH_1DAREA/ +s/GWY_TYPE_NL_FIT_PRESET\>/GWY_TYPE_NLFIT_PRESET/ +s/GWY_TYPE_CD_LINE\>/GWY_TYPE_CDLINE/ +s/GwyXyz\>/GwyXYZ/ +s/GwyXy\>/GwyXY/ +s/GwyRgba\>/GwyRGBA/ +s/GwySiUnit\>/GwySIUnit/ +s/GwySiValueFormat\>/GwySIValueFormat/ +s/GwyCdLine\>/GwyCDLine/ +s/GwyGl\([A-Z]\)/GwyGL\1/ +s/Gwy\([HV]\)ruler\>/Gwy\1Ruler/ +s/Gwy\([HV]\)marker/Gwy\1Marker/ +s/GwyNLFitter\>/GwyMathNLFit/ +s/GwyMathNlfit\>/GwyMathNLFit/ +s/define-method \([1-3]d\)\([a-z]\+\)/define-method \2\1/ +s/"\(as\|assert\|def\|exec\|from\|global\|import\|in\|is\|lambda\|pass\|print\|raise\|with\|yield\)")/"\1_")/ diff -Nru gwyddion-2.46/modules/pygwy/pygwy-generate-doc.py gwyddion-2.47/modules/pygwy/pygwy-generate-doc.py --- gwyddion-2.46/modules/pygwy/pygwy-generate-doc.py 2015-07-29 08:28:23.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy-generate-doc.py 2016-11-13 20:46:22.000000000 +0000 @@ -1,320 +1,403 @@ #!/usr/bin/python +# $Id: pygwy-generate-doc.py 19221 2016-11-09 21:11:19Z yeti-dn $ # Script for generation of gwy.py dummy file. The file contains empty function bodies with comments. # Used for generation of documentation by using epydoc. # Public domain import re, sys, string -# interesting variables -doc_dirs = string.split("../../app ../../libdraw ../../libgwyddion ../../libgwydgets ../../libgwymodule ../../libprocess .") -defs_file = "pygwy.defs" -wrap_file = "pygwywrap.c" -ignore_functions = ["static", "typedef", "be", "parameter"] -ignore_endswith = ["_wrap"] -datatype = {'gdouble': "float", 'GDoubleValue': "float", 'gboolean': "bool", 'const-gchar*': "string", 'const-guchar*': "string", \ - 'gint': "int", 'guint': "int", 'gint32': "int", 'GIntValue': "int", 'GwyRGBA*': "L{RGBA}", 'GQuark': "int", 'GwyContainer*': "L{Container}", \ - 'GwyDataField*': "L{DataField}", 'GwyDataLine*': "L{DataLine}", 'GwyGraphModel*': "L{GraphModel}", 'GwySIUnit*': "L{SIUnit}", 'GwyGraph*': "L{Graph}", \ - 'GwySpectra*': "L{Spectra}", 'GwyDataView*': "L{DataView}", 'GtkWidget*': "L{gtk.Widget}", 'GObject*': "L{gobject.GObject}", 'GtkWindow*': "L{gtk.Window}", \ - 'GtkTooltips*': "L{gtk.Tooltips}", 'GtkAccelGroup*': "L{gtk.AccelGroup}", 'GtkComboBox*': "L{gtk.ComboBox}"} +from optparse import OptionParser + +parser = OptionParser(usage='''\ +pygwy-generate-doc.py --codegendir=DIR >gwy.py +Reads pygwy.defs and pygwywrap.c. +Generates dummy module gwy.py that has the same API and function documentation +extracted from C.''') + +parser.add_option('-c', '--codegendir', dest='codegendir', type='string', + default='', metavar='DIR', + help='Directory with codegen python modules') +parser.add_option('-u', '--unimplemented', dest='unimplemented', + action='store_true', default=False, + help='Write unimplemented methods with z_UNIMPLEMENTED_ prefix') + +(options, args) = parser.parse_args() +if options.codegendir: + sys.path.insert(0, options.codegendir) +assert not args + +import docextract, defsparser, override, definitions, string +# interesting variables +doc_dirs = ['../../' + x for x in 'app libdraw libgwyddion libgwydgets libgwymodule libprocess'.split()] + ['.'] +defs_file = 'pygwy.defs' +wrap_file = 'pygwywrap.c' +ignore_functions = ['static', 'typedef', 'be', 'parameter'] +keywords = 'as assert def exec from global import in is lambda pass print raise with yield'.split() +ignore_endswith = ['_pygwy'] +indent = ' ' + +datatypes = { + 'gdouble': 'float', + 'GwyDoubleOutArg': 'float', + 'gboolean': 'bool', + 'gchar*': 'string', + 'const-gchar*': 'string', + 'const-guchar*': 'string', + 'gint': 'int', + 'guint': 'int', + 'gint32': 'int', + 'GwyIntOutArg': 'int', + 'GQuark': 'int', + 'GString*': 'string', + 'GwyIntArray*': 'list', + 'GwyDoubleArray*': 'list', + 'GwyIntArrayOutArg': 'list', + 'GwyDoubleArrayOutArg': 'list', + 'GObject*': 'L{gobject.GObject}', +} + +def unwrap_name(fname, fail_if_not_wrapped=False): + if fname.endswith('_pygwy'): + return fname[:-6] + if fail_if_not_wrapped: + assert fname.endswith('_pygwy') + return fname def get_python_name(c_name): - py_name = c_name.capitalize() - letters = list(re.findall("_[a-z]", c_name)) - for match in letters: - py_name = py_name.replace(match, match.upper()[1]) - return py_name.replace("_", "") + pymap = { + 'xy': 'XY', 'xyz': 'XY', 'rgba': 'RGBA', 'math_nlfit': 'MathNLFit', + 'gl_material': 'GLMaterial', 'hruler': 'HRuler', 'vruler': 'VRuler', + 'hmarker': 'HMarker', 'nl_fitter': 'NLFitter', 'si_unit': 'SIUnit', + 'cdline': 'CDLine', 'nl_fit_preset': 'NLFitPreset', + } + py_name = c_name.capitalize() + for c, p in pymap.items(): + if c_name == 'gwy_' + c: + py_name = 'Gwy' + p + break + letters = list(re.findall(r'_[a-z]', c_name)) + for match in letters: + py_name = py_name.replace(match, match.upper()[1]) + return py_name.replace('_', '') def get_c_name(py_name): - c_name = py_name - l = re.findall("[A-Z][A-Z][A-Z]*", py_name) - for m in l: - c_name = c_name.replace(m, '_'+m) - l = re.findall("[A-Z][a-z][a-z]*", py_name) - for m in l[1:]: - c_name = c_name.replace(m, '_'+m) - return c_name.lower() + c_name = re.sub(r'([A-Z][a-z]+)', r'\1_', py_name) + c_name = re.sub(r'([A-Z]{2,})([A-Z][a-z])', r'\1_\2', c_name) + return c_name.lower().strip('_') + +def found_in_texts(s, *args): + for a in args: + if a.find(s) != -1: + return True + return False def rep_code(r): - return "B{C{"+r.groups()[0]+"}}" + s = r.group(0) + if r.group(1) in ('param', 'return', 'cvar', 'note', 'warning', 'attention'): + return s + return 'B{C{' + s[1:] + '}}' def rep_location(r): - return "L{"+r.groups()[0]+"}" + return 'L{' + r.group(0) + '}' def replace_special(s): - p = re.compile("%([a-zA-Z0-9_]+)") - s = re.sub(p, rep_code, s) - p = re.compile("@(?!param)(?!return)([a-zA-Z0-9_]+)") - s = re.sub(p, rep_code, s) - p = re.compile("#([a-zA-Z0-9_]+)") - s = re.sub(p, rep_code, s) - s = s.replace("TRUE", "True") - s = s.replace("FALSE", "False") - p = re.compile("(gwy_[a-zA-Z0-9_]+)") - s = re.sub(p, rep_location, s) - for c_class in c_class_list: - s = s.replace(c_class+"_", get_python_name(c_class)+'.') - s = s.replace("Gwyddion", "ABCgwyddion") - s = s.replace("Gwy", "") - s = s.replace("ABCgwyddion", "Gwyddion") - s = s.replace("GWY_", "") - #p = re.compile("(gwy\.[a-zA-Z\._]+)") - #s = re.sub(p, rep_location, s) - - return s - -def format_func(str, spaces, level=1): - indent = "" - for i in range(level): - indent += spaces - r = re.compile("^\s+", re.M) - res = re.sub(r, indent+spaces, str, 0) # change indentation - r = re.compile("^\s+def", re.M) - res = re.sub(r, indent+"def", res) # indent def - return res - + s = re.sub(r'', r'@warning:', s) + s = re.sub(r'', '', s) + s = re.sub(r'%([a-zA-Z0-9_]+)', rep_code, s) + s = re.sub(r'@([a-zA-Z0-9_]+)', rep_code, s) + s = re.sub(r'#([a-zA-Z0-9_]+)', rep_code, s) + s = re.sub(r'\bTRUE\b', r'True', s) + s = re.sub(r'\bFALSE\b', r'False', s) + s = re.sub(r'\bNULL\b', r'None', s) + s = re.sub(r'\bGWY_', r'', s) + s = re.sub(r'\bGTK_', r'gtk.', s) + s = re.sub(r'\bGDK_', r'gdk.', s) + s = re.sub(r'\bG_', r'glib.', s) + p = re.compile(r'(gwy_[a-zA-Z0-9_]+)') + s = re.sub(p, rep_location, s) + for c_class in c_class_list: + s = re.sub(c_class + '_', get_python_name(c_class) + '.', s) + s = re.sub(r'([a-z]\.)([1-3]d)([a-z]+)', r'\1\3\2', s) + s = re.sub(r'\bGwy([A-Z0-9])', r'\1', s) + s = re.sub(r'\bGWY_', '', s) + s = re.sub(r'(?m)^Since: ', '@since: ', s) + return s + +def format_datatype(ptype, datatypes): + return 'I{(' + datatypes.get(ptype, ptype) + ')}' + def printdoc(s): - # trim fore-spaces - ptr = re.compile("^\s+") - s = re.sub(ptr, "", s) - - print replace_special(s) - -def replace_datatype(s): - if datatype.has_key(s): - return datatype[s] - else: - return s - -def print_functions(spaces, method, docs, enums, level=1): - ignored_params = [] - enum_str = dict() - spaces2 = spaces - if level == 0: - spaces = "" - print spaces+"def", method.name+"(", - - for i in range(len(method.params)): - if method.params[i].ptype.startswith("GError"): - ignored_params.append(method.params[i].pname) - continue - if i > 0: - print ',', - # from is a keyword in Python - method.params[i].pname = method.params[i].pname.replace('[', '') - method.params[i].pname = method.params[i].pname.replace(']', '') - if method.params[i].pname == "from": - method.params[i].pname = "_from" - #if i+1 == len(method.params): - print method.params[i].pname, - #else: - # print method.params[i].pname+',', - for enum in enums: - if enum.c_name == method.params[i].ptype and docs.has_key(enum.c_name): - enum_list = "" - for l in enum.values: - enum_list += "C{B{"+l[1].replace("GWY_", "") +"}}, " - # enum_list = docs[enum.c_name].description + enum_list - enum_str[(method.params[i].pname)] = enum_list - - print "):" - if docs.has_key(method.c_name): - print spaces+spaces2+"\"\"\"" - printdoc(docs[method.c_name].description), - for param in docs[method.c_name].params: - if param[0] in ignored_params: + print replace_special(re.sub(r'\A\s+', r'', s)) + +def printcode(s='', level=0): + if s: + print indent*level + s + else: + print + +def print_function(level, method, docs, enumvals, isconstr=False): + # Gather all out-arguments and exclude them from the normal parameter list. + allretvals = [] + if (method.ret is None or method.ret in ('none', 'GwyArrayFuncStatus')): + normal_retval = False + else: + normal_retval = True + # FIXME: We have no idea how to call the return value here. + allretvals.append(definitions.Parameter(method.ret, 'value', + None, None)) + + # Prototype line + ignored_params = set() + protoparams = [] + for i, p in enumerate(method.params): + pname = p.pname + if pname in keywords: + pname += '_' + if p.ptype == 'GError**': + ignored_params.add(pname) continue - #if level == 1: - # continue - if level == 1 and param == docs[method.c_name].params[0]: + if (p.ptype.startswith('Gwy') and p.ptype.endswith('OutArg') + or p.ptype == 'GwySkipArg'): + allretvals.append(p) + ignored_params.add(pname) continue - if param[0] == "from": - param_name = "_from" - else: - param_name = param[0] - # find original datatype - ptype = "" - for p in method.params: - if p.pname == param_name: - ptype = " I{("+ replace_datatype(p.ptype)+")} " - break - # check for enum - if enum_str.has_key(param[0]): - printdoc('@param '+param_name+': '+param[1].rstrip()+ "Expected values: "+enum_str[param[0]].rstrip()+ptype) - else: - printdoc('@param '+param_name+': '+param[1].rstrip()+ptype) - ret = docs[method.c_name].ret - if len(ret) > 0: - if type(ret) is not type(''): - ret = ret[0] - printdoc("@return:"+ret) - print spaces+spaces2+"\"\"\"" - print spaces+spaces2+"return", method.guess_return_value_ownership() - -def add_override_methods(parser): - # add methods and functions from override file - override_docs = docextract.extract(["../"]) - for d in override_docs.keys(): - is_method = -1 - params = ['parameters'] - for param in override_docs[d].params: - params.append( ('some_type', param[0]) ) - for i in range(len(c_class_list)): - if d.startswith(c_class_list[i]+"_"): - is_method = i - name = d.replace(c_class_list[i]+"_", "") - break - #print ('c-name', d, tuple(params)) - if is_method != -1: - # add as method - parser.define_method(name, ('c-name', d), - ('of-object', get_python_name(c_class_list[i])), tuple(params)) - else: - # add as functions - parser.define_function(d, ('c-name', d), tuple(params)) - -def func_cmp(x, y): - return cmp(x.name, y.name) - -# Add codegen path to our import path -i = 1 -codegendir = None -while i < len(sys.argv): - arg = sys.argv[i] - if arg == '--codegendir': - del sys.argv[i] - codegendir = sys.argv[i] - del sys.argv[i] - elif arg.startswith('--codegendir='): - codegendir = arg.split('=', 2)[1] - del sys.argv[i] + protoparams.append(pname) + printcode('def ' + method.name + '(' + ', '.join(protoparams) + '):', level) + + # Docstring. Take it from _pygwy wrapped variant if it has manually + # written documentation. Otherwise try the original function. This means + # we have to do it in the reverse order. + doc = docs.get(unwrap_name(method.c_name), None) + doc = docs.get(method.c_name, doc) + if doc: + printcode('"""', level+1) + printdoc(doc.description) + # Go through actual method params (from defs file). + for p in method.params: + pname = p.pname + if pname in keywords: + pname += '_' + if pname in ignored_params: + continue + + # Try to find the corresponding documentation. + param = [x for x in doc.params if x[0] == pname] + if len(param) > 1: + sys.stderr.write('Parameter %s of %s found multiple times.\n' + % (p.pname, c_name)) + continue + paramdoc = param[0][1].rstrip() + ' ' if param else '' + + # Check for enum and write a list of expected values. + if p.ptype in enumvals: + expvals = enumvals[p.ptype] + ptype = 'I{(L{' + p.ptype + '})}' + else: + expvals = '' + ptype = format_datatype(p.ptype, datatypes) + printdoc('@param ' + pname + ': ' + paramdoc + expvals + ptype) + + # Handle methods/functions returning tuples at least somehow. + retdoc = doc.ret + if type(retdoc) is not str: + retdoc = retdoc[0] + retdoc = retdoc.strip() + + if len(allretvals) == 1 and normal_retval: + ptype = format_datatype(method.ret, datatypes) + printdoc('@return: ' + retdoc + ' ' + ptype) + elif len(allretvals) == 1 and not normal_retval: + retname = 'B{C{' + allretvals[0].pname + '}}' + rettype = format_datatype(allretvals[0].ptype, datatypes) + printdoc('@return: Value ' + retname + '. (' + rettype + ')') + elif allretvals: + retnames = ', '.join('B{C{' + p.pname + '}}' for p in allretvals) + rettypes = ', '.join(format_datatype(p.ptype, datatypes) + for p in allretvals) + printdoc('@return: Tuple consisting of ' + str(len(allretvals)) + + ' values (' + retnames + '). (' + rettypes + ')') + + printcode('"""', level+1) + + if allretvals: + ret = ', '.join('None' for i in range(len(allretvals))) + printcode('return ' + ret, level+1) else: - i += 1 -if codegendir: - sys.path.insert(0, codegendir) -del codegendir + printcode('pass', level+1) + printcode() -# Load it -import docextract, defsparser, override, definitions, string +def print_class(obj, docs, sectionmap): + printcode() + printcode('class %s:' % obj.name) + if docs.has_key(obj.c_name): + printcode('"""', 1) + if obj.c_name in sectionmap: + name = sectionmap[obj.c_name] + for param in docs[name].params: + if param[0] == 'short_description': + printdoc(param[1]) + printcode() + printdoc(docs[name].description) + else: + printdoc(docs[obj.c_name].description) + printcode('"""', 1) +# Patch docextract's skip_to_identifier() because we want to recognise: +# - types (mainly enums, but possibly other stuff) +# - sections (for class documentation for which C documentation is useless) +identifier_patterns = docextract.identifier_patterns +type_name_pattern = re.compile(r'^(Gwy\w*)\s*:?(\s*\(.*\)\s*){0,2}\s*$') +section_name_pattern = re.compile(r'^(SECTION:\s*\w+):?(\s*\(.*\)\s*){0,2}\s*$') +identifier_patterns = ( + ('section', section_name_pattern), + ('signal', docextract.signal_name_pattern), + ('property', docextract.property_name_pattern), + ('function', docextract.function_name_pattern), + ('type', type_name_pattern), +) + +def skip_to_identifier(fp, line, cur_doc): + # Skip the initial comment block line ('/**') if not eof. + if line: + line = fp.readline() + + # Now skip empty lines. + line = docextract.skip_to_nonblank(fp, line) + + # See if the first non-blank line is the identifier. + if line and not docextract.comment_end_pattern.match(line): + # Remove the initial ' * ' in comment block line and see if there is an + # identifier. + line = docextract.comment_line_lead_pattern.sub('', line) + for pattern in identifier_patterns: + match = pattern[1].match(line) + if match: + cur_doc.set_name(match.group(1)) + annotations = docextract.get_annotation_list(match.group(2)) + for annotation in annotations: + cur_doc.add_annotation(annotation) + cur_doc.set_type(pattern[0]) + return line + return line -docs = docextract.extract(doc_dirs) +docextract.skip_to_identifier = skip_to_identifier -p = defsparser.DefsParser(defs_file) +docs = docextract.extract(doc_dirs) +sectionmap = [s for s in docs.keys() if s.startswith('SECTION:')] +for i, s in enumerate(sectionmap): + param = [x[1] for x in docs[s].params if x[0] == 'title'] + if len(param) == 1 and param[0].strip(): + sectionmap[i] = (param[0].strip(), s) +sectionmap = dict(sectionmap) + +parser = defsparser.DefsParser(defs_file) +parser.startParsing() +parser.include('override.defs') -p.startParsing() -# create list of class +# Create list of class. Add rewrite rules GwyWhatever* -> L{Whatever} c_class_list = [] -for obj in p.objects: - c_class_list.append(get_c_name(obj.c_name)) +for obj in parser.objects + parser.boxes: + c_class_list.append(get_c_name(obj.c_name)) + datatypes[obj.c_name + '*'] = 'L{' + obj.name + '}' + +# Add rewrite rules GtkWhatever* -> L{gtk.Whatever} +for line in file(defs_file): + for m in re.finditer(r'"(Gtk|Gdk)([A-Z]\w+)\*"', line): + prefix, suffix = m.group(1), m.group(2) + datatypes[prefix + suffix + '*'] = 'L{' + prefix.lower() + '.' + suffix + '}' + +# Create helper dict for listings of enumerated values. +expected_enumvals = dict() +for enum in parser.enums: + expvals = ['C{B{' + re.sub(r'^GWY_', r'', enumval[1]) + '}}' + for enumval in enum.values] + expvals = ' Expected values: ' + ', '.join(expvals) + '. ' + expected_enumvals[enum.c_name] = expvals -add_override_methods(p) +#add_override_methods(parser) f = file(wrap_file) wrap_file_cont = f.read() -override_file_cont = "" +override_file_cont = '' override = override.Overrides() -#enums -""" -for enum in p.enums: - if docs.has_key(enum.c_name): - print "\"\"\"" - printdoc(docs[enum.c_name].description) - print "\"\"\"" - for i in range(len(enum.values)-1): - print enum.values[i][1].replace("GWY_", ""), ',', - print enum.values[len(enum.values)-1][1].replace("GWY_", ""), " = range(", len(enum.values), ")" -""" - # Keep GENERATED seprarated so that this file is not marked generated. -print "# This is dummy " + "GENERATED" + " file used for generation of documentation" +print '# vim: set fileencoding=utf-8 :' +print '# This is dummy %s file used for generation of documentation' % 'GENERATED' -#objects/classes +# Objects/classes +for obj in parser.objects + parser.boxes: + class_written = False + any_methods = False + if wrap_file_cont.find(obj.name) == -1: + sys.stderr.write('Class %s not found.\n' % obj.c_name) + continue + + constructor = parser.find_constructor(obj, override) + if constructor: + if not class_written: + print_class(obj, docs, sectionmap) + class_written = True + ignore_functions.append(constructor.name) + constructor.name = '__init__' + print_function(1, constructor, docs, expected_enumvals, + isconstr=True) + any_methods = True + for method in parser.find_methods(obj): + method.name = unwrap_name(method.name) + if method.varargs: + continue + if not class_written: + print_class(obj, docs, sectionmap) + class_written = True + if not found_in_texts(method.name, wrap_file_cont, override_file_cont): + sys.stderr.write('Method %s not found.\n' % method.c_name) + if not options.unimplemented: + continue + method.name = 'UNIMPLEMENTED_' + method.name + print_function(1, method, docs, expected_enumvals) + any_methods = True + + if class_written and not any_methods: + printcode('pass', 1) + +# Functions +for func in sorted(parser.functions, key=lambda x: x.name): + if (isinstance(func, definitions.MethodDef) + or func.is_constructor_of + or func.varargs + or func.name in ignore_functions): + continue + func.name = unwrap_name(func.name) + # check if function is used in pygwywrap.c file + if not found_in_texts(func.name, wrap_file_cont, override_file_cont): + sys.stderr.write('Function %s not found.\n' % func.c_name) + if not options.unimplemented: + continue + func.name = 'z_UNIMPLEMENTED_' + func.name + print_function(0, func, docs, expected_enumvals) -for obj in p.objects: - class_written = False - if wrap_file_cont.find(obj.name) == -1: - sys.stderr.write("class "+obj.c_name+" not found.\n") - continue - #print dir(obj) - - methods = p.find_methods(obj) - if not methods: - continue - constructor = p.find_constructor(obj, override) - if constructor: - if not class_written: - print "class", obj.name+":" - if docs.has_key(obj.c_name): - print " \"\"\"" - printdoc(docs[obj.c_name].name) - printdoc(docs[obj.c_name].description) - for param in docs[obj.c_name].params: - print param - printdoc(docs[obj.c_name].get_param_description(param)) - printdoc(docs[obj.c_name].ret) - print " \"\"\"" - #print dir(docs[obj.c_name]) - #exit() - class_written = True - ignore_functions.append(constructor.name) - constructor.name = "__init__" - print_functions(" ", constructor, docs, p.enums) - for method in methods: - # skip methods beginning with number - if method.name[0] in ['0', '1','2', '3', '4', '5', '6', '7', '8', '9']: - method.name = "Num_"+method.name - continue - if method.varargs: - continue - # skip ignore suffix - to_ignore = False - for end in ignore_endswith: - if method.name.endswith(end): - to_ignore = True - break - if to_ignore: - continue - - if wrap_file_cont.find(method.c_name) == -1 and override_file_cont.find(method.c_name) == -1: - sys.stderr.write("method "+method.c_name+" not found.\n") - method.name = "UNIMPLEMENTED_"+method.name - if not class_written: - print "class", obj.name+":" - if docs.has_key(obj.c_name): - print " \"\"\"" - printdoc(docs[obj.c_name].description) - print " \"\"\"" - class_written = True - print_functions(" ", method, docs, p.enums) - -# functions -p.functions.sort(func_cmp) -for func in p.functions: - if isinstance(func, definitions.MethodDef): - continue - if func.is_constructor_of: - continue - # skip functions beginning with number - if func.name[0] in ['0', '1','2', '3', '4', '5', '6', '7', '8', '9']: - continue - # skip varargs functions - if func.varargs: - continue - # skip ignore functions - if func.name in ignore_functions: - continue - # skip ignore suffix - to_ignore = False - for end in ignore_endswith: - if func.name.endswith(end): - to_ignore = True - break - if to_ignore: - continue - # check if function is used in pygwywrap.c file - if wrap_file_cont.find(func.c_name) == -1 and override_file_cont.find(func.c_name): - sys.stderr.write("Func "+func.c_name+" not found.\n") - func.name = "z_UNIMPLEMENTED_"+func.name - print_functions(" ", func, docs, p.enums, 0) +# Enums +for enum in parser.enums: + printcode() + printcode('class %s:' % enum.name) + printcode('"""', 1) + if docs.has_key(enum.c_name): + printdoc(docs[enum.c_name].description) + params = docs[enum.c_name].params + printdoc('''\ +@note: All the enumerated values are defined at the module level, I{not} the +class level. The are just groupped by class here for easier orientation. +''') + for enumval in enum.values: + c_name = enumval[1] + pyname = re.sub(r'^GWY_', r'', c_name) + doc = '' + for paramdoc in params: + if paramdoc[0] == c_name: + doc = paramdoc[1].strip() + break + printdoc('@cvar %s: %s' % (pyname, doc)) + printcode('"""', 1) + printcode('pass', 1) diff -Nru gwyddion-2.46/modules/pygwy/pygwy.h gwyddion-2.47/modules/pygwy/pygwy.h --- gwyddion-2.46/modules/pygwy/pygwy.h 2015-07-29 08:28:23.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy.h 2016-11-15 12:25:40.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: pygwy-console.c 16948 2015-02-22 07:22:30Z yeti-dn $ + * @(#) $Id: pygwy.h 19267 2016-11-15 12:25:40Z yeti-dn $ * Copyright (C) 2008 Jan Horak * E-mail: xhorak@gmail.com * @@ -23,14 +23,39 @@ #ifndef __PYGWY_H__ #define __PYGWY_H__ -#define pygwy_plugin_dir_name "pygwy" +#define pygwy_module_dir_name "pygwy" + +#define pygwy_stderr_redirect_setup_code \ + "import sys, tempfile\n" \ + "_pygwy_stderr_redir = tempfile.TemporaryFile()\n" \ + "_pygwy_stderr_orig = sys.stderr\n" \ + "sys.stderr = _pygwy_stderr_redir\n" + +#define pygwy_stderr_redirect_restore_code \ + "_pygwy_stderr_redir.seek(0)\n" \ + "_pygwy_stderr_string = _pygwy_stderr_redir.read()\n" \ + "_pygwy_stderr_redir.close()\n" \ + "sys.stderr = _pygwy_stderr_orig\n" + +#define pygwy_stderr_redirect_readstr_code \ + "_pygwy_stderr_pos = _pygwy_stderr_redir.tell()\n" \ + "_pygwy_stderr_redir.seek(0)\n" \ + "_pygwy_stderr_string = _pygwy_stderr_redir.read(_pygwy_stderr_pos)\n" \ + "_pygwy_stderr_redir.seek(0)" PyObject* pygwy_create_environment (const gchar *filename, gboolean show_errors); void pygwy_initialize (void); -void pygwy_run_string (const char *cmd, - int type, - PyObject *g, - PyObject *l); + +G_GNUC_UNUSED +static inline void +pygwy_run_string(const char *cmd, int type, PyObject *globals, PyObject *locals) +{ + PyObject *ret = PyRun_String(cmd, type, globals, locals); + if (!ret) + PyErr_Print(); + else + Py_DECREF(ret); +} #endif diff -Nru gwyddion-2.46/modules/pygwy/pygwy.override gwyddion-2.47/modules/pygwy/pygwy.override --- gwyddion-2.46/modules/pygwy/pygwy.override 2016-07-19 15:28:33.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/pygwy.override 2016-11-16 12:25:48.000000000 +0000 @@ -1,6 +1,7 @@ /* - * Copyright (C) 2008 Jan Horak - * E-mail: xhorak@gmail.com + * $Id: pygwy.override 19233 2016-11-10 19:31:14Z yeti-dn $ + * Copyright (C) 2008 Jan Horak, 2015-2016 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 @@ -20,7 +21,7 @@ * Description: This file contains overriden functions which cannot be * automatically generated by pygwy-codegen. */ -/* -*- Mode: C; c-basic-offset: 4 -*- */ + %% headers #include @@ -28,84 +29,209 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include -typedef gdouble ArrayOfGDoubleNullTerminated; -typedef gint GIntValue; -typedef gdouble GDoubleValue; -typedef gdouble GDoubleArray; -typedef gdouble GDoubleArrayToFill; +typedef gboolean GwyArrayFuncStatus; + +typedef gboolean GwyBooleanOutArg; +typedef gint GwyIntOutArg; +typedef gint GwyIntInOutArg; +typedef gdouble GwyDoubleOutArg; +typedef gdouble GwyDoubleInOutArg; +typedef GwyRGBA GwyRGBAOutArg; + typedef gchar keep_gchar; // do not delete when returning typedef gchar pass_owner_gchar; // do not delete in wrapped function -// ##include "pywrap.h" +typedef GwyNLFitter GwyMathNLFit; + +#define gwy_si_value_format_new gwy_si_unit_value_format_new +#define gwy_si_value_format_copy gwy_si_unit_value_format_copy +#define gwy_si_value_format_free gwy_si_unit_value_format_free +#define gwy_si_value_format_clone gwy_si_unit_value_format_clone +#define gwy_si_value_format_set_units gwy_si_unit_value_format_set_units + +/* Helpers for array impedance matching. ATM we create temporary GArrays. + * Here we do not bother with typing and just use GArray; wrap_calls.c has + * typedefs for various array types to make them tranparent. */ +static GArray* +create_double_garray_from_sequence(PyObject *object) +{ + GArray *array; + gdouble *a; + gsize n, i; + + if (!PySequence_Check(object)) + return NULL; + + n = PySequence_Size(object); + array = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(array, n); + a = (gdouble*)array->data; + for (i = 0; i < n; i++) { + PyObject *item = PySequence_GetItem(object, i); + if (PyFloat_Check(item)) + a[i] = PyFloat_AsDouble(item); + else if (PyNumber_Check(item)) { + PyObject *number = PyNumber_Float(item); + a[i] = PyFloat_AsDouble(number); + Py_DECREF(number); + } + else { + g_array_free(array, TRUE); + return NULL; + } + } + return array; +} + +static PyObject* +create_list_consume_double_garray(GArray *array) +{ + PyObject *list; + const gdouble *a; + gsize n, i; + + n = array->len; + if (!(list = PyList_New(n))) { + g_array_free(array, TRUE); + /* Should we raise an exception, or who does it? */ + return NULL; + } + a = (const gdouble*)array->data; + for (i = 0; i < n; i++) + PyList_SetItem(list, i, PyFloat_FromDouble(a[i])); + g_array_free(array, TRUE); + return list; +} + +static GArray* +create_int_garray_from_sequence(PyObject *object) +{ + GArray *array; + gint *a; + gsize n, i; + + if (!PySequence_Check(object)) + return NULL; + + n = PySequence_Size(object); + array = g_array_new(FALSE, FALSE, sizeof(gint)); + g_array_set_size(array, n); + a = (gint*)array->data; + for (i = 0; i < n; i++) { + PyObject *item = PySequence_GetItem(object, i); + if (PyInt_Check(item)) + a[i] = PyInt_AsLong(item); + else if (PyLong_Check(item)) + a[i] = PyLong_AsLong(item); + else { + g_array_free(array, TRUE); + return NULL; + } + } + return array; +} + +static PyObject* +create_list_consume_int_garray(GArray *array) +{ + PyObject *list; + const gint *a; + gsize n, i; + + n = array->len; + if (!(list = PyList_New(n))) { + g_array_free(array, TRUE); + /* Should we raise an exception, or who does it? */ + return NULL; + } + a = (const gint*)array->data; + for (i = 0; i < n; i++) + PyList_SetItem(list, i, PyInt_FromLong(a[i])); + g_array_free(array, TRUE); + return list; +} + +static PyObject* +create_string_consume_gstring(GString *str) +{ + PyObject *pystr; + + if (G_UNLIKELY(!str)) { + Py_INCREF(Py_None); + return Py_None; + } + pystr = PyString_FromStringAndSize(str->str, str->len); + g_string_free(str, TRUE); + return pystr; +} + +static int +assign_number_as_double(PyObject *item, gdouble *value, const gchar *pname) +{ + gchar *error_message; + + if (PyFloat_Check(item)) { + *value = PyFloat_AsDouble(item); + return 0; + } + + /* This can be questionable but allows assigning integers or fractions. */ + if (PyNumber_Check(item)) { + PyObject *number = PyNumber_Float(item); + *value = PyFloat_AsDouble(number); + Py_DECREF(number); + return 0; + } + + error_message = g_strconcat(pname, " must be a float", NULL); + PyErr_SetString(PyExc_TypeError, error_message); + g_free(error_message); + return -1; +} + +static int +assign_number_as_int(PyObject *item, gint *value, const gchar *pname) +{ + gchar *error_message; + + if (PyInt_Check(item)) { + *value = PyInt_AsLong(item); + return 0; + } + + error_message = g_strconcat(pname, " must be an integer", NULL); + PyErr_SetString(PyExc_TypeError, error_message); + g_free(error_message); + return -1; +} + +static void +append_to_list_of_containers(GwyContainer *data, gpointer list) +{ + if (PyList_Append((PyObject*) list, pygobject_new((GObject*)data)) < 0) + g_warning("Could not append container to python list of containers."); +} + +/* + * Ignore all get-type() and free() functions. + * + * Also include things we define here in ignore-glob because otherwise the + * show up as not wrapped in the report. + */ %% modulename gwy + +%% +include + boxed.override + %% import gobject.GObject as PyGObject_Type import gtk.Table as PyGtkTable_Type @@ -126,46 +252,39 @@ import gtk.TreeIter as PyGtkTreeIter_Type import gtk.ListStore as PyGtkListStore_Type import gtk.UpdateType as PyGtkUpdateType_Type +import gtk.AccelGroup as PyGtkAccelGroup_Type import gtk.gdk.Drawable as PyGdkDrawable_Type import gtk.gdk.Pixbuf as PyGdkPixbuf_Type import gtk.gdk.GC as PyGdkGC_Type import gtk.gdk.LineStyle as PyGdkLineStyle_Type + +%% +ignore + Container.set_const_string + Container.set_const_string_by_name + %% ignore-glob - *_get_type - gwy_container_gis_* - gwy_container_get_string - gwy_container_get_value - gwy_container_set_value - gwy_container_get_value_by_name - gwy_container_set_value_by_name - gwy_gradient_sample - gwy_vector_layer_button* - gwy_vector_layer_motion_notify - gwy_vector_layer_key* - gwy_md5_get_digest - gwy_graph_draw_line - gwy_gradient_get_samples - gwy_data_field_get_data - gwy_data_line_get_data - gwy_container_set_string - gwy_math_median - gwy_math_sort + gwy_*_get_type + gwy_*_free + gwy_container_gis_* + %% ignore-type - GwyPlainTool + GwyPlainTool + %% define gwy_app_data_browser_get_current kwargs /** - * gwy_app_data_browser_get_current: - * @obj_type: object type, expected values: C{B{APP_DATA_FIELD_ID, APP_GRAPH_MODEL_ID, - * APP_SPECTRA_ID, APP_BRICK_ID, APP_DATA_FIELD_KEY, APP_MASK_FIELD_KEY, APP_SHOW_FIELD_KEY, - * APP_GRAPH_MODEL_KEY, APP_SPECTRA_KEY, APP_BRICK_KEY, APP_CONTAINER, APP_DATA_VIEW, APP_GRAPH, - * APP_DATA_FIELD, APP_MASK_FIELD, APP_SHOW_FIELD, APP_GRAPH_MODEL, APP_SPECTRA, APP_BRICK}} + * gwy_app_data_browser_get_current: + * @obj_type: Data item type. I{(L{AppWhat})} + * + * Get current data item of given type. * - * Get current object of given type. + * Depending on what you request, the function can return data object + * themselves, integer keys, ids, ... * - * Returns: reference to current object or None. + * Returns: The current object or None. **/ static PyObject * _wrap_gwy_app_data_browser_get_current(PyObject *self, PyObject *args, PyObject *kwargs) @@ -187,6 +306,7 @@ case GWY_APP_SPECTRA_ID: case GWY_APP_BRICK_ID: case GWY_APP_SURFACE_ID: + case GWY_APP_CONTAINER_ID: case GWY_APP_PAGE: // integer gwy_app_data_browser_get_current(obj_type, &iobj, NULL); @@ -229,109 +349,39 @@ %% define gwy_app_data_browser_get_containers noargs /** - * gwy_app_data_browser_get_containers: + * gwy_app_data_browser_get_containers: * - * Get list of containers of current data browser. + * Get list of containers of current data browser. * - * Returns: list of containers L{Container} object + * Returns: list of containers L{Container} object **/ static PyObject * _wrap_gwy_app_data_browser_get_containers(PyGObject *self) { - PyObject *list = NULL; - - list = PyList_New(0); - gwy_app_data_browser_foreach(pygwy_create_py_list_of_containers, (gpointer) list); - return list; + PyObject *list = PyList_New(0); + gwy_app_data_browser_foreach(append_to_list_of_containers, (gpointer)list); + return list; } %% -define GwyDataField.duplicate noargs +define GwyDataLine.get_data_pointer noargs /** - * gwy_data_field_duplicate: + * gwy_data_line_get_data_pointer: * - * Duplicate datafield + * Gets pointer to data which the data line contains. * - * Returns: duplicated datafield + * Returns: integer pointing to the raw data of the data field **/ static PyObject * -_wrap_gwy_data_field_duplicate(PyGObject *self) -{ - GwyDataField *ret; - - ret = gwy_data_field_duplicate(GWY_DATA_FIELD(self->obj)); - - return pygobject_new((GObject *)ret); -} - -%% -define GwyBrick.duplicate noargs -/** - * gwy_brick_duplicate: - * - * Duplicate brick - * - * Returns: duplicated brick -**/ -static PyObject * -_wrap_gwy_brick_duplicate(PyGObject *self) -{ - GwyBrick *ret; - - ret = gwy_brick_duplicate(GWY_BRICK(self->obj)); - - return pygobject_new((GObject *)ret); -} - -%% -override gwy_app_undo_qcheckpointv kwargs -static PyObject * -_wrap_gwy_app_undo_qcheckpointv(PyObject *self, PyObject *args, PyObject *kwargs) +_wrap_gwy_data_line_get_data_pointer(PyGObject *self) { - static char *kwlist[] = {"container", "key", NULL}; - - PyGObject *cont; - GQuark key; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:gwy_app_undo_qcheckpointv", kwlist, &PyGwyContainer_Type, &cont, &key)) - return NULL; - gwy_app_undo_qcheckpointv(GWY_CONTAINER(cont->obj), 1, &key); - Py_INCREF(Py_None); - return Py_None; -} + gdouble* data; + unsigned long ptr; -%% -define GwyDataField.get_data noargs -/** - * gwy_data_field_get_data: - * - * Create a tuple of data which the datafield contains. Content of the tuple is NOT reference to original datafield but its copy. - * - * Returns: tuple of raw numeric data from DataField -**/ -static PyObject * -_wrap_gwy_data_field_get_data(PyGObject *self) -{ - gdouble *data; - gint len, xres, yres; - PyObject *tuple; - int i; - - xres = gwy_data_field_get_xres(GWY_DATA_FIELD(self->obj)); - yres = gwy_data_field_get_yres(GWY_DATA_FIELD(self->obj)); - // Get size of data field - len = xres * yres; - // Create tuple by size of data field - tuple = PyTuple_New(len); - - data = gwy_data_field_get_data(GWY_DATA_FIELD(self->obj)); - // fill tuple with data field values - for (i = 0; i < len; i++) { - /* get data read only, any changes to the tuple does not reflect on actual datafield */ - PyTuple_SetItem(tuple, i, PyFloat_FromDouble(data[i])); - } + data = gwy_data_line_get_data(GWY_DATA_LINE(self->obj)); + ptr = (long)data; - return tuple; + return PyLong_FromUnsignedLong(ptr); } %% @@ -339,20 +389,20 @@ /** * gwy_data_field_get_data_pointer: * - * Get Pointer to data which the datafield contains. + * Gets pointer to data which the data field contains. * - * Returns: integer pointing to the raw data of the datafield + * Returns: integer pointing to the raw data of the data field **/ static PyObject * _wrap_gwy_data_field_get_data_pointer(PyGObject *self) { - gdouble* data; - unsigned long ptr; + gdouble* data; + unsigned long ptr; - data = gwy_data_field_get_data(GWY_DATA_FIELD(self->obj)); - ptr = (long)data; + data = gwy_data_field_get_data(GWY_DATA_FIELD(self->obj)); + ptr = (long)data; - return PyLong_FromUnsignedLong(ptr); + return PyLong_FromUnsignedLong(ptr); } %% @@ -360,45 +410,20 @@ /** * gwy_brick_get_data_pointer: * - * Get Pointer to data which the brick contains. + * Gets pointer to data which the brick contains. * * Returns: integer pointing to the raw data of the brick **/ static PyObject * _wrap_gwy_brick_get_data_pointer(PyGObject *self) { - gdouble* data; - unsigned long ptr; + gdouble* data; + unsigned long ptr; - data = gwy_brick_get_data(GWY_BRICK(self->obj)); - ptr = (long)data; + data = gwy_brick_get_data(GWY_BRICK(self->obj)); + ptr = (long)data; - return PyLong_FromUnsignedLong(ptr); -} - -%% -define GwyDataLine.get_data noargs -static PyObject * -_wrap_gwy_data_line_get_data(PyGObject *self) -{ - gdouble *data; - gint res; - PyObject *tuple; - int i; - - // Get size of data line - res = gwy_data_line_get_res(GWY_DATA_LINE(self->obj)); - // Create tuple by size of data field - tuple = PyTuple_New(res); - - data = gwy_data_line_get_data(GWY_DATA_LINE(self->obj)); - // fill tuple with data field values - for (i = 0; i < res; i++) { - /* get data read only, any changes to the tuple does not reflect on actual datafield */ - PyTuple_SetItem(tuple, i, PyFloat_FromDouble(data[i])); - } - - return tuple; + return PyLong_FromUnsignedLong(ptr); } %% @@ -444,9 +469,7 @@ } static int -_map_gwy_container_ass_subscript(PyGObject *cont, - PyObject *key, - PyObject *v) +_map_gwy_container_ass_subscript(PyGObject *cont, PyObject *key, PyObject *v) { GQuark quark; @@ -486,485 +509,393 @@ return 0; } -PyMappingMethods G_GNUC_INTERNAL _wrap_gwy_container_tp_as_mapping = { - (lenfunc) _map_gwy_container_length, - (binaryfunc) _map_gwy_container_subscript, - (objobjargproc) _map_gwy_container_ass_subscript +static const PyMappingMethods _wrap_gwy_container_tp_as_mapping = { + (lenfunc)_map_gwy_container_length, + (binaryfunc)_map_gwy_container_subscript, + (objobjargproc)_map_gwy_container_ass_subscript }; %% -define GwyContainer.set_string kwargs -/** - * gwy_container_set_string: - * @key: an object key - * @value: new string - * - * Set string for key to given value - * - **/ -static PyObject * -_wrap_gwy_container_set_string(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "key", "value", NULL }; - int key, value_len; - guchar *value; - gchar *dup_value; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"is#:GwyContainer.set_string", kwlist, &key, &value, &value_len)) - return NULL; - - dup_value = g_strndup(value, value_len); - gwy_container_set_string(GWY_CONTAINER(self->obj), key, dup_value); - - Py_INCREF(Py_None); - return Py_None; -} - -%% -define GwyContainer.get_string kwargs -static PyObject * -_wrap_gwy_container_get_string(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "key", NULL }; - int key; - const guchar *value; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GwyContainer.set_string", kwlist, &key)) - return NULL; - - value = gwy_container_get_string(GWY_CONTAINER(self->obj), key); - if (value) - return PyString_FromString(value); - else - return NULL; -} - -%% -define GwyContainer.get_object kwargs -/** - * gwy_container_get_object: - * @key: key of object. - * - * Get object of given key from container. - * - * Returns: object of given key -**/ -static PyObject * -_wrap_gwy_container_get_object(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"key", NULL}; - gint key; - gpointer obj; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:gwy_container_get_object", kwlist, &key)) - return NULL; - obj = gwy_container_get_object((GWY_CONTAINER(self->obj)), key); - if (obj && (GWY_IS_DATA_FIELD(obj) || GWY_IS_DATA_LINE(obj) || GWY_IS_RESOURCE(obj) || GWY_IS_SI_UNIT(obj))) { - return pygobject_new((GObject *)obj); - } else { - Py_INCREF(Py_None); - return Py_None; - } -} - -%% -define GwyContainer.keys noargs -static PyObject * -_wrap_gwy_container_keys(PyGObject *self) -{ - gint i; - GQuark *keys; - PyObject *tuple; - - keys = gwy_container_keys(GWY_CONTAINER(self->obj)); - tuple = PyTuple_New(gwy_container_get_n_items(GWY_CONTAINER(self->obj))); - if (!tuple) - return NULL; - // fill tuple with keys - for (i = 0 ; i < gwy_container_get_n_items(GWY_CONTAINER(self->obj)); i++) { - PyTuple_SetItem(tuple, i, PyInt_FromLong(keys[i])); - } - g_free(keys); - return tuple; -} - -%% define GwyContainer.keys_by_name noargs -static PyObject * +static PyObject* _wrap_gwy_container_keys_by_name(PyGObject *self) { - gint i; - const gchar **keys; - PyObject *tuple; - - keys = gwy_container_keys_by_name(GWY_CONTAINER(self->obj)); - tuple = PyTuple_New(gwy_container_get_n_items(GWY_CONTAINER(self->obj))); - if (!tuple) - return NULL; - // fill tuple with keys - for (i = 0 ; i < gwy_container_get_n_items(GWY_CONTAINER(self->obj)); i++) { - PyTuple_SetItem(tuple, i, PyString_FromString(keys[i])); - } - g_free(keys); - return tuple; + gint i; + const gchar **keys; + PyObject *tuple; + + keys = gwy_container_keys_by_name(GWY_CONTAINER(self->obj)); + tuple = PyTuple_New(gwy_container_get_n_items(GWY_CONTAINER(self->obj))); + if (!tuple) + return NULL; + // fill tuple with keys + for (i = 0 ; i < gwy_container_get_n_items(GWY_CONTAINER(self->obj)); i++) { + PyTuple_SetItem(tuple, i, PyString_FromString(keys[i])); + } + g_free(keys); + return tuple; } %% define GwyContainer.get_value_by_name kwargs - static PyObject * _wrap_gwy_container_get_value_by_name(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = {"name", NULL}; - char* name; - GValue val; - PyObject* obj; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:gwy.Container.get_value_by_name", kwlist, &name)) - return NULL; - val = gwy_container_get_value_by_name((GWY_CONTAINER(self->obj)), name); + static char *kwlist[] = {"name", NULL}; + char* name; + GValue val; + PyObject* obj; - obj = pyg_value_as_pyobject(&val,0); + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:gwy.Container.get_value_by_name", kwlist, &name)) + return NULL; + val = gwy_container_get_value_by_name((GWY_CONTAINER(self->obj)), name); + obj = pyg_value_as_pyobject(&val, 0); - return obj; + return obj; } %% define GwyContainer.set_value_by_name kwargs - static PyObject * _wrap_gwy_container_set_value_by_name(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = {"name", "value", NULL}; - char* name; - GValue val; - PyObject* v; - GType g_type; - PyObject* py_type; - gwy_clear(&val,1); - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO:gwy.Container.get_value_by_name", kwlist, &name, &v)) - return NULL; - - py_type = PyObject_Type(v); - g_type = pyg_type_from_object(py_type); - Py_DECREF(py_type); - if(g_type==0) - { - return NULL; - } - g_value_init(&val, G_TYPE_FUNDAMENTAL(g_type)); - pyg_value_from_pyobject(&val,v); - gwy_container_set_value_by_name((GWY_CONTAINER(self->obj)), name, &val, NULL); + static char *kwlist[] = {"name", "value", NULL}; + char* name; + GValue val; + PyObject* v; + GType g_type; + PyObject* py_type; - Py_RETURN_NONE; + gwy_clear(&val, 1); + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO:gwy.Container.set_value_by_name", kwlist, &name, &v)) + return NULL; + + py_type = PyObject_Type(v); + g_type = pyg_type_from_object(py_type); + Py_DECREF(py_type); + if (!g_type) + return NULL; + g_value_init(&val, G_TYPE_FUNDAMENTAL(g_type)); + pyg_value_from_pyobject(&val, v); + gwy_container_set_value_by_name((GWY_CONTAINER(self->obj)), name, &val, NULL); + + Py_RETURN_NONE; } %% define GwyContainer.get_value kwargs - static PyObject * _wrap_gwy_container_get_value(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = {"key", NULL}; - guint key; /* In fact, GQuark */ - GValue val; - PyObject* obj; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"I:gwy.Container.get_value", kwlist, &key)) - return NULL; - val = gwy_container_get_value((GWY_CONTAINER(self->obj)), (GQuark)key); + static char *kwlist[] = {"key", NULL}; + guint key; /* In fact, GQuark */ + GValue val; + PyObject* obj; - obj = pyg_value_as_pyobject(&val,0); + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"I:gwy.Container.get_value", kwlist, &key)) + return NULL; + val = gwy_container_get_value((GWY_CONTAINER(self->obj)), (GQuark)key); + obj = pyg_value_as_pyobject(&val, 0); - return obj; + return obj; } %% define GwyContainer.set_value_by_name kwargs - static PyObject * _wrap_gwy_container_set_value_by_name(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = {"key", "value", NULL}; - guint key; - GValue val; - PyObject* v; - GType g_type; - PyObject* py_type; - gwy_clear(&val,1); - - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"IO:gwy.Container.get_value", kwlist, &key, &v)) - return NULL; - - py_type = PyObject_Type(v); - g_type = pyg_type_from_object(py_type); - Py_DECREF(py_type); - if(g_type==0) - { - return NULL; - } - g_value_init(&val, G_TYPE_FUNDAMENTAL(g_type)); - pyg_value_from_pyobject(&val,v); - gwy_container_set_value((GWY_CONTAINER(self->obj)), (GQuark)key, &val, NULL); + static char *kwlist[] = {"key", "value", NULL}; + guint key; + GValue val; + PyObject* v; + GType g_type; + PyObject* py_type; + + gwy_clear(&val, 1); + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"IO:gwy.Container.get_value", kwlist, &key, &v)) + return NULL; - Py_RETURN_NONE; + py_type = PyObject_Type(v); + g_type = pyg_type_from_object(py_type); + Py_DECREF(py_type); + if (!g_type) + return NULL; + g_value_init(&val, G_TYPE_FUNDAMENTAL(g_type)); + pyg_value_from_pyobject(&val,v); + gwy_container_set_value((GWY_CONTAINER(self->obj)), (GQuark)key, &val, NULL); + Py_RETURN_NONE; } %% -override gwy_app_file_load kwargs -/** - * gwy_app_file_load: - * @filename: Filename of file to open - * - * Load specified file - * - * Returns: A main GwyContainer of opened file -**/ -static PyObject * -_wrap_gwy_app_file_load(PyObject *self, PyObject *args, PyObject *kwargs) +override-slot GwyDataLine.tp_as_sequence + +static ssize_t +_sq_gwy_data_line_length(PyGObject *self) { - static char *kwlist[] = {"filename", NULL}; + GwyDataLine *dline = GWY_DATA_LINE(self->obj); + return dline->res; +} - gchar *filename; - GwyContainer *c; - PyObject *object; +static PyObject* +_sq_gwy_data_line_item(PyGObject *self, Py_ssize_t i) +{ + GwyDataLine *dline = GWY_DATA_LINE(self->obj); + gint res = gwy_data_line_get_res(dline); - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:gwy_app_file_load", kwlist, &filename)) + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "DataLine index out of range"); return NULL; - c = gwy_app_file_load(filename, NULL, NULL); - object = pygobject_new((GObject *)c); - g_object_unref(c); - return object; + } + return PyFloat_FromDouble(dline->data[i]); } +static int +_sq_gwy_data_line_ass_item(PyGObject *self, Py_ssize_t i, PyObject *item) +{ + GwyDataLine *dline = GWY_DATA_LINE(self->obj); + gint res = gwy_data_line_get_res(dline); + + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "DataLine index out of range"); + return -1; + } + if (assign_number_as_double(item, dline->data + i, "DataLine item") == 0) { + //gwy_data_line_invalidate(dline); + return 0; + } + return -1; +} + +static const PySequenceMethods _wrap_gwy_data_line_tp_as_sequence = { + (lenfunc)_sq_gwy_data_line_length, + NULL, + NULL, + (ssizeargfunc)_sq_gwy_data_line_item, + NULL, + (ssizeobjargproc)_sq_gwy_data_line_ass_item, + NULL, + NULL, + NULL, + NULL, +}; + %% -override gwy_file_load kwargs -/** - * gwy_file_load: - * @filename: Filename of file to open - * @mode: Run mode (RUN_INTERACTIVE or RUN_NONINTERACTIVE). - * - * Load specified file using specified mode - * - * Returns: A main GwyContainer of opened file -**/ -static PyObject * -_wrap_gwy_file_load(PyObject *self, PyObject *args, PyObject *kwargs) +override-slot GwyDataField.tp_as_sequence + +static ssize_t +_sq_gwy_data_field_length(PyGObject *self) { - static char *kwlist[] = {"filename", "mode", NULL}; + GwyDataField *dfield = GWY_DATA_FIELD(self->obj); + return dfield->xres * dfield->yres; +} - gchar *filename; - GwyRunType mode; - GwyContainer *c; - PyObject *object; +static PyObject* +_sq_gwy_data_field_item(PyGObject *self, Py_ssize_t i) +{ + GwyDataField *dfield = GWY_DATA_FIELD(self->obj); + gint res = dfield->xres * dfield->yres; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:gwy_file_load", kwlist, &filename, &mode)) + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "DataField index out of range"); return NULL; - c = gwy_file_load(filename, mode, NULL); - object = pygobject_new((GObject *)c); - g_object_unref(c); - return object; + } + return PyFloat_FromDouble(dfield->data[i]); } -%% -override gwy_app_file_write kwargs -static PyObject * -_wrap_gwy_app_file_write(PyObject *self, PyObject *args, PyObject *kwargs) +static int +_sq_gwy_data_field_ass_item(PyGObject *self, Py_ssize_t i, PyObject *item) { - static char *kwlist[] = {"container", "filename", NULL}; - gchar *filename; - PyGObject* container; + GwyDataField *dfield = GWY_DATA_FIELD(self->obj); + gint res = dfield->xres * dfield->yres; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!s:gwy_app_file_write", - kwlist, &PyGwyContainer_Type, &container, &filename)) - return NULL; - if (gwy_app_file_write(GWY_CONTAINER(container->obj), filename, NULL, NULL)) { - Py_RETURN_TRUE; - } - else { - Py_RETURN_FALSE; - } + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "DataField index out of range"); + return -1; + } + if (assign_number_as_double(item, dfield->data + i, "DataField item") == 0) { + gwy_data_field_invalidate(dfield); + return 0; + } + return -1; +} +static const PySequenceMethods _wrap_gwy_data_field_tp_as_sequence = { + (lenfunc)_sq_gwy_data_field_length, + NULL, + NULL, + (ssizeargfunc)_sq_gwy_data_field_item, + NULL, + (ssizeobjargproc)_sq_gwy_data_field_ass_item, + NULL, + NULL, + NULL, + NULL, +}; -} %% -define GwyContainer.datafields noargs -static PyObject * -_wrap_gwy_container_datafields(PyGObject *self) -{ - gint i; - GQuark *keys; - PyObject *py_list; - gpointer value; - - py_list = PyList_New(0); - if (!py_list) { - return NULL; - } +override-slot GwyBrick.tp_as_sequence - keys = gwy_container_keys(GWY_CONTAINER(self->obj)); - for (i = 0 ; i < gwy_container_get_n_items(GWY_CONTAINER(self->obj)); i++) - { - if (gwy_container_gis_object(GWY_CONTAINER(self->obj), keys[i], &value) - && GWY_IS_DATA_FIELD(value)) - { - PyList_Append(py_list, pygobject_new((GObject*)value)); - } - } - g_free(keys); - return py_list; +static ssize_t +_sq_gwy_brick_length(PyGObject *self) +{ + GwyBrick *brick = GWY_BRICK(self->obj); + return brick->xres * brick->yres * brick->zres; } -%% -define GwyContainer.graph_models noargs -static PyObject * -_wrap_gwy_container_graph_models(PyGObject *self) + +static PyObject* +_sq_gwy_brick_item(PyGObject *self, Py_ssize_t i) { - gint i; - GQuark *keys; - PyObject *py_list; - gpointer value; - - py_list = PyList_New(0); - if (!py_list) { - return NULL; - } + GwyBrick *brick = GWY_BRICK(self->obj); + gint res = brick->xres * brick->yres * brick->zres; - keys = gwy_container_keys(GWY_CONTAINER(self->obj)); - for (i = 0 ; i < gwy_container_get_n_items(GWY_CONTAINER(self->obj)); i++) - { - if (gwy_container_gis_object(GWY_CONTAINER(self->obj), keys[i], &value) - && GWY_IS_GRAPH_MODEL(value)) - { - PyList_Append(py_list, pygobject_new((GObject*)value)); - } - } - g_free(keys); - return py_list; + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "Brick index out of range"); + return NULL; + } + return PyFloat_FromDouble(brick->data[i]); } -%% -define GwyDataField.number_grains noargs -/** - * gwy_data_field_number_grains: - * - * Create a tuple of integer grain numbers in the data field representing a - * mask. - * - * Returns: tuple of grain numbers for each piel - **/ -static PyObject * -_wrap_gwy_data_field_number_grains(PyGObject *self) +static int +_sq_gwy_brick_ass_item(PyGObject *self, Py_ssize_t i, PyObject *item) { - gint *grains; - guint len, xres, yres, i; - PyObject *tuple; + GwyBrick *brick = GWY_BRICK(self->obj); + gint res = brick->xres * brick->yres * brick->zres; - xres = gwy_data_field_get_xres(GWY_DATA_FIELD(self->obj)); - yres = gwy_data_field_get_yres(GWY_DATA_FIELD(self->obj)); - // Get size of data field - len = xres * yres; - // Create tuple by size of data field - tuple = PyTuple_New(len); + if (i < 0 || i >= res) { + PyErr_SetString(PyExc_IndexError, "Brick index out of range"); + return -1; + } + if (assign_number_as_double(item, brick->data + i, "Brick item") == 0) { + //gwy_brick_invalidate(brick); + return 0; + } + return -1; +} + +static const PySequenceMethods _wrap_gwy_brick_tp_as_sequence = { + (lenfunc)_sq_gwy_brick_length, + NULL, + NULL, + (ssizeargfunc)_sq_gwy_brick_item, + NULL, + (ssizeobjargproc)_sq_gwy_brick_ass_item, + NULL, + NULL, + NULL, + NULL, +}; - grains = g_new0(gint, len); - gwy_data_field_number_grains(GWY_DATA_FIELD(self->obj), grains); - // fill tuple with data field values - for (i = 0; i < len; i++) - PyTuple_SetItem(tuple, i, PyInt_FromLong(grains[i])); - g_free(grains); +%% +override-slot GwySelection.tp_as_sequence - return tuple; +static ssize_t +_sq_gwy_selection_length(PyGObject *self) +{ + GwySelection *selection = GWY_SELECTION(self->obj); + return gwy_selection_get_data(selection, NULL); } -%% -define GwyDataField.grains_get_values kwargs -/** - * gwy_data_field_grains_get_values: - * @grains: Numbered grains as obtained using gwy.DataField.number_grains() - * @quantity: Grain quantity. - * - * Obtains values of one grain quantity for all grains. - * - * The zeroth value corresponds to the empty space between grains and isn't - * meaningful in general. - * - * Returns: tuple of values of the grain quantity - **/ static PyObject* -_wrap_gwy_data_field_grains_get_values(PyGObject *self, PyObject *args, PyObject *kwargs) +_sq_gwy_selection_item(PyGObject *self, Py_ssize_t i) { - static char *kwlist[] = {"grains", "quantity", NULL}; - - PyObject *graintuple, *valuetuple; - GwyGrainQuantity quantity; - guint *grains; - gdouble *values; - guint xres, yres, ngrains, len, i; + GwySelection *selection = GWY_SELECTION(self->obj); + guint n = gwy_selection_get_data(selection, NULL); + GwyDoubleArray *array; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:Gwy.DataField.grains_get_values", kwlist, &PyTuple_Type, &graintuple, &quantity)) + if (i < 0 || i >= n) { + PyErr_SetString(PyExc_IndexError, "Selection index out of range"); return NULL; + } + array = gwy_selection_get_object_pygwy(selection, i); + return create_list_consume_double_garray(array); +} - xres = gwy_data_field_get_xres(GWY_DATA_FIELD(self->obj)); - yres = gwy_data_field_get_yres(GWY_DATA_FIELD(self->obj)); - len = xres * yres; - if (PyTuple_GET_SIZE(graintuple) != len) { - PyErr_SetString(PyExc_ValueError, "Grain number tuple length does not match the datafield size."); - return NULL; - } +static int +_sq_gwy_selection_ass_item(PyGObject *self, Py_ssize_t i, PyObject *item) +{ + GwySelection *selection = GWY_SELECTION(self->obj); + guint n = gwy_selection_get_data(selection, NULL); + guint maxn = gwy_selection_get_max_objects(selection); + GwyDoubleArray *array; - grains = g_new(gint, len); - ngrains = 0; - for (i = 0; i < len; i++) { - PyObject *item = PyTuple_GET_ITEM(graintuple, i); - if (!PyInt_Check(item)) { - PyErr_SetString(PyExc_TypeError, "Grain number is not an integer."); - g_free(grains); - return NULL; - } - grains[i] = PyInt_AS_LONG(item); - if (grains[i] > ngrains) - ngrains = grains[i]; - } + if (i < 0 || i >= maxn || i > n) { + PyErr_SetString(PyExc_IndexError, "Selection index out of range"); + return -1; + } + array = create_double_garray_from_sequence(item); + if (!array || array->len != gwy_selection_get_object_size(selection)) { + PyErr_SetString(PyExc_ValueError, + "Selection object must be a sequence of coordinates"); + if (array) + g_array_free(array, TRUE); + return -1; + } + gwy_selection_set_object(selection, i, (gdouble*)array->data); + g_array_free(array, TRUE); + return 0; +} - values = g_new(gdouble, ngrains+1); - gwy_data_field_grains_get_values(GWY_DATA_FIELD(self->obj), - values, ngrains, grains, quantity); - g_free(grains); +static const PySequenceMethods _wrap_gwy_selection_tp_as_sequence = { + (lenfunc)_sq_gwy_selection_length, + NULL, + NULL, + (ssizeargfunc)_sq_gwy_selection_item, + NULL, + (ssizeobjargproc)_sq_gwy_selection_ass_item, + NULL, + NULL, + NULL, + NULL, +}; - valuetuple = PyTuple_New(ngrains+1); - for (i = 0; i <= ngrains; i++) - PyTuple_SetItem(valuetuple, i, PyFloat_FromDouble(values[i])); - g_free(values); +%% +override-attr GwySIValueFormat.units +static PyObject* +_wrap_gwy_si_value_format__get_units(PyGBoxed *self, void *closure) +{ + GwySIValueFormat *vf = pyg_boxed_get(self, GwySIValueFormat); + const guchar *s = (const guchar*)vf->units; + gboolean is_ascii = TRUE; + guint i; + + /* g_str_is_ascii() requires GLib 2.40+ */ + for (i = 0; s[i]; i++) { + if (s[i] & 0x80) { + is_ascii = FALSE; + break; + } + } - return valuetuple; + if (is_ascii) { + return PyString_FromStringAndSize(vf->units_gstring->str, + vf->units_gstring->len); + } + return PyUnicode_FromString(vf->units_gstring->str); } -%% -define GwyGraphCurveModel.set_color -/** - * gwy_graph_curve_model_set_color: - * @color: The color to set. - * - * Sets the color of a graph curve. - **/ -static PyObject * -_wrap_gwy_graph_curve_model_set_color(PyGObject *self, PyObject *args, PyObject *kwargs) +static int +_wrap_gwy_si_value_format__set_units(PyGBoxed *self, PyObject *value, void *closure) { - static char *kwlist[] = { "red", "green", "blue", "color", NULL }; - double x; - GwyRGBA color; + GwySIValueFormat *vf = pyg_boxed_get(self, GwySIValueFormat); - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"dddd:Gwy.GraphCurveModel.set_color", kwlist, &color.r, &color.g, &color.b, &color.a)) - return NULL; - g_object_set(self->obj, "color", &color, NULL); + if (PyString_Check(value)) { + gwy_si_value_format_set_units(vf, PyString_AsString(value)); + return 0; + } + if (PyUnicode_Check(value)) { + PyObject *utf8value = PyUnicode_AsUTF8String(value); - Py_INCREF(Py_None); - return Py_None; + if (!utf8value) + return -1; + gwy_si_value_format_set_units(vf, PyString_AsString(utf8value)); + Py_DECREF(utf8value); + return 0; + } + PyErr_SetString(PyExc_TypeError, "Units must be a string."); + return -1; } - -// TODO: use G_OBJECT_TYPE_NAME instead of string values in set_object_by_name /* vim: set ft=c 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.46/modules/pygwy/README.pygwy gwyddion-2.47/modules/pygwy/README.pygwy --- gwyddion-2.46/modules/pygwy/README.pygwy 2015-07-29 08:28:23.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/README.pygwy 2016-11-09 08:29:05.000000000 +0000 @@ -11,11 +11,6 @@ By configure script: ./configure --enable-pygwy -MSVC - set following variables in make.msc: - ENABLE_PYGWY = 1 - PYTHON_TOP = Python installation directory (like C:\Python24) - PYTHON_LIBRARY = Python linking library (like python24.lib) - Script location ================ The Python modules are stored in a Gwyddion user directory (~/.gwyddion/pygwy @@ -187,4 +182,83 @@ gwy.gwy_app_file_write(container, new_filename) - +Bending C API to work in Python +=============================== + +1. Low-level: Writing a C method manually in pygwy.override. + + We can do anything here, add new operators and protocols (using + override-slot) or just plain methods and functions. This file is passed to + pygwy-codegen.py as --override pygwy.override and the code there essentially + gets directly included in pygwywrap.c, the generated Python module code. + + The syntax is hairy but you can read __parse_override() in + /usr/share/pygobject/2.0/codegen/override.py for some hints (and the actual + parsing code). + + Plain functions and methods are called _wrap_THE_REAL_NAME() + +2. Code generation level: pygwy-codegen.py. + + Here we mostly define how to handle various argument types. This may + include some plain types but is especially suited for handling types + introduced for wrapping: GwyDoubleOutArg for double out-args or + GwyDoubleArray for sequences of doubles. These types of course only + originate from wrap_calls or fix-defs (below). + + We save work when adapting functions by defining type substitutions + and then putting the generic code than handles them here. It will + automatically appear in methods. + +3. Modifying the .defs file: in extra.defs and pygwy-fix-defs.py. + + Extra definition in extra.defs are simply included in pygwy.defs. Some + things, such as boxed types, are easier to just write directly here. For + some reason boxed types need an explicit definition they are never + automatically picked up. + + Here we rewrite argument types and add attributes to arguments or functions. + Arguments and functions can be skipped here or attain default values. + + In addition, pygwy-fix-defs.py generates some direct code into + boxed.override defining setters for plain C structs. There may be some + reasonable way of teaching codegen to do this automatically by patching + Wrapper.write_getsets() but this may be too fragile. + +3. Wrapping functions by thin python-friendly wrappers in wrap_calls.c and + wrap_calls.h. Also macro-prototypes.h belongs here – the header provides + prototypes for macros so that the parser knows how to wrap them. + + If the friendly function does no harm in the C API it can be just added + there. So this is mostly used for arrays, for which a thin wrapper + takes/passes a GArray-derived type instead of plain C array. Then + pygwy-codegen.py can automatically create the corresponding code. + +There are four major classes of things in the C API that do not translate +easily into Python: + +A) Plain structs and pointer types. We handle them by boxing them in C. + Explicit boxed type record in extra.defs is necessary. Setters for some + field types are directly generated by pygwy-fix-defs.py, other have to + be explicitly defined in pygwy.override. + +B) Multiple return values, passed as pointers to things-to-fill. This is now + relatively simple. We rewrite them to GwyWhateverOutArg in + pygwy-fix-defs.py and the function writer in pygwy-codegen.py knows how + to sort arguments to input and output and write a function that returns a + tuple if necessary. + +C) Optional outputs. Ugly. Since all arguments are in-args and things like + arrays are passed by value (copy) this gets complicated. At present if the + C function can produce something it will always do so in Python. + +D) C arrays. The C code has always ways to figure out the array size. Python + does not what they are. So the solution is, universally, add a wrap_calls + function that has GArray-derived arguments/return values. Fortunately, the + wrap_calls functions tends to have just a few lines and can be written + mechanically (by a human). + +E) Allocate-if-necessary return values (value formats, sometimes units and + other things). These we convert to always-allocate functions, usually by + a simple skip_args list entry that removes the possibility to pass an + already allocated thing to the function. diff -Nru gwyddion-2.46/modules/pygwy/wrap_calls.c gwyddion-2.47/modules/pygwy/wrap_calls.c --- gwyddion-2.46/modules/pygwy/wrap_calls.c 2015-11-08 11:39:13.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/wrap_calls.c 2016-11-16 16:52:15.000000000 +0000 @@ -1,7 +1,7 @@ /* - * $Id: wrap_calls.c 17718 2015-11-06 08:04:04Z pecold $ - * Copyright (C) 2008 Jan Horak, 2015 David Necas (Yeti) - * E-mail: xhorak@gmail.com, yeti@gwyddio.net. + * $Id: wrap_calls.c 19279 2016-11-16 16:52:15Z yeti-dn $ + * Copyright (C) 2008 Jan Horak, 2015-2016 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 @@ -23,86 +23,314 @@ */ #include "wrap_calls.h" -#include -#include -#include - -/* What is present on the exported image */ -typedef enum { - PIXMAP_NONE, - PIXMAP_RULERS, - PIXMAP_FMSCALE = PIXMAP_RULERS, - PIXMAP_SCALEBAR -} PixmapOutput; - +#include +#include /* function-helper to short array creation */ -static GArray* -create_array(gpointer data, guint len, guint type_size, gboolean free_data) +static GwyDoubleArray* +create_double_array(const gdouble *data, guint len, gboolean free_data) { - GArray *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; +} - ret = g_array_new(FALSE, FALSE, type_size); +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(data); + g_free((gpointer)data); return ret; } +gdouble +gwy_math_median_pygwy(GwyDoubleArray *array) +{ + gdouble retval = gwy_math_median(array->len, (gdouble*)array->data); + g_array_free(array, TRUE); + return retval; +} + +GwyArrayFuncStatus +gwy_math_curvature_pygwy(GwyDoubleArray *coeffs, gint *dimen, + gdouble *kappa1, gdouble *kappa2, + gdouble *phi1, gdouble *phi2, + 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); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_math_refine_maximum_pygwy (GwyDoubleArray *z, + gdouble *x, gdouble *y, gboolean *refined) +{ + gboolean ok = (z->len == 9); + if (ok) + *refined = gwy_math_refine_maximum((gdouble*)z->data, x, y); + g_array_free(z, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_math_is_in_polygon_pygwy(gdouble x, gdouble y, GwyDoubleArray *poly, + 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); + } + g_array_free(poly, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_math_find_nearest_line_pygwy(gdouble x, gdouble y, + GwyDoubleArray *coords, GwyDoubleArray *metric, + gint *idx, gdouble *d2min) +{ + 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, + metric ? (gdouble*)metric->data : NULL); + } + g_array_free(coords, TRUE); + if (metric) + g_array_free(metric, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_math_find_nearest_point_pygwy(gdouble x, gdouble y, + GwyDoubleArray *coords, GwyDoubleArray *metric, + gint *idx, gdouble *d2min) +{ + 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, + metric ? (gdouble*)metric->data : NULL); + } + g_array_free(coords, TRUE); + if (metric) + g_array_free(metric, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_math_fit_polynom_pygwy(GwyDoubleArray *xdata, GwyDoubleArray *ydata, + gint n, + GwyDoubleArrayOutArg coeffs) +{ + 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, + n, (gdouble*)coeffs->data); + } + else + g_array_free(coeffs, TRUE); + g_array_free(xdata, TRUE); + g_array_free(ydata, TRUE); + return ok; +} + +GwyDoubleArray* +gwy_fft_window_pygwy(GwyDoubleArray *data, GwyWindowingType windowing) +{ + gwy_fft_window(data->len, (gdouble*)data->data, windowing); + /* This is the same as freeing data and returning a new array. */ + return data; +} + /** - * gwy_data_field_get_profile_wrap: - * @data_field: A data field. - * @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. - * @thickness: Thickness of line to be averaged. - * @interpolation: Interpolation type to use. + * gwy_selection_get_data_pygwy: + * @selection: A selection. + * + * Get selection coordinates as single flat list. + * + * Returns: a list of selected data +**/ +GwyDoubleArray* +gwy_selection_get_data_pygwy(GwySelection *selection) +{ + GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); + guint n = gwy_selection_get_data(selection, NULL); + guint objsize = gwy_selection_get_object_size(selection); + g_array_set_size(array, n*objsize); + gwy_selection_get_data(selection, (gdouble*)array->data); + return array; +} + +GwyDoubleArray* +gwy_selection_get_object_pygwy(GwySelection *selection, gint i) +{ + GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); + guint objsize = gwy_selection_get_object_size(selection); + g_array_set_size(array, objsize); + gwy_selection_get_object(selection, i, (gdouble*)array->data); + return array; +} + +GwyArrayFuncStatus +gwy_selection_set_data_pygwy(GwySelection *selection, + GwyDoubleArray *data) +{ + guint n = data->len; + guint objsize = gwy_selection_get_object_size(selection); + gboolean ok = !(n % objsize); + if (ok) + gwy_selection_set_data(selection, n/objsize, (gdouble*)data->data); + g_array_free(data, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_selection_set_object_pygwy(GwySelection *selection, + gint i, + GwyDoubleArray *data) +{ + guint n = data->len; + guint objsize = gwy_selection_get_object_size(selection); + gboolean ok = (n == objsize); + if (ok) + gwy_selection_set_object(selection, i, (gdouble*)data->data); + g_array_free(data, TRUE); + return ok; +} + +/** + * gwy_data_line_get_data_pygwy: * - * Extracts a possibly averaged profile from data field to a data line. + * Extract the data of a data line. * - * Returns: @data_line itself if it was not %NULL, otherwise a newly created - * data line. + * 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. **/ -GwyDataLine* -gwy_data_field_get_profile_wrap(GwyDataField *data_field, - gint scol, - gint srow, - gint ecol, - gint erow, - gint res, - gint thickness, - GwyInterpolationType interpolation) +GwyDoubleArray* +gwy_data_line_get_data_pygwy(GwyDataLine *dline) { - return gwy_data_field_get_profile(data_field, NULL, scol, srow, ecol, erow, - res, thickness, interpolation); + return create_double_array(dline->data, dline->res, FALSE); } /** - * gwy_selection_get_data_wrap: + * gwy_data_field_get_data_pygwy: * - * Return list of selected points. + * Extract the data of a data field. * - * Returns: a list of selected data -**/ -GArrayDouble* -gwy_selection_get_data_wrap(GwySelection *selection) + * 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. + **/ +GwyDoubleArray* +gwy_data_field_get_data_pygwy(GwyDataField *dfield) { - gdouble *data; - gint len; + return create_double_array(dfield->data, dfield->xres*dfield->yres, FALSE); +} - len = gwy_selection_get_data(selection, NULL); - len *= gwy_selection_get_object_size(selection); - data = g_new(gdouble, len); - gwy_selection_get_data(selection, data); +/** + * gwy_brick_get_data_pygwy: + * + * 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. + * + * 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_array(data, len, sizeof(gdouble), TRUE); +/** + * gwy_data_line_set_data_pygwy: + * @data: Sequence of floating point values. + * + * Sets the entire contents of a 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, + GwyDoubleArray *data) +{ + guint n = data_line->res; + gboolean ok = (data->len == n); + if (ok) { + gwy_assign(data_line->data, (gdouble*)data->data, n); + /* gwy_data_line_invalidate(data_line); */ + } + g_array_free(data, TRUE); + return ok; } /** - * gwy_data_field_fit_polynom_wrap: + * gwy_data_field_set_data_pygwy: + * @data: Sequence of floating point values. + * + * Sets the entire contents of a 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, + GwyDoubleArray *data) +{ + guint n = data_field->xres*data_field->yres; + gboolean ok = (data->len == n); + if (ok) { + gwy_assign(data_field->data, (gdouble*)data->data, n); + gwy_data_field_invalidate(data_field); + } + g_array_free(data, TRUE); + return ok; +} + +/** + * gwy_brick_set_data_pygwy: + * @data: Sequence of floating point values. + * + * Sets the entire contents of a 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, + GwyDoubleArray *data) +{ + guint n = brick->xres*brick->yres*brick->zres; + gboolean ok = (data->len == n); + if (ok) { + gwy_assign(brick->data, (gdouble*)data->data, n); + /* gwy_brick_invalidate(brick); */ + } + 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). * @row_degree: Degree of polynomial to fit row-wise (y-coordinate). @@ -111,20 +339,19 @@ * * Returns: a newly allocated array with coefficients. **/ -GArrayDouble* -gwy_data_field_fit_polynom_wrap(GwyDataField *data_field, - gint col_degree, - gint row_degree) -{ - gdouble* coeffs; - - coeffs = gwy_data_field_fit_polynom(data_field, col_degree, row_degree, NULL); - return create_array(coeffs, (col_degree+1)*(row_degree+1), sizeof(gdouble), - TRUE); +GwyDoubleArray* +gwy_data_field_fit_polynom_pygwy(GwyDataField *data_field, + gint col_degree, gint row_degree) +{ + 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); + return coeffs; } /** - * gwy_data_field_area_fit_polynom_wrap: + * gwy_data_field_area_fit_polynom_pygwy: * @data_field: A data field. * @col: Upper-left column coordinate. * @row: Upper-left row coordinate. @@ -144,25 +371,253 @@ * Returns: a newly allocated array with coefficients. * **/ -GArrayDouble* -gwy_data_field_area_fit_polynom_wrap(GwyDataField *data_field, - gint col, - gint row, - gint width, - gint height, - gint col_degree, gint row_degree) -{ - gdouble *coeffs; +GwyDoubleArray* +gwy_data_field_area_fit_polynom_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint col_degree, gint row_degree) +{ + 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, + (gdouble*)coeffs->data); + return coeffs; +} + +GwyArrayFuncStatus +gwy_data_field_subtract_polynom_pygwy(GwyDataField *data_field, + gint col_degree, + gint row_degree, + 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); + } + g_array_free(coeffs, TRUE); + return ok; +} - coeffs = gwy_data_field_area_fit_polynom(data_field, +GwyArrayFuncStatus +gwy_data_field_area_subtract_polynom_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs) +{ + 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, NULL); - return create_array(coeffs, (col_degree + 1) * (row_degree + 1), - sizeof(gdouble), TRUE); + col_degree, row_degree, + (gdouble*)coeffs->data); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyDoubleArray* +gwy_data_field_fit_legendre_pygwy(GwyDataField *data_field, + gint col_degree, + gint row_degree) +{ + 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); + return coeffs; +} + +GwyDoubleArray* +gwy_data_field_area_fit_legendre_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint col_degree, + gint row_degree) +{ + 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, + (gdouble*)coeffs->data); + return coeffs; +} + +GwyArrayFuncStatus +gwy_data_field_subtract_legendre_pygwy(GwyDataField *data_field, + gint col_degree, + gint row_degree, + 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); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_area_subtract_legendre_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs) +{ + 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, + (gdouble*)coeffs->data); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyDoubleArray* +gwy_data_field_fit_poly_max_pygwy(GwyDataField *data_field, + gint max_degree) +{ + GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(coeffs, (max_degree+1)*(max_degree+2)/2); + gwy_data_field_fit_poly_max(data_field, max_degree, (gdouble*)coeffs->data); + return coeffs; +} + +GwyDoubleArray* +gwy_data_field_area_fit_poly_max_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint max_degree) +{ + GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(coeffs, (max_degree+1)*(max_degree+2)/2); + gwy_data_field_area_fit_poly_max(data_field, col, row, width, height, + max_degree, (gdouble*)coeffs->data); + return coeffs; +} + +GwyArrayFuncStatus +gwy_data_field_subtract_poly_max_pygwy(GwyDataField *data_field, + gint max_degree, + 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); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_area_subtract_poly_max_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + gint max_degree, + 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); + } + g_array_free(coeffs, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_fit_poly_pygwy(GwyDataField *data_field, + GwyDataField *mask_field, + GwyIntArray *term_powers, + gboolean exclude, + GwyDoubleArrayOutArg coeffs) +{ + gboolean ok = !(term_powers->len % 2); + if (ok) { + 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); + } + else + g_array_free(coeffs, TRUE); + g_array_free(term_powers, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_area_fit_poly_pygwy(GwyDataField *data_field, + GwyDataField *mask_field, + gint col, gint row, + gint width, gint height, + GwyIntArray *term_powers, + gboolean exclude, + GwyDoubleArrayOutArg coeffs) +{ + gboolean ok = !(term_powers->len % 2); + 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); + } + else + g_array_free(coeffs, TRUE); + g_array_free(term_powers, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_subtract_poly_pygwy(GwyDataField *data_field, + GwyIntArray *term_powers, + GwyDoubleArray *coeffs) +{ + 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); + } + g_array_free(term_powers, TRUE); + g_array_free(coeffs, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_area_subtract_poly_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + GwyIntArray *term_powers, + GwyDoubleArray *coeffs) +{ + guint nterms = coeffs->len; + 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); + } + g_array_free(term_powers, TRUE); + g_array_free(coeffs, TRUE); + return ok; } /** - * gwy_data_field_elliptic_area_extract_wrap: + * gwy_data_field_elliptic_area_extract_pygwy: * @data_field: A data field. * @col: Upper-left bounding box column coordinate. * @row: Upper-left bounding box row coordinate. @@ -176,25 +631,39 @@ * * Returns: The number of extracted values. **/ -GArrayDouble* -gwy_data_field_elliptic_area_extract_wrap(GwyDataField *data_field, - gint col, - gint row, - gint width, - gint height) -{ - gdouble *data; - guint n = gwy_data_field_get_elliptic_area_size(width, height); - - data = g_new(gdouble, n); - gwy_data_field_elliptic_area_extract(data_field, - col, row, width, height, data); - - return create_array(data, n, sizeof(gdouble), TRUE); +GwyDoubleArray* +gwy_data_field_elliptic_area_extract_pygwy(GwyDataField *data_field, + gint col, gint row, + 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); + return array; +} + +GwyArrayFuncStatus +gwy_data_field_elliptic_area_unextract_pygwy(GwyDataField *data_field, + gint col, gint row, + gint width, gint height, + GwyDoubleArray *data) +{ + GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); + 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); + } + g_array_free(data, TRUE); + return ok; } /** - * gwy_data_field_circular_area_extract_wrap: + * gwy_data_field_circular_area_extract_pygwy: * @data_field: A data field. * @col: Row index of circular area centre. * @row: Column index of circular area centre. @@ -205,178 +674,335 @@ * * Returns: Array of values. **/ -GArrayDouble* -gwy_data_field_circular_area_extract_wrap(GwyDataField *data_field, - gint col, - gint row, - gdouble radius) -{ - gdouble *data; +GwyDoubleArray* +gwy_data_field_circular_area_extract_pygwy(GwyDataField *data_field, + gint col, gint row, + gdouble radius) +{ + 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); + return array; +} + +GwyArrayFuncStatus +gwy_data_field_circular_area_unextract_pygwy(GwyDataField *data_field, + gint col, gint row, + gdouble radius, + GwyDoubleArray *data) +{ + 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); + } + g_array_free(data, TRUE); + return ok; +} - data = g_new(gdouble, gwy_data_field_get_circular_area_size(radius)); - gwy_data_field_circular_area_extract(data_field, col, row, radius, data); +GwyArrayFuncStatus +gwy_data_field_affine_pygwy(GwyDataField *data_field, + GwyDataField *dest, + GwyDoubleArray *affine, + GwyInterpolationType interp, + GwyExteriorType exterior, + gdouble fill_value) +{ + gboolean ok = (affine->len == 6); + if (ok) { + gwy_data_field_affine(data_field, dest, (gdouble*)affine->data, + interp, exterior, fill_value); + } + g_array_free(affine, TRUE); + return ok; +} - return create_array(data, gwy_data_field_get_circular_area_size(radius), - sizeof(gdouble), TRUE); +void +gwy_data_field_get_local_maxima_list_pygwy(GwyDataField *dfield, + GwyDoubleArrayOutArg xdata, + GwyDoubleArrayOutArg ydata, + GwyDoubleArrayOutArg zdata, + gint ndata, + gint skip, + gdouble threshold, + gboolean subpixel) +{ + g_array_set_size(xdata, ndata); + 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); + g_array_set_size(xdata, ndata); + g_array_set_size(ydata, ndata); + g_array_set_size(zdata, ndata); +} + +GwyPlaneSymmetry +gwy_data_field_unrotate_find_corrections_pygwy(GwyDataLine *derdist, + GwyDoubleArrayOutArg correction) +{ + g_array_set_size(correction, GWY_SYMMETRY_LAST); + return gwy_data_field_unrotate_find_corrections(derdist, + (gdouble*)correction->data); +} + +GwyDoubleArray* +gwy_data_line_part_fit_polynom_pygwy(GwyDataLine *data_line, + gint n, + gint from, + gint to) +{ + 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); + return coeffs; +} + +GwyDoubleArray* +gwy_data_line_fit_polynom_pygwy(GwyDataLine *data_line, + gint n) +{ + GwyDoubleArray *coeffs = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(coeffs, n+1); + gwy_data_line_fit_polynom(data_line, n, (gdouble*)coeffs->data); + return coeffs; +} + +void +gwy_data_line_part_subtract_polynom_pygwy(GwyDataLine *data_line, + GwyDoubleArray *coeffs, + gint from, + gint to) +{ + gwy_data_line_part_subtract_polynom(data_line, + coeffs->len, (gdouble*)coeffs->data, + from, to); + g_array_free(coeffs, TRUE); +} + +void +gwy_data_line_subtract_polynom_pygwy(GwyDataLine *data_line, + GwyDoubleArray *coeffs) +{ + gwy_data_line_subtract_polynom(data_line, + coeffs->len, (gdouble*)coeffs->data); + g_array_free(coeffs, TRUE); } /** - * gwy_app_data_browser_get_data_ids_wrap: - * @data: A data container. - * - * Gets the list of all channels in a data container. + * gwy_key_from_name_pygwy: + * @name: String representation of key. * - * The container must be known to the data browser. + * Convert string representation of key to numerical. * - * Returns: A newly allocated array with channel ids. + * Returns: Corresponding numerical key. **/ -GArrayInt* -gwy_app_data_browser_get_data_ids_wrap(GwyContainer *data) +GQuark +gwy_key_from_name_pygwy(const gchar *name) { - gint *ids, *id_p, c = 0; - - ids = gwy_app_data_browser_get_data_ids(data); - id_p = ids; - while (*(id_p++) != -1) - c++; - - return create_array(ids, c, sizeof(gint), TRUE); + return g_quark_from_string(name); } /** - * gwy_get_key_from_name_wrap: - * @name: string representation of key. + * gwy_name_from_key_pygwy: + * @key: Numerical representation of a key. * - * Convert string representation of key to numerical. + * Convert numerical representation of key to string. * - * Returns: key value. + * 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. **/ -gint -gwy_get_key_from_name(const gchar *name) +const gchar* +gwy_name_from_key_pygwy(GQuark key) { - return g_quark_from_string(name); + return g_quark_to_string(key); } -GwyDataField* -gwy_tip_dilation_wrap(GwyDataField *tip, GwyDataField *surface) +GwyIntArray* +gwy_container_keys_pygwy(GwyContainer *container) { - GwyDataField *r = gwy_data_field_new_alike(surface, FALSE); - - if (!gwy_tip_dilation(tip, surface, r, NULL, NULL)) { - g_object_unref(r); - return NULL; - } - return r; + g_assert(sizeof(GQuark) == sizeof(gint)); + return create_int_array((gint*)gwy_container_keys(container), + gwy_container_get_n_items(container), TRUE); } -GwyDataField* -gwy_tip_erosion_wrap(GwyDataField *tip, GwyDataField *surface) +static GwyIntArray* +create_id_array(gint *ids) { - GwyDataField *r = gwy_data_field_new_alike(surface, FALSE); + guint n = 0; + while (ids[n] != -1) + n++; + return create_int_array(ids, n, TRUE); +} - if (!gwy_tip_erosion(tip, surface, r, NULL, NULL)) { - g_object_unref(r); - return NULL; - } - return r; +/** + * 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). + * + * Returns: List of channel ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_data_ids_pygwy(GwyContainer *container) +{ + return create_id_array(gwy_app_data_browser_get_data_ids(container)); } -GwyDataField* -gwy_tip_cmap_wrap(GwyDataField *tip, GwyDataField *surface) +/** + * 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). + * + * Returns: List of graph ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_graph_ids_pygwy(GwyContainer *container) { - GwyDataField *r = gwy_data_field_new_alike(surface, FALSE); + return create_id_array(gwy_app_data_browser_get_graph_ids(container)); +} - if (!gwy_tip_cmap(tip, surface, r, NULL, NULL)) { - g_object_unref(r); - return NULL; - } - return r; +/** + * 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). + * + * Returns: List of spectra ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_spectra_ids_pygwy(GwyContainer *container) +{ + return create_id_array(gwy_app_data_browser_get_spectra_ids(container)); } -GwyDataField* -gwy_tip_estimate_partial_wrap(GwyDataField *tip, GwyDataField *surface, - gdouble threshold, gboolean use_edges) +/** + * 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). + * + * Returns: List of volume data ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_volume_ids_pygwy(GwyContainer *container) { - gint v; + return create_id_array(gwy_app_data_browser_get_volume_ids(container)); +} - return gwy_tip_estimate_partial(tip, surface, threshold, use_edges, &v, - NULL, NULL); +/** + * 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). + * + * Returns: List of XYZ data ids. + **/ +GwyIntArray* +gwy_app_data_browser_get_xyz_ids_pygwy(GwyContainer *container) +{ + return create_id_array(gwy_app_data_browser_get_xyz_ids(container)); } -GwyDataField* -gwy_tip_estimate_full_wrap(GwyDataField *tip, GwyDataField *surface, - gdouble threshold, gboolean use_edges) +GwyIntArray* +gwy_app_data_browser_find_data_by_title_pygwy(GwyContainer *data, + const gchar *titleglob) { - gint v; + return create_id_array(gwy_app_data_browser_find_data_by_title(data, + titleglob)); +} - return gwy_tip_estimate_full(tip, surface, threshold, use_edges, &v, - NULL, NULL); +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)); } -GwyDataField* -gwy_data_field_create_full_mask(GwyDataField *d) +GwyIntArray* +gwy_app_data_browser_find_spectra_by_title_pygwy(GwyContainer *data, + const gchar *titleglob) { - GwyDataField *m; - m = gwy_data_field_new_alike(d, TRUE); - gwy_data_field_add(m, 1.0); - return m; + return create_id_array(gwy_app_data_browser_find_spectra_by_title(data, + titleglob)); } -gboolean -gwy_get_grain_quantity_needs_same_units_wrap(GwyGrainQuantity quantity) +GwyIntArray* +gwy_app_data_browser_find_volume_by_title_pygwy(GwyContainer *data, + const gchar *titleglob) { - return gwy_grain_quantity_needs_same_units(quantity); + return create_id_array(gwy_app_data_browser_find_volume_by_title(data, + titleglob)); } -GwySIUnit* -gwy_construct_grain_quantity_units(GwyGrainQuantity quantity, - GwySIUnit *siunitxy, - GwySIUnit *siunitz) +GwyIntArray* +gwy_app_data_browser_find_xyz_by_title_pygwy(GwyContainer *data, + const gchar *titleglob) { - return gwy_grain_quantity_get_units(quantity, siunitxy, siunitz, NULL); + return create_id_array(gwy_app_data_browser_find_xyz_by_title(data, + titleglob)); } /** - * gwy_data_field_number_grains_wrap: + * gwy_data_field_number_grains_pygwy: * @mask_field: A data field representing a mask. * * Constructs an array with grain numbers from a mask data field. * - * Returns: An array of integers, containing 0 outside grains and the grain + * Returns: A list of integers, containing 0 outside grains and the grain * number inside a grain. **/ -GArrayInt* -gwy_data_field_number_grains_wrap(GwyDataField *mask_field) +GwyIntArray* +gwy_data_field_number_grains_pygwy(GwyDataField *mask_field) { gint xres = gwy_data_field_get_xres(mask_field); gint yres = gwy_data_field_get_yres(mask_field); - gint *grains = g_new0(gint, xres*yres); - gwy_data_field_number_grains(mask_field, grains); - return create_array(grains, xres*yres, sizeof(gint), TRUE); + GwyIntArray *grains = g_array_new(FALSE, TRUE, sizeof(gint)); + g_array_set_size(grains, xres*yres); + gwy_data_field_number_grains(mask_field, (gint*)grains->data); + return grains; } /** - * gwy_data_field_number_grains_periodic_wrap: + * 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. * - * Returns: An array of integers, containing 0 outside grains and the grain + * Returns: A list of integers, containing 0 outside grains and the grain * number inside a grain. **/ -GArrayInt* -gwy_data_field_number_grains_periodic_wrap(GwyDataField *mask_field) +GwyIntArray* +gwy_data_field_number_grains_periodic_pygwy(GwyDataField *mask_field) { gint xres = gwy_data_field_get_xres(mask_field); gint yres = gwy_data_field_get_yres(mask_field); - gint *grains = g_new0(gint, xres*yres); - gwy_data_field_number_grains_periodic(mask_field, grains); - return create_array(grains, xres*yres, sizeof(gint), TRUE); + GwyIntArray *grains = g_array_new(FALSE, TRUE, sizeof(gint)); + g_array_set_size(grains, xres*yres); + gwy_data_field_number_grains_periodic(mask_field, (gint*)grains->data); + return grains; } static gint -find_ngrains(const GArrayInt *grains) +find_ngrains(const GwyIntArray *grains) { gint ngrains = 0; const gint *g = (const gint*)grains->data; @@ -390,7 +1016,7 @@ } /** - * gwy_data_field_get_grain_bounding_boxes_wrap: + * gwy_data_field_get_grain_bounding_boxes_pygwy: * @data_field: A data field representing a mask. * @grains: Array of grain numbers. * @@ -404,27 +1030,49 @@ * box of the corresponding grain (the zeroth quadrupe does not * correspond to any as grain numbers start from 1). **/ -GArrayInt* -gwy_data_field_get_grain_bounding_boxes_wrap(GwyDataField *data_field, - const GArrayInt *grains) -{ - gint xres = gwy_data_field_get_xres(data_field); - gint yres = gwy_data_field_get_yres(data_field); - const gint *g = (const gint*)grains->data; - GArrayInt *bboxes; - gint ngrains, *bbdata; - - g_return_val_if_fail(grains->len == xres*yres, NULL); - ngrains = find_ngrains(grains); - bboxes = g_array_sized_new(FALSE, FALSE, sizeof(gint), 4*(ngrains + 1)); - g_array_set_size(bboxes, 4*(ngrains+1)); - bbdata = (gint*)bboxes->data; - gwy_data_field_get_grain_bounding_boxes(data_field, ngrains, g, bbdata); - return bboxes; +GwyArrayFuncStatus +gwy_data_field_get_grain_bounding_boxes_pygwy(GwyDataField *data_field, + GwyIntArray *grains, + GwyIntArrayOutArg bboxes) +{ + guint xres = gwy_data_field_get_xres(data_field); + guint yres = gwy_data_field_get_yres(data_field); + gboolean ok = (grains->len == xres*yres); + 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); + } + else + g_array_free(bboxes, TRUE); + g_array_free(grains, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_data_field_get_grain_sizes_pygwy(GwyDataField *data_field, + GwyIntArray *grains, + GwyIntArrayOutArg sizes) +{ + guint xres = gwy_data_field_get_xres(data_field); + guint yres = gwy_data_field_get_yres(data_field); + gboolean ok = (grains->len == xres*yres); + 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); + } + else + g_array_free(sizes, TRUE); + g_array_free(grains, TRUE); + return ok; } /** - * gwy_data_field_grains_get_values_wrap: + * gwy_data_field_grains_get_values_pygwy: * @data_field: A data field representing a surface. * @grains: Array of grain numbers. * @quantity: The quantity to calculate, identified by GwyGrainQuantity. @@ -439,29 +1087,30 @@ * quantity for corresponding grain (the zeroth item does not * correspond to any as grain numbers start from 1). **/ -GArrayDouble* -gwy_data_field_grains_get_values_wrap(GwyDataField *data_field, - const GArrayInt *grains, - GwyGrainQuantity quantity) -{ - gint xres = gwy_data_field_get_xres(data_field); - gint yres = gwy_data_field_get_yres(data_field); - const gint *g = (const gint*)grains->data; - GArrayDouble *values; - gint ngrains; - gdouble *vdata; - - g_return_val_if_fail(grains->len == xres*yres, NULL); - ngrains = find_ngrains(grains); - values = g_array_sized_new(FALSE, FALSE, sizeof(gdouble), ngrains + 1); - g_array_set_size(values, ngrains+1); - vdata = (gdouble*)values->data; - gwy_data_field_grains_get_values(data_field, vdata, ngrains, g, quantity); - return values; +GwyArrayFuncStatus +gwy_data_field_grains_get_values_pygwy(GwyDataField *data_field, + GwyIntArray *grains, + GwyGrainQuantity quantity, + GwyDoubleArrayOutArg values) +{ + guint xres = gwy_data_field_get_xres(data_field); + guint yres = gwy_data_field_get_yres(data_field); + gboolean ok = (grains->len == xres*yres); + 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); + } + else + g_array_free(values, TRUE); + g_array_free(grains, TRUE); + return ok; } /** - * gwy_data_field_grains_get_distribution_wrap: + * 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. @@ -479,24 +1128,402 @@ * Returns: The distribution as a data line. **/ GwyDataLine* -gwy_data_field_grains_get_distribution_wrap(GwyDataField *data_field, - GwyDataField *grain_field, - const GArrayInt *grains, - GwyGrainQuantity quantity, - gint nstats) -{ - gint xres = gwy_data_field_get_xres(data_field); - gint yres = gwy_data_field_get_yres(data_field); - const gint *g = (const gint*)grains->data; - gint ngrains; +gwy_data_field_grains_get_distribution_pygwy(GwyDataField *data_field, + GwyDataField *grain_field, + GwyIntArray *grains, + GwyGrainQuantity quantity, + gint nstats) +{ + GwyDataLine *dist; + guint xres = gwy_data_field_get_xres(data_field); + guint yres = gwy_data_field_get_yres(data_field); + guint ngrains; g_return_val_if_fail(grains->len == xres*yres, NULL); g_return_val_if_fail(grain_field->xres == xres, NULL); g_return_val_if_fail(grain_field->yres == yres, NULL); ngrains = find_ngrains(grains); - return gwy_data_field_grains_get_distribution(data_field, grain_field, - NULL, ngrains, g, + dist = gwy_data_field_grains_get_distribution(data_field, grain_field, + NULL, ngrains, + (gint*)grains->data, quantity, nstats); + g_array_free(grains, TRUE); + return dist; +} + +GwyDataField* +gwy_tip_dilation_pygwy(GwyDataField *tip, GwyDataField *surface) +{ + 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); +} + +GwyDataField* +gwy_tip_cmap_pygwy(GwyDataField *tip, GwyDataField *surface) +{ + return gwy_tip_cmap(tip, surface, + gwy_data_field_new_alike(surface, FALSE), NULL, NULL); +} + +GwyDataField* +gwy_data_field_create_full_mask_pygwy(GwyDataField *d) +{ + GwyDataField *m; + m = gwy_data_field_new_alike(d, TRUE); + gwy_si_unit_set_from_string(gwy_data_field_get_si_unit_z(m), NULL); + gwy_data_field_add(m, 1.0); + return m; +} + +gboolean +gwy_get_grain_quantity_needs_same_units_pygwy(GwyGrainQuantity quantity) +{ + return gwy_grain_quantity_needs_same_units(quantity); +} + +GwySIUnit* +gwy_construct_grain_quantity_units_pygwy(GwyGrainQuantity quantity, + GwySIUnit *siunitxy, + GwySIUnit *siunitz) +{ + return gwy_grain_quantity_get_units(quantity, siunitxy, siunitz, NULL); +} + +void +gwy_surface_set_pygwy(GwySurface *surface, guint pos, const GwyXYZ *point) +{ + GwyXYZ pt = *point; + gwy_surface_set(surface, pos, pt); +} + +GwyIntArray* +gwy_spectra_find_nearest_pygwy(GwySpectra *spectra, + gdouble x, gdouble y, guint n) +{ + GwyIntArray *array = g_array_new(FALSE, FALSE, sizeof(guint)); + g_array_set_size(array, MIN(n, gwy_spectra_get_n_spectra(spectra))); + gwy_spectra_find_nearest(spectra, x, y, n, (guint*)array->data); + return array; +} + +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), + 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), + FALSE); +} + +GwyArrayFuncStatus +gwy_graph_curve_model_set_data_pygwy(GwyGraphCurveModel *gcmodel, + GwyDoubleArray *xdata, + 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); + } + g_array_free(xdata, TRUE); + g_array_free(ydata, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_graph_curve_model_set_data_interleaved_pygwy(GwyGraphCurveModel *gcmodel, + GwyDoubleArray *xydata) +{ + gboolean ok = !(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; +} + +void +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); + g_array_free(grid_data, TRUE); +} + +void +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); + g_array_free(grid_data, TRUE); +} + +GwyDoubleArray* +gwy_graph_area_get_x_grid_data_pygwy(GwyGraphArea *area) +{ + guint n; + const gdouble *xdata = gwy_graph_area_get_x_grid_data(area, &n); + return create_double_array(xdata, n, FALSE); +} + +GwyDoubleArray* +gwy_graph_area_get_y_grid_data_pygwy(GwyGraphArea *area) +{ + guint n; + const gdouble *ydata = gwy_graph_area_get_y_grid_data(area, &n); + return create_double_array(ydata, n, FALSE); +} + +GwyDoubleArray* +gwy_draw_data_field_map_adaptive_pygwy(GwyDataField *data_field, + GwyDoubleArray *z) +{ + 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); + g_array_free(z, TRUE); + return mapped; +} + +GwyDoubleArray* +gwy_data_view_get_metric_pygwy(GwyDataView *data_view) +{ + GwyDoubleArray *metric = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(metric, 4); + gwy_data_view_get_metric(data_view, (gdouble*)metric->data); + return metric; +} + +GwyDoubleArray* +gwy_axis_get_major_ticks_pygwy(GwyAxis *axis) +{ + guint n; + const gdouble *ticks = gwy_axis_get_major_ticks(axis, &n); + return create_double_array(ticks, n, FALSE); +} + +gulong +gwy_app_undo_qcheckpoint_pygwy(GwyContainer *container, GwyIntArray *keys) +{ + gulong id; + g_assert(sizeof(GQuark) == sizeof(gint)); + id = gwy_app_undo_qcheckpointv(container, keys->len, (GQuark*)keys->data); + g_array_free(keys, TRUE); + return id; +} + +GObject* +gwy_inventory_get_item_pygwy(GwyInventory *inventory, + const gchar *name) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to get object from non-object Inventory"); + return NULL; + } + return (GObject*)gwy_inventory_get_item(inventory, name); +} + +GObject* +gwy_inventory_get_item_or_default_pygwy(GwyInventory *inventory, + const gchar *name) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to get object from non-object Inventory"); + return NULL; + } + return (GObject*)gwy_inventory_get_item_or_default(inventory, name); +} + +GObject* +gwy_inventory_get_nth_item_pygwy(GwyInventory *inventory, + guint n) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to get object from non-object Inventory"); + return NULL; + } + return (GObject*)gwy_inventory_get_nth_item(inventory, n); +} + +GObject* +gwy_inventory_get_default_item_pygwy(GwyInventory *inventory) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to get object from non-object Inventory"); + return NULL; + } + return (GObject*)gwy_inventory_get_default_item(inventory); +} + +void +gwy_inventory_insert_item_pygwy(GwyInventory *inventory, + GObject *object) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(G_OBJECT_TYPE(object), type->type)) { + g_warning("Attempting to insert object to wrong-typed Inventory"); + g_object_ref(object); + return; + } + gwy_inventory_insert_item(inventory, object); +} + +void +gwy_inventory_insert_nth_item_pygwy(GwyInventory *inventory, + GObject *object, + guint n) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(G_OBJECT_TYPE(object), type->type)) { + g_warning("Attempting to insert object to wrong-typed Inventory"); + g_object_ref(object); + return; + } + gwy_inventory_insert_nth_item(inventory, object, n); +} + +void +gwy_inventory_rename_item_pygwy(GwyInventory *inventory, + const gchar *name, + const gchar *newname) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to rename object in non-object Inventory"); + return; + } + if (!type->rename) { + g_warning("Attempting to rename object in Inventory that " + "does not support renaming."); + return; + } + gwy_inventory_rename_item(inventory, name, newname); +} + +GObject* +gwy_inventory_new_item_pygwy(GwyInventory *inventory, + const gchar *name, + const gchar *newname) +{ + const GwyInventoryItemType *type = gwy_inventory_get_item_type(inventory); + if (!type->type || !g_type_is_a(type->type, G_TYPE_OBJECT)) { + g_warning("Attempting to create object in non-object Inventory"); + return NULL; + } + if (!type->rename || !type->copy) { + g_warning("Attempting to rename object in Inventory that " + "does not support copying."); + return NULL; + } + return (GObject*)gwy_inventory_new_item(inventory, name, newname); +} + +GwyArrayFuncStatus +gwy_cdline_fit_pygwy(GwyCDLine *cdline, + GwyDoubleArray *x, GwyDoubleArray *y, + GwyDoubleArrayOutArg params, GwyDoubleArrayOutArg err) +{ + gboolean ok = (x->len == y->len); + if (ok) { + guint np = gwy_cdline_get_nparams(cdline); + g_array_set_size(params, np); + g_array_set_size(err, np); + gwy_cdline_fit(cdline, x->len, (gdouble*)x->data, (gdouble*)y->data, + np, (gdouble*)params->data, (gdouble*)err->data, + NULL, NULL); + } + else { + g_array_free(params, TRUE); + g_array_free(err, TRUE); + } + g_array_free(x, TRUE); + g_array_free(y, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_cdline_get_value_pygwy(GwyCDLine *cdline, + gdouble x, GwyDoubleArray *params, + gdouble *value, gboolean *fres) +{ + gboolean ok = (params->len == gwy_cdline_get_nparams(cdline)); + if (ok) + *value = gwy_cdline_get_value(cdline, x, (gdouble*)params->data, fres); + g_array_free(params, TRUE); + return ok; +} + +GwyArrayFuncStatus +gwy_peaks_analyze_pygwy(GwyPeaks *peaks, + GwyDoubleArray *xdata, + GwyDoubleArray *ydata, + guint maxpeaks, + guint *npeaks) +{ + gboolean ok = (ydata->len == xdata->len); + 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; +} + +GwyDoubleArray* +gwy_peaks_get_quantity_pygwy(GwyPeaks *peaks, + GwyPeakQuantity quantity) +{ + GwyDoubleArray *array = g_array_new(FALSE, FALSE, sizeof(gdouble)); + g_array_set_size(array, gwy_peaks_n_peaks(peaks)); + gwy_peaks_get_quantity(peaks, quantity, (gdouble*)array->data); + return array; +} + +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); +} + +void +gwy_marker_box_set_markers_pygwy(GwyMarkerBox *mbox, + GwyDoubleArray *markers) +{ + gwy_marker_box_set_markers(mbox, markers->len, (gdouble*)markers->data); + g_array_free(markers, 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 : */ diff -Nru gwyddion-2.46/modules/pygwy/wrap_calls.h gwyddion-2.47/modules/pygwy/wrap_calls.h --- gwyddion-2.46/modules/pygwy/wrap_calls.h 2015-10-25 21:15:34.000000000 +0000 +++ gwyddion-2.47/modules/pygwy/wrap_calls.h 2016-11-15 12:48:19.000000000 +0000 @@ -1,7 +1,7 @@ /* - * $Id: wrap_calls.h 17657 2015-10-25 20:39:57Z yeti-dn $ - * Copyright (C) 2008 Jan Horak, 2015 David Necas (Yeti) - * E-mail: xhorak@gmail.com, yeti@gwyddio.net. + * $Id: wrap_calls.h 19268 2016-11-15 12:48:19Z yeti-dn $ + * Copyright (C) 2008 Jan Horak, 2015-2016 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 @@ -22,78 +22,320 @@ * generated wrapping by using pygwy-codegen. */ -#ifndef _WRAP_CALLS_H -#define _WRAP_CALLS_H +#ifndef __PYGWY_WRAP_CALLS_H__ +#define __PYGWY_WRAP_CALLS_H__ -#include -#include #include -#include +#include +#include +#include +#include +#include + +typedef gboolean GwyArrayFuncStatus; -typedef GArray GArrayInt; -typedef GArray GArrayDouble; +typedef GArray *GwyDoubleArrayOutArg; +typedef GArray GwyDoubleArray; +typedef GArray *GwyIntArrayOutArg; +typedef GArray GwyIntArray; -GwyDataLine* gwy_data_field_get_profile_wrap (GwyDataField *data_field, - gint scol, - gint srow, - gint ecol, - gint erow, - gint res, - gint thickness, - GwyInterpolationType interpolation); -GArrayDouble* gwy_selection_get_data_wrap (GwySelection *selection); -GArrayDouble* gwy_data_field_fit_polynom_wrap (GwyDataField *data_field, - gint col_degree, - gint row_degree); -GArrayDouble* gwy_data_field_area_fit_polynom_wrap (GwyDataField *data_field, - gint col, - gint row, - gint width, - gint height, - gint col_degree, - gint row_degree); -GArrayDouble* gwy_data_field_elliptic_area_extract_wrap (GwyDataField *data_field, - gint col, - gint row, - gint width, - gint height); -GArrayDouble* gwy_data_field_circular_area_extract_wrap (GwyDataField *data_field, - gint col, - gint row, - gdouble radius); -GArrayInt* gwy_app_data_browser_get_data_ids_wrap (GwyContainer *data); -gint gwy_get_key_from_name (const gchar *name); -GwyDataField* gwy_tip_dilation_wrap (GwyDataField *tip, - GwyDataField *surface); -GwyDataField* gwy_tip_erosion_wrap (GwyDataField *tip, - GwyDataField *surface); -GwyDataField* gwy_tip_cmap_wrap (GwyDataField *tip, - GwyDataField *surface); -GwyDataField* gwy_tip_estimate_partial_wrap (GwyDataField *tip, - GwyDataField *surface, - gdouble threshold, - gboolean use_edges); -GwyDataField* gwy_tip_estimate_full_wrap (GwyDataField *tip, - GwyDataField *surface, - gdouble threshold, - gboolean use_edges); -GwyDataField* gwy_data_field_create_full_mask (GwyDataField *d); -GArrayInt* gwy_data_field_number_grains_wrap (GwyDataField *mask_field); -GArrayInt* gwy_data_field_number_grains_periodic_wrap (GwyDataField *mask_field); -GArrayInt* gwy_data_field_get_grain_bounding_boxes_wrap(GwyDataField *data_field, - const GArrayInt *grains); -GArrayDouble* gwy_data_field_grains_get_values_wrap (GwyDataField *data_field, - const GArrayInt *grains, - GwyGrainQuantity quantity); -gboolean gwy_get_grain_quantity_needs_same_units_wrap(GwyGrainQuantity quantity); -GwySIUnit* gwy_construct_grain_quantity_units (GwyGrainQuantity quantity, - GwySIUnit *siunitxy, - GwySIUnit *siunitz); -GwyDataLine* gwy_data_field_grains_get_distribution_wrap (GwyDataField *data_field, - GwyDataField *grain_field, - const GArrayInt *grains, - GwyGrainQuantity quantity, - gint nstats); +gdouble gwy_math_median_pygwy (GwyDoubleArray *array); +GwyArrayFuncStatus gwy_math_curvature_pygwy (GwyDoubleArray *coeffs, + gint *dimen, + gdouble *kappa1, + gdouble *kappa2, + gdouble *phi1, + gdouble *phi2, + gdouble *xc, + gdouble *yc, + gdouble *zc); +GwyArrayFuncStatus gwy_math_refine_maximum_pygwy (GwyDoubleArray *z, + gdouble *x, + gdouble *y, + gboolean *refined); +GwyArrayFuncStatus gwy_math_is_in_polygon_pygwy (gdouble x, + gdouble y, + GwyDoubleArray *poly, + gboolean *is_inside); +GwyArrayFuncStatus gwy_math_find_nearest_line_pygwy (gdouble x, + gdouble y, + GwyDoubleArray *coords, + GwyDoubleArray *metric, + gint *idx, + gdouble *d2min); +GwyArrayFuncStatus gwy_math_find_nearest_point_pygwy (gdouble x, + gdouble y, + GwyDoubleArray *coords, + GwyDoubleArray *metric, + gint *idx, + gdouble *d2min); +GwyArrayFuncStatus gwy_math_fit_polynom_pygwy (GwyDoubleArray *xdata, + GwyDoubleArray *ydata, + gint n, + GwyDoubleArrayOutArg coeffs); +GwyDoubleArray* gwy_fft_window_pygwy (GwyDoubleArray *data, + GwyWindowingType windowing); +GwyDoubleArray* gwy_selection_get_data_pygwy (GwySelection *selection); +GwyDoubleArray* gwy_selection_get_object_pygwy (GwySelection *selection, + gint i); +GwyArrayFuncStatus gwy_selection_set_data_pygwy (GwySelection *selection, + GwyDoubleArray *data); +GwyArrayFuncStatus gwy_selection_set_object_pygwy (GwySelection *selection, + gint i, + GwyDoubleArray *data); +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); +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); +GwyDoubleArray* gwy_data_field_fit_polynom_pygwy (GwyDataField *data_field, + gint col_degree, + gint row_degree); +GwyDoubleArray* gwy_data_field_area_fit_polynom_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint col_degree, + gint row_degree); +GwyArrayFuncStatus gwy_data_field_subtract_polynom_pygwy (GwyDataField *data_field, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs); +GwyArrayFuncStatus gwy_data_field_area_subtract_polynom_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs); +GwyDoubleArray* gwy_data_field_fit_legendre_pygwy (GwyDataField *data_field, + gint col_degree, + gint row_degree); +GwyDoubleArray* gwy_data_field_area_fit_legendre_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint col_degree, + gint row_degree); +GwyArrayFuncStatus gwy_data_field_subtract_legendre_pygwy (GwyDataField *data_field, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs); +GwyArrayFuncStatus gwy_data_field_area_subtract_legendre_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint col_degree, + gint row_degree, + GwyDoubleArray *coeffs); +GwyDoubleArray* gwy_data_field_fit_poly_max_pygwy (GwyDataField *data_field, + gint max_degree); +GwyDoubleArray* gwy_data_field_area_fit_poly_max_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint max_degree); +GwyArrayFuncStatus gwy_data_field_subtract_poly_max_pygwy (GwyDataField *data_field, + gint max_degree, + GwyDoubleArray *coeffs); +GwyArrayFuncStatus gwy_data_field_area_subtract_poly_max_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + gint max_degree, + GwyDoubleArray *coeffs); +GwyArrayFuncStatus gwy_data_field_fit_poly_pygwy (GwyDataField *data_field, + GwyDataField *mask_field, + GwyIntArray *term_powers, + gboolean exclude, + GwyDoubleArrayOutArg coeffs); +GwyArrayFuncStatus gwy_data_field_area_fit_poly_pygwy (GwyDataField *data_field, + GwyDataField *mask_field, + gint col, + gint row, + gint width, + gint height, + GwyIntArray *term_powers, + gboolean exclude, + GwyDoubleArrayOutArg coeffs); +GwyArrayFuncStatus gwy_data_field_subtract_poly_pygwy (GwyDataField *data_field, + GwyIntArray *term_powers, + GwyDoubleArray *coeffs); +GwyArrayFuncStatus gwy_data_field_area_subtract_poly_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + GwyIntArray *term_powers, + GwyDoubleArray *coeffs); +GwyDoubleArray* gwy_data_field_elliptic_area_extract_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height); +GwyArrayFuncStatus gwy_data_field_elliptic_area_unextract_pygwy (GwyDataField *data_field, + gint col, + gint row, + gint width, + gint height, + GwyDoubleArray *data); +GwyDoubleArray* gwy_data_field_circular_area_extract_pygwy (GwyDataField *data_field, + gint col, + gint row, + gdouble radius); +GwyArrayFuncStatus gwy_data_field_circular_area_unextract_pygwy (GwyDataField *data_field, + gint col, + gint row, + gdouble radius, + GwyDoubleArray *data); +GwyArrayFuncStatus gwy_data_field_affine_pygwy (GwyDataField *data_field, + GwyDataField *dest, + GwyDoubleArray *affine, + GwyInterpolationType interp, + GwyExteriorType exterior, + gdouble fill_value); +void gwy_data_field_get_local_maxima_list_pygwy (GwyDataField *dfield, + GwyDoubleArrayOutArg xdata, + GwyDoubleArrayOutArg ydata, + GwyDoubleArrayOutArg zdata, + gint ndata, + gint skip, + gdouble threshold, + gboolean subpixel); +GwyPlaneSymmetry gwy_data_field_unrotate_find_corrections_pygwy (GwyDataLine *derdist, + GwyDoubleArrayOutArg correction); +GwyDoubleArray* gwy_data_line_part_fit_polynom_pygwy (GwyDataLine *data_line, + gint n, + gint from, + gint to); +GwyDoubleArray* gwy_data_line_fit_polynom_pygwy (GwyDataLine *data_line, + gint n); +void gwy_data_line_part_subtract_polynom_pygwy (GwyDataLine *data_line, + GwyDoubleArray *coeffs, + gint from, + gint to); +void gwy_data_line_subtract_polynom_pygwy (GwyDataLine *data_line, + GwyDoubleArray *coeffs); +GQuark gwy_key_from_name_pygwy (const gchar *name); +const gchar* gwy_name_from_key_pygwy (GQuark key); +GwyIntArray* gwy_container_keys_pygwy (GwyContainer *container); +GwyIntArray* gwy_app_data_browser_get_data_ids_pygwy (GwyContainer *container); +GwyIntArray* gwy_app_data_browser_get_graph_ids_pygwy (GwyContainer *container); +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_find_data_by_title_pygwy (GwyContainer *data, + const gchar *titleglob); +GwyIntArray* gwy_app_data_browser_find_graphs_by_title_pygwy (GwyContainer *data, + const gchar *titleglob); +GwyIntArray* gwy_app_data_browser_find_spectra_by_title_pygwy(GwyContainer *data, + const gchar *titleglob); +GwyIntArray* gwy_app_data_browser_find_volume_by_title_pygwy (GwyContainer *data, + const gchar *titleglob); +GwyIntArray* gwy_app_data_browser_find_xyz_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, + GwyIntArray *grains, + GwyIntArrayOutArg sizes); +GwyArrayFuncStatus gwy_data_field_get_grain_bounding_boxes_pygwy (GwyDataField *data_field, + GwyIntArray *grains, + GwyIntArrayOutArg bboxes); +GwyArrayFuncStatus gwy_data_field_grains_get_values_pygwy (GwyDataField *data_field, + GwyIntArray *grains, + GwyGrainQuantity quantity, + GwyDoubleArrayOutArg values); +GwyDataLine* gwy_data_field_grains_get_distribution_pygwy (GwyDataField *data_field, + GwyDataField *grain_field, + GwyIntArray *grains, + GwyGrainQuantity quantity, + gint nstats); +GwyDataField* gwy_tip_dilation_pygwy (GwyDataField *tip, + GwyDataField *surface); +GwyDataField* gwy_tip_erosion_pygwy (GwyDataField *tip, + GwyDataField *surface); +GwyDataField* gwy_tip_cmap_pygwy (GwyDataField *tip, + GwyDataField *surface); +GwyDataField* gwy_data_field_create_full_mask_pygwy (GwyDataField *d); +gboolean gwy_get_grain_quantity_needs_same_units_pygwy (GwyGrainQuantity quantity); +GwySIUnit* gwy_construct_grain_quantity_units_pygwy (GwyGrainQuantity quantity, + GwySIUnit *siunitxy, + GwySIUnit *siunitz); +void gwy_surface_set_pygwy (GwySurface *surface, + guint pos, + const GwyXYZ *point); +GwyIntArray* gwy_spectra_find_nearest_pygwy (GwySpectra *spectra, + gdouble x, + gdouble y, + guint n); +GwyDoubleArray* gwy_graph_curve_model_get_xdata_pygwy (GwyGraphCurveModel *gcmodel); +GwyDoubleArray* gwy_graph_curve_model_get_ydata_pygwy (GwyGraphCurveModel *gcmodel); +GwyArrayFuncStatus gwy_graph_curve_model_set_data_pygwy (GwyGraphCurveModel *gcmodel, + GwyDoubleArray *xdata, + GwyDoubleArray *ydata); +GwyArrayFuncStatus gwy_graph_curve_model_set_data_interleaved_pygwy(GwyGraphCurveModel *gcmodel, + GwyDoubleArray *xydata); +void gwy_graph_area_set_x_grid_data_pygwy (GwyGraphArea *area, + GwyDoubleArray *grid_data); +void gwy_graph_area_set_y_grid_data_pygwy (GwyGraphArea *area, + GwyDoubleArray *grid_data); +GwyDoubleArray* gwy_graph_area_get_x_grid_data_pygwy (GwyGraphArea *area); +GwyDoubleArray* gwy_graph_area_get_y_grid_data_pygwy (GwyGraphArea *area); +GwyDoubleArray* gwy_draw_data_field_map_adaptive_pygwy (GwyDataField *data_field, + GwyDoubleArray *z); +GwyDoubleArray* gwy_data_view_get_metric_pygwy (GwyDataView *data_view); +GwyDoubleArray* gwy_axis_get_major_ticks_pygwy (GwyAxis *axis); +gulong gwy_app_undo_qcheckpoint_pygwy (GwyContainer *container, + GwyIntArray *keys); +GObject* gwy_inventory_get_item_pygwy (GwyInventory *inventory, + const gchar *name); +GObject* gwy_inventory_get_item_or_default_pygwy (GwyInventory *inventory, + const gchar *name); +GObject* gwy_inventory_get_nth_item_pygwy (GwyInventory *inventory, + guint n); +GObject* gwy_inventory_get_default_item_pygwy (GwyInventory *inventory); +void gwy_inventory_insert_item_pygwy (GwyInventory *inventory, + GObject *object); +void gwy_inventory_insert_nth_item_pygwy (GwyInventory *inventory, + GObject *object, + guint n); +void gwy_inventory_rename_item_pygwy (GwyInventory *inventory, + const gchar *name, + const gchar *newname); +GObject* gwy_inventory_new_item_pygwy (GwyInventory *inventory, + const gchar *name, + const gchar *newname); +GwyArrayFuncStatus gwy_cdline_fit_pygwy (GwyCDLine *cdline, + GwyDoubleArray *x, + GwyDoubleArray *y, + GwyDoubleArrayOutArg params, + GwyDoubleArrayOutArg err); +GwyArrayFuncStatus gwy_cdline_get_value_pygwy (GwyCDLine *cdline, + gdouble x, + GwyDoubleArray *params, + gdouble *value, + gboolean *fres); +GwyArrayFuncStatus gwy_peaks_analyze_pygwy (GwyPeaks *peaks, + GwyDoubleArray *xdata, + GwyDoubleArray *ydata, + guint maxpeaks, + guint *npeaks); +GwyDoubleArray* gwy_peaks_get_quantity_pygwy (GwyPeaks *peaks, + GwyPeakQuantity quantity); +GwyDoubleArray* gwy_marker_box_get_markers_pygwy (GwyMarkerBox *mbox); +void gwy_marker_box_set_markers_pygwy (GwyMarkerBox *mbox, + GwyDoubleArray *markers); #endif diff -Nru gwyddion-2.46/modules/tools/sfunctions.c gwyddion-2.47/modules/tools/sfunctions.c --- gwyddion-2.46/modules/tools/sfunctions.c 2016-10-10 08:25:25.000000000 +0000 +++ gwyddion-2.47/modules/tools/sfunctions.c 2016-10-18 08:13:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * @(#) $Id: sfunctions.c 19039 2016-10-08 10:54:58Z yeti-dn $ + * @(#) $Id: sfunctions.c 19095 2016-10-17 09:26:16Z yeti-dn $ * Copyright (C) 2003-2016 David Necas (Yeti), Petr Klapetek. * E-mail: yeti@gwyddion.net, klapetek@gwyddion.net. * @@ -123,7 +123,7 @@ static gboolean module_register(void); -static GType gwy_tool_sfunctions_get_type (void) G_GNUC_CONST; +static GType gwy_tool_sfunctions_get_type (void) G_GNUC_CONST; static void gwy_tool_sfunctions_finalize (GObject *object); static void gwy_tool_sfunctions_init_dialog (GwyToolSFunctions *tool); static void gwy_tool_sfunctions_data_switched (GwyTool *gwytool, @@ -163,10 +163,17 @@ static void gwy_tool_sfunctions_apply (GwyToolSFunctions *tool); static void gwy_data_field_area_range (GwyDataField *dfield, GwyDataLine *dline, - gint col, gint row, gint width, gint height, + gint col, + gint row, + gint width, + gint height, GwyOrientation direction, GwyInterpolationType interp, gint lineres); +static void update_unc_fields (GwyPlainTool *plain_tool); +static gboolean sfunction_supports_masking (GwySFOutputType type); +static gboolean sfunction_has_explicit_resampling (GwySFOutputType type); +static gboolean sfunction_has_direction (GwySFOutputType type); static GwyModuleInfo module_info = { GWY_MODULE_ABI_VERSION, @@ -175,7 +182,7 @@ "functions (height distribution, correlations, PSDF, Minkowski " "functionals) of selected part of data."), "Petr Klapetek ", - "2.14", + "2.15", "David Nečas (Yeti) & Petr Klapetek", "2004", }; @@ -548,9 +555,6 @@ GwyPlainTool *plain_tool; GwyToolSFunctions *tool; gboolean ignore; - gchar xukey[24]; - gchar yukey[24]; - gchar zukey[24]; plain_tool = GWY_PLAIN_TOOL(gwytool); ignore = (data_view == plain_tool->data_view); @@ -568,36 +572,7 @@ "focus", -1, NULL); gwy_selection_set_max_objects(plain_tool->selection, 1); - - g_snprintf(xukey, sizeof(xukey), "/%d/data/cal_xunc", plain_tool->id); - 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; - gtk_widget_show(tool->separate); - /*we need to resample uncertainties*/ - tool->xunc = gwy_data_field_new_resampled(tool->xunc, - gwy_data_field_get_xres(plain_tool->data_field), - gwy_data_field_get_yres(plain_tool->data_field), - GWY_INTERPOLATION_BILINEAR); - tool->yunc = gwy_data_field_new_resampled(tool->yunc, - gwy_data_field_get_xres(plain_tool->data_field), - gwy_data_field_get_yres(plain_tool->data_field), - GWY_INTERPOLATION_BILINEAR); - - tool->zunc = gwy_data_field_new_resampled(tool->zunc, - gwy_data_field_get_xres(plain_tool->data_field), - gwy_data_field_get_yres(plain_tool->data_field), - GWY_INTERPOLATION_BILINEAR); - - } else { - tool->has_calibration = FALSE; - gtk_widget_hide(tool->separate); - } + update_unc_fields(plain_tool); } gwy_tool_sfunctions_update_curve(tool); @@ -620,40 +595,9 @@ static void gwy_tool_sfunctions_data_changed(GwyPlainTool *plain_tool) { - GwyToolSFunctions *tool = GWY_TOOL_SFUNCTIONS(plain_tool); - gchar xukey[24], yukey[24], zukey[24]; - - g_snprintf(xukey, sizeof(xukey), "/%d/data/cal_xunc", plain_tool->id); - 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)) { - gint xres = gwy_data_field_get_xres(plain_tool->data_field); - gint yres = gwy_data_field_get_yres(plain_tool->data_field); - - tool->has_calibration = TRUE; - gtk_widget_show(tool->separate); - /*we need to resample uncertainties*/ - tool->xunc = gwy_data_field_new_resampled(tool->xunc, xres, yres, - GWY_INTERPOLATION_BILINEAR); - tool->yunc = gwy_data_field_new_resampled(tool->yunc, xres, yres, - GWY_INTERPOLATION_BILINEAR); - - tool->zunc = gwy_data_field_new_resampled(tool->zunc, xres, yres, - GWY_INTERPOLATION_BILINEAR); - - } - else { - tool->has_calibration = FALSE; - } - - gwy_tool_sfunctions_update_curve(tool); - gwy_tool_sfunctions_update_target_graphs(tool); + update_unc_fields(plain_tool); + gwy_tool_sfunctions_update_curve(GWY_TOOL_SFUNCTIONS(plain_tool)); + gwy_tool_sfunctions_update_target_graphs(GWY_TOOL_SFUNCTIONS(plain_tool)); } static void @@ -661,11 +605,8 @@ { GwyToolSFunctions *tool = GWY_TOOL_SFUNCTIONS(plain_tool); - if (tool->args.masking == GWY_MASK_IGNORE - || tool->args.output_type != GWY_SF_DH) - return; - - gwy_tool_sfunctions_update_curve(tool); + if (sfunction_supports_masking(tool->args.output_type)) + gwy_tool_sfunctions_update_curve(tool); } static void @@ -702,22 +643,16 @@ gtk_widget_set_sensitive(tool->update, !tool->args.instant_update); gwy_table_hscale_set_sensitive(tool->resolution, tool->args.fixres); - sensitive = (tool->args.output_type == GWY_SF_ACF - || tool->args.output_type == GWY_SF_HHCF - || tool->args.output_type == GWY_SF_PSDF - || tool->args.output_type == GWY_SF_RPSDF); + sensitive = (sfunction_has_explicit_resampling(tool->args.output_type) + && tool->args.fixres); gtk_widget_set_sensitive(tool->interpolation, sensitive); gtk_widget_set_sensitive(tool->interpolation_label, sensitive); - sensitive = (tool->args.output_type == GWY_SF_DA - || tool->args.output_type == GWY_SF_CDA - || tool->args.output_type == GWY_SF_ACF - || tool->args.output_type == GWY_SF_HHCF - || tool->args.output_type == GWY_SF_PSDF); + sensitive = sfunction_has_direction(tool->args.output_type); for (l = tool->direction; l; l = g_slist_next(l)) gtk_widget_set_sensitive(GTK_WIDGET(l->data), sensitive); - sensitive = (tool->args.output_type == GWY_SF_DH); + sensitive = sfunction_supports_masking(tool->args.output_type); gtk_widget_set_sensitive(tool->masking_label, sensitive); for (l = tool->masking; l; l = g_slist_next(l)) gtk_widget_set_sensitive(GTK_WIDGET(l->data), sensitive); @@ -727,29 +662,34 @@ gwy_tool_sfunctions_update_curve(GwyToolSFunctions *tool) { GwyPlainTool *plain_tool; + GwyDataField *dfield, *mask, *tmp_mask = NULL; + GwyOrientation dir = tool->args.direction; + GwyInterpolationType interp = tool->args.interpolation; + GwyGraphModel *gmodel = tool->gmodel; GwyGraphCurveModel *gcmodel, *ugcmodel = NULL; - GwyDataField *mask_field = NULL; gdouble sel[4]; gint isel[4] = { sizeof("Die, die, GCC!"), 0, 0, 0 }; gint n, nsel, lineres, w = sizeof("Die, die, GCC!"), h = 0; const gchar *title, *xlabel, *ylabel; plain_tool = GWY_PLAIN_TOOL(tool); + dfield = plain_tool->data_field; + mask = plain_tool->mask_field; - n = gwy_graph_model_get_n_curves(tool->gmodel); + n = gwy_graph_model_get_n_curves(gmodel); nsel = 0; - if (plain_tool->data_field) { + if (dfield) { if (!plain_tool->selection || !gwy_selection_get_object(plain_tool->selection, 0, sel)) { isel[0] = isel[1] = 0; - w = gwy_data_field_get_xres(plain_tool->data_field); - h = gwy_data_field_get_yres(plain_tool->data_field); + w = gwy_data_field_get_xres(dfield); + h = gwy_data_field_get_yres(dfield); } else { - isel[0] = floor(gwy_data_field_rtoj(plain_tool->data_field, sel[0])); - isel[1] = floor(gwy_data_field_rtoi(plain_tool->data_field, sel[1])); - 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])); + isel[0] = floor(gwy_data_field_rtoj(dfield, sel[0])); + isel[1] = floor(gwy_data_field_rtoi(dfield, sel[1])); + isel[2] = floor(gwy_data_field_rtoj(dfield, sel[2])); + isel[3] = floor(gwy_data_field_rtoi(dfield, sel[3])); w = ABS(isel[2] - isel[0]) + 1; h = ABS(isel[3] - isel[1]) + 1; @@ -766,190 +706,136 @@ return; if (nsel == 0 && n > 0) { - gwy_graph_model_remove_all_curves(tool->gmodel); + gwy_graph_model_remove_all_curves(gmodel); return; } tool->has_uline = FALSE; lineres = tool->args.fixres ? tool->args.resolution : -1; + if (sfunction_supports_masking(tool->args.output_type) && mask) { + if (tool->args.masking == GWY_MASK_EXCLUDE) { + tmp_mask = gwy_data_field_duplicate(mask); + gwy_data_field_grains_invert(tmp_mask); + } + else if (tool->args.masking == GWY_MASK_INCLUDE) + tmp_mask = g_object_ref(mask); + /* Otherwise keep tmp_mask as NULL. */ + } + switch (tool->args.output_type) { case GWY_SF_DH: - if (tool->args.masking == GWY_MASK_EXCLUDE - && plain_tool->mask_field) { - mask_field = gwy_data_field_duplicate(plain_tool->mask_field); - gwy_data_field_grains_invert(mask_field); - } - else if (tool->args.masking == GWY_MASK_INCLUDE - && plain_tool->mask_field) - mask_field = g_object_ref(plain_tool->mask_field); - - gwy_data_field_area_dh(plain_tool->data_field, mask_field, - tool->line, - isel[0], isel[1], w, h, - lineres); + gwy_data_field_area_dh(dfield, tmp_mask, tool->line, + isel[0], isel[1], w, h, lineres); xlabel = "z"; ylabel = "ρ"; if (tool->has_calibration) { - gwy_data_field_area_dh_uncertainty(plain_tool->data_field, - tool->zunc, - mask_field, + gwy_data_field_area_dh_uncertainty(dfield, tool->zunc, tmp_mask, tool->uline, isel[0], isel[1], w, h, lineres); tool->has_uline = TRUE; } - GWY_OBJECT_UNREF(mask_field); break; case GWY_SF_CDH: - gwy_data_field_area_cdh(plain_tool->data_field, NULL, - tool->line, - isel[0], isel[1], w, h, - lineres); + gwy_data_field_area_cdh(dfield, tmp_mask, tool->line, + isel[0], isel[1], w, h, lineres); xlabel = "z"; ylabel = "D"; - if (tool->has_calibration) { - gwy_data_field_area_cdh_uncertainty(plain_tool->data_field, - tool->zunc, - plain_tool->mask_field, - tool->uline, - isel[0], isel[1], w, h, - lineres); + if (tool->has_calibration) { + gwy_data_field_area_cdh_uncertainty(dfield, tool->zunc, tmp_mask, + tool->uline, + isel[0], isel[1], w, h, + lineres); tool->has_uline = TRUE; } - break; case GWY_SF_DA: - gwy_data_field_area_da(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - lineres); + gwy_data_field_area_da(dfield, tool->line, isel[0], isel[1], w, h, + dir, lineres); xlabel = "tan β"; ylabel = "ρ"; break; case GWY_SF_CDA: - gwy_data_field_area_cda(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - lineres); + gwy_data_field_area_cda(dfield, tool->line, isel[0], isel[1], w, h, + dir, lineres); xlabel = "tan β"; ylabel = "D"; break; case GWY_SF_ACF: - gwy_data_field_area_acf(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - lineres); + gwy_data_field_area_acf(dfield, tool->line, isel[0], isel[1], w, h, + dir, interp, lineres); xlabel = "τ"; ylabel = "G"; if (tool->has_calibration) { - gwy_data_field_area_acf_uncertainty(plain_tool->data_field, - tool->zunc, - tool->uline, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - lineres); + gwy_data_field_area_acf_uncertainty(dfield, tool->zunc, tool->uline, + isel[0], isel[1], w, h, + dir, interp, lineres); tool->has_uline = TRUE; } break; case GWY_SF_HHCF: - gwy_data_field_area_hhcf(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - lineres); + gwy_data_field_area_hhcf(dfield, tool->line, isel[0], isel[1], w, h, + dir, interp, lineres); xlabel = "τ"; ylabel = "H"; if (tool->has_calibration) { - gwy_data_field_area_hhcf_uncertainty(plain_tool->data_field, - tool->zunc, - tool->uline, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - lineres); - /* gwy_data_field_hhcf_uncertainty(plain_tool->data_field, tool->zunc, - tool->uline, tool->args.direction);*/ + gwy_data_field_area_hhcf_uncertainty(dfield, tool->zunc, tool->uline, + isel[0], isel[1], w, h, + dir, interp, lineres); tool->has_uline = TRUE; } break; case GWY_SF_PSDF: - gwy_data_field_area_psdf(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - GWY_WINDOWING_HANN, - lineres); + gwy_data_field_area_psdf(dfield, tool->line, isel[0], isel[1], w, h, + dir, interp, GWY_WINDOWING_HANN, lineres); xlabel = "k"; ylabel = "W1"; break; case GWY_SF_MINKOWSKI_VOLUME: - gwy_data_field_area_minkowski_volume(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - lineres); + gwy_data_field_area_minkowski_volume(dfield, tool->line, + isel[0], isel[1], w, h, lineres); xlabel = "z"; ylabel = "V"; break; case GWY_SF_MINKOWSKI_BOUNDARY: - gwy_data_field_area_minkowski_boundary(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - lineres); + gwy_data_field_area_minkowski_boundary(dfield, tool->line, + isel[0], isel[1], w, h, lineres); xlabel = "z"; ylabel = "S"; break; case GWY_SF_MINKOWSKI_CONNECTIVITY: - gwy_data_field_area_minkowski_euler(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - lineres); + gwy_data_field_area_minkowski_euler(dfield, tool->line, + isel[0], isel[1], w, h, lineres); xlabel = "z"; ylabel = "χ"; break; case GWY_SF_RPSDF: - gwy_data_field_area_rpsdf(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.interpolation, - GWY_WINDOWING_HANN, - lineres); + gwy_data_field_area_rpsdf(dfield, tool->line, isel[0], isel[1], w, h, + interp, GWY_WINDOWING_HANN, lineres); xlabel = "k"; ylabel = "Wr"; break; case GWY_SF_RACF: - gwy_data_field_area_racf(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, + gwy_data_field_area_racf(dfield, tool->line, isel[0], isel[1], w, h, lineres); xlabel = "τ"; ylabel = "Gr"; break; case GWY_SF_RANGE: - gwy_data_field_area_range(plain_tool->data_field, - tool->line, - isel[0], isel[1], w, h, - tool->args.direction, - tool->args.interpolation, - lineres); + gwy_data_field_area_range(dfield, tool->line, isel[0], isel[1], w, h, + dir, interp, lineres); xlabel = "τ"; ylabel = "R"; break; @@ -958,35 +844,36 @@ g_return_if_reached(); break; } + GWY_OBJECT_UNREF(tmp_mask); if (nsel > 0 && n == 0) { gcmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(tool->gmodel, gcmodel); + gwy_graph_model_add_curve(gmodel, gcmodel); g_object_set(gcmodel, "mode", GWY_GRAPH_CURVE_LINE, NULL); g_object_unref(gcmodel); if (tool->has_calibration && tool->has_uline) { ugcmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(tool->gmodel, ugcmodel); + gwy_graph_model_add_curve(gmodel, ugcmodel); g_object_set(ugcmodel, "mode", GWY_GRAPH_CURVE_LINE, NULL); g_object_unref(ugcmodel); } } else { - gcmodel = gwy_graph_model_get_curve(tool->gmodel, 0); + gcmodel = gwy_graph_model_get_curve(gmodel, 0); if (tool->has_calibration && tool->has_uline) { - if (gwy_graph_model_get_n_curves(tool->gmodel) < 2) { + if (gwy_graph_model_get_n_curves(gmodel) < 2) { ugcmodel = gwy_graph_curve_model_new(); - gwy_graph_model_add_curve(tool->gmodel, ugcmodel); + gwy_graph_model_add_curve(gmodel, ugcmodel); g_object_set(ugcmodel, "mode", GWY_GRAPH_CURVE_LINE, NULL); g_object_unref(ugcmodel); } else { - ugcmodel = gwy_graph_model_get_curve(tool->gmodel, 1); + ugcmodel = gwy_graph_model_get_curve(gmodel, 1); } } - else if (gwy_graph_model_get_n_curves(tool->gmodel) > 1) - gwy_graph_model_remove_curve(tool->gmodel, 1); + else if (gwy_graph_model_get_n_curves(gmodel) > 1) + gwy_graph_model_remove_curve(gmodel, 1); } gwy_graph_curve_model_set_data_from_dataline(gcmodel, tool->line, 0, 0); @@ -1002,15 +889,14 @@ g_object_set(ugcmodel, "description", "uncertainty", NULL); } - g_object_set(tool->gmodel, + g_object_set(gmodel, "title", title, "axis-label-bottom", xlabel, "axis-label-left", ylabel, NULL); - gwy_graph_model_set_units_from_data_line(tool->gmodel, tool->line); + gwy_graph_model_set_units_from_data_line(gmodel, tool->line); gwy_tool_sfunctions_update_target_graphs(tool); - } static void @@ -1037,6 +923,7 @@ GwyToolSFunctions *tool) { tool->args.fixres = gtk_toggle_button_get_active(check); + gwy_tool_sfunctions_update_sensitivity(tool); gwy_tool_sfunctions_update_curve(tool); } @@ -1242,4 +1129,66 @@ g_object_unref(buf); } +static void +update_unc_fields(GwyPlainTool *plain_tool) +{ + GwyToolSFunctions *tool = GWY_TOOL_SFUNCTIONS(plain_tool); + gchar xukey[24], yukey[24], zukey[24]; + + g_snprintf(xukey, sizeof(xukey), "/%d/data/cal_xunc", plain_tool->id); + g_snprintf(yukey, sizeof(yukey), "/%d/data/cal_yunc", plain_tool->id); + g_snprintf(zukey, sizeof(zukey), "/%d/data/cal_zunc", plain_tool->id); + + GWY_OBJECT_UNREF(tool->xunc); + GWY_OBJECT_UNREF(tool->yunc); + GWY_OBJECT_UNREF(tool->zunc); + + 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)) { + gint xres = gwy_data_field_get_xres(plain_tool->data_field); + gint yres = gwy_data_field_get_yres(plain_tool->data_field); + + /* We need to resample uncertainties. */ + tool->xunc = gwy_data_field_new_resampled(tool->xunc, xres, yres, + GWY_INTERPOLATION_BILINEAR); + tool->yunc = gwy_data_field_new_resampled(tool->yunc, xres, yres, + GWY_INTERPOLATION_BILINEAR); + tool->zunc = gwy_data_field_new_resampled(tool->zunc, xres, yres, + GWY_INTERPOLATION_BILINEAR); + + tool->has_calibration = TRUE; + gtk_widget_show(tool->separate); + } + else { + tool->has_calibration = FALSE; + gtk_widget_hide(tool->separate); + } +} + +static gboolean +sfunction_supports_masking(GwySFOutputType type) +{ + return (type == GWY_SF_DH || type == GWY_SF_CDH); +} + +static gboolean +sfunction_has_explicit_resampling(GwySFOutputType type) +{ + return (type == GWY_SF_ACF || type == GWY_SF_HHCF + || type == GWY_SF_PSDF || type == GWY_SF_RPSDF + || type == GWY_SF_RANGE); +} + +static gboolean +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_PSDF); +} + /* 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.46/NEWS gwyddion-2.47/NEWS --- gwyddion-2.46/NEWS 2016-10-14 09:25:11.000000000 +0000 +++ gwyddion-2.47/NEWS 2016-11-18 09:57:33.000000000 +0000 @@ -1,3 +1,48 @@ +2.47 (2016-11-18) +Application: +- Translations updated: Czech, French, Russian. +- Dependencies: Configure now warns if FFTW is unavailable or disabled. The + library will become a required dependency in a future version. + +Libraries: +- libgwyddion, libgwydraw, libgwyapp: Simple structs such as GwyXY and GwyRGBA + now have on-heap constructors (mostly helping language bindings). +- libgwyprocess: New single-step tip modelling functions, either for fixed + model size or optimised for a certain height range, with more general + model parameter handling. +- libgwyprocess: Elliptical parabolic tip model was added. +- libgwyprocess: Fast Laplace interpolation function + gwy_data_field_laplace_solve() was added. +- libgwyprocess: GwyShapeFitPreset 3D geometrical shape fitting preset class + was added, making available the functionality of Fit Shape in the library. +- libgwyprocess: Parabolic bump function was added. +- libgwyprocess: Helper function for grain pixel size calculation was added. +- libgwyddion: GwyNLFitter has an option to reduce ordinate value differences + using the local function derivative, approximating a geometric fit. +- libgwyddion: GwyNLFitter has accessor functions for all the useful data + so it is no longer necessary to poke inside the struct. +- libgwydraw: gwy_selection_set_data() broken in 2.46 (and affecting selections + in several modules) was fixed. +- libgwyapp: Data browser data lists scroll to show the selected item. + +Modules: +- Graph logscale (new): Physically transforms graph to logarithmic scale. +- Pygwy: Large number of functions were added and fixed, some of the fixes + involved API changes: redundant list length parameters disappeared, structs + such as RGBA are now Python classes, silly function names (a_something...) + were sanitised. Syntax highlighting in the console should work again in + MS Windows. +- Image export: Inset scale bar label can be placed either below or above the + bar. +- Statistical functions: Cumulative height distribution supports masking. +- JPK: Compilation failure when minizip is not available was fixed. +- Fit shape: Module was rebased on the GwyShapeFitPreset library functions. +- Object synthesis: Parabolic bump shape was added. +- Lattice synthesis: Several new lattice types were added: Penrose, Cairo, + snub square, Si 7x7 reconstruction. +- Nano Measuring Machine: Can handle data larger than 4 GB points total on + 64bit systems (but not more than 2 GB per channel). + 2.46 (2016-10-14) Application: - Translations updated: Czech, French, Italian, Russian. diff -Nru gwyddion-2.46/perl/Makefile.in gwyddion-2.47/perl/Makefile.in --- gwyddion-2.46/perl/Makefile.in 2016-10-14 09:41:58.000000000 +0000 +++ gwyddion-2.47/perl/Makefile.in 2016-11-18 10:52:41.000000000 +0000 @@ -542,8 +542,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@HAVE_PERL_FALSE@install-data-local: @HAVE_PERL_FALSE@uninstall-local: +@HAVE_PERL_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/cs.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/cs.gmo differ diff -Nru gwyddion-2.46/po/cs.po gwyddion-2.47/po/cs.po --- gwyddion-2.46/po/cs.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/cs.po 2016-11-18 10:05:45.000000000 +0000 @@ -1,10 +1,10 @@ -# @(#) $Id: cs.po 19054 2016-10-11 18:27:54Z yeti-dn $ +# @(#) $Id: cs.po 19260 2016-11-15 08:44:28Z yeti-dn $ msgid "" msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" -"PO-Revision-Date: 2016-10-11 20:27+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" +"PO-Revision-Date: 2016-11-15 09:44+0100\n" "Last-Translator: Yeti \n" "Language-Team: Czech\n" "Language: cs\n" @@ -128,16 +128,16 @@ msgid "Untitled" msgstr "Nepojmenovaný" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "Počáteční výpočet residua..." -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "Fitruji..." #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gaussovka" @@ -218,7 +218,7 @@ msgid "Power" msgstr "Mocnina" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Lorentzovka" @@ -453,7 +453,7 @@ msgid "Position" msgstr "Poloha" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -573,12 +573,12 @@ msgstr "Frekvenčně a lokálně adaptabilní" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Zaokrouhlení" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Lineární" @@ -643,59 +643,91 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "Normální" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Jen fáze" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Vynechat oblast pod maskou" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Použít pouze oblast pod maskou" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Ignorovat masku (použít celá data)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "Taxikářská" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "Šachovnicová" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "Oktagonální 4,8" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "Oktagonální 8,4" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "Oktagonální" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "Eukleidovská" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "Mřížka (jednoduchá)" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "Mřížka (trojúrovňová)" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Otvory" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "Sféra" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "Válec (ležící)" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "Pyramida (diagonální)" + +#: libprocess/gwyshapefitpreset.c:350 +msgid "Parabolic bump" +msgstr "Parabolický hrbol" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "Prstenec" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "Dilatace..." -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "Eroze..." @@ -728,57 +760,65 @@ msgstr[1] "Byla nalezena %d lokální maxima" msgstr[2] "Bylo nalezeno %d lokálních maxim" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "Pyramida" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Pyramidální" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Kontaktní" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "Bezkontaktní" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Delta funkce" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Analytický" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "Parabola" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "Symetrický" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "Kužel" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "Eliptická parabola" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "Asymetrický" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Konvertuji pole" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Začínám částečný odhad" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Začínám plný odhad" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "Trianguluji..." @@ -806,8 +846,8 @@ msgid "Hide full controls" msgstr "Skryj kompletní ovládací prvky" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "Základní" @@ -830,8 +870,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "stupňů" @@ -911,10 +951,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -926,13 +966,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -940,7 +980,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -965,7 +1005,7 @@ msgid "Maximum z value" msgstr "Největší hodnota z" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "Pop_isek:" @@ -1044,7 +1084,7 @@ msgstr "Skrytý" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Body" @@ -1101,7 +1141,7 @@ msgid "_Line type:" msgstr "Typ čá_ry:" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "T_loušťka čáry:" @@ -1217,7 +1257,7 @@ msgid "_Reversed layout" msgstr "_Obrácené rozmístění" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "Vodorovná osa" @@ -1226,7 +1266,7 @@ msgstr "Graf" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Data" @@ -1270,7 +1310,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1300,7 +1340,7 @@ msgstr "Upřednostňovaný" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1591,7 +1631,7 @@ msgid "Minimum" msgstr "Minimum" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1606,7 +1646,7 @@ msgstr "Max. poloha" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "RMS" @@ -1693,16 +1733,16 @@ msgid "XYZ" msgstr "XYZ" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "Zprávy pro %s" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "Zprávy pro Nepojmenovaný" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "Žádný" @@ -1741,7 +1781,7 @@ msgid "Opening of `%s' failed" msgstr "Načtení ‚%s‘ se nezdařilo" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "Plná cesta souboru: %s." @@ -1751,36 +1791,36 @@ msgid "Loaded using: %s." msgstr "Načítán pomocí: %s." -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Sloučení souboru" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Otevření souboru" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "Zapsání ‚%s‘ se nezdařilo" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "Ukládán pomocí: %s." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "Soubor ‚%s‘ již existuje. Přepsat?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "Takový soubor již v ‚%s‘ existuje. Přepsání nahradí jeho obsah." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Přepsat soubor?" @@ -2033,7 +2073,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Velikost" @@ -2073,41 +2113,41 @@ msgid "current-language-code|en" msgstr "cs" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "Log %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Export" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "Vy_prázdnit" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Zavřít" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Typ" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Funkce" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Parametry" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Čas" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Exportovat log" @@ -2151,7 +2191,7 @@ msgid "_New" msgstr "_Nový" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Smazat" @@ -2790,7 +2830,7 @@ msgstr "Posunout _dolů" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3271,10 +3311,10 @@ msgstr "Export jako text" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -3987,13 +4027,13 @@ msgstr "OpenEXR datový typ %u je neplatný či nepodporovaný." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "Chyba při inicializaci knihovny libpng (v %s)" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "chyba při použití knihovny libpng" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -4027,7 +4067,7 @@ msgid "Pages:" msgstr "Strany:" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4037,7 +4077,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4053,7 +4093,7 @@ msgid "H_eight:" msgstr "_Výška:" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "Stejná _měřítka" @@ -4064,7 +4104,7 @@ msgstr "_Z-škála (na jednotku):" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4072,7 +4112,7 @@ msgstr "Změnit jednotky" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4150,100 +4190,100 @@ msgid "Cannot read channel labels." msgstr "Nelze přečíst popisky kanálů." -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "PNG obrázek (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG obrázek (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF obrázek (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Bitmapa Windows či OS2 (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA obrázek (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "Vodorov./svis. čáry" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Elipsy" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Čáry" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Obdélníky" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "Mřížka" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "Cesta" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "Žád_né" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "_Pravítka" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "_Vložené měřítko" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "Škála _falešných barev" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "Žádný" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "Nahoře" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "Podél pravé hrany" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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 " @@ -4253,152 +4293,156 @@ "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:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "Vybrat barvu" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "Černá" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "Bílá" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "Velikost pi_xelu:" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "Pixelů na pa_lec:" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Zvětšení" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Výška:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "_Písmo:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "Ve_likost písma" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "Tloušťka obr_ysu:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "Šířka okra_je:" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "_Délka značek:" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "Svázat _velikosti s rozměrem pixelu" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "_Desetinný oddělovač je čárka" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "Barvy" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "Barva čar a te_xtu:" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "_Transparentní pozadí" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "Barva _pozadí:" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "Příčná škála" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Délka:" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Umístění" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "vlevo" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "uprostřed" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "vpravo" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "nahoře" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "dole" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "_Vodorovná mezera:" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "_Svislá mezera:" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "_Barva:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "Barva obr_ysu:" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "O_pacita:" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "Kreslit čárk_y" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "Kreslit _popisek" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "Kreslit text _nad měřítko" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "Obraz" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4407,134 +4451,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "Typ _interpolace:" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "Kreslit orá_mování" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "Nakreslit _masku" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "Kreslit _legendu masky" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Škála hodnot" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "Pe_vná přesnost:" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "Pevný práh pro _kilo:" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "Název" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "Polo_ha:" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "_Mezera:" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "Umístit _jednotky do názvu" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "Nakreslit _výběr" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Objekty" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "Podélné měřítko" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "_Načíst" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "_Uložit" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Přejmenovat" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "_Jméno předvolby:" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "Export %s" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "Exportovat s 16bitovou hloubkou" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "Příčná škála" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "Hodnoty" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "Výběr" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Předvolby" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "Chyba při použití knihovny cairo: %s" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "Uložení pixbufu se nezdařilo: %s." -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 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:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "Kr_eslit čísla" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "Délka koncových _značek:" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "_Poloměr značky:" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Maska" @@ -4627,42 +4671,42 @@ 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." -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Načítá skeny ve formátu JPK." -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "JPK obrázkový sken (.jpk, .jpk-qi-image)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "JPK silové křivky (.jpk-force, .jpk-force-map, .jpk-qi-data)" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "Soubor neobsahuje rozměry mřížky." -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "Minizip nedokáže otevřít soubor coby soubor ZIP." -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 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:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "Neuniformní seznamy kanálů nejsou podporovány." -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, 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:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "Nemohu najít žádný výškový kanál." @@ -5148,77 +5192,77 @@ msgid "More than one record dimension found." msgstr "Více než jedna dimenze je ‚record‘." -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "Načítá profily Nano Measuring Machine." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "Nano Measuring Machine soubory (*.dsc)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "Načítání dat Nano Measuring Machine musí být spuštěno interaktivně." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "Načítám soubory..." -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "Vykresluji povrch..." -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "Načtení sady NMM profilů" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Informace" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "Počet datových souborů:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "Počet datových bodů:" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "Bodů v jednom profilu:" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "Načítané kanály" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "Vykreslit mapu hustoty bodů" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Rozlišení" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "_Vodorovný rozměr:" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "_Svislý rozměr:" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "Mapa hustoty bodů" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "Něco průběžně mění datové soubory na disku." @@ -5773,9 +5817,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6284,39 +6328,39 @@ msgid "IonScope SICM files (.img)" msgstr "IonScope SICM soubory (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Načítá datové soubory SIS (Surface Imaging Systems)." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "SIS soubory (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "Blok není blok dokumentu." -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "Informace o dokumentu jsou příliš krátké." -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "Informace o parametrech jsou příliš krátké." -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "Neočekávaný blok obrázku." -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "Soubor skončil v bloku obrázku." -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "Soubor skončil v bloku kanálu." -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 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." @@ -6619,11 +6663,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Maska" @@ -6687,7 +6731,7 @@ msgstr "Proložení funkce grafem" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "_Proložit" @@ -6705,12 +6749,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Parametr" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Chyba" @@ -6732,7 +6776,7 @@ msgstr "Kreslit _celou kružnici" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "Uložit výsledky" @@ -6762,20 +6806,20 @@ msgstr "nelze použít" #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "===== Výsledek proložení =====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "Data: %s\n" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6788,14 +6832,14 @@ msgstr "Rozsah x: %.*f až %.*f %s\n" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "Proložená funkce: %s\n" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Výsledky\n" @@ -6842,38 +6886,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "DOS spektrum pro \"%s\"" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Exportuje data grafu do textových souborů." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Export jako _text..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Export dat grafu do textového souboru" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Obyčejný text" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "Vhodný pro Gnuplot" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Hodnoty oddělené čárkami" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "Vhodný pro Origin" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "Textová vlna Igor Pro" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Exportuje data grafu do textových souborů." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Export jako _text..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Export dat grafu do textového souboru" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "POSIXový _formát čísel" @@ -6947,7 +6991,7 @@ msgstr "Proložení FD křivky" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "Od_hadnout" @@ -6958,7 +7002,7 @@ msgstr "Vy_kreslit odhad" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Fix." @@ -6973,7 +7017,7 @@ msgstr "Výsledné χ2:" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Korelační matice" @@ -7056,6 +7100,62 @@ msgid "Level graph curves" msgstr "Vyrovnání křivek grafu" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "Fyzicky transformuje data grafu do logaritmické škály." + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "/_Logaritmická transformace..." + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "Transformovat osy grafu do logaritmické škály" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "Logaritmická transformace" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "Transformovat osy:" + +#: modules/graph/graph_logscale.c:253 +msgid "_X" +msgstr "_X" + +#: modules/graph/graph_logscale.c:254 +msgid "_Y" +msgstr "_Y" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "_Obojí" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "Zacházení se zápornými hodnotami:" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "_Vynechat" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "Použít _absolutní hodnotu" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "Základ:" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "Přirozený (e)" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "10" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "Hledá píky na křivkách grafu." @@ -7445,13 +7545,13 @@ msgstr "Vytvořit povrch balistickou depozicí" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7463,19 +7563,19 @@ msgid "Initializing..." msgstr "Inicializuje se..." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Generovaný" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "Střední deponovaná tloušťka" @@ -7484,55 +7584,55 @@ msgid "Ballistic Deposition" msgstr "Balistická depozice" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "Postupné náhledy" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Rozměry" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Generátor" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "_Pokrytí:" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "_Jako aktuální kanál" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Vývoj" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "Vykreslit grafy:" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "Deponuji částice..." @@ -7554,7 +7654,7 @@ msgid "Error loading file: %s\n" msgstr "Chyba při čtení souboru: %s\n" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "Obsah souboru nelze uložit: %s" @@ -7563,7 +7663,7 @@ msgid "Load Calibration Data" msgstr "Nahrát kalibrační data" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Název kalibrace" @@ -7573,18 +7673,18 @@ msgid "No data loaded" msgstr "Nebyla vložena žádná data" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "Kalibrace ‚%s‘ již existuje" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Přepsat" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Přidat" @@ -7619,55 +7719,55 @@ msgid "Specify simple calibration data." msgstr "Vytvořit jednoduchá kalibrační data." -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "Jednoduchá kalibrační data" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "_X od:" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "_X do:" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "_Y od:" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "_Y do:" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "_Z od:" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "_Z do:" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "Nejistota _X:" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "Nejistota _Y:" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "Nejistota _Z:" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "Korekční faktor v ose _X:" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "Korekční faktor v ose _Y:" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "Korekční faktor v ose _Z:" @@ -7753,7 +7853,7 @@ msgid "Search canceled" msgstr "Hledání zrušeno" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -8063,65 +8163,69 @@ msgid "Data processing:" msgstr "Zpracování dat:" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "Počet maxim" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Šikmost" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "Špičatost" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "Autokorelační délka" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "Generuje sloupcovité povrchy pomocí jednoduchého algoritmu růstu" -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "/S_yntetická/_Sloupcový..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "Generovat sloupcový povrch" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "Růst sloupcového povrchu" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Velikost částic" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Dopad" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Sklon" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Směr" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "Typ relaxace:" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "_Tání:" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Slabá" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Silná" @@ -8350,12 +8454,12 @@ msgid "Y Distance" msgstr "Vzdálenost v ose Y" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Skóre" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "T_yp výstupu:" @@ -8396,31 +8500,27 @@ msgid "Create corrected data from 2nd channel" msgstr "Vytvořit opravená data z druhého kanálu" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "Koreluje se první sada..." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "Koreluje se druhá sada..." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "Rozšiřuji okraje..." - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "Opravený druhý kanál" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "Rozdíl v X" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Rozdíl v Y" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Absolutní rozdíl" @@ -8483,7 +8583,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "Cílový _graf:" @@ -8493,7 +8593,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "Nový graf" @@ -8789,7 +8889,7 @@ msgid "Plot drift _graph" msgstr "Nakreslit _graf driftu" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Náhled:" @@ -9478,9 +9578,9 @@ msgid "Filtered Data" msgstr "Filtrovaná data" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Rozdíl" @@ -9602,7 +9702,7 @@ msgstr "PSDF řez" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "Ro_zliš.:" @@ -9655,109 +9755,85 @@ msgid "Enable _power multiplier" msgstr "Aplikovat mocninný multi_plikátor" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "Mřížka (jednoduchá)" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "Mřížka (trojúrovňová)" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Otvory" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "Prstenec" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "Sféra" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "Válec (ležící)" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "Pyramida (diagonální)" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "Fituje definované geometrické tvary na data." -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "/_Vyrovnání/Proložit _tvar..." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "Fitovat geometrické tvary" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "/Proložit _tvar..." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "Proložení tvaru" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "Proložit _narychlo" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "Odvozené veličiny" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "Střední kvadratická odchylka:" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "Proložený tvar" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Oba" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "Typ _funkce:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "Zobrazovat rozdíly s přizpůsobenou barevnou mapou" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "Plný fit je _geometrický" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "Počítat rozdíly i pro vynechané pixely" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "_Přepočítat obrázek" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "_Vrátit předchozí hodnoty" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "Odhad parametrů se nezdařil" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "Prokládání se nezdařilo" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "Prokládání bylo přerušeno" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "(pevný)" @@ -10027,11 +10103,11 @@ msgid "Keep grains satisfying:" msgstr "Ponechat zrna splňující:" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "Spodní práh:" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "Horní práh:" @@ -10601,108 +10677,128 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "Interpolace dat pod maskou řešením Laplaceovy rovnice" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "Laplaceovská interpolace..." - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "Náhodná konstanta" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "Náhodné roviny" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "Náhodné hrboly" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "Radiální vzdálenost" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "Segmentová vzdálenost" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "Znáhodněná segmentová vzdálenost" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "Vzdálenost od hranice" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "Znáhodněná vzdálenost od hranice" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "Vzdálenost od druhého nejbližšího" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "Vytváří povrch na základě pravidelných nebo náhodných mřížek." -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "/S_yntetická/_Mřížka..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "Generovat povrch na základě mřížky" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "Náhodná" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "Čtvercová" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "Hexagonální" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "Trojúhelníková" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "Káhirská" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "Čtvercový pahýl" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "Oříznutý čtverec" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "Křemík 7x7" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "Penrosova (vrcholy)" + +#: modules/process/lat_synth.c:551 +msgid "lattice|Penrose (centers)" +msgstr "Penrosova (středy)" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "_Mřížka:" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "_Velikost:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "Rela_xace mřížky:" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "Relaxace _výšky:" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Povrch" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "Vá_ha:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "Vytvářím mřížku..." -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "Relaxuji mřížku..." -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "Relaxuji mřížku..." @@ -10811,21 +10907,21 @@ "interpolation" msgstr "Vyrovnat jednotlivá zrna s laplaceovskou interpolací mezi nimi" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Pozadí" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "Vyrovnat zrna" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "Vyrovnat podle:" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11064,12 +11160,12 @@ msgid "Mark data disconnected from other values" msgstr "Označit data oddělená od ostatních hodnot" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Positivní" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Negativní" @@ -11782,95 +11878,99 @@ msgid "Random Noise" msgstr "Náhodný šum" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Sféry" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "Kvádry" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Kužely" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Pyramidy" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Diamanty" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Čtyřstěny" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "Valouny" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "Došky" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "Stany" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Gaussovky" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "Prstence" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +msgid "Parabolic bumps" +msgstr "Parabolické hrboly" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "Vytváří náhodně vzorovaný povrch umísťováním objektů." -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/S_yntetická/_Objekty..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "Vytvořit povrch z náhodně umístěných objektů" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "Oba (náhodně)" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "Náhodné objekty" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "_Tvar:" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "obj." -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Poměr stran" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "Poměr _stran:" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "Škálova_t s velikostí:" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "Typ tvaru:" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "_Uříznout:" @@ -12461,11 +12561,11 @@ msgid "Level data by arc revolution" msgstr "Vyrovnat data valením oblouku" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "_Vodorovný směr" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "_Svislý směr" @@ -12746,47 +12846,51 @@ msgid "Tip radius evolution" msgstr "Vývoj poloměru hrotu" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Modeluje SPM hrot." -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "/_Hrot a indentace/_Modelovat hrot..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Modelování hrotu AFM" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Modelování hrotu" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Typ hrotu:" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Počet stran:" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "_Sklon hrotu:" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "_Rotace hrotu:" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "Poloměr _vrcholku:" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "_Anisotropie hrotu:" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "Modelovaný hrot" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Rozlišení hrotu: %d × %d pixelů" @@ -12954,7 +13058,7 @@ msgstr "Vlny" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "_Veličina:" @@ -13143,63 +13247,58 @@ msgid "Python wrapper console" msgstr "Konzola rozhraní Pythonu" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr ">>> Spouštím skript výše\n" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Otevřít skript v Pythonu" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Uložit skript jako" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Konsola pygwy" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Vyprázdnit log" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Otevřít skript v jazyce Python (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Uložit skript (Ctrl-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Spustit skript (Ctrl-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Příkaz" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "Pygwy, pythoní rozhraní ke Gwyddionu." -#: pygwy.c:585 pygwy.c:676 +#: pygwy.c:258 +msgid "Python Interpreter Errors" +msgstr "Chyby interptetu Pythonu" + +#: pygwy.c:384 +msgid "Python interpreter error occurred." +msgstr "Došlo k chybě interpretu Pythonu." + +#: pygwy.c:459 msgid "Function written in Python" msgstr "Funkce napsaná v Pythonu" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Grafová funkce napsaná v Pythonu" - -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." -msgstr "" -"Pygwy plugin: %s (%s)\n" -"Export se nezdařil." - #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." msgstr "Nástroj ořez, ořezává data na menší velikost." @@ -13210,7 +13309,7 @@ #: modules/tools/crop.c:122 msgid "Crop data" -msgstr "Ořízni data" +msgstr "Oříznout data" #: modules/tools/distance.c:111 msgid "Distance measurement tool, measures distances and angles." @@ -13283,10 +13382,6 @@ msgid "_Mask" msgstr "_Masku" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "_Obojí" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "Řešení Laplaceovy rovnice" @@ -13352,7 +13447,7 @@ msgstr "Rozdělení výšek" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Rozsah" @@ -13457,11 +13552,11 @@ msgstr "Střední hodnota:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Volby" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "Okamžité aktuali_zace" @@ -13913,7 +14008,7 @@ msgid "_Copy" msgstr "_Kopírovat" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -13923,63 +14018,63 @@ "(rozdělení výšek, korelace, spektrální hustotu, Minkowského funkcionály) " "vybrané části dat." -#: modules/tools/sfunctions.c:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Rozdělení výšek" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "Kumul. rozdělení výšek" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Rozdělení úhlů" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "Kumul. rozdělení úhlů" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "Radiální PSDF" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "Radiální ACF" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "Minkovského objem" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "Minkovského hranice" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "Minkovského spojitost" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Statistické funkce" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "Výpočet jednorozměrných statistických funkcí" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "_Oddělit nejistotu" @@ -14845,3 +14940,19 @@ "interrupted." msgstr "" "Regularizace XYZ dat selhala kvůli numerické nestabilitě nebo byla přerušena." + +#~ msgid "Graph function written in Python" +#~ msgstr "Grafová funkce napsaná v Pythonu" + +#~ msgid "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." +#~ msgstr "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export se nezdařil." + +#~ msgid "Borders extension..." +#~ msgstr "Rozšiřuji okraje..." + +#~ msgid "Laplace interpolation..." +#~ msgstr "Laplaceovská interpolace..." Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/de.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/de.gmo differ diff -Nru gwyddion-2.46/po/de.po gwyddion-2.47/po/de.po --- gwyddion-2.46/po/de.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/de.po 2016-11-18 10:05:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" "PO-Revision-Date: 2014-09-03 20:32+0100\n" "Last-Translator: Lennart Fricke \n" "Language-Team: deutsch \n" @@ -141,17 +141,17 @@ msgid "Untitled" msgstr "Unbenannt" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "" -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 #, fuzzy msgid "Fitting..." msgstr "FFT-Filterung" #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gauß" @@ -238,7 +238,7 @@ msgid "Power" msgstr "" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "" @@ -493,7 +493,7 @@ msgid "Position" msgstr "Position" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -615,12 +615,12 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Linear" @@ -688,62 +688,97 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 #, fuzzy msgid "correlation|Normal" msgstr "Korrelation" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Nur Phase" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Maskierten Bereich ausschließen" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Nur maskierten Bereich einbeziehen" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Gesamtes Bild verwenden (Maske ignorieren)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 #, fuzzy msgid "distance|Chess" msgstr "Abstand" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:345 +#, fuzzy +msgid "Sphere" +msgstr "Unterdrücken" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:349 +#, fuzzy +msgid "Pyramid (diamond)" +msgstr "Pyramidal" + +#: libprocess/gwyshapefitpreset.c:350 +#, fuzzy +msgid "Parabolic bump" +msgstr "Parallel" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 #, fuzzy msgid "Dilation..." msgstr "Dilatation" -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 #, fuzzy msgid "Erosion..." msgstr "Erosion" @@ -777,63 +812,72 @@ msgstr[0] "%d interne lokale Maxima gefunden" msgstr[1] "%d interne lokale Maxima gefunden" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 #, fuzzy msgid "Pyramid" msgstr "Pyramide" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Pyramidal" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 #, fuzzy msgid "Contact" msgstr "Kontakt" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 #, fuzzy msgid "Noncontact" msgstr "Nicht-Kontakt" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Delta-Funktion" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Analytisch" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 #, fuzzy msgid "Parabola" msgstr "Parallel" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 #, fuzzy msgid "Symmetric" msgstr "Symmetrie" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 #, fuzzy msgid "Cone" msgstr "Keine" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "" + +#: libprocess/tip.c:459 +#, fuzzy +msgid "Asymmetric" +msgstr "Symmetrie" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Konvertiere Felder" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Starte partielle Abschätzung" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Starte komplette Abschätzung" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 #, fuzzy msgid "Triangulating..." msgstr "Triangulation..." @@ -864,8 +908,8 @@ msgid "Hide full controls" msgstr "Kontrollelemente ausblenden" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "" @@ -888,8 +932,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "Grad" @@ -974,10 +1018,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -989,13 +1033,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -1003,7 +1047,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -1028,7 +1072,7 @@ msgid "Maximum z value" msgstr "Maximaler z-Wert" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "_Beschriftung:" @@ -1111,7 +1155,7 @@ msgstr "Versteckt" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Punkte" @@ -1169,7 +1213,7 @@ msgid "_Line type:" msgstr "_Linientyp:" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "Linien_dicke:" @@ -1301,7 +1345,7 @@ msgid "_Reversed layout" msgstr "seiten_verkehrt" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "" @@ -1310,7 +1354,7 @@ msgstr "Graph" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Daten" @@ -1357,7 +1401,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1389,7 +1433,7 @@ msgstr "Bevorzugt" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1692,7 +1736,7 @@ msgid "Minimum" msgstr "Minimum" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1709,7 +1753,7 @@ msgstr "Maximaler z-Wert" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 #, fuzzy msgid "RMS" @@ -1801,16 +1845,16 @@ msgid "XYZ" msgstr "" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 #, fuzzy msgid "channel|None" msgstr "Kanäle" @@ -1840,7 +1884,7 @@ msgid "Opening of `%s' failed" msgstr "Das Öffnen von `%s' ist fehlgeschlagen" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, fuzzy, c-format msgid "Full file path: %s." msgstr "Datei_typ: %s" @@ -1850,31 +1894,31 @@ msgid "Loaded using: %s." msgstr "Lade Einstellungen" -#: app/file.c:381 +#: app/file.c:380 #, fuzzy msgid "Merge File" msgstr "Zusammengefügte Bilder" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Datei öffnen" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "Das Speichern von `%s' ist fehlgeschlagen" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "" -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "Die Datei `%s' Existiert bereits. Soll sie ersetzt werden?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." @@ -1882,7 +1926,7 @@ "Die Datei existiert bereits in `%s'. Beim Ersetzen wird ihr Inhalt " "überschrieben." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Datei ersetzen?" @@ -2142,7 +2186,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Größe" @@ -2178,43 +2222,43 @@ msgid "current-language-code|en" msgstr "" -#: app/log.c:538 +#: app/log.c:536 #, fuzzy, c-format msgid "Log of %s (%s)" msgstr "Metadaten von %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 #, fuzzy msgid "_Export" msgstr "Text exportieren" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Schließen" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Typ" -#: app/log.c:618 +#: app/log.c:616 #, fuzzy msgid "Function" msgstr "F_unktion:" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Parameter" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "" -#: app/log.c:732 +#: app/log.c:730 #, fuzzy msgid "Export Log" msgstr "Text exportieren" @@ -2260,7 +2304,7 @@ msgid "_New" msgstr "_Neu" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Löschen" @@ -2779,7 +2823,7 @@ msgstr "Runter" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3280,10 +3324,10 @@ msgstr "Text exportieren" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -4024,13 +4068,13 @@ msgstr "Der Datentyp %d ist ungültig oder wird nicht unterstützt." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -4064,7 +4108,7 @@ msgid "Pages:" msgstr "" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4074,7 +4118,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4090,7 +4134,7 @@ msgid "H_eight:" msgstr "H_öhe:" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "Identische _Maße" @@ -4101,7 +4145,7 @@ msgstr "_Z-Skalierung (pro Abtast-Einheit):" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4109,7 +4153,7 @@ msgstr "Einheiten ändern" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4190,279 +4234,283 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows- oder OS2-Bitmap (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 #, fuzzy msgid "Portable document format (.pdf)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 #, fuzzy msgid "Scalable Vector Graphics (.svg)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 #, fuzzy msgid "Horiz./vert. lines" msgstr "Drift-_Linien" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Ellipsen" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Linien" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Rechtecke" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 #, fuzzy msgid "Lattice" msgstr "_Linientyp:" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 #, fuzzy msgid "ruler|_None" msgstr "_Keine" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 #, fuzzy msgid "title|None" msgstr "_Keine" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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:2914 +#: modules/file/imgexport.c:2931 #, fuzzy msgid "Select Color" msgstr "Kurvenfarbe setzen" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 #, fuzzy msgid "Black" msgstr "Blackman" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 #, fuzzy msgid "Pi_xel size:" msgstr "_Punktgröße:" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Zoom:" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Höhe:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 #, fuzzy msgid "_Font:" msgstr "Schri_ftgröße:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "Schri_ftgröße:" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 #, fuzzy msgid "O_utline thickness:" msgstr "Linien_dicke:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 #, fuzzy msgid "_Border width:" msgstr "S_teigung:" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 #, fuzzy msgid "_Tick length:" msgstr "_Länge:" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 #, fuzzy msgid "Colors" msgstr "Farbe" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 #, fuzzy msgid "_Transparent background" msgstr "Untergrund e_xtrahieren" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 #, fuzzy msgid "_Background color:" msgstr "Untergrund" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 #, fuzzy msgid "Lateral scale" msgstr "_Laterale Skala:" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Länge:" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 #, fuzzy msgid "left" msgstr "Links" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 #, fuzzy msgid "center" msgstr "Mitte" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 #, fuzzy msgid "right" msgstr "Rechts" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 #, fuzzy msgid "Hori_zontal gap:" msgstr "Horizontal" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 #, fuzzy msgid "_Vertical gap:" msgstr "_Vertikal:" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 #, fuzzy msgid "Colo_r:" msgstr "Farbe:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 #, fuzzy msgid "O_pacity:" msgstr "_Skala:" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 #, fuzzy msgid "Draw _ticks" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 #, fuzzy msgid "Draw _label" msgstr "_Beschriftungen anzeigen" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "" + +#: modules/file/imgexport.c:3773 #, fuzzy msgid "Image" msgstr "FFT Imaginärteil" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4471,148 +4519,148 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "_Interpolationstyp:" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 #, fuzzy msgid "Draw _frame" msgstr "_Rahmen anzeigen" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 #, fuzzy msgid "Draw mask _legend" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Werteskala" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 #, fuzzy msgid "Fi_xed precision:" msgstr "_Genauigkeit:" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 #, fuzzy msgid "Fixed _kilo threshold:" msgstr "_Weicher Schwellwert:" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 #, fuzzy msgid "Title" msgstr "_Titel:" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 #, fuzzy msgid "Posi_tion:" msgstr "Position:" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Objekte" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 #, fuzzy msgid "Lateral" msgstr "GL-Material" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 #, fuzzy msgid "verb|_Load" msgstr "_Laden" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 #, fuzzy msgid "_Rename" msgstr "_Umbenennen" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 #, fuzzy msgid "Lateral Scale" msgstr "Laterale Skala" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 #, fuzzy msgid "Values" msgstr "Wert" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 #, fuzzy msgid "Selection" msgstr "Richtung:" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 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:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 #, fuzzy msgid "Draw _numbers" msgstr "_Maske zeichnen" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 #, fuzzy msgid "Marker _radius:" msgstr "Fehlerzeilen markieren" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Maske" @@ -4703,43 +4751,43 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "" -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "" -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "" -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:747 +#: modules/file/jpkscan.c:748 #, fuzzy msgid "Non-uniform channel lists are not supported." msgstr "Abstands-Kraft-Kurven werden nicht unterstützt." -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "" @@ -5227,86 +5275,86 @@ msgid "More than one record dimension found." msgstr "" -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 #, fuzzy msgid "Imports Nano Measuring Machine profile files." msgstr "Importiert NanoScan XML-Dateien." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 #, fuzzy msgid "Nano Measuring Machine files (*.dsc)" msgstr "Nanonis SXM-Dateien (.sxm)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 #, fuzzy msgid "Nano Measuring Machine data import must be run as interactive." msgstr "Der Import von XYZ-Rohdaten muss interaktiv ausgeführt werden." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 #, fuzzy msgid "Reading files..." msgstr "Markiere Grenzen" -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "" -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 #, fuzzy msgid "Import NMM Profile Set" msgstr "Importiert Matlab MAT-Dateien, v5." -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Information" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 #, fuzzy msgid "Number of data files:" msgstr "A_nzahl an Schritten:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 #, fuzzy msgid "Total number of points:" msgstr "Anzahl der Spalten" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 #, fuzzy msgid "Imported Channels" msgstr "Kanäle" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Auflösung" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "_Horizontale Größe:" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "_Vertikale Größe:" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 #, fuzzy msgid "Point density map" msgstr "Punkt_typ:" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "" @@ -5864,9 +5912,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6384,39 +6432,39 @@ msgid "IonScope SICM files (.img)" msgstr "IonScope SICM-Dateien (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Importiert SIS-Dateien (Surface Imaging Systems)." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "SIS-Dateien (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "" @@ -6737,11 +6785,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Maskier-Modus" @@ -6810,7 +6858,7 @@ msgstr "Graph anfitten" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "" @@ -6829,12 +6877,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Parameter" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Fehler" @@ -6857,7 +6905,7 @@ msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "" @@ -6888,21 +6936,21 @@ msgstr "N.V." #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 #, fuzzy msgid "===== Fit Results =====" msgstr "===== Fit-Ergebnisse====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6915,14 +6963,14 @@ msgstr "" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Ergebnisse\n" @@ -6974,39 +7022,39 @@ msgid "DOS Spectrum for \"%s\"" msgstr "" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +#, fuzzy +msgid "Exports graph data to text files." +msgstr "Exportiert Graphen in Textdateien." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Exportieren als _Text..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Diagrammdaten als Textdatei exportieren" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "" -#: modules/graph/graph_export_ascii.c:71 -#, fuzzy -msgid "Exports graph data to text files." -msgstr "Exportiert Graphen in Textdateien." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Exportieren als _Text..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Diagrammdaten als Textdatei exportieren" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "" @@ -7087,7 +7135,7 @@ msgstr "FD-Kurve fitten" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 #, fuzzy msgid "verb|_Estimate" @@ -7100,7 +7148,7 @@ msgstr "_Diagramm-Einheiten" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 #, fuzzy msgid "Fix" msgstr "Fest" @@ -7117,7 +7165,7 @@ msgstr "χ2 Ergebnis:" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Korrelationsmatrix" @@ -7207,6 +7255,68 @@ msgid "Level graph curves" msgstr "Diagrammkurven nivellieren" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" + +#: modules/graph/graph_logscale.c:93 +#, fuzzy +msgid "/_Logscale transform..." +msgstr "Hough-Transformation." + +#: modules/graph/graph_logscale.c:96 +#, fuzzy +msgid "Transform graph axes to logarithmic scale" +msgstr "Erzeugt eine Präsentation mit logarithmischer Farbskalierung" + +#: modules/graph/graph_logscale.c:229 +#, fuzzy +msgid "Logscale Transform" +msgstr "Hough-Transformation" + +#: modules/graph/graph_logscale.c:245 +#, fuzzy +msgid "Axes to transform:" +msgstr "Hough-Transformation." + +#: modules/graph/graph_logscale.c:253 +#, fuzzy +msgid "_X" +msgstr "_X:" + +#: modules/graph/graph_logscale.c:254 +#, fuzzy +msgid "_Y" +msgstr "_Y:" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "_Beide" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "" + #: modules/graph/graph_peaks.c:118 #, fuzzy msgid "Finds peaks on graph curves." @@ -7618,13 +7728,13 @@ msgstr "" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7636,19 +7746,19 @@ msgid "Initializing..." msgstr "Initialisiere..." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 #, fuzzy msgid "Mean deposited thickness" @@ -7659,59 +7769,59 @@ msgid "Ballistic Deposition" msgstr "Maximaler z-Wert" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 #, fuzzy msgid "Dimensions" msgstr "Abmessungen" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 #, fuzzy msgid "Co_verage:" msgstr "_Minimalwert" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 #, fuzzy msgid "Evolution" msgstr "Auflösung" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 #, fuzzy msgid "Plot graphs:" msgstr "_Graphen zeichnen" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "" @@ -7733,7 +7843,7 @@ msgid "Error loading file: %s\n" msgstr "" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, fuzzy, c-format msgid "Cannot save preset: %s" msgstr "" @@ -7744,7 +7854,7 @@ msgid "Load Calibration Data" msgstr "Kalibrierdaten laden" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Kalibrierungs-Name:" @@ -7754,18 +7864,18 @@ msgid "No data loaded" msgstr "Keine Daten geladen" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, fuzzy, c-format msgid "Calibration '%s' already exists" msgstr "Kalibrierung `%s' existiert bereits." -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Überschreiben" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "" @@ -7800,56 +7910,56 @@ msgid "Specify simple calibration data." msgstr "" -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 #, fuzzy msgid "Simple Calibration Data" msgstr "Einfache Kalibrierungsdaten" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "" @@ -7935,7 +8045,7 @@ msgid "Search canceled" msgstr "Suche abgebrochen" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 #, fuzzy @@ -8266,73 +8376,78 @@ msgid "Data processing:" msgstr "Daten aufbereiten" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 #, fuzzy msgid "Number of maxima" msgstr "Anzahl an Körnern" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +#, fuzzy +msgid "Autocorrelation length" +msgstr "Korrelations_methode:" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "" -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 #, fuzzy msgid "/S_ynthetic/_Columnar..." msgstr "/S_ynthetisch/_Muster..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 #, fuzzy msgid "Generate columnar surface" msgstr "Relative Linien" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 #, fuzzy msgid "Particle Size" msgstr "_Pixel-Radius:" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 #, fuzzy msgid "Inclination" msgstr "Kreuzungen" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 #, fuzzy msgid "Direction" msgstr "Richtung:" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 #, fuzzy msgid "Relaxation type:" msgstr "_Interpolationstyp:" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 #, fuzzy msgid "_Melting:" msgstr "_Skala:" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "" @@ -8577,12 +8692,12 @@ msgid "Y Distance" msgstr "Y Abstand" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "Ausgabe_art:" @@ -8627,34 +8742,30 @@ msgid "Create corrected data from 2nd channel" msgstr "" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 #, fuzzy msgid "Correlating first set..." msgstr "Korreliere..." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 #, fuzzy msgid "Correlating second set..." msgstr "Korreliere..." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "" - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 #, fuzzy msgid "Corrected 2nd channel" msgstr "Neuen Kanal erzeugen" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "X Differenz" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Y Differenz" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Absolute Differenz" @@ -8727,7 +8838,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 #, fuzzy msgid "Target _graph:" @@ -8738,7 +8849,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 #, fuzzy msgid "New graph" @@ -9061,7 +9172,7 @@ msgid "Plot drift _graph" msgstr "Drift-Graph zeichnen" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Vorschau:" @@ -9823,9 +9934,9 @@ msgid "Filtered Data" msgstr "Gefilterte Daten" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Differenz" @@ -9961,7 +10072,7 @@ msgstr "_Auswahlmodus:" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "_Feste Auflösung:" @@ -10017,118 +10128,92 @@ msgid "Enable _power multiplier" msgstr "" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "" - -#: modules/process/fit-shape.c:529 -#, fuzzy -msgid "Sphere" -msgstr "Unterdrücken" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "" - -#: modules/process/fit-shape.c:533 -#, fuzzy -msgid "Pyramid (diamond)" -msgstr "Pyramidal" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "" -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 #, fuzzy msgid "/_Level/_Fit Shape..." msgstr "/_Nivellierung/_Sphäre fitten..." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 #, fuzzy msgid "/_Fit Shape..." msgstr "/_Nivellierung/_Sphäre fitten..." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 #, fuzzy msgid "Fit Shape" msgstr "Sphäre fitten" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 #, fuzzy msgid "Derived Quantities" msgstr "Korn-Statistiken" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 #, fuzzy msgid "Mean square difference:" msgstr "X Differenz" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 #, fuzzy msgid "Fitted shape" msgstr "Gefittete Sphäre" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Beides" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 #, fuzzy msgid "_Function type:" msgstr "Funktionstyp:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "" @@ -10415,12 +10500,12 @@ msgid "Keep grains satisfying:" msgstr "Einfache Körnungsstatistiken" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 #, fuzzy msgid "Lower threshold:" msgstr "_Harter Schwellwert:" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 #, fuzzy msgid "Upper threshold:" msgstr "_Harter Schwellwert:" @@ -11021,130 +11106,153 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "Daten unter der Maske durch Lösung der Laplace-Gleichung interpolieren" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -#, fuzzy -msgid "Laplace interpolation..." -msgstr "Interpoliere..." - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 #, fuzzy msgid "Random constant" msgstr "Fenstergröße" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 #, fuzzy msgid "Random linear" msgstr "Fenstergröße" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 #, fuzzy msgid "Random bumpy" msgstr "Fenstergröße" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 #, fuzzy msgid "Radial distance" msgstr "X Abstand" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 #, fuzzy msgid "Segmented distance" msgstr "Segmentierung" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 #, fuzzy msgid "Segmented random" msgstr "Segmentierung" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 #, fuzzy msgid "Border distance" msgstr "X Abstand" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 #, fuzzy msgid "Border random" msgstr "Rand" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 #, fuzzy msgid "Second nearest distance" msgstr "Abstände messen" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "" -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 #, fuzzy msgid "/S_ynthetic/_Lattice..." msgstr "/S_ynthetisch/_Partikel..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 #, fuzzy msgid "Generate lattice based surface" msgstr "Relative Linien" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 #, fuzzy msgid "lattice|Square" msgstr "Quadrat" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 #, fuzzy msgid "lattice|Hexagonal" msgstr "Hexagonal" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 #, fuzzy msgid "lattice|Triangular" msgstr "Dreieckig" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +#, fuzzy +msgid "lattice|Cairo" +msgstr "Quadrat" + +#: modules/process/lat_synth.c:547 +#, fuzzy +msgid "lattice|Snub square" +msgstr "Quadrat" + +#: modules/process/lat_synth.c:548 +#, fuzzy +msgid "lattice|Truncated square" +msgstr "Quadrat" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "" + +#: modules/process/lat_synth.c:551 +#, fuzzy +msgid "lattice|Penrose (centers)" +msgstr "Fit-Parameter" + +#: modules/process/lat_synth.c:644 #, fuzzy msgid "_Lattice:" msgstr "_Linientyp:" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 #, fuzzy msgid "_Size:" msgstr "_Größe:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 #, fuzzy msgid "Lattice rela_xation:" msgstr "Partikelerzeugung" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 #, fuzzy msgid "_Height relaxation:" msgstr "Höhenverteilung" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 #, fuzzy msgid "Surface" msgstr "Oberflächen-Flächeninhalt" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 #, fuzzy msgid "_Weight:" msgstr "_Gewicht:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 #, fuzzy msgid "Constructing lattice..." msgstr "Daten _korrigieren" -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "" -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "" @@ -11261,23 +11369,23 @@ "interpolation" msgstr "" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Untergrund" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 #, fuzzy msgid "Level Grains" msgstr "Graphen mit Gerade nivellieren." -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 #, fuzzy msgid "Quantity to level:" msgstr "/_Beenden" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11548,12 +11656,12 @@ msgid "Mark data disconnected from other values" msgstr "Daten markieren, die weiter als 3σ vom Mittelwert abweichen" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Positiv" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Negativ" @@ -12340,107 +12448,112 @@ msgid "Random Noise" msgstr "Fenstergröße" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 #, fuzzy msgid "Spheres" msgstr "Unterdrücken" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 #, fuzzy msgid "Cones" msgstr "Keine" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 #, fuzzy msgid "Diamonds" msgstr "Diamant" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 #, fuzzy msgid "Tents" msgstr "Punkte" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 #, fuzzy msgid "Gaussians" msgstr "Gauss'sch" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 #, fuzzy msgid "Doughnuts" msgstr "Rauigkeit" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +#, fuzzy +msgid "Parabolic bumps" +msgstr "Parallel" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "" -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/S_ynthetisch/_Objekte..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 #, fuzzy msgid "Both (random)" msgstr "Rand" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 #, fuzzy msgid "Random Objects" msgstr "Fenstergröße" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 #, fuzzy msgid "_Shape:" msgstr "_Skala:" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "" -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 #, fuzzy msgid "Aspect Ratio" msgstr "_Operator:" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 #, fuzzy msgid "_Aspect ratio:" msgstr "_Operator:" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 #, fuzzy msgid "_Feature type:" msgstr "_Filtertyp:" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "" @@ -13079,11 +13192,11 @@ msgid "Level data by arc revolution" msgstr "" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "_Horizontal" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "_Vertikal" @@ -13380,49 +13493,54 @@ msgid "Tip radius evolution" msgstr "Spitzendilatation" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "" -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 #, fuzzy msgid "/_Tip and Indentation/_Model Tip..." msgstr "/Spi_tze/Spitze _modellieren..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Spitzen_typ:" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "Spitzen_neigung:" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "Spitzen_rotation:" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +#, fuzzy +msgid "Tip _anisotropy:" +msgstr "DWT Anisotropie" + +#: modules/process/tip_model.c:490 #, fuzzy msgid "Modeled tip" msgstr "Modus" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Auflösung der Spitze: %d × %d Pixel" @@ -13602,7 +13720,7 @@ msgstr "" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 #, fuzzy msgid "_Quantity:" msgstr "/_Beenden" @@ -13819,61 +13937,58 @@ msgid "Python wrapper console" msgstr "" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr "" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Python-Skript öffnen" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Skript speichern als" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Pygwy-Konsole" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Python-Skript öffnen (Strg-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Skript speichern (Strg-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Skript ausführen (Strg-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "" -#: pygwy.c:585 pygwy.c:676 -msgid "Function written in Python" -msgstr "In Python geschriebene Funktion" - -#: pygwy.c:630 -msgid "Graph function written in Python" +#: pygwy.c:258 +msgid "Python Interpreter Errors" msgstr "" -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." +#: pygwy.c:384 +msgid "Python interpreter error occurred." msgstr "" +#: pygwy.c:459 +msgid "Function written in Python" +msgstr "In Python geschriebene Funktion" + #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." msgstr "" @@ -13954,10 +14069,6 @@ msgid "_Mask" msgstr "_Maske" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "_Beide" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "" @@ -14022,7 +14133,7 @@ msgstr "Höhen-Histogramm" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Bereich" @@ -14130,11 +14241,11 @@ msgstr "_Minimalwert" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Optionen" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "_Sofort aktualisieren" @@ -14595,70 +14706,70 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 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:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Höhenverteilung" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Winkelverteilung" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Statistik-Funktionen" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "1D-Statistik-Funktionen berechnen" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "" @@ -15614,6 +15725,10 @@ msgstr "" #, fuzzy +#~ msgid "Laplace interpolation..." +#~ msgstr "Interpoliere..." + +#, fuzzy #~ msgid "Placement:" #~ msgstr "_Anzeige:" Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/en_GB.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/en_GB.gmo differ diff -Nru gwyddion-2.46/po/en_GB.po gwyddion-2.47/po/en_GB.po --- gwyddion-2.46/po/en_GB.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/en_GB.po 2016-11-18 10:05:45.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" -"PO-Revision-Date: 2016-10-11 20:28+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" +"PO-Revision-Date: 2016-11-15 09:45+0100\n" "Last-Translator: Yeti \n" "Language-Team: None, I suppose\n" "Language: en_GB\n" @@ -12,7 +12,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" #: libgwyddion/gwyexpr.c:765 msgid "Invalid token" @@ -128,16 +128,16 @@ msgid "Untitled" msgstr "Untitled" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "Initial residua evaluation..." -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "Fitting..." #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gaussian" @@ -218,7 +218,7 @@ msgid "Power" msgstr "Power" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Lorentzian" @@ -453,7 +453,7 @@ msgid "Position" msgstr "Position" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -573,12 +573,12 @@ msgstr "Scale and space adaptive" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Round" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Linear" @@ -643,59 +643,91 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "Normal" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Phase-only" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Exclude masked region" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Include only masked region" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Use entire image (ignore mask)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "City-block" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "Chess" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "Octagonal 4,8" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "Octagonal 8,4" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "Octagonal" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "Euclidean" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "Grating (simple)" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "Grating (3-level)" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Holes" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "Sphere" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "Cylinder (lying)" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "Pyramid (diamond)" + +#: libprocess/gwyshapefitpreset.c:350 +msgid "Parabolic bump" +msgstr "Parabolic bump" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "Ring" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "Dilation..." -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "Erosion..." @@ -726,57 +758,65 @@ msgstr[0] "Found one internal local maximum" msgstr[1] "Found %d internal local maxima" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "Pyramid" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Pyramidal" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Contact" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "Non-contact" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Delta-function" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Analytical" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "Parabola" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "Symmetrical" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "Cone" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "Elliptical parabola" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "Asymmetric" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Converting fields" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Starting partial estimation" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Starting full estimation" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "Triangulating..." @@ -804,8 +844,8 @@ msgid "Hide full controls" msgstr "Hide full controls" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "Basic" @@ -828,8 +868,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "deg" @@ -909,10 +949,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -924,13 +964,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -938,7 +978,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -963,7 +1003,7 @@ msgid "Maximum z value" msgstr "Maximum z-value" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "_Label:" @@ -1042,7 +1082,7 @@ msgstr "Hidden" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Points" @@ -1099,7 +1139,7 @@ msgid "_Line type:" msgstr "_Line type:" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "Line t_hickness:" @@ -1215,7 +1255,7 @@ msgid "_Reversed layout" msgstr "_Reversed layout" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "Abscissa" @@ -1224,7 +1264,7 @@ msgstr "Graph" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Data" @@ -1268,7 +1308,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1298,7 +1338,7 @@ msgstr "Preferred" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1589,7 +1629,7 @@ msgid "Minimum" msgstr "Minimum" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1604,7 +1644,7 @@ msgstr "Max. position" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "RMS" @@ -1691,16 +1731,16 @@ msgid "XYZ" msgstr "XYZ" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "Messages for %s" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "Messages for Untitled" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "None" @@ -1740,7 +1780,7 @@ msgid "Opening of `%s' failed" msgstr "Opening of ‘%s’ failed" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "Full file path: %s." @@ -1750,37 +1790,37 @@ msgid "Loaded using: %s." msgstr "Loaded using: %s." -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Merge File" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Open File" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "Saving of ’%s‘ failed" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "Saved using: %s." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "File ‘%s’ already exists. Replace?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "" "The file already exists in ‘%s’. Replacing it will overwrite its contents." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Replace File?" @@ -2032,7 +2072,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Size" @@ -2072,41 +2112,41 @@ msgid "current-language-code|en" msgstr "en_GB" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "Log of %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Export" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "Clea_r" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Close" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Type" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Function" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Parameters" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Time" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Export Log" @@ -2150,7 +2190,7 @@ msgid "_New" msgstr "_New" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Delete" @@ -2776,7 +2816,7 @@ msgstr "Move _Down" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3257,10 +3297,10 @@ msgstr "Export Text" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -3974,14 +4014,14 @@ msgstr "OpenEXR data type %u is invalid or unsupported." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "libpng initialisation error (in %s)" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" -msgstr "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" +msgstr "libpng error occurred" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/hdrimage.cc:2210 modules/file/pixmap.c:786 @@ -4014,7 +4054,7 @@ msgid "Pages:" msgstr "Pages:" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4024,7 +4064,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4040,7 +4080,7 @@ msgid "H_eight:" msgstr "H_eight:" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "Identical _measures" @@ -4051,7 +4091,7 @@ msgstr "_Z-scale (per sample unit):" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4059,7 +4099,7 @@ msgstr "Change Units" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4137,100 +4177,100 @@ msgid "Cannot read channel labels." msgstr "Cannot read channel labels." -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows or OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "Horiz./vert. lines" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Ellipses" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Lines" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Rectangles" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "Lattice" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "Path" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "_None" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "_Rulers" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "_Inset scale bar" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "_False colour ruler" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "None" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "At the top" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "Along the right edge" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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 " @@ -4240,152 +4280,156 @@ "PPM, BMP, TARGA) images. Export to some formats relies on GDK and other " "libraries thus may be installation-dependent." -#: modules/file/imgexport.c:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "Select Colour" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "Black" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "White" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "Pi_xel size:" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "Pixels per _inch:" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Zoom:" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Height:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "_Font:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "_Font size:" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "O_utline thickness:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "_Border width:" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "_Tick length:" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "Tie sizes to _data pixels" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "_Decimal separator is comma" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "Colours" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "_Line and text colour:" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "_Transparent background" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "_Background colour:" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "Lateral scale" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Length:" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Placement" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "left" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "centre" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "right" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "top" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "bottom" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "Hori_zontal gap:" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "_Vertical gap:" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "Colou_r:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "Out_line colour:" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "O_pacity:" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "Draw _ticks" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "Draw _label" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "Draw text _above scale bar" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "Image" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4394,134 +4438,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "_Interpolation type:" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "Draw _frame" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "Draw _mask" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "Draw mask _legend" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Value Scale" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "Fi_xed precision:" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "Fixed _kilo threshold:" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "Title" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "Posi_tion:" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "_Gap:" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "Put _units to title" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "Draw _selection" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Objects" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "Lateral" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "_Load" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "_Store" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Rename" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "Preset _name:" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "Export %s" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "Export as 1_6 bit grey scale" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "Lateral Scale" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "Values" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "Selection" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Presets" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "Cairo error occurred: %s" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "Pixbuf save failed: %s." -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "Image is too large to be stored as TARGA." -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "Draw _numbers" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "_End marker length:" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "Marker _radius:" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Mask" @@ -4611,42 +4655,42 @@ 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." -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Imports JPK image scans." -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "JPK image scans (.jpk, .jpk-qi-image)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "File does not contain grid dimensions." -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "Minizip cannot open the file as a ZIP file." -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 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:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "Non-uniform channel lists are not supported." -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, 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:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "Cannot find any height channel." @@ -5130,77 +5174,77 @@ msgid "More than one record dimension found." msgstr "More than one record dimension found." -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "Imports Nano Measuring Machine profile files." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "Nano Measuring Machine files (*.dsc)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "Nano Measuring Machine data import must be run as interactive." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "Reading files..." -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "Rendering surface..." -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "Import NMM Profile Set" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Information" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "Number of data files:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "Total number of points:" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "Points per profile:" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "Imported Channels" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "Plot point density map" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Resolution" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "_Horizontal size:" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "_Vertical size:" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "Point density map" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "Something is changing the data files on disk." @@ -5751,9 +5795,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6252,39 +6296,39 @@ msgid "IonScope SICM files (.img)" msgstr "IonScope SICM files (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Imports SIS (Surface Imaging Systems) data files." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "SIS files (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "Block not a document block." -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "Too short document info." -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "Too short parameter info." -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "Unexpected image block." -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "End of file reached in image block." -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "End of file reached in channel block." -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "End of file reached when another channel was expected." @@ -6588,11 +6632,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Masking Mode" @@ -6656,7 +6700,7 @@ msgstr "Fit Graph" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "_Fit" @@ -6674,12 +6718,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Parameter" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Error" @@ -6701,7 +6745,7 @@ msgstr "_Draw whole circle" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "Save Fit Report" @@ -6731,20 +6775,20 @@ msgstr "N.A." #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "===== Fit Results =====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "Data: %s\n" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6757,14 +6801,14 @@ msgstr "X-range: %.*f to %.*f %s\n" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "Fitted function: %s\n" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Results\n" @@ -6811,38 +6855,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "DOS Spectrum for \"%s\"" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Exports graph data to text files." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Export _Text..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Export graph data to a text file" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Plain text" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "Gnuplot-friendly" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Comma separated values" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "Origin-friendly" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "Igor Pro text wave" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Exports graph data to text files." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Export _Text..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Export graph data to a text file" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "POSIX _number format" @@ -6916,7 +6960,7 @@ msgstr "Fit FD Curve" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "_Estimate" @@ -6927,7 +6971,7 @@ msgstr "_Plot Inits" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Fix" @@ -6942,7 +6986,7 @@ msgstr "χ2 result:" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Correlation Matrix" @@ -7025,6 +7069,62 @@ msgid "Level graph curves" msgstr "Level graph curves" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "Physically transforms graph data to logarithmic scale." + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "/_Logscale transform..." + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "Transform graph axes to logarithmic scale" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "Logscale Transform" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "Axes to transform:" + +#: modules/graph/graph_logscale.c:253 +msgid "_X" +msgstr "_X" + +#: modules/graph/graph_logscale.c:254 +msgid "_Y" +msgstr "_Y" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "_Both" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "Negative value handling:" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "O_mit" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "_Take absolute value" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "Base:" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "Natural (e)" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "10" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "Finds peaks on graph curves." @@ -7414,13 +7514,13 @@ msgstr "Generate surface by ballistic deposition" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7432,19 +7532,19 @@ msgid "Initializing..." msgstr "Initialising..." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Generated" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "Mean deposited thickness" @@ -7453,55 +7553,55 @@ msgid "Ballistic Deposition" msgstr "Ballistic Deposition" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "Progressive preview" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Dimensions" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Generator" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "Co_verage:" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "_Like Current Channel" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Evolution" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "Plot graphs:" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "Depositing particles..." @@ -7523,7 +7623,7 @@ msgid "Error loading file: %s\n" msgstr "Error loading file: %s\n" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "Cannot save preset: %s" @@ -7532,7 +7632,7 @@ msgid "Load Calibration Data" msgstr "Load Calibration Data" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Calibration name:" @@ -7542,18 +7642,18 @@ msgid "No data loaded" msgstr "No data loaded" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "Calibration ‘%s’ already exists" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Overwrite" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Append" @@ -7588,55 +7688,55 @@ msgid "Specify simple calibration data." msgstr "Specify simple calibration data." -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "Simple Calibration Data" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "_X from:" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "_X to:" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "_Y from:" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "_Y to:" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "_Z from:" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "_Z to:" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "_X uncertainty:" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "_Y uncertainty:" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "_Z uncertainty:" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "_X correction factor:" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "_Y correction factor:" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "_Z correction factor:" @@ -7721,7 +7821,7 @@ msgid "Search canceled" msgstr "Search cancelled" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -8031,65 +8131,69 @@ msgid "Data processing:" msgstr "Data processing:" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "Number of maxima" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Skew" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "Kurtosis" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "Autocorrelation length" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "Generates columnar surfaces by a simple growth algorithm." -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "/S_ynthetic/_Columnar..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "Generate columnar surface" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "Grow Columnar Surface" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Particle Size" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Incidence" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Inclination" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Direction" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "Relaxation type:" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "_Melting:" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Weak" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Strong" @@ -8318,12 +8422,12 @@ msgid "Y Distance" msgstr "Y Distance" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Score" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "Output _type:" @@ -8364,31 +8468,27 @@ msgid "Create corrected data from 2nd channel" msgstr "Create corrected data from 2nd channel" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "Correlating the first set..." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "Correlating the second set..." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "Borders extension..." - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "Corrected 2nd channel" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "X difference" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Y difference" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Absolute difference" @@ -8451,7 +8551,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "Target _graph:" @@ -8461,7 +8561,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "New graph" @@ -8757,7 +8857,7 @@ msgid "Plot drift _graph" msgstr "Plot drift _graph" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Preview:" @@ -9445,9 +9545,9 @@ msgid "Filtered Data" msgstr "Filtered Data" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Difference" @@ -9570,7 +9670,7 @@ msgstr "PSDF Section" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "_Fix res.:" @@ -9623,109 +9723,85 @@ msgid "Enable _power multiplier" msgstr "Enable _power multiplier" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "Grating (simple)" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "Grating (3-level)" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Holes" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "Ring" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "Sphere" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "Cylinder (lying)" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "Pyramid (diamond)" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "Fits predefined geometrical shapes to data." -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "/_Level/_Fit Shape..." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "Fit geometrical shapes" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "/_Fit Shape..." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "Fit Shape" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "_Quick Fit" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "Derived Quantities" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "Mean square difference:" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "Fitted shape" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Both" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "_Function type:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "Show differences with _adapted colour map" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "Full fit is _geometric" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "Calculate differences for e_xcluded pixels" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "_Recalculate Image" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "Revert to _Previous Values" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "Parameter estimation failed" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "Fit failed" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "Fit was interruped" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "(fixed)" @@ -9994,11 +10070,11 @@ msgid "Keep grains satisfying:" msgstr "Keep grains satisfying:" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "Lower threshold:" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "Upper threshold:" @@ -10569,108 +10645,128 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "Interpolate data under mask by solution of Laplace equation" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "Laplace interpolation..." - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "Random constant" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "Random linear" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "Random bumpy" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "Radial distance" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "Segmented distance" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "Segmented random" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "Border distance" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "Border random" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "Second nearest distance" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "Generates surfaces based on regular or random lattices." -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "/S_ynthetic/_Lattice..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "Generate lattice-based surface" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "Random" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "Square" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "Hexagonal" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "Triangular" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "lattice|Cairo" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "lattice|Snub square" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "lattice|Truncated square" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "Silicon 7x7" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "lattice|Penrose (vertices)" + +#: modules/process/lat_synth.c:551 +msgid "lattice|Penrose (centers)" +msgstr "lattice|Penrose (centres)" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "_Lattice:" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "_Size:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "Lattice rela_xation:" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "_Height relaxation:" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Surface" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "_Weight:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "Constructing lattice..." -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "Relaxing lattice..." -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "Relaxing heights..." @@ -10782,21 +10878,21 @@ "Level individual grains, interpolating the shifts between using Laplacian " "interpolation" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Background" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "Level Grains" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "Quantity to level:" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11035,12 +11131,12 @@ msgid "Mark data disconnected from other values" msgstr "Mark data disconnected from other values" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Positive" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Negative" @@ -11752,95 +11848,99 @@ msgid "Random Noise" msgstr "Random Noise" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Spheres" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "Boxes" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Cones" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Pyramids" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Diamonds" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Tetrahedrons" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "Nuggets" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "Thatches" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "Tents" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Gaussians" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "Doughnuts" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +msgid "Parabolic bumps" +msgstr "Parabolic bumps" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "Generates randomly patterned surfaces by placing objects." -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/S_ynthetic/_Objects..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "Generate surface of randomly placed objects" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "Both (random)" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "Random Objects" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "_Shape:" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "obj." -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Aspect Ratio" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "_Aspect ratio:" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "Scales _with size" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "_Feature type:" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "_Truncate:" @@ -12430,11 +12530,11 @@ msgid "Level data by arc revolution" msgstr "Level data by arc revolution" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "_Horizontal direction" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "_Vertical direction" @@ -12714,47 +12814,51 @@ msgid "Tip radius evolution" msgstr "Tip radius evolution" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Models SPM tip." -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "/_Tip and Indentation/_Model Tip..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Model AFM tip" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Model Tip" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Tip _type:" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Number of sides:" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "Tip _slope:" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "Tip _rotation:" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "Tip _apex radius:" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "Tip _anisotropy:" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "Modelled tip" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Tip resolution: %d × %d pixels" @@ -12923,7 +13027,7 @@ msgstr "Waves" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "_Quantity:" @@ -13112,63 +13216,58 @@ msgid "Python wrapper console" msgstr "Python wrapper console" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr ">>> Running the script above\n" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Open Python script" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Save Script as" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Pygwy Console" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Clear Log" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Open script in Python language (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Save script (Ctrl-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Execute script (Ctrl-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Command" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "Pygwy, the Gwyddion Python wrapper." -#: pygwy.c:585 pygwy.c:676 +#: pygwy.c:258 +msgid "Python Interpreter Errors" +msgstr "Python Interpreter Errors" + +#: pygwy.c:384 +msgid "Python interpreter error occurred." +msgstr "Python interpreter error occurred." + +#: pygwy.c:459 msgid "Function written in Python" msgstr "Function written in Python" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Graph function written in Python" - -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." -msgstr "" -"Pygwy plugin: %s (%s)\n" -"Export failed." - #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." msgstr "Crop tool, crops data to smaller size." @@ -13252,10 +13351,6 @@ msgid "_Mask" msgstr "_Mask" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "_Both" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "Laplace solver" @@ -13321,7 +13416,7 @@ msgstr "Height histogram" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Range" @@ -13426,11 +13521,11 @@ msgstr "Average:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Options" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "_Instant updates" @@ -13880,7 +13975,7 @@ msgid "_Copy" msgstr "_Copy" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -13890,63 +13985,63 @@ "(height distribution, correlations, PSDF, Minkowski functionals) of selected " "part of data." -#: modules/tools/sfunctions.c:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Height distribution" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "Cum. height distribution" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Distribution of angles" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "Cum. distribution of angles" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "Radial PSDF" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "Radial ACF" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "Minkowski volume" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "Minkowski boundary" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "Minkowski connectivity" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Statistical Functions" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "Calculate 1D statistical functions" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "_Separate uncertainty" @@ -14814,6 +14909,22 @@ "XYZ data regularisation failed due to numerical instability or was " "interrupted." +#~ msgid "Borders extension..." +#~ msgstr "Borders extension..." + +#~ msgid "Laplace interpolation..." +#~ msgstr "Laplace interpolation..." + +#~ msgid "Graph function written in Python" +#~ msgstr "Graph function written in Python" + +#~ msgid "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." +#~ msgstr "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." + #, fuzzy #~ msgid "Duplicate group id" #~ msgstr "Duplicate" Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/es.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/es.gmo differ diff -Nru gwyddion-2.46/po/es.po gwyddion-2.47/po/es.po --- gwyddion-2.46/po/es.po 2016-10-14 09:46:03.000000000 +0000 +++ gwyddion-2.47/po/es.po 2016-11-18 10:05:45.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" "PO-Revision-Date: 2014-09-06 17:28+0200\n" "Last-Translator: François RIGUET \n" "Language-Team: the Gwyddion team \n" @@ -131,19 +131,19 @@ msgid "Untitled" msgstr "Sin título" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 #, fuzzy msgid "Fitting..." msgstr "Filtro" #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gaussiano" @@ -225,7 +225,7 @@ msgid "Power" msgstr "Potenciación" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Lorentziana" @@ -462,7 +462,7 @@ msgid "Position" msgstr "Posición" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -584,12 +584,12 @@ msgstr "Adaptable en en escala y espacio" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Redondo" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Lineal" @@ -654,63 +654,100 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "Normal" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Sólo Fase" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Excluye la región con enmascarada" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Incluye solo la región enmascarada" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Usa la imagen entera (ignora la máscara)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "celestia" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 #, fuzzy msgid "distance|Chess" msgstr "Distancia" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "openvas-client" +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Agujeros" + +#: libprocess/gwyshapefitpreset.c:345 +#, fuzzy +msgid "Sphere" +msgstr "Esferas" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:349 +#, fuzzy +msgid "Pyramid (diamond)" +msgstr "Piramidal" + +#: libprocess/gwyshapefitpreset.c:350 +#, fuzzy +msgid "Parabolic bump" +msgstr "Paralelo" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 #, fuzzy msgid "Dilation..." msgstr "Dilatación" -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 #, fuzzy msgid "Erosion..." msgstr "Erosión" @@ -743,65 +780,74 @@ msgstr[0] "" msgstr[1] "" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 #, fuzzy msgid "Pyramid" msgstr "Pirámide" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Piramidal" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "almanah" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Contacto" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Función Delta" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 #, fuzzy msgid "Parabola" msgstr "Paralelo" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 #, fuzzy msgid "Symmetric" msgstr "Simétrico" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 #, fuzzy msgid "Cone" msgstr "Conos" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "" + +#: libprocess/tip.c:459 +#, fuzzy +msgid "Asymmetric" +msgstr "Simétrico" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "" @@ -829,8 +875,8 @@ msgid "Hide full controls" msgstr "Esconder controles completos" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "" @@ -853,8 +899,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "grad" @@ -942,10 +988,10 @@ # based on translation from "aisleriot" #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -957,13 +1003,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -971,7 +1017,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -1002,7 +1048,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "E_tiqueta:" @@ -1095,7 +1141,7 @@ msgstr "Oculto" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Puntos" @@ -1159,7 +1205,7 @@ msgid "_Line type:" msgstr "" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "" @@ -1294,7 +1340,7 @@ msgid "_Reversed layout" msgstr "" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 #, fuzzy msgid "Abscissa" msgstr "_Abscisa" @@ -1306,7 +1352,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "advene" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Data" @@ -1354,7 +1400,7 @@ # based on translation from "gtk2_ardour" #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1392,7 +1438,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "lang" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1722,7 +1768,7 @@ msgid "Minimum" msgstr "Mínimo" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1737,7 +1783,7 @@ msgstr "" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "RMS" @@ -1841,16 +1887,16 @@ msgid "XYZ" msgstr "" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "" @@ -1879,7 +1925,7 @@ msgid "Opening of `%s' failed" msgstr "" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "" @@ -1889,36 +1935,36 @@ msgid "Loaded using: %s." msgstr "" -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Fusionar Archivo" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Abre Archivo" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "" -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "Archivo `%s' ya existe. Sobrescribir? " -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "" -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "¿Sustituir Archivo?" @@ -2186,7 +2232,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Tamaño" @@ -2224,55 +2270,55 @@ msgid "current-language-code|en" msgstr "" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "almanah" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Exportar" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacious" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "Limpia_r" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Cerrar" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Tipo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "alleyoop" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Función" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Parámetros" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aisleriot" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Tiempo" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "freeciv" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Exportar registro" @@ -2321,7 +2367,7 @@ msgid "_New" msgstr "_Nuevo" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Suprimir" @@ -2884,7 +2930,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3408,10 +3454,10 @@ msgstr "Exportar Texto" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -4141,13 +4187,13 @@ msgstr "" #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ @@ -4189,7 +4235,7 @@ msgid "Pages:" msgstr "Páginas:" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4199,7 +4245,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4217,7 +4263,7 @@ msgid "H_eight:" msgstr "A_ltura" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "" @@ -4228,7 +4274,7 @@ msgstr "" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4236,7 +4282,7 @@ msgstr "" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4314,295 +4360,299 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows o OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 #, fuzzy msgid "Portable document format (.pdf)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 #, fuzzy msgid "Scalable Vector Graphics (.svg)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Elipses" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Líneas" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Rectángulos" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "inkscape" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "_Reglas" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 #, fuzzy msgid "Black" msgstr "Blackmann" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "docky" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Zoom:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Alto:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 #, fuzzy msgid "_Font:" msgstr "Tipo de letra:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 #, fuzzy msgid "O_utline thickness:" msgstr "G_rosor:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 #, 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:3163 +#: modules/file/imgexport.c:3180 #, fuzzy msgid "_Tick length:" msgstr "longitud" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 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:3193 +#: modules/file/imgexport.c:3210 #, fuzzy msgid "Colors" msgstr "Color" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 #, fuzzy msgid "_Background color:" msgstr "Fondo" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 #, fuzzy msgid "Lateral scale" msgstr "Material GL" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Colocación" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "izquierda" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "centro" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "derecha" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bluefish" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "arriba" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bluefish" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "abajo" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 #, fuzzy msgid "Hori_zontal gap:" msgstr "Horizontal" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 #, 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:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 #, fuzzy msgid "Colo_r:" msgstr "Color:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4611,159 +4661,159 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "orage" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 #, fuzzy msgid "Draw _frame" msgstr "Mostrar _marco" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 #, 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:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 #, fuzzy msgid "Title" msgstr "_Título:" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 #, 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:3894 +#: modules/file/imgexport.c:3934 #, fuzzy msgid "_Gap:" msgstr "Intervalo:" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "celestia" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Objetos" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 #, fuzzy msgid "Lateral" msgstr "Material GL" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "_Cargar" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "_Archivar" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "anjuta" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Renombrar" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 #, fuzzy msgid "Values" msgstr "Valor" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 #, 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:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Predefinidos" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 #, 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:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Máscara" @@ -4853,43 +4903,43 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "" -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Importa JPK imágenes." -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 #, fuzzy msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "Imágenes JPK (.jpk)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "" -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "" @@ -5369,90 +5419,90 @@ msgid "More than one record dimension found." msgstr "" -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 #, fuzzy msgid "Imports Nano Measuring Machine profile files." msgstr "Importa NanoScan XML archivos." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 #, fuzzy msgid "Nano Measuring Machine files (*.dsc)" msgstr "Archivos Nanonis SXM (.sxm)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 #, fuzzy msgid "Nano Measuring Machine data import must be run as interactive." msgstr "La importación de gráfico ASCII debe ser ejecutado como interactivo." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "" -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "" -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 #, fuzzy msgid "Import NMM Profile Set" msgstr "Importa Matlab MAT v5 archivos." # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "amule" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Información" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 #, fuzzy msgid "Number of data files:" msgstr "_Número de Lados:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 #, fuzzy msgid "Total number of points:" msgstr "_Número de Lados:" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gtk2_ardour" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 #, fuzzy msgid "Imported Channels" msgstr "Canales" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "data" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Resolución" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "" @@ -6002,9 +6052,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6528,39 +6578,39 @@ msgid "IonScope SICM files (.img)" msgstr "Archivos IonScope SICM (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Importa SIS (Surface Imaging Systems) archivos de datos." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "Archivos SIS (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "" @@ -6873,11 +6923,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "" @@ -6943,7 +6993,7 @@ msgstr "Aproxima Gráfico" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "_Ajustar" @@ -6963,14 +7013,14 @@ # based on translation from "beast" #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Parámetro" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "advene" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Error" @@ -6994,7 +7044,7 @@ msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "" @@ -7024,20 +7074,20 @@ msgstr "" #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -7050,14 +7100,14 @@ msgstr "" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "" @@ -7105,42 +7155,42 @@ msgid "DOS Spectrum for \"%s\"" msgstr "" +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Exporta datos de gráfico a archivos de texto. " + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Exportar _texto..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Exporta datos de gráfico a archivo de texto" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "po" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Texto plano" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "libgda4" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Valores separados por comas" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Exporta datos de gráfico a archivos de texto. " - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Exportar _texto..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Exporta datos de gráfico a archivo de texto" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "" @@ -7220,7 +7270,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "_Estimar" @@ -7233,7 +7283,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "e2fsprogs" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Arreglar" @@ -7250,7 +7300,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "" @@ -7334,6 +7384,68 @@ msgid "Level graph curves" msgstr "Nivela curvas de gráfico" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "" + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "" + +#: modules/graph/graph_logscale.c:229 +#, fuzzy +msgid "Logscale Transform" +msgstr "Transformada de Hough" + +#: modules/graph/graph_logscale.c:245 +#, fuzzy +msgid "Axes to transform:" +msgstr "Transformada de Hough" + +#: modules/graph/graph_logscale.c:253 +#, fuzzy +msgid "_X" +msgstr "_X:" + +#: modules/graph/graph_logscale.c:254 +#, fuzzy +msgid "_Y" +msgstr "_Y:" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "flush" +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "_Ambos" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "" + #: modules/graph/graph_peaks.c:118 #, fuzzy msgid "Finds peaks on graph curves." @@ -7732,13 +7844,13 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "avahi" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7752,19 +7864,19 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "awffull" -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Generado el" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "" @@ -7774,61 +7886,61 @@ msgid "Ballistic Deposition" msgstr "Estimación de punta ciega" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "banshee-community-extensions" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Dimensiones" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "audacity" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Generador" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "awn-extras-applets" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Evolution" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "" @@ -7850,7 +7962,7 @@ msgid "Error loading file: %s\n" msgstr "" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "" @@ -7859,7 +7971,7 @@ msgid "Load Calibration Data" msgstr "" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "" @@ -7869,7 +7981,7 @@ msgid "No data loaded" msgstr "" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" @@ -7877,14 +7989,14 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Sobrescritura" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "bacula" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Añadir" @@ -7921,55 +8033,55 @@ msgid "Specify simple calibration data." msgstr "" -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "" @@ -8064,7 +8176,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 #, fuzzy @@ -8392,76 +8504,83 @@ msgid "Data processing:" msgstr "Proceso de Datos" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Asimetría" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "Curtosis" -#: modules/process/col_synth.c:190 +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "gnumeric" +#: modules/process/col_synth.c:175 +#, fuzzy +msgid "Autocorrelation length" +msgstr "Correlación" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "" -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "" -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "compiz-fusion-plugins-extra" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Tamaño de las partículas" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Incidencia" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Inclinación" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "beast" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Dirección" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "eog" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 #, fuzzy msgid "_Melting:" msgstr "E_scalado:" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gajim" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Débil" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "plugin_htmlbar" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Remarcado" @@ -8717,12 +8836,12 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "help" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Puntuación" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "" @@ -8766,32 +8885,28 @@ msgid "Create corrected data from 2nd channel" msgstr "" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "" -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "" -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "" - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 #, fuzzy msgid "Corrected 2nd channel" msgstr "Crear un nuevo cannal" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "" @@ -8854,7 +8969,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 #, fuzzy msgid "Target _graph:" @@ -8865,7 +8980,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 #, fuzzy msgid "New graph" @@ -9172,7 +9287,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "aptitude" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Previsualizar:" @@ -9915,9 +10030,9 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Diferencia" @@ -10045,7 +10160,7 @@ msgstr "" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "" @@ -10098,123 +10213,95 @@ msgid "Enable _power multiplier" msgstr "" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "" - -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "openvas-client" -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Agujeros" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "" - -#: modules/process/fit-shape.c:529 -#, fuzzy -msgid "Sphere" -msgstr "Esferas" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "" - -#: modules/process/fit-shape.c:533 -#, fuzzy -msgid "Pyramid (diamond)" -msgstr "Piramidal" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "" -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "" -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "" -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 #, fuzzy msgid "Fit Shape" msgstr "Aproxima esfera" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 #, fuzzy msgid "verb|_Quick Fit" msgstr "_Ajustar" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp-gap" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 #, fuzzy msgid "Mean square difference:" msgstr "Diferencia" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "awn-extras-applets" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Ambos" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gimp" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 #, fuzzy msgid "_Function type:" msgstr "Tipo de función:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "" @@ -10489,11 +10576,11 @@ msgid "Keep grains satisfying:" msgstr "" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "" @@ -11074,112 +11161,135 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "" - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "" -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "" -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "" + +# Translation for this string generated by http://littlesvr.ca/ostd/ +# based on translation from "audacity" +#: modules/process/lat_synth.c:551 +#, fuzzy +msgid "lattice|Penrose (centers)" +msgstr "Parámetros" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "control-center" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "_Tamaño:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "client" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Superficie" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "_Peso:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "" -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "" -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "" @@ -11288,21 +11398,21 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Fondo" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11579,14 +11689,14 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "goffice" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 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:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Negativo" @@ -12377,104 +12487,109 @@ msgid "Random Noise" msgstr "Ruido aleatorio" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Esferas" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gbrainy" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "Cajas" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Conos" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "freeciv" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Las Pirámides" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "help" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Diamantes" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Tetraedros" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "Pepitas" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "Paja" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "Tiendas" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Gaussianas" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "Rosquillas" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +#, fuzzy +msgid "Parabolic bumps" +msgstr "Paralelo" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "" -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "" -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "compiz-fusion-plugins-extra" -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Relacion de aspecto" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 #, fuzzy msgid "_Feature type:" msgstr "Características" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "" @@ -13105,11 +13220,11 @@ msgid "Level data by arc revolution" msgstr "" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "" @@ -13408,49 +13523,54 @@ msgid "Tip radius evolution" msgstr "" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Hace un modelo de una punta SPM" -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 #, fuzzy msgid "/_Tip and Indentation/_Model Tip..." msgstr "/_Punta/_Modelado de Punta..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Modelo de punta AFM" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Modelo de punta" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Punta _tipo:" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Número de Lados:" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "Punta _pendiente:" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "Punta _rotación:" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "Radio del _ápice de la punta " -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +#, fuzzy +msgid "Tip _anisotropy:" +msgstr "Punta _pendiente:" + +#: modules/process/tip_model.c:490 #, fuzzy msgid "Modeled tip" msgstr "Punta Modelada " -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "" @@ -13629,7 +13749,7 @@ msgstr "Ondas" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "" @@ -13827,61 +13947,58 @@ msgid "Python wrapper console" msgstr "" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr "" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Abrir secuencia de comandos Python" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "freeciv" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Borrar registro" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Abrir secuencia de comandos en el lenguaje Python (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Comando" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "" -#: pygwy.c:585 pygwy.c:676 -msgid "Function written in Python" +#: pygwy.c:258 +msgid "Python Interpreter Errors" msgstr "" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Función gráfica escrita en Python" +#: pygwy.c:384 +msgid "Python interpreter error occurred." +msgstr "" -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." +#: pygwy.c:459 +msgid "Function written in Python" msgstr "" #: modules/tools/crop.c:84 @@ -13967,12 +14084,6 @@ msgid "_Mask" msgstr "_Máscara" -# Translation for this string generated by http://littlesvr.ca/ostd/ -# based on translation from "flush" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "_Ambos" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "" @@ -14040,7 +14151,7 @@ # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gedit-plugins" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Rango" @@ -14146,11 +14257,11 @@ msgstr "Media:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Opciones" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "" @@ -14626,72 +14737,72 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 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:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "" # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "gnumeric" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Funciones estadísticas" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "" @@ -15628,6 +15739,9 @@ "interrupted." msgstr "" +#~ msgid "Graph function written in Python" +#~ msgstr "Función gráfica escrita en Python" + # Translation for this string generated by http://littlesvr.ca/ostd/ # based on translation from "abiword" #, fuzzy Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/fr.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/fr.gmo differ diff -Nru gwyddion-2.46/po/fr.po gwyddion-2.47/po/fr.po --- gwyddion-2.46/po/fr.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/fr.po 2016-11-18 10:05:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: French localization\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" -"PO-Revision-Date: 2016-10-03 22:47+0100\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" +"PO-Revision-Date: 2016-11-17 22:47+0100\n" "Last-Translator: François Riguet \n" "Language-Team: François RIGUET \n" "Language: fr_FR\n" @@ -18,6 +18,8 @@ "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Poedit 1.5.4\n" +"X-Poedit-Basepath: /home/lila/Documents/Gwyddion/Gwyddion\n" +"X-Poedit-SearchPath-0: \n" #: libgwyddion/gwyexpr.c:765 msgid "Invalid token" @@ -133,16 +135,16 @@ msgid "Untitled" msgstr "Sans titre" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "Évaluation initiale des résidus..." -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "Ajustement..." #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gaussienne" @@ -223,7 +225,7 @@ msgid "Power" msgstr "Puissance" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Lorentzienne" @@ -458,7 +460,7 @@ msgid "Position" msgstr "Position" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -578,12 +580,12 @@ msgstr "Échelle et espace adaptatifs" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Arrondi" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Linéaire" @@ -648,59 +650,91 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "Normale" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Phase uniquement" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Exclure la région masquée" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Inclure uniquement la région masquée" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Utiliser l'image entière (ignorer le masque)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "Manhattan" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "Tchebychev" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "Octogonale 4,8" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "Octogonale 8,4" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "Octogonale" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "Euclidienne" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "Réseau (simple)" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "Réseau (3 niveaux)" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Trous" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "Sphère" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "Cylindre (couché)" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "Pyramide (diamant)" + +#: libprocess/gwyshapefitpreset.c:350 +msgid "Parabolic bump" +msgstr "Bosse parabolique" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "Anneau" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "Dilatation..." -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "Érosion..." @@ -731,57 +765,65 @@ msgstr[0] "Un maximum local interne a été trouvé" msgstr[1] "%d maxima locaux internes ont été trouvés" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "Pyramide" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Pyramidal" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Contact" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "Sans contact" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Fonction delta" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Analytique" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "Parabole" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "Symétrique" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "Cône" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "Parabole elliptique" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "Asymétrique" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Conversion des champs" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Démarrage de l'estimation partielle" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Démarrage de l'estimation complète" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "Triangulation..." @@ -809,8 +851,8 @@ msgid "Hide full controls" msgstr "Masquer tous les contrôles" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "Basique" @@ -833,8 +875,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "deg" @@ -914,10 +956,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -929,13 +971,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -943,7 +985,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -968,7 +1010,7 @@ msgid "Maximum z value" msgstr "Valeur Z maximale" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "_Légende :" @@ -1047,7 +1089,7 @@ msgstr "Caché" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Points" @@ -1104,7 +1146,7 @@ msgid "_Line type:" msgstr "Type de _ligne :" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "Épaisseur de ligne :" @@ -1220,7 +1262,7 @@ msgid "_Reversed layout" msgstr "Disposition inve_rsée" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "Abscisse" @@ -1229,7 +1271,7 @@ msgstr "Graphe" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Données" @@ -1273,7 +1315,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1303,7 +1345,7 @@ msgstr "Préféré" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1594,7 +1636,7 @@ msgid "Minimum" msgstr "Minimum" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1609,7 +1651,7 @@ msgstr "Position max" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "RMS" @@ -1696,16 +1738,16 @@ msgid "XYZ" msgstr "XYZ" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "Messages pour %s" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "Messages pour Sans titre" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "Aucun" @@ -1745,7 +1787,7 @@ msgid "Opening of `%s' failed" msgstr "L'ouverture de `%s' a échoué" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "Chemin complet : %s." @@ -1755,37 +1797,37 @@ msgid "Loaded using: %s." msgstr "Chargé en utilisant : %s." -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Fusionner un fichier" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Ouvrir un fichier" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "L'enregistrement de `%s' a échoué" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "Sauvegardé en utilisant : %s." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "Le fichier `%s' existe déjà. Remplacer ?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "" "Ce fichier existe déjà dans `%s'. Le remplacement écrasera son contenu." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Remplacer le fichier ?" @@ -2039,7 +2081,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Taille" @@ -2079,41 +2121,41 @@ msgid "current-language-code|en" msgstr "fr" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "Journal de %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Exporter" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "Efface_r" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "Fermer" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Type" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Fonction" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Paramètres" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Date" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Exporter le journal" @@ -2157,7 +2199,7 @@ msgid "_New" msgstr "_Nouveau" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "Supprimer" @@ -2811,7 +2853,7 @@ msgstr "_Descendre" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3297,10 +3339,10 @@ msgstr "Exporter au format texte" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -4022,13 +4064,13 @@ msgstr "Le type de données OpenEXR %u est invalide ou non supportée." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "Erreur d'initialisation de libpng (dans %s)" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "Une erreur s'est produite dans libpng" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -4062,7 +4104,7 @@ msgid "Pages:" msgstr "Pages : " -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4072,7 +4114,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4088,7 +4130,7 @@ msgid "H_eight:" msgstr "Hauteur :" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "_Mesures identiques" @@ -4099,7 +4141,7 @@ msgstr "Échelle _Z (par unité d'échantillon) :" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4107,7 +4149,7 @@ msgstr "Changer les unités" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4191,100 +4233,100 @@ msgid "Cannot read channel labels." msgstr "Impossible de lire les légendes des canaux." -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Image PNG (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "Image JPEG (.jpeg, .jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "Image TIFF (.tiff, .tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Image PPM (.ppm, .pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Image BMP (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "Image TARGA (.tga, .targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "Image WebP (.webp)" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "Document PDF (.pdf)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "Document PostScript encapsulé (.eps)" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "Image vectorielle SVG (.svg)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "Lignes horiz./vert." -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Ellipses" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Lignes" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Rectangles" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "Maillage" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "Chemin" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "_Aucune" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "G_raduations" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "Échelle" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "Échelle de couleurs" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "Aucun" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "En haut" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "Le long du bord droit" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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 " @@ -4294,152 +4336,156 @@ "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:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "Couleur des sélections" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "Noir" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "Blanc" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "Taille des pi_xels :" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "P_ixels par pouce :" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Zoom :" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Hauteur :" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "Police :" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "Taille de police :" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "Épaisse_ur des contours :" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "Épaisseur des bordures :" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "Longueur des gradua_tions :" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "Lier les _dimensions aux pixels" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "Le séparateur de décimale est la virgule" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "Couleurs" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "Cou_leur des lignes et du texte :" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "Arrière-plan transparent" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "Couleur d'arrière-plan :" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "Échelle latérale" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Longueur :" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Positionnement" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "gauche" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "centre" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "droite" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "haut" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "bas" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "Écart hori_zontal :" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "Écart vertical :" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "Couleu_r :" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "Cou_leur des contours :" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "O_pacité :" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "Afficher les ex_trémités" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "Afficher _l'annotation" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "Dessiner le texte _au-dessus de l'échelle" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "Image" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4448,134 +4494,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "Type d'interpolation :" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "Dessiner le cadre" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "Dessiner le _masque" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "Afficher la _légende du masque" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Échelle de valeurs" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "Précision fi_xée :" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "Seuil d'unité :" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "Titre" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "Posi_tion :" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "Écart :" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "Ajouter les _unités dans le titre" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "Dessiner les _sélections" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Objets" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "Latéral" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "Charger" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "Enregi_strer" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Renommer" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "_Nom du préréglage :" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "Exporter au format %s" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "Exporter en niveaux de gris 1_6 bits" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "Échelle latérale" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "Valeurs" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "Sélection" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Préréglages" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "Une erreur s'est produite dans Cairo : %s" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "La sauvegarde de l'image à échoué : %s." -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 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:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "Dessiner les _nombres" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "Longu_eur du marqueur de fin :" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "_Rayon du marqueur :" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Masque" @@ -4675,44 +4721,44 @@ "Le type de données n'est pas connu. Faites en part aux développeurs s'il " "vous plaît." -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Importe les images de scan JPK." -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "Scan JPK (.jpk)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "Courbes de force JPK (.jpk-force, .jpk-force-map, .jpk-qi-data)" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "Le fichier ne contient pas les dimensions de la grille." -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "Minizip n'arrive pas à ouvrir le fichier en tant que fichier ZIP." -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 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:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "Les listes non uniformes de canaux ne sont pas supportées." -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, 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:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "Impossible de trouver un canal de hauteurs." @@ -5215,79 +5261,79 @@ msgid "More than one record dimension found." msgstr "Plus d'une dimension d'enregistrement a été trouvée." -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "Importe les fichiers Nano Measuring Machine." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "Nano Measuring Machine (*.dsc)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "" "L'import des données Nano Measuring Machine doit être fait de manière " "interactive." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "Lecture des fichiers..." -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "Calcul de la surface..." -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "Importer un ensemble de profils NMM" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Information" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "Nombre de fichiers de données :" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "Nombre total de points :" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "Points par profil :" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "Canaux importés" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "Afficher la carte de densité des points" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Résolution" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "Taille _horizontale :" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "Taille _verticale :" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "Carte de densité des points" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "Quelque chose modifie les fichiers de données sur le disque." @@ -5864,9 +5910,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6377,39 +6423,39 @@ msgid "IonScope SICM files (.img)" msgstr "IonScope SICM (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Importe les fichiers SIS (Surface Imaging Systems)." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "SIS (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "Le bloc n'est pas un bloc document." -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "Information de document trop courte." -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "Information de paramètre trop courte." -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "Bloc image inattendu." -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "Fin du fichier atteinte dans le bloc image." -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "Fin du fichier atteinte dans le bloc de canal." -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "Fin du fichier atteinte alors qu'un autre canal était attendu." @@ -6714,11 +6760,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Utilisation du masque" @@ -6782,7 +6828,7 @@ msgstr "Ajuster le graphe" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "Ajuster" @@ -6800,12 +6846,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Paramètre" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Erreur" @@ -6827,7 +6873,7 @@ msgstr "_Dessiner un cercle entier" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "Sauver le rapport d'ajustement" @@ -6857,20 +6903,20 @@ msgstr "N. A." #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "===== Résultats de l'ajustement =====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "Données : %s\n" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6883,14 +6929,14 @@ msgstr "Plage X : %.*f jusqu'à %.*f %s\n" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "Fonction ajustée : %s\n" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Résultats\n" @@ -6937,38 +6983,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "Spectre DOS pour \"%s\"" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Exporte le graphe dans un fichier texte." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Exporter au format _texte..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Exporter le graphe dans un fichier texte" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Texte brut" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "Compatible Gnuplot" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Valeurs séparées par des virgules" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "Compatible Origin" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "Igor Pro wave texte" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Exporte le graphe dans un fichier texte." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Exporter au format _texte..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Exporter le graphe dans un fichier texte" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "_Nombre au format POSIX" @@ -7042,7 +7088,7 @@ msgstr "Ajuster la courbe FD" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "_Estimer" @@ -7053,7 +7099,7 @@ msgstr "Initialiser" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Fixe" @@ -7068,7 +7114,7 @@ msgstr "Résultat χ2 :" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Matrice de corrélation" @@ -7151,6 +7197,63 @@ msgid "Level graph curves" msgstr "Ajustement de graphes" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" +"Transforme physiquement les données du graphe en échelle logarithmique." + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "/Échelle _logarithmique..." + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "Changer les axes des graphes en échelle logarithmique" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "Échelle logarithmique" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "Axes à transformer :" + +#: modules/graph/graph_logscale.c:253 +msgid "_X" +msgstr "_X" + +#: modules/graph/graph_logscale.c:254 +msgid "_Y" +msgstr "_Y" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "Les deux" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "Gestion des valeurs négatives :" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "O_mettre" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "Prendre la valeur absolue" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "Base :" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "Naturelle (e)" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "10" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "Localise les pics dans un graphe." @@ -7545,13 +7648,13 @@ msgstr "Générer une surface par dépôt balistique" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7563,19 +7666,19 @@ msgid "Initializing..." msgstr "Initialisation..." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Généré" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "Épaisseur moyenne déposée" @@ -7584,55 +7687,55 @@ msgid "Ballistic Deposition" msgstr "Dépôt balistique" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "Aperçu progressif" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Dimensions" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Générateur" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "Cou_verture :" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "Identique au canal courant" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Évolution" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "Afficher les graphes :" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "Dépôt des particules en cours..." @@ -7654,7 +7757,7 @@ msgid "Error loading file: %s\n" msgstr "Erreur lors du chargement du fichier : %s\n" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "Impossible de sauvegarder le pré-réglage : %s." @@ -7663,7 +7766,7 @@ msgid "Load Calibration Data" msgstr "Charger des données de calibration" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Nom de la calibration :" @@ -7673,18 +7776,18 @@ msgid "No data loaded" msgstr "Aucunes données chargées" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "La calibration '%s' existe déjà" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Écraser" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Ajouter" @@ -7719,55 +7822,55 @@ msgid "Specify simple calibration data." msgstr "Spécifier des données de calibration basiques." -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "Données de calibration basiques" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "X début :" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "X fin :" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "Y début :" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "Y fin :" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "Z début :" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "Z fin :" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "Incertitude X :" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "Incertitude Y :" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "Incertitude Z :" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "Facteur de correction X :" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "Facteur de correction Y :" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "Facteur de correction Z :" @@ -7852,7 +7955,7 @@ msgid "Search canceled" msgstr "Recherche annulée" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -8165,67 +8268,71 @@ msgid "Data processing:" msgstr "Traitement des données :" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "Nombre de maxima :" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Asymétrie" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "Kurtosis" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "Longueur d’auto-corrélation :" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "" "Génère des surfaces colonnaires à l'aide d'un algorithme de croissance " "simple." -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "/S_ynthèse/_Croissance colonnaire..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "Générer une surface colonnaire" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "Surface à croissance colonnaire" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Taille de particule" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Incidence" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Inclinaison" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Direction" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "Type de relaxation :" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "Fusion :" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Faible" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Forte" @@ -8454,12 +8561,12 @@ msgid "Y Distance" msgstr "Distance Y" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Score" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "_Type de sortie :" @@ -8500,31 +8607,27 @@ msgid "Create corrected data from 2nd channel" msgstr "Créer des données corrigées à partir du second canal" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "Corrélation du premier jeu..." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "Corrélation du second jeu..." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "Extension vers les bords..." - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "Second canal corrigé" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "Différence X" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Différence Y" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Différence absolue" @@ -8589,7 +8692,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "_Graphe cible :" @@ -8599,7 +8702,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "Nouveau graphe" @@ -8897,7 +9000,7 @@ msgid "Plot drift _graph" msgstr "Afficher le graphe de dérive" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Aperçu :" @@ -9587,9 +9690,9 @@ msgid "Filtered Data" msgstr "Données filtrées" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Différence" @@ -9713,7 +9816,7 @@ msgstr "Section de PSD" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "Résolution _fixe :" @@ -9766,109 +9869,85 @@ msgid "Enable _power multiplier" msgstr "Activer le multiplicateur _puissance" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "Réseau (simple)" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "Réseau (3 niveaux)" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Trous" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "Anneau" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "Sphère" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "Cylindre (couché)" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "Pyramide (diamant)" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "Ajuste des formes géométriques prédéfinies aux données." -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "/Niveau/Ajuster une _forme..." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "Ajuste des formes géométriques" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "/Ajuster une _forme..." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "Forme ajustée" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "Ajuster rapidement" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "Quantités dérivées" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "Différence quadratique moyenne" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "Forme ajustée" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Les deux" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "Type de _fonction :" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "Afficher l'écart avec une échelle de couleur _adaptée" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "L'ajustement complet est _géométrique" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "Calculer la différence pour les pixels exclus" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "_Recalculer l'image" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "Retourner aux valeurs précédentes" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "Échec de l'estimation des paramètres" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "Échec de l'ajustement" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "Ajustement interrompu" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "(fixé)" @@ -10141,11 +10220,11 @@ msgid "Keep grains satisfying:" msgstr "Conserver les grains satisfaisant :" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "Seuil bas : " -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "Seuil haut : " @@ -10719,108 +10798,128 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "Interpole les données sous le masque à l'aide de l'équation de Laplace" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "Interpolation laplacienne..." - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "Aléatoire constant" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "Aléatoire linéaire" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "Aléatoire bosselé" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "Distance radiale" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "Distance segmentée" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "Aléatoire segmenté" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "Distance de bord" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "Bord aléatoire" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "Second point le plus proche" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "Génère des surfaces basées sur des maillages réguliers ou aléatoires." -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "/S_ynthèse/Mai_llage..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "Générer une surface basée sur un maillage" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "Aléatoire" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "Carrée" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "Hexagonale" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "Triangulaire" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "Caire" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "Carré adouci" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "Carré tronqué" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "Silicium 7x7" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "Penrose (vertex)" + +#: modules/process/lat_synth.c:551 +msgid "lattice|Penrose (centers)" +msgstr "Penrose (centres)" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "Mai_lle :" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "Dimen_sion :" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "Rela_xation du maillage :" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "Relaxation des _hauteurs :" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Surface" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "Poids :" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "Maillage en cours..." -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "Relaxation du maillage..." -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "Relaxation des hauteurs..." @@ -10933,21 +11032,21 @@ "Mise à niveau des grains individuels, en interpolant les décalages à l'aide " "d'une interpolation laplacienne." -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Arrière-plan" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "Mise à niveau des grains" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "Quantité à mettre à niveau :" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11186,12 +11285,12 @@ msgid "Mark data disconnected from other values" msgstr "Marque les données éloignées des autres valeurs" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Positif" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Négatif" @@ -11908,95 +12007,99 @@ msgid "Random Noise" msgstr "Bruit aléatoire" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Sphères" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "Boîtes" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Cônes" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Pyramides" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Losanges" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Tétraèdres" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "Pépites" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "Chaumes" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "Tentes" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Gaussiennes" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "Beignets" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +msgid "Parabolic bumps" +msgstr "Bosses paraboliques" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "Génère des motifs de surface aléatoire en plaçant des objets." -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/S_ynthèse/_Objets..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "Générer une surface avec des objets placés aléatoirement" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "Les deux (aléatoire)" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "Objets aléatoires" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "Forme :" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "obj." -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Rapport d'aspect" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "Rapport d'_aspect :" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "Mettre à l'échelle avec la taille" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "Type d'objet :" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "_Tronquer :" @@ -12589,11 +12692,11 @@ msgid "Level data by arc revolution" msgstr "Mettre à niveau avec un arc de révolution" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "Direction _horizontale" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "Direction _verticale" @@ -12875,47 +12978,51 @@ msgid "Tip radius evolution" msgstr "Évolution du rayon de la sonde" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Modélise la sonde SPM." -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "/Sonde et indentation/Modéliser la sonde..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Modéliser une sonde AFM" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Modélise une sonde" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "_Type de sonde :" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Nombre de côtés" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "Pente de la _sonde :" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "_Rotation de la sonde :" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "Rayon de l'_apex de la sonde :" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "_Anisotropie de la sonde :" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "Sonde modélisée" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Résolution de la sonde : %d × %d pixels." @@ -13087,7 +13194,7 @@ msgstr "Ondes" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "Quantité" @@ -13276,63 +13383,58 @@ msgid "Python wrapper console" msgstr "Console Python" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr ">>> Calcul en cours du script\n" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Ouvrir un script Python" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Sauver le script sous" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Console Pygwy" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Effacer le journal" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Ouvrir un script Python (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Sauver le script (Ctrl-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Exécuter le script (Ctrl-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Commande " -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "Pygwy, l'interface Python pour Gwyddion" -#: pygwy.c:585 pygwy.c:676 +#: pygwy.c:258 +msgid "Python Interpreter Errors" +msgstr "Erreurs de l'interpréteur Python" + +#: pygwy.c:384 +msgid "Python interpreter error occurred." +msgstr "Une erreur s'est produite dans l'interpréteur Python." + +#: pygwy.c:459 msgid "Function written in Python" msgstr "Fonction écrite en Python" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Fonction graphique écrite en Python" - -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." -msgstr "" -"Plg-in Pygwy : %s (%s)\n" -"Échec de l'export." - #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." msgstr "Rognage, limite les données à une zone plus petite." @@ -13417,10 +13519,6 @@ msgid "_Mask" msgstr "_Masque" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "Les deux" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "Solveur laplacien" @@ -13488,7 +13586,7 @@ msgstr "Histogramme des hauteurs" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Plage" @@ -13593,11 +13691,11 @@ msgstr "Moyenne :" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Options" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "Mises à jour instantanées" @@ -14052,7 +14150,7 @@ msgid "_Copy" msgstr "_Copier" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -14062,63 +14160,63 @@ "(distribution de hauteur, correlations, PSDF, fonctions de Minkowski) de la " "partie sélectionnée des données." -#: modules/tools/sfunctions.c:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Distribution des hauteurs" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "Distribution des hauteurs cumulée" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Distribution angulaire" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "Distribution cumulée des angles" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "PSDF radiale" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "ACF radiale" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "Volume de Minkowski" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "Limite de Minkowski" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "Connectivité de Minkowski" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Fonctions statistiques" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "Calcule les fonctions statistiques 1D" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "Incertitudes _séparées" @@ -14991,6 +15089,22 @@ "La régularisation des données XYZ a échoué à cause d'une instabilité " "numérique ou a été interrompue." +#~ msgid "Graph function written in Python" +#~ msgstr "Fonction graphique écrite en Python" + +#~ msgid "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." +#~ msgstr "" +#~ "Plg-in Pygwy : %s (%s)\n" +#~ "Échec de l'export." + +#~ msgid "Borders extension..." +#~ msgstr "Extension vers les bords..." + +#~ msgid "Laplace interpolation..." +#~ msgstr "Interpolation laplacienne..." + #~ msgid "Duplicate group id" #~ msgstr "Identifiant de groupe redondant" diff -Nru gwyddion-2.46/po/gwyddion.pot gwyddion-2.47/po/gwyddion.pot --- gwyddion-2.46/po/gwyddion.pot 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/gwyddion.pot 2016-11-18 10:05:44.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -132,16 +132,16 @@ msgid "Untitled" msgstr "" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "" -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "" #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "" @@ -222,7 +222,7 @@ msgid "Power" msgstr "" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "" @@ -457,7 +457,7 @@ msgid "Position" msgstr "" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -577,12 +577,12 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "" @@ -647,59 +647,91 @@ msgid "Kaiser 2.5" msgstr "" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:350 +msgid "Parabolic bump" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "" -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "" @@ -730,57 +762,65 @@ msgstr[0] "" msgstr[1] "" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "" @@ -808,8 +848,8 @@ msgid "Hide full controls" msgstr "" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "" @@ -832,8 +872,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "" @@ -913,10 +953,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -928,13 +968,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -942,7 +982,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -967,7 +1007,7 @@ msgid "Maximum z value" msgstr "" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "" @@ -1046,7 +1086,7 @@ msgstr "" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "" @@ -1103,7 +1143,7 @@ msgid "_Line type:" msgstr "" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "" @@ -1219,7 +1259,7 @@ msgid "_Reversed layout" msgstr "" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "" @@ -1228,7 +1268,7 @@ msgstr "" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "" @@ -1272,7 +1312,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1302,7 +1342,7 @@ msgstr "" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1585,7 +1625,7 @@ msgid "Minimum" msgstr "" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1600,7 +1640,7 @@ msgstr "" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "" @@ -1687,16 +1727,16 @@ msgid "XYZ" msgstr "" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "" @@ -1725,7 +1765,7 @@ msgid "Opening of `%s' failed" msgstr "" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "" @@ -1735,36 +1775,36 @@ msgid "Loaded using: %s." msgstr "" -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "" -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "" -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "" @@ -2010,7 +2050,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "" @@ -2046,41 +2086,41 @@ msgid "current-language-code|en" msgstr "" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "" @@ -2124,7 +2164,7 @@ msgid "_New" msgstr "" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "" @@ -2639,7 +2679,7 @@ msgstr "" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3118,10 +3158,10 @@ msgstr "" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -3825,13 +3865,13 @@ msgstr "" #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -3865,7 +3905,7 @@ msgid "Pages:" msgstr "" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -3875,7 +3915,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -3891,7 +3931,7 @@ msgid "H_eight:" msgstr "" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "" @@ -3902,7 +3942,7 @@ msgstr "" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -3910,7 +3950,7 @@ msgstr "" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -3988,252 +4028,256 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4242,134 +4286,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "" @@ -4458,42 +4502,42 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "" -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "" -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "" -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "" @@ -4967,77 +5011,77 @@ msgid "More than one record dimension found." msgstr "" -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "" -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "" -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "" -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "" -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "" @@ -5579,9 +5623,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6075,39 +6119,39 @@ msgid "IonScope SICM files (.img)" msgstr "" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "" -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "" @@ -6409,11 +6453,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "" @@ -6477,7 +6521,7 @@ msgstr "" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "" @@ -6495,12 +6539,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "" @@ -6522,7 +6566,7 @@ msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "" @@ -6552,20 +6596,20 @@ msgstr "" #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6578,14 +6622,14 @@ msgstr "" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "" @@ -6632,36 +6676,36 @@ msgid "DOS Spectrum for \"%s\"" msgstr "" -#: modules/graph/graph_export_ascii.c:55 -msgid "Plain text" +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." msgstr "" -#: modules/graph/graph_export_ascii.c:56 -msgid "Gnuplot friendly" +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." msgstr "" -#: modules/graph/graph_export_ascii.c:57 -msgid "Comma separated values" +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" msgstr "" -#: modules/graph/graph_export_ascii.c:58 -msgid "Origin friendly" +#: modules/graph/graph_export_ascii.c:101 +msgid "Plain text" msgstr "" -#: modules/graph/graph_export_ascii.c:59 -msgid "Igor Pro text wave" +#: modules/graph/graph_export_ascii.c:102 +msgid "Gnuplot friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." +#: modules/graph/graph_export_ascii.c:103 +msgid "Comma separated values" msgstr "" -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." +#: modules/graph/graph_export_ascii.c:104 +msgid "Origin friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" +#: modules/graph/graph_export_ascii.c:105 +msgid "Igor Pro text wave" msgstr "" #: modules/graph/graph_export_ascii.c:127 @@ -6737,7 +6781,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "" @@ -6748,7 +6792,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "" @@ -6763,7 +6807,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "" @@ -6846,6 +6890,62 @@ msgid "Level graph curves" msgstr "" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "" + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "" + +#: modules/graph/graph_logscale.c:253 +msgid "_X" +msgstr "" + +#: modules/graph/graph_logscale.c:254 +msgid "_Y" +msgstr "" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "" @@ -7226,13 +7326,13 @@ msgstr "" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7244,19 +7344,19 @@ msgid "Initializing..." msgstr "" -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "" @@ -7265,55 +7365,55 @@ msgid "Ballistic Deposition" msgstr "" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "" @@ -7335,7 +7435,7 @@ msgid "Error loading file: %s\n" msgstr "" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "" @@ -7344,7 +7444,7 @@ msgid "Load Calibration Data" msgstr "" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "" @@ -7354,18 +7454,18 @@ msgid "No data loaded" msgstr "" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "" @@ -7400,55 +7500,55 @@ msgid "Specify simple calibration data." msgstr "" -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "" @@ -7533,7 +7633,7 @@ msgid "Search canceled" msgstr "" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -7843,65 +7943,69 @@ msgid "Data processing:" msgstr "" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "" -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "" -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "" @@ -8128,12 +8232,12 @@ msgid "Y Distance" msgstr "" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "" @@ -8174,31 +8278,27 @@ msgid "Create corrected data from 2nd channel" msgstr "" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "" -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "" -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "" - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "" @@ -8261,7 +8361,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "" @@ -8271,7 +8371,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "" @@ -8565,7 +8665,7 @@ msgid "Plot drift _graph" msgstr "" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "" @@ -9245,9 +9345,9 @@ msgid "Filtered Data" msgstr "" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "" @@ -9369,7 +9469,7 @@ msgstr "" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "" @@ -9422,109 +9522,85 @@ msgid "Enable _power multiplier" msgstr "" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "" -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "" -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "" -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "" @@ -9788,11 +9864,11 @@ msgid "Keep grains satisfying:" msgstr "" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "" @@ -10358,108 +10434,128 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "" - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "" -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "" -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "" + +#: modules/process/lat_synth.c:551 +msgid "lattice|Penrose (centers)" +msgstr "" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "" -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "" -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "" @@ -10565,21 +10661,21 @@ "interpolation" msgstr "" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -10818,12 +10914,12 @@ msgid "Mark data disconnected from other values" msgstr "" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "" @@ -11534,95 +11630,99 @@ msgid "Random Noise" msgstr "" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +msgid "Parabolic bumps" +msgstr "" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "" -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "" -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "" -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "" @@ -12208,11 +12308,11 @@ msgid "Level data by arc revolution" msgstr "" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "" @@ -12491,47 +12591,51 @@ msgid "Tip radius evolution" msgstr "" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "" -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "" -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "" @@ -12695,7 +12799,7 @@ msgstr "" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "" @@ -12884,59 +12988,56 @@ msgid "Python wrapper console" msgstr "" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr "" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "" -#: pygwy.c:585 pygwy.c:676 -msgid "Function written in Python" +#: pygwy.c:258 +msgid "Python Interpreter Errors" msgstr "" -#: pygwy.c:630 -msgid "Graph function written in Python" +#: pygwy.c:384 +msgid "Python interpreter error occurred." msgstr "" -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." +#: pygwy.c:459 +msgid "Function written in Python" msgstr "" #: modules/tools/crop.c:84 @@ -13017,10 +13118,6 @@ msgid "_Mask" msgstr "" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "" @@ -13084,7 +13181,7 @@ msgstr "" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "" @@ -13185,11 +13282,11 @@ msgstr "" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "" @@ -13636,70 +13733,70 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 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:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "" Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/it.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/it.gmo differ diff -Nru gwyddion-2.46/po/it.po gwyddion-2.47/po/it.po --- gwyddion-2.46/po/it.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/it.po 2016-11-18 10:05:45.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" "PO-Revision-Date: 2016-09-30 14:27+0200\n" "Last-Translator: Livia Della Seta \n" "Language-Team: Italian \n" @@ -137,16 +137,16 @@ msgid "Untitled" msgstr "Senza titolo " -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "Valutazione iniziale residuei" -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "Fitting..." #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Gaussiana" @@ -227,7 +227,7 @@ msgid "Power" msgstr "Potenza" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Lorentzian" @@ -462,7 +462,7 @@ msgid "Position" msgstr "Posizione" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -582,12 +582,12 @@ msgstr "Scala e spazio adattati" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Esatta" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Lineare" @@ -652,59 +652,92 @@ msgid "Kaiser 2.5" msgstr "Kaiser 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "correlazione|normale" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Solo Fase" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Escludi regione sotto maschera" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Includi solo area maschera" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Usa immagine intera (ignora maschera)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "distanza|City-block" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "distanza|Scacchi" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "distanza|Ottagonale 4,8" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "distanza|Ottagonale 8,4" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "distanza|Ottagonale" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "distanza!Euclidea" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Buchi" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "Sfera" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "Cilindro (giacente)" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "Piramide (rombo)" + +#: libprocess/gwyshapefitpreset.c:350 +#, fuzzy +msgid "Parabolic bump" +msgstr "Passo parabolico" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "Anello" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "Espansione..." -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "Erosione..." @@ -735,57 +768,66 @@ msgstr[0] "Trovato un massimo locale interno" msgstr[1] "Trovati %d massimi locali interni" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "Piramide" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Piramidale" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Contact" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "Noncontact" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Funzione Delta" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Analitico" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "Parabola" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "Simmetrico" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "Cono" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "" + +#: libprocess/tip.c:459 +#, fuzzy +msgid "Asymmetric" +msgstr "Simmetrico" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Conversione campi" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Inizio stima parziale" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Inizio stima totale " #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "Triangolazione..." @@ -813,8 +855,8 @@ msgid "Hide full controls" msgstr "Nascondi comandi completi" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "aggettivo|Basico" @@ -837,8 +879,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "°gra" @@ -918,10 +960,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -933,13 +975,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -947,7 +989,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -972,7 +1014,7 @@ msgid "Maximum z value" msgstr "Valore massimo z" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "_Etichetta:" @@ -1051,7 +1093,7 @@ msgstr "Nascosto" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Punti" @@ -1108,7 +1150,7 @@ msgid "_Line type:" msgstr "Tipo linea:" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "Spessore linea:" @@ -1224,7 +1266,7 @@ msgid "_Reversed layout" msgstr "Disposizione invertita" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "Ascissa" @@ -1233,7 +1275,7 @@ msgstr "Grafico" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Dati" @@ -1277,7 +1319,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1307,7 +1349,7 @@ msgstr "Preferiti" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1598,7 +1640,7 @@ msgid "Minimum" msgstr "Minimo" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1613,7 +1655,7 @@ msgstr "Posizione Max." #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "RMS" @@ -1700,16 +1742,16 @@ msgid "XYZ" msgstr "XYZ" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "Messaggi per %s" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "Messaggi per Senza Titolo" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "canale|Nessuno" @@ -1749,7 +1791,7 @@ msgid "Opening of `%s' failed" msgstr "Apertura di `%s' fallita" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "Percorso completo file: %s" @@ -1759,30 +1801,30 @@ msgid "Loaded using: %s." msgstr "Caricato usando: %s." -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Fondi file" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Apri File" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "Salvataggio di `%s' fallito" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "Salvato usando: %s." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "File `%s esistente. Sostituire?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." @@ -1790,7 +1832,7 @@ "Il file già esiste in `%s'. La sua sostituzione ne sovrascriverà il " "contenuto." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Sostituire file?" @@ -2044,7 +2086,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Dimensioni" @@ -2084,41 +2126,41 @@ msgid "current-language-code|en" msgstr "codice linguaggio corrente|it" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "Registro di %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Esporta" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "Pulisci" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Esci" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Tipo" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Funzione" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Parametri" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Tempo" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Esporta log" @@ -2162,7 +2204,7 @@ msgid "_New" msgstr "Nuovo" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Elimina" @@ -2813,7 +2855,7 @@ msgstr "Muovi in basso" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3294,10 +3336,10 @@ msgstr "Esporta Testo" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -4014,13 +4056,14 @@ msgstr "Il tipo dati OpenEXR %u non è valido o non è supportato." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "errore inizializzazione libpng (in %s)" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +#, fuzzy +msgid "libpng error occurred" msgstr "Errore libpng" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -4054,7 +4097,7 @@ msgid "Pages:" msgstr "Pagine:" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4064,7 +4107,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4080,7 +4123,7 @@ msgid "H_eight:" msgstr "Altezza:" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "Misure Identiche" @@ -4091,7 +4134,7 @@ msgstr "_Scala Z (per unità di campione):" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4099,7 +4142,7 @@ msgstr "Cambia unità" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4180,100 +4223,100 @@ msgid "Cannot read channel labels." msgstr "Impossibile leggere le etichette dei canali" -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Windows or OS2 Bitmap (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "Linee Orizz./Vert" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Ellissi" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Linee" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Rettangoli" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "Reticolo" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "Percorso" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "righello|_Nessuno" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "_Righelli" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "barra scala _incorporata" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "Righello _Falsi colori" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "titolo|Nessuno" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "Lungo il lato destro" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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 " @@ -4284,152 +4327,156 @@ "si basa su GDK e altre librerie per cui potrebbe dipendere dal tipo di " "installazione." -#: modules/file/imgexport.c:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "Selezione colore" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "Nero" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "Bianco" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "Dimensione Pi_xel:" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "Pixels per _inch:" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "Ingrandisci:" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "Altezza:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "Carattere:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "_Dimensione carattere:" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "Spessore contorno:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "Larghezza margine:" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "Lunghezza _Tacca:" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "Lega dimensioni a pixel dati" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "Separatore decimale: virgola" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "Colori" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "Colore _Linea e testo:" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "Sfondo _Trasparente" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "Colore sfondo:" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "Scala Laterale:" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Lunghezza:" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Auto" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Posizionamento" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "Sinistra" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "Centro" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "Destra" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "Sopra" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "sotto" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "Apertura Ori_zzontale:" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "Apertura _Verticale:" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "Colo_re:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "Colore contorno:" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "O_pacità" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "Disegna tacche" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "Disegna _etichette" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "Immagine" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4438,134 +4485,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "Tipo di interpolazione:" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "Disegna cornice" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "Disegna _Maschera" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "Disegna _legenda Maschera" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Scala valore" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "Precisione fissata:" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "Soglia _kilo fissata:" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "Titolo" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "Posizione:" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "Apertura:" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "Assegna _unità al titolo" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "Disegna _selezione" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Oggetti " -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "Laterale" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "Carica" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "verbo|_Immagazzina " -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Rinomina" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "Nome predefinito:" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "Esporta %s" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "Esporta come 1_6 bit grayscale" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "Scala laterale" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "Valori" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "Selezione" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Predefiniti" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "Errore Cairo: %s" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "Salvataggio pixbuf fallito: %s." -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "Immagine troppo grande per essere salvata come TARGA." -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "Disegna _numeri" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "lunghezza segnale fine:" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "Marcatore _raggio:" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Maschera" @@ -4656,42 +4703,42 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "Tipo di dati sconosciuto. Da segnalare agli sviluppatori." -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Importa scansioni immagini JPK " -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "Immagini scansione JPK (.jpk, .jpk-qi-image)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "Curve di Forza JPK (.jpk-force, .jpk-force-map, .jpk-qi-data)" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "Il file non contiene le dimensioni della griglia." -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "Minizip non può aprire il file." -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 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:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "Liste canali non uniformi non supportate" -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, 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:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "Impossibile trovare alcun canale altezza" @@ -5185,78 +5232,78 @@ msgid "More than one record dimension found." msgstr "Più di una dimensione della registrazione non trovata." -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "Importa file profilo Nano Measuring Machine" -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "File Nano Measuring Machine (*.dsc)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "" "I dati Nano Measuring Machine devono essere importati in modo interattivo." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "Lettura file..." -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "Rappresentazione superficie..." -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "Importa NMM Profile Set" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Informazioni" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "Numero file dati:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "Numero totale punti:" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "Punti per profilo:" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "Canali Importati" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "Traccia mappa densità punti" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Risoluzione" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "Dimensione orizzontale:" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "Dimensione verticale:" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "Mappa densità punti" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "Qualcosa sta modificando i file dati su disco" @@ -5811,9 +5858,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6315,39 +6362,39 @@ msgid "IonScope SICM files (.img)" msgstr "File IonScope SICM (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Importa file dati SIS (Surface Imaging Systems)." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "file SIS (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "Il blocco non è un blocco di documento." -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "Informazioni documento troppo brevi." -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "Informazioni parametro troppo brevi." -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "Blocco immagine inaspettato." -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "Termine file raggiunto in blocco immagine." -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "Termine file raggiunto in blocco canale." -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "Termine canale raggiunto al posto di un altro canale aspettato." @@ -6651,11 +6698,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Modalità Maschera" @@ -6719,7 +6766,7 @@ msgstr "Adatta Grafico" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "Adatta" @@ -6737,12 +6784,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Parametro" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Errore" @@ -6764,7 +6811,7 @@ msgstr "_Disegna cerchio" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "Salva il Fit Report" @@ -6796,20 +6843,20 @@ msgstr "N.A." #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "===== Risultati del Fit =====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "Dati: %s\n" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6822,14 +6869,14 @@ msgstr "Intervallo X : da %.*f a %.*f %s\n" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "Funzione adattata: %s\n" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Risultati\n" @@ -6876,38 +6923,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "Spettro DOS per \"%s\"" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Esporta dati grafico come file di testo." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Esporta _Testo..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Esporta dati grafico in un file di testo" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Testo Semplice" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "Gnuplot friendly " -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Comma separated values Valori separati da virgola" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "Origin friendly" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "Igor Pro text wave" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Esporta dati grafico come file di testo." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Esporta _Testo..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Esporta dati grafico in un file di testo" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "formato _Numero POSIX " @@ -6981,7 +7028,7 @@ msgstr "Fit Curva FD..." #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "Stima" @@ -6992,7 +7039,7 @@ msgstr "_Metti in grafico inits" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Fissa" @@ -7007,7 +7054,7 @@ msgstr "χ2 risulta:" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Matrice di Correlazione" @@ -7090,6 +7137,69 @@ msgid "Level graph curves" msgstr "Livella curve grafico" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" + +#: modules/graph/graph_logscale.c:93 +#, fuzzy +msgid "/_Logscale transform..." +msgstr "Trasforma grado...." + +#: modules/graph/graph_logscale.c:96 +#, fuzzy +msgid "Transform graph axes to logarithmic scale" +msgstr "Crea una presentazione con scala di colori logaritmica" + +#: modules/graph/graph_logscale.c:229 +#, fuzzy +msgid "Logscale Transform" +msgstr "Trasformata di Hough" + +#: modules/graph/graph_logscale.c:245 +#, fuzzy +msgid "Axes to transform:" +msgstr "Trasformata _Inversa" + +#: modules/graph/graph_logscale.c:253 +#, fuzzy +msgid "_X" +msgstr "_X:" + +#: modules/graph/graph_logscale.c:254 +#, fuzzy +msgid "_Y" +msgstr "_Y:" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "Entrambi" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "" + +#: modules/graph/graph_logscale.c:269 +#, fuzzy +msgid "_Take absolute value" +msgstr "Pendenza assoluta media" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "Trova picchi su curve grafico" @@ -7478,13 +7588,13 @@ msgstr "Generazione superficie tramite deposizione balistica" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7496,19 +7606,19 @@ msgid "Initializing..." msgstr "Inizializzazione...." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Generato" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "Spessore medio depositato" @@ -7517,55 +7627,55 @@ msgid "Ballistic Deposition" msgstr "Deposizione Balistica" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "Anteprima progressiva" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Dimensioni" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Generatore" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "Co_pertura:" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Evoluzione" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "Disegna grafici:" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "Deposizione particelle..." @@ -7587,7 +7697,7 @@ msgid "Error loading file: %s\n" msgstr "Errore nel caricare il file: %s\n" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "Impossibile salvare il preimpostato: %s" @@ -7596,7 +7706,7 @@ msgid "Load Calibration Data" msgstr "Carica Dati Calibrazione" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Nome Calibrazione:" @@ -7606,18 +7716,18 @@ msgid "No data loaded" msgstr "nessun dato caricato" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "Calibrazione `%s già esistente. " -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Sovrascrivi" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Aggiungi" @@ -7652,55 +7762,55 @@ msgid "Specify simple calibration data." msgstr "Spèecificare dati calibrazione." -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "Dati Calibrazione Semplice" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "da _X:" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "a _X:" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "da _Y:" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "a _Y:" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "da _Z:" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "a _Z:" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "Incertezza _X:" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "Incertezza _Y:" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "Incertezza _Z:" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "Fattore di correzione _X:" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "Fattore di correzione _Y:" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "Fattore di correzione _Z:" @@ -7785,7 +7895,7 @@ msgid "Search canceled" msgstr "Ricerca cancellat" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -8096,65 +8206,70 @@ msgid "Data processing:" msgstr "Elaborazione Dati:" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "Numero massimi" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Skew" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "curtosi" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +#, fuzzy +msgid "Autocorrelation length" +msgstr "lunghezza _Autocorrelazione:" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "Genera superfici colonnari con un semplice algoritmo di crescita." -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "/Sintetico/_Colonnare..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "Generazione superficie colonnare" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "Accresci superficie colonnare" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Dimensione particella" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Incidenza" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Inclinazione" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Direzione" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "Tipo di rilassamento:" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "Fusione:" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Debole" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Forte" @@ -8383,12 +8498,12 @@ msgid "Y Distance" msgstr "Distanza Y" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Punteggio" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "Tipo Output:" @@ -8429,31 +8544,27 @@ msgid "Create corrected data from 2nd channel" msgstr "Creazione dati corretti dal 2° canale" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "Correlazione prima serie....." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "Correlazione seconda serie....." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "Estensione margini...." - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "2° canale corretto" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "Differenza X" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Differenza Y" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Differenza assoluta" @@ -8518,7 +8629,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "" @@ -8528,7 +8639,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "Nuovo grafico" @@ -8824,7 +8935,7 @@ msgid "Plot drift _graph" msgstr "Grafico rappresentazione deriva" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Anteprima" @@ -9515,9 +9626,9 @@ msgid "Filtered Data" msgstr "Dati filtrati" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Differenza" @@ -9641,7 +9752,7 @@ msgstr "Sezione PSDF" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "_Fix res.:" @@ -9694,109 +9805,85 @@ msgid "Enable _power multiplier" msgstr "Abilita moltiplicatore di _potenza" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Buchi" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "Anello" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "Sfera" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "Cilindro (giacente)" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "Piramide (rombo)" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "Adatta figure geometriche predefinite ai dati." -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "/_Livella/_Adatta Figura.." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "Adatta figure geometriche" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "/Adatta Figura.." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "Adatta Figura" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "verbo|Adattamento rapido" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "Quantità Derivate" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "Differenza quadratica media" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "Figura adattata" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Entrambe" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "Tipo _Funzione:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "Mostra differenze con mappa colore _adattata" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "Calcola differenze per pi_xels esclusi" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "_Ricalcola Immagine" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "Ritorna a Valori _Precedenti" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "Stima parametri fallita." -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "Fit fallito" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "Fit interrotto" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "" @@ -10065,11 +10152,11 @@ msgid "Keep grains satisfying:" msgstr "Mantieni grani che soddisfano:" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "Soglia inferiore:" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "Soglia superiore:" @@ -10644,108 +10731,132 @@ "Interpolazione dati sotto la maschera attraverso soluzione dell'equazione di " "Laplace" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "Interpolazione di Laplace" - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "Costante casuale" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "lineare casuale" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "irregolare casuale" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "Distanza radiale" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "Distanza segmentata" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "Segmentazione casuale" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "Distanza margine" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "Margine casuale" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "Seconda distanza più vicina" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "Generazione superfici basati su reticoli regolari o casuali" -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "/Sintetico/Reticolo..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "Generazione superficie basata sul reticolo" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "reticolo|Casuale" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "reticolo|Quadrato" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "reticolo|Esagonale" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "reticolo|Triangolare" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +#, fuzzy +msgid "lattice|Cairo" +msgstr "reticolo|Casuale" + +#: modules/process/lat_synth.c:547 +#, fuzzy +msgid "lattice|Snub square" +msgstr "reticolo|Quadrato" + +#: modules/process/lat_synth.c:548 +#, fuzzy +msgid "lattice|Truncated square" +msgstr "reticolo|Quadrato" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "" + +#: modules/process/lat_synth.c:551 +#, fuzzy +msgid "lattice|Penrose (centers)" +msgstr "Parametri reticolo" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "Reticolo:" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "Dimensione:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "Rilassamento reticolo:" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "Rilassamento altezza" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Superficie" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "_Peso:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "Costruzione reticolo..." -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "Rilassamento reticolo..." -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "Altezze rilassamento..." @@ -10854,21 +10965,21 @@ msgstr "" "Livella grani individuali, con interpolazione Laplaciana degli spostamenti" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Sottofondo" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "Livella grani" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "Quantità da livellare:" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11108,12 +11219,12 @@ msgid "Mark data disconnected from other values" msgstr "Segna dati non connessi con altri valori" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Positivo" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Negativo" @@ -11826,95 +11937,100 @@ msgid "Random Noise" msgstr "Rumore casuale" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Sfere" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Coni" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Piramidi" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Rombi" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Tetraedri" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Gaussiane" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +#, fuzzy +msgid "Parabolic bumps" +msgstr "Passo parabolico" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "Generazione casuali superfici dal posizionamento di oggetti" -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/Sintetico/_Oggetti..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "Generazione superficie di oggetti collocati casualmente" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "Entrambi (casuale)" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "Oggetti casuali" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "Figura:" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "obj." -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Proporzioni" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "Proporzioni" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "Scala con dimensioni" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "_Tipo Caratteristica:" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "_Truncato:" @@ -12508,11 +12624,11 @@ msgid "Level data by arc revolution" msgstr "Livella dati per rivoluzione arco" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "Direzione orizzontale" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "Direzione verticale" @@ -12792,47 +12908,52 @@ msgid "Tip radius evolution" msgstr "Evoluzione raggio punta" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Modella punte SPM" -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "/Punta e Indentazione/_Modello Punta" -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Modello punta AFM" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Modello punta" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Tipo Punta" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Numero facce:" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "Pendenza Punta" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "Rotazione Punta" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "Raggio apicale punta:" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +#, fuzzy +msgid "Tip _anisotropy:" +msgstr "DWT Anisotropa" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "Punta modellata" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Risoluzione punta: %d × %d pixels" @@ -13003,7 +13124,7 @@ msgstr "Onde" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "_Quantità:" @@ -13192,62 +13313,58 @@ msgid "Python wrapper console" msgstr "Python wrapper console" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr ">>> Script in esecuzione\n" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Apri script Python " -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Salva Script come" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Pygwy Console" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Pulisci Registro" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Apri script in Python (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Salva script (Ctrl-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Esegui script (Ctrl-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Comando" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "" -#: pygwy.c:585 pygwy.c:676 -msgid "Function written in Python" -msgstr "Funzione scritta in Python" +#: pygwy.c:258 +msgid "Python Interpreter Errors" +msgstr "" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Funzione grafico scritta in Python" +#: pygwy.c:384 +#, fuzzy +msgid "Python interpreter error occurred." +msgstr "Errore libpng" -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." -msgstr "" -"Pygwy plugin: %s (%s)\n" -"Esportazione fallita." +#: pygwy.c:459 +msgid "Function written in Python" +msgstr "Funzione scritta in Python" #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." @@ -13333,10 +13450,6 @@ msgid "_Mask" msgstr "_Maschera" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "Entrambi" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "Risolutore Laplaciano" @@ -13403,7 +13516,7 @@ msgstr "Istogramma altezze" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Intervallo" @@ -13508,11 +13621,11 @@ msgstr "Media:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Opzioni" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "_Aggiornamento immediato" @@ -13965,7 +14078,7 @@ msgid "_Copy" msgstr "_Copia" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -13975,63 +14088,63 @@ "unidimensionali (distribuzione delle altezze, correlazioni, PSDF, funzioni " "di Minkowski) di una parte selezionata di dati." -#: modules/tools/sfunctions.c:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Distribuzione Altezze" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "Distribuzione altezze cum." -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Distribuzione angoli" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "Distribuzione angoli cum" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF " -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "PSDF radiale" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "ACF radiale" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "Volume di Minkowski" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "Confine di Minkowski" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "Connettività di Minkowski" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Funzioni Statistiche" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "Calcolo funzioni statistiche1D " -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "_Separa incertezze" @@ -14900,6 +15013,22 @@ "regolarizzazione dati XYZ fallita a causa di instabilità numerica o è stata " "interrotta" +#~ msgid "Borders extension..." +#~ msgstr "Estensione margini...." + +#~ msgid "Laplace interpolation..." +#~ msgstr "Interpolazione di Laplace" + +#~ msgid "Graph function written in Python" +#~ msgstr "Funzione grafico scritta in Python" + +#~ msgid "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." +#~ msgstr "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Esportazione fallita." + #~ msgid "Placement:" #~ msgstr "Posizionamento:" Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/ko.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/ko.gmo differ diff -Nru gwyddion-2.46/po/ko.po gwyddion-2.47/po/ko.po --- gwyddion-2.46/po/ko.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/ko.po 2016-11-18 10:05:45.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" "PO-Revision-Date: 2015-04-20 09:48+0200\n" "Last-Translator: Jeong Jiseong \n" "Language-Team: Korean_gwyddion\n" @@ -131,17 +131,17 @@ msgid "Untitled" msgstr "제목 없음" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "" -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 #, fuzzy msgid "Fitting..." msgstr "FFT 필터링" #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "가우시안 타입" @@ -224,7 +224,7 @@ msgid "Power" msgstr "거듭제곱" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "로렌츠 " @@ -464,7 +464,7 @@ msgid "Position" msgstr "위치" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -585,13 +585,13 @@ msgstr "" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 #, fuzzy msgid "Round" msgstr "둥근" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "선형적인" @@ -656,59 +656,92 @@ msgid "Kaiser 2.5" msgstr "" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "FFT" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "" + +#: libprocess/gwyshapefitpreset.c:350 +#, fuzzy +msgid "Parabolic bump" +msgstr "평행의" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "" -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "" @@ -739,59 +772,67 @@ msgstr[0] "" msgstr[1] "" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 #, fuzzy msgid "Pyramid" msgstr "vdW: 각뿔(피라미드)" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 #, fuzzy msgid "Parabola" msgstr "평행의" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "" @@ -819,8 +860,8 @@ msgid "Hide full controls" msgstr "" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "" @@ -843,8 +884,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "" @@ -926,10 +967,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -941,13 +982,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -955,7 +996,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -980,7 +1021,7 @@ msgid "Maximum z value" msgstr "Z 최대값" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "라벨(L):" @@ -1061,7 +1102,7 @@ msgstr "숨김" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "점" @@ -1119,7 +1160,7 @@ msgid "_Line type:" msgstr "선 종류(L):" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "선 굵기(H):" @@ -1236,7 +1277,7 @@ msgid "_Reversed layout" msgstr "반전된 레이아웃(R)" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "" @@ -1245,7 +1286,7 @@ msgstr "그래프" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "데이터" @@ -1289,7 +1330,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1319,7 +1360,7 @@ msgstr "선호 방법" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1605,7 +1646,7 @@ msgid "Minimum" msgstr "최소" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1620,7 +1661,7 @@ msgstr "최대 위치" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "" @@ -1710,16 +1751,16 @@ msgid "XYZ" msgstr "" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "" -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "채널|없음" @@ -1748,7 +1789,7 @@ msgid "Opening of `%s' failed" msgstr "`%s' 열기를 실패하였습니다." -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "전체 파일 경로: %s." @@ -1758,36 +1799,36 @@ msgid "Loaded using: %s." msgstr "%s 을 사용해서 불러왔습니다. " -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "파일 병합" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "파일 열기" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "`%s' 저장을 실패하였습니다. " -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "%s 을 사용해서 저장되었습니다." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "파일 '%s'는 이미 존재합니다. 대체하시겠습니까?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." msgstr "그 파일은 이미 '%s'에 존재합니다. 같은 이름으로 덮어씁니다. " -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "파일을 대체하시겠습니까? " @@ -2038,7 +2079,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "크기" @@ -2074,41 +2115,41 @@ msgid "current-language-code|en" msgstr "현재-언어-코드|en" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "%s (%s)의 로그" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "내보내기(E)" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "지우기(R)" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "닫기(C)" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "종류" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "기능" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "변수" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "시간" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "로그 내보내기" @@ -2153,7 +2194,7 @@ msgid "_New" msgstr "새로 만들기(N)" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "삭제하기(D)" @@ -2671,7 +2712,7 @@ msgstr "" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3160,10 +3201,10 @@ msgstr "텍스트 내보내기" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -3872,13 +3913,13 @@ msgstr "" #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" msgstr "" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... @@ -3912,7 +3953,7 @@ msgid "Pages:" msgstr "" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -3922,7 +3963,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -3938,7 +3979,7 @@ msgid "H_eight:" msgstr "" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "" @@ -3949,7 +3990,7 @@ msgstr "" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -3957,7 +3998,7 @@ msgstr "" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4035,263 +4076,267 @@ msgid "Cannot read channel labels." msgstr "" -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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:2914 +#: modules/file/imgexport.c:2931 #, fuzzy msgid "Select Color" msgstr "곡선 색상 설정" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 #, fuzzy msgid "Pi_xel size:" msgstr "점 크기(P):" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 #, fuzzy msgid "O_utline thickness:" msgstr "선 굵기(H):" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 #, fuzzy msgid "_Border width:" msgstr "새 너비(W):" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 #, fuzzy msgid "_Tick length:" msgstr "최소 길이(L)" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 #, fuzzy msgid "Colors" msgstr "색상" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 #, fuzzy msgid "_Background color:" msgstr "그리기 색상(O):" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 #, fuzzy msgid "Lateral scale" msgstr "GL 재료" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 #, fuzzy msgid "Hori_zontal gap:" msgstr "수평의" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 #, fuzzy msgid "_Vertical gap:" msgstr "수직방향(V)" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 #, fuzzy msgid "Colo_r:" msgstr "색상" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4300,144 +4345,144 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 #, fuzzy msgid "Draw _frame" msgstr "Grain number" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 #, fuzzy msgid "Fi_xed precision:" msgstr "정밀도(P):" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 #, fuzzy msgid "Fixed _kilo threshold:" msgstr "Soft threshold(S):" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 #, fuzzy msgid "Title" msgstr "제목 없음" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 #, fuzzy msgid "Posi_tion:" msgstr "위치" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 #, fuzzy msgid "Lateral" msgstr "GL 재료" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 #, fuzzy msgid "Values" msgstr "값" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 #, fuzzy msgid "Selection" msgstr "부분:" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "" -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "" -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 #, fuzzy msgid "Draw _numbers" msgstr "Grain number" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 #, fuzzy msgid "Marker _radius:" msgstr "곡률 반경 1" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "" @@ -4526,42 +4571,42 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "" -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "" -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "" -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "" -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "" -#: modules/file/jpkscan.c:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "" -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "" -#: modules/file/jpkscan.c:1496 +#: modules/file/jpkscan.c:1497 #, fuzzy msgid "Cannot find any height channel." msgstr "도움말을 표시할 수 없습니다. " @@ -5038,81 +5083,81 @@ msgid "More than one record dimension found." msgstr "" -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "" -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "" -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 #, fuzzy msgid "Reading files..." msgstr "마스킹 모드" -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "" -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 #, fuzzy msgid "Number of data files:" msgstr "클러스터 개수" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 #, fuzzy msgid "Imported Channels" msgstr "채널" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 #, fuzzy msgid "Point density map" msgstr "점 종류(T):" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "" @@ -5655,9 +5700,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6155,39 +6200,39 @@ msgid "IonScope SICM files (.img)" msgstr "" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "" -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "" -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "" -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "" -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "" -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "" -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "" -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "" @@ -6492,11 +6537,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "마스킹 모드" @@ -6562,7 +6607,7 @@ msgstr "" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "" @@ -6580,12 +6625,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "" @@ -6607,7 +6652,7 @@ msgstr "" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "" @@ -6637,20 +6682,20 @@ msgstr "" #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6663,14 +6708,14 @@ msgstr "" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "" @@ -6718,38 +6763,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "텍스트 파일로 그래프 데이터 내보내기" + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/텍스트로 내보내기(T)..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "텍스트 파일로 그래프 데이터 내보내기" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "텍스트 파일로 그래프 데이터 내보내기" - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/텍스트로 내보내기(T)..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "텍스트 파일로 그래프 데이터 내보내기" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "" @@ -6827,7 +6872,7 @@ msgstr "FD 곡선 맞춤" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "" @@ -6838,7 +6883,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "" @@ -6853,7 +6898,7 @@ msgstr "" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "" @@ -6937,6 +6982,64 @@ msgid "Level graph curves" msgstr "그래프 곡선의 높이 레벨 맞추기" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "" + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "" + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "" + +#: modules/graph/graph_logscale.c:253 +#, fuzzy +msgid "_X" +msgstr "X(X):" + +#: modules/graph/graph_logscale.c:254 +#, fuzzy +msgid "_Y" +msgstr "Y(Y):" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "모두(B)" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "" + #: modules/graph/graph_peaks.c:118 #, fuzzy msgid "Finds peaks on graph curves." @@ -7325,13 +7428,13 @@ msgstr "" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7343,19 +7446,19 @@ msgid "Initializing..." msgstr "" -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 #, fuzzy msgid "Mean deposited thickness" @@ -7366,55 +7469,55 @@ msgid "Ballistic Deposition" msgstr "팁 추정 효과 가리기" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "그래프 그리기:" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "" @@ -7436,7 +7539,7 @@ msgid "Error loading file: %s\n" msgstr "" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "" @@ -7445,7 +7548,7 @@ msgid "Load Calibration Data" msgstr "" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "" @@ -7455,18 +7558,18 @@ msgid "No data loaded" msgstr "" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "" @@ -7501,55 +7604,55 @@ msgid "Specify simple calibration data." msgstr "" -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "" @@ -7633,7 +7736,7 @@ msgid "Search canceled" msgstr "" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -7951,65 +8054,69 @@ msgid "Data processing:" msgstr "데이터 프로세스" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "" -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "" -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "" @@ -8236,12 +8343,12 @@ msgid "Y Distance" msgstr "" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "" @@ -8283,32 +8390,28 @@ msgid "Create corrected data from 2nd channel" msgstr "" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "" -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "" -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "" - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 #, fuzzy msgid "Corrected 2nd channel" msgstr "채널" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "" @@ -8371,7 +8474,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 #, fuzzy msgid "Target _graph:" @@ -8382,7 +8485,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 #, fuzzy msgid "New graph" @@ -8678,7 +8781,7 @@ msgid "Plot drift _graph" msgstr "" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "" @@ -9367,9 +9470,9 @@ msgid "Filtered Data" msgstr "필터링된 데이터" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "차이" @@ -9492,7 +9595,7 @@ msgstr "" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "" @@ -9545,115 +9648,91 @@ msgid "Enable _power multiplier" msgstr "" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "" -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 #, fuzzy msgid "/_Level/_Fit Shape..." msgstr "/평평하게 만들기(L)/구면 맞추기(F)" -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 #, fuzzy msgid "/_Fit Shape..." msgstr "/평평하게 만들기(L)/구면 맞추기(F)" -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 #, fuzzy msgid "Fit Shape" msgstr "모양:" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "" -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 #, fuzzy msgid "Derived Quantities" msgstr "그레인 개수" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 #, fuzzy msgid "Mean square difference:" msgstr "이미지 차이점(G)" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "모두" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 #, fuzzy msgid "_Function type:" msgstr "기능" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "" @@ -9919,11 +9998,11 @@ msgid "Keep grains satisfying:" msgstr "" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "" @@ -10491,108 +10570,129 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "" - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "" -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "" -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "" + +#: modules/process/lat_synth.c:551 +#, fuzzy +msgid "lattice|Penrose (centers)" +msgstr "변수" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "" -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "" -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "" @@ -10699,21 +10799,21 @@ "interpolation" msgstr "" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -10967,12 +11067,12 @@ msgid "Mark data disconnected from other values" msgstr "" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "양성의" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "음성의" @@ -11709,96 +11809,101 @@ msgid "Random Noise" msgstr "" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +#, fuzzy +msgid "Parabolic bumps" +msgstr "평행의" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "" -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "" -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "" -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 #, fuzzy msgid "_Feature type:" msgstr "필터 종류(F):" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "" @@ -12398,11 +12503,11 @@ msgid "Level data by arc revolution" msgstr "" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "수평 방향(H)" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "수직 방향(V)" @@ -12685,47 +12790,51 @@ msgid "Tip radius evolution" msgstr "" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "" -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "" -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "" @@ -12890,7 +12999,7 @@ msgstr "" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "" @@ -13080,59 +13189,56 @@ msgid "Python wrapper console" msgstr "" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr "" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "로그 지우기" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "명령어" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "" -#: pygwy.c:585 pygwy.c:676 -msgid "Function written in Python" +#: pygwy.c:258 +msgid "Python Interpreter Errors" msgstr "" -#: pygwy.c:630 -msgid "Graph function written in Python" +#: pygwy.c:384 +msgid "Python interpreter error occurred." msgstr "" -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." +#: pygwy.c:459 +msgid "Function written in Python" msgstr "" #: modules/tools/crop.c:84 @@ -13214,10 +13320,6 @@ msgid "_Mask" msgstr "마스크(M)" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "모두(B)" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "" @@ -13281,7 +13383,7 @@ msgstr "높이 히스토그램" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "범위" @@ -13383,11 +13485,11 @@ msgstr "평균:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "" @@ -13835,70 +13937,70 @@ msgid "_Copy" msgstr "" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 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:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "높이 분포" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "ACF" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "HHCF" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "PSDF" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "" diff -Nru gwyddion-2.46/po/POTFILES.in gwyddion-2.47/po/POTFILES.in --- gwyddion-2.46/po/POTFILES.in 2016-10-14 09:41:51.000000000 +0000 +++ gwyddion-2.47/po/POTFILES.in 2016-11-18 10:52:26.000000000 +0000 @@ -14,6 +14,7 @@ libprocess/cdline.c libprocess/gwygrainvalue.c libprocess/gwyprocessenums.c +libprocess/gwyshapefitpreset.c libprocess/morph_lib.c libprocess/tip.c libprocess/triangulation.c @@ -210,6 +211,7 @@ modules/graph/graph_filter.c modules/graph/graph_fit.c modules/graph/graph_level.c +modules/graph/graph_logscale.c modules/graph/graph_peaks.c modules/layer/axis.c modules/layer/ellipse.c Binary files /tmp/tmpb4okYB/wDoaAHe0Tz/gwyddion-2.46/po/ru.gmo and /tmp/tmpb4okYB/zbGJn8XiMp/gwyddion-2.47/po/ru.gmo differ diff -Nru gwyddion-2.46/po/ru.po gwyddion-2.47/po/ru.po --- gwyddion-2.46/po/ru.po 2016-10-14 09:46:02.000000000 +0000 +++ gwyddion-2.47/po/ru.po 2016-11-18 10:05:45.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gwyddion\n" "Report-Msgid-Bugs-To: yeti@gwyddion.net\n" -"POT-Creation-Date: 2016-10-14 11:46+0200\n" -"PO-Revision-Date: 2016-10-03 08:20+0300\n" +"POT-Creation-Date: 2016-11-18 11:05+0100\n" +"PO-Revision-Date: 2016-11-15 23:19+0300\n" "Last-Translator: Daniil Bratashov \n" "Language-Team: russian \n" "Language: ru_RU\n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Basepath: .\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 1.8.11\n" "X-Poedit-SearchPath-0: /home/dan/.poedit\n" #: libgwyddion/gwyexpr.c:765 @@ -136,16 +136,16 @@ msgid "Untitled" msgstr "Безымянный" -#: libgwyddion/gwynlfit.c:373 +#: libgwyddion/gwynlfit.c:426 msgid "Initial residua evaluation..." msgstr "Оценка начальной невязки..." -#: libgwyddion/gwynlfit.c:422 modules/process/fit-shape.c:1858 +#: libgwyddion/gwynlfit.c:479 modules/process/fit-shape.c:1632 msgid "Fitting..." msgstr "Аппроксимация..." #: libgwyddion/gwynlfitpreset.c:1442 libprocess/gwyprocessenums.c:101 -#: modules/process/fit-shape.c:531 +#: libprocess/gwyshapefitpreset.c:347 msgid "Gaussian" msgstr "Гауссиана" @@ -226,7 +226,7 @@ msgid "Power" msgstr "Степенная" -#: libgwyddion/gwynlfitpreset.c:1712 modules/process/fit-shape.c:532 +#: libgwyddion/gwynlfitpreset.c:1712 libprocess/gwyshapefitpreset.c:348 msgid "Lorentzian" msgstr "Лоренцева" @@ -461,7 +461,7 @@ msgid "Position" msgstr "Позиция" -#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4583 +#: libprocess/gwygrainvalue.c:1122 app/meta.c:411 modules/file/imgexport.c:4625 #: modules/process/curvature.c:762 modules/tools/level3.c:468 #: modules/tools/readvalue.c:286 msgid "Value" @@ -581,12 +581,12 @@ msgstr "Адаптивный по масштабу и пространству" #. TRANSLATORS: Interpolation type (AKA nearest neighbour) -#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3751 +#: libprocess/gwyprocessenums.c:207 modules/file/imgexport.c:3791 #: modules/xyz/xyz_raster.c:640 msgid "Round" msgstr "Округление" -#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3752 +#: libprocess/gwyprocessenums.c:208 modules/file/imgexport.c:3792 #: modules/xyz/xyz_raster.c:641 msgid "Linear" msgstr "Линейная" @@ -651,59 +651,91 @@ msgid "Kaiser 2.5" msgstr "Кайзер 2.5" -#: libprocess/gwyprocessenums.c:264 +#: libprocess/gwyprocessenums.c:271 msgid "correlation|Normal" msgstr "Обычная" -#: libprocess/gwyprocessenums.c:265 +#: libprocess/gwyprocessenums.c:272 msgid "FFT" msgstr "БПФ" -#: libprocess/gwyprocessenums.c:266 +#: libprocess/gwyprocessenums.c:273 msgid "Phase only" msgstr "Только фаза" -#: libprocess/gwyprocessenums.c:299 +#: libprocess/gwyprocessenums.c:306 msgid "Exclude masked region" msgstr "Исключить область под маской" -#: libprocess/gwyprocessenums.c:300 +#: libprocess/gwyprocessenums.c:307 msgid "Include only masked region" msgstr "Включить только область под маской" -#: libprocess/gwyprocessenums.c:301 +#: libprocess/gwyprocessenums.c:308 msgid "Use entire image (ignore mask)" msgstr "Использовать всё изображение (игнорировать маску)" -#: libprocess/gwyprocessenums.c:595 +#: libprocess/gwyprocessenums.c:602 msgid "distance|City-block" msgstr "Кварталы" -#: libprocess/gwyprocessenums.c:596 +#: libprocess/gwyprocessenums.c:603 msgid "distance|Chess" msgstr "Шахматное" -#: libprocess/gwyprocessenums.c:597 +#: libprocess/gwyprocessenums.c:604 msgid "distance|Octagonal 4,8" msgstr "Октагональное 4,8" -#: libprocess/gwyprocessenums.c:598 +#: libprocess/gwyprocessenums.c:605 msgid "distance|Octagonal 8,4" msgstr "Октагональное 8,4" -#: libprocess/gwyprocessenums.c:599 +#: libprocess/gwyprocessenums.c:606 msgid "distance|Octagonal" msgstr "Октагональное" -#: libprocess/gwyprocessenums.c:600 +#: libprocess/gwyprocessenums.c:607 msgid "distance|Euclidean" msgstr "Евклидово" -#: libprocess/morph_lib.c:169 libprocess/tip.c:672 +#: libprocess/gwyshapefitpreset.c:342 +msgid "Grating (simple)" +msgstr "Решетка (простая)" + +#: libprocess/gwyshapefitpreset.c:343 +msgid "Grating (3-level)" +msgstr "Решетка (3х-уровневая)" + +#: libprocess/gwyshapefitpreset.c:344 modules/process/pat_synth.c:215 +msgid "Holes" +msgstr "Отверстия" + +#: libprocess/gwyshapefitpreset.c:345 +msgid "Sphere" +msgstr "Сфера" + +#: libprocess/gwyshapefitpreset.c:346 +msgid "Cylinder (lying)" +msgstr "Цилиндр (лежащий)" + +#: libprocess/gwyshapefitpreset.c:349 +msgid "Pyramid (diamond)" +msgstr "Пирамида (алмаз)" + +#: libprocess/gwyshapefitpreset.c:350 +msgid "Parabolic bump" +msgstr "Параболическая ступень" + +#: libprocess/gwyshapefitpreset.c:351 +msgid "Ring" +msgstr "Кольцо" + +#: libprocess/morph_lib.c:169 libprocess/tip.c:1043 msgid "Dilation..." msgstr "Расширение..." -#: libprocess/morph_lib.c:235 libprocess/tip.c:793 +#: libprocess/morph_lib.c:235 libprocess/tip.c:1164 msgid "Erosion..." msgstr "Эрозия..." @@ -736,57 +768,65 @@ msgstr[1] "Найдено %d внутренних локальных максимума" msgstr[2] "Найдено %d внутренних локальных максимумов" -#: libprocess/tip.c:320 +#: libprocess/tip.c:422 msgid "Pyramid" msgstr "Пирамида" -#: libprocess/tip.c:321 libprocess/tip.c:328 libprocess/tip.c:335 +#: libprocess/tip.c:423 libprocess/tip.c:429 libprocess/tip.c:435 msgid "Pyramidal" msgstr "Пирамидальный" -#: libprocess/tip.c:327 +#: libprocess/tip.c:428 msgid "Contact" msgstr "Контактный" -#: libprocess/tip.c:334 +#: libprocess/tip.c:434 msgid "Noncontact" msgstr "Бесконтактный" -#: libprocess/tip.c:341 +#: libprocess/tip.c:440 msgid "Delta function" msgstr "Дельта-функция" -#: libprocess/tip.c:342 +#: libprocess/tip.c:441 msgid "Analytical" msgstr "Аналитический" -#: libprocess/tip.c:348 +#: libprocess/tip.c:446 msgid "Parabola" msgstr "Парабола" -#: libprocess/tip.c:349 libprocess/tip.c:356 +#: libprocess/tip.c:447 libprocess/tip.c:453 msgid "Symmetric" msgstr "Симметричный" -#: libprocess/tip.c:355 +#: libprocess/tip.c:452 msgid "Cone" msgstr "Конический" -#: libprocess/tip.c:968 libprocess/tip.c:996 libprocess/tip.c:1045 -#: libprocess/tip.c:1072 +#: libprocess/tip.c:458 +msgid "Elliptical parabola" +msgstr "Эллиптическая парабола" + +#: libprocess/tip.c:459 +msgid "Asymmetric" +msgstr "Асимметричный" + +#: libprocess/tip.c:1339 libprocess/tip.c:1367 libprocess/tip.c:1416 +#: libprocess/tip.c:1443 msgid "Converting fields" msgstr "Преобразуются поля" -#: libprocess/tip.c:978 +#: libprocess/tip.c:1349 msgid "Starting partial estimation" msgstr "Запускается частичная оценка" -#: libprocess/tip.c:1055 +#: libprocess/tip.c:1426 msgid "Starting full estimation" msgstr "Запускается полная оценка" #: libprocess/triangulation.c:2085 modules/process/calcoefs_view.c:793 -#: modules/process/lat_synth.c:1134 +#: modules/process/lat_synth.c:1178 msgid "Triangulating..." msgstr "Производится триангуляция..." @@ -814,8 +854,8 @@ msgid "Hide full controls" msgstr "Скрыть все элементы управления" -#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4754 -#: modules/process/fit-shape.c:736 +#: libgwydgets/gwy3dwindow.c:709 modules/file/imgexport.c:4796 +#: modules/process/fit-shape.c:461 msgid "adjective|Basic" msgstr "Основные" @@ -838,8 +878,8 @@ #: modules/process/facet_analysis.c:375 modules/process/indent_analyze.c:460 #: modules/process/rotate.c:264 modules/process/shade.c:237 #: modules/process/shade.c:245 modules/process/tilt.c:211 -#: modules/process/tilt.c:223 modules/process/tip_model.c:231 -#: modules/process/tip_model.c:237 modules/process/unrotate.c:334 +#: modules/process/tilt.c:223 modules/process/tip_model.c:234 +#: modules/process/tip_model.c:240 modules/process/unrotate.c:334 msgid "deg" msgstr "°" @@ -919,10 +959,10 @@ #: libgwydgets/gwy3dwindow.c:1070 libgwydgets/gwy3dwindow.c:1240 #: app/toolbox-editor.c:215 modules/file/hdrimage.cc:2213 -#: modules/file/imgexport.c:4718 modules/file/pixmap.c:789 +#: modules/file/imgexport.c:4760 modules/file/pixmap.c:789 #: modules/file/rawfile.c:424 modules/process/angle_dist.c:172 -#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:352 -#: modules/process/calibrate.c:391 modules/process/col_synth.c:382 +#: modules/process/bdep_synth.c:341 modules/process/calcoefs_new.c:371 +#: modules/process/calibrate.c:391 modules/process/col_synth.c:392 #: modules/process/correct_affine.c:301 modules/process/curvature.c:615 #: modules/process/cwt.c:135 modules/process/deposit_synth.c:349 #: modules/process/diff_synth.c:411 modules/process/domain_synth.c:354 @@ -934,13 +974,13 @@ #: modules/process/fft_synth.c:341 modules/process/fractal.c:231 #: modules/process/grain_edge.c:213 modules/process/grain_mark.c:247 #: modules/process/grain_wshed.c:167 modules/process/hough.c:179 -#: modules/process/lat_synth.c:523 modules/process/latsim.c:159 +#: modules/process/lat_synth.c:567 modules/process/latsim.c:159 #: modules/process/level.c:245 modules/process/linematch.c:804 #: modules/process/lno_synth.c:433 modules/process/local_contrast.c:130 #: modules/process/logistic.c:234 modules/process/mark_disconn.c:208 #: modules/process/mask_distribute.c:152 modules/process/measure_lattice.c:256 #: modules/process/median-bg.c:180 modules/process/noise_synth.c:336 -#: modules/process/obj_synth.c:438 modules/process/pat_synth.c:385 +#: modules/process/obj_synth.c:441 modules/process/pat_synth.c:385 #: modules/process/pid.c:199 modules/process/polydistort.c:210 #: modules/process/polylevel.c:373 modules/process/psdf_logphi.c:249 #: modules/process/rank.c:158 modules/process/rotate.c:243 @@ -948,7 +988,7 @@ #: modules/process/semsim.c:211 modules/process/shade.c:208 #: modules/process/slope_dist.c:276 modules/process/sphere-revolve.c:218 #: modules/process/straighten_path.c:249 modules/process/tilt.c:161 -#: modules/process/tip_model.c:166 modules/process/unrotate.c:220 +#: modules/process/tip_model.c:169 modules/process/unrotate.c:220 #: modules/process/volumize_layers.c:221 modules/process/wave_synth.c:349 #: modules/process/wpour_mark.c:278 modules/volume/volume_calibrate.c:370 #: modules/volume/volume_extract.c:331 modules/volume/volume_kmeans.c:153 @@ -973,7 +1013,7 @@ msgid "Maximum z value" msgstr "Максимальное значение z" -#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3796 +#: libgwydgets/gwy3dwindow.c:1168 modules/file/imgexport.c:3836 msgid "_Label:" msgstr "_Метка:" @@ -1052,7 +1092,7 @@ msgstr "Скрытый" #: libgwydgets/gwydgetenums.c:47 libgwydgets/gwygraphwindowmeasuredialog.c:572 -#: modules/file/imgexport.c:474 modules/tools/selectionmanager.c:274 +#: modules/file/imgexport.c:475 modules/tools/selectionmanager.c:274 msgid "Points" msgstr "Точки" @@ -1109,7 +1149,7 @@ msgid "_Line type:" msgstr "Тип _линии:" -#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3133 +#: libgwydgets/gwygraphareadialog.c:181 modules/file/imgexport.c:3150 msgid "Line t_hickness:" msgstr "Тол_щина линии:" @@ -1225,7 +1265,7 @@ msgid "_Reversed layout" msgstr "_Обратное расположение" -#: libgwydgets/gwygraphmodel.c:2178 +#: libgwydgets/gwygraphmodel.c:2180 msgid "Abscissa" msgstr "Абсцисса" @@ -1234,7 +1274,7 @@ msgstr "График" #: libgwydgets/gwygraphwindow.c:170 modules/file/hdrimage.cc:472 -#: modules/process/fit-shape.c:932 +#: modules/process/fit-shape.c:656 msgid "Data" msgstr "Данные" @@ -1278,7 +1318,7 @@ #: libgwydgets/gwygraphwindowmeasuredialog.c:398 #: libgwydgets/gwygraphwindowmeasuredialog.c:588 app/gwyplaintool.c:1018 -#: modules/process/lat_synth.c:703 modules/process/obj_synth.c:566 +#: modules/process/lat_synth.c:747 modules/process/obj_synth.c:569 #: modules/process/pat_synth.c:846 modules/process/pat_synth.c:1148 #: modules/process/pat_synth.c:1483 msgid "Height" @@ -1308,7 +1348,7 @@ msgstr "Предпочтительное" #: libgwydgets/gwyoptionmenus.c:470 app/meta.c:410 -#: modules/file/imgexport.c:4120 modules/file/imgexport.c:4565 +#: modules/file/imgexport.c:4160 modules/file/imgexport.c:4607 #: modules/file/rawfile.c:995 modules/process/convolution_filter.c:538 #: modules/process/neural.c:418 modules/tools/selectionmanager.c:345 msgid "Name" @@ -1507,7 +1547,7 @@ #: app/about.c:282 msgid "Remote Control" -msgstr "Удалённое управление" +msgstr "Дистанционное управление" #: app/about.c:286 app/about.c:290 msgid "Python Scripting Interface" @@ -1600,7 +1640,7 @@ msgid "Minimum" msgstr "Минимум" -#: app/app.c:1605 modules/process/col_synth.c:167 modules/tools/filter.c:241 +#: app/app.c:1605 modules/process/col_synth.c:170 modules/tools/filter.c:241 #: modules/tools/icolorange.c:435 modules/tools/linestats.c:168 #: modules/volume/volume_linestat.c:145 msgid "Maximum" @@ -1615,7 +1655,7 @@ msgstr "Положение максимума" #: app/app.c:1608 modules/process/bdep_synth.c:134 -#: modules/process/col_synth.c:168 modules/process/scars.c:346 +#: modules/process/col_synth.c:171 modules/process/scars.c:346 #: modules/process/scars.c:353 modules/process/threshold.c:341 msgid "RMS" msgstr "Ср. квадр." @@ -1702,16 +1742,16 @@ msgid "XYZ" msgstr "XYZ" -#: app/data-browser.c:6612 +#: app/data-browser.c:6619 #, c-format msgid "Messages for %s" msgstr "Сообщения для %s" -#: app/data-browser.c:6616 +#: app/data-browser.c:6623 msgid "Messages for Untitled" msgstr "Сообщения для безымянного." -#: app/datachooser.c:211 app/datachooser.c:522 +#: app/datachooser.c:285 app/datachooser.c:596 msgid "channel|None" msgstr "Нет" @@ -1751,7 +1791,7 @@ msgid "Opening of `%s' failed" msgstr "Не удалось открыть '%s'" -#: app/file.c:291 app/file.c:527 +#: app/file.c:291 app/file.c:526 #, c-format msgid "Full file path: %s." msgstr "Полный путь к файлу: %s." @@ -1761,30 +1801,30 @@ msgid "Loaded using: %s." msgstr "Загружено используя: %s." -#: app/file.c:381 +#: app/file.c:380 msgid "Merge File" msgstr "Объединить файлы" -#: app/file.c:383 app/gwyappfilechooser.c:221 +#: app/file.c:382 app/gwyappfilechooser.c:221 msgid "Open File" msgstr "Открыть файл" -#: app/file.c:521 app/gwymoduleutils.c:192 +#: app/file.c:520 app/gwymoduleutils.c:192 #, c-format msgid "Saving of `%s' failed" msgstr "Сохранение `%s' не выполнено" -#: app/file.c:530 +#: app/file.c:529 #, c-format msgid "Saved using: %s." msgstr "Сохранено используя: %s." -#: app/file.c:690 +#: app/file.c:689 #, c-format msgid "File `%s' already exists. Replace?" msgstr "Файл `%s' уже существует. Заменить?" -#: app/file.c:694 +#: app/file.c:693 #, c-format msgid "" "The file already exists in `%s'. Replacing it will overwrite its contents." @@ -1792,7 +1832,7 @@ "Файл уже существует в `%s'. Если его заменить, то его содержимое будет " "перезаписано." -#: app/file.c:697 +#: app/file.c:696 msgid "Replace File?" msgstr "Заменить существующий файл?" @@ -2046,7 +2086,7 @@ #: app/gwyplaintool.c:1011 modules/file/rawfile.c:997 #: modules/process/convolution_filter.c:349 #: modules/process/convolution_filter.c:553 modules/process/neural.c:419 -#: modules/process/obj_synth.c:535 modules/process/pat_synth.c:1449 +#: modules/process/obj_synth.c:538 modules/process/pat_synth.c:1449 msgid "Size" msgstr "Размер" @@ -2086,41 +2126,41 @@ msgid "current-language-code|en" msgstr "ru" -#: app/log.c:538 +#: app/log.c:536 #, c-format msgid "Log of %s (%s)" msgstr "Журнал %s (%s)" -#: app/log.c:590 app/meta.c:224 modules/tools/selectionmanager.c:399 +#: app/log.c:588 app/meta.c:224 modules/tools/selectionmanager.c:399 msgid "_Export" msgstr "_Экспорт" -#: app/log.c:596 +#: app/log.c:594 msgid "Clea_r" msgstr "О_чистить" -#: app/log.c:601 app/meta.c:240 +#: app/log.c:599 app/meta.c:240 msgid "_Close" msgstr "_Закрыть" -#: app/log.c:617 modules/file/imgexport.c:4128 modules/file/rawfile.c:996 +#: app/log.c:615 modules/file/imgexport.c:4168 modules/file/rawfile.c:996 msgid "Type" msgstr "Тип" -#: app/log.c:618 +#: app/log.c:616 msgid "Function" msgstr "Функция" -#: app/log.c:619 modules/file/imgexport.c:3100 modules/process/fit-shape.c:740 +#: app/log.c:617 modules/file/imgexport.c:3117 modules/process/fit-shape.c:465 #: modules/process/neural.c:610 modules/tools/stats.c:425 msgid "Parameters" msgstr "Параметры" -#: app/log.c:620 +#: app/log.c:618 msgid "Time" msgstr "Время" -#: app/log.c:732 +#: app/log.c:730 msgid "Export Log" msgstr "Экспортировать журнал" @@ -2164,7 +2204,7 @@ msgid "_New" msgstr "Новый _элемент" -#: app/meta.c:235 modules/file/imgexport.c:4630 modules/file/rawfile.c:1058 +#: app/meta.c:235 modules/file/imgexport.c:4672 modules/file/rawfile.c:1058 #: modules/process/neural.c:711 modules/tools/selectionmanager.c:405 msgid "_Delete" msgstr "_Удалить" @@ -2821,7 +2861,7 @@ msgstr "Переместить в_низ" #: app/toolbox-editor.c:292 modules/file/hdrimage.cc:2304 -#: modules/file/imgexport.c:3084 modules/file/pixmap.c:872 +#: modules/file/imgexport.c:3101 modules/file/pixmap.c:872 #: modules/file/rawfile.c:658 modules/process/crosscor.c:252 #: modules/process/dimensions.h:473 modules/process/tip_blind.c:333 msgid "_Width:" @@ -3304,10 +3344,10 @@ msgstr "Экспортировать текст" #: modules/file/asciiexport.c:275 modules/file/gxyzffile.c:402 -#: modules/file/imgexport.c:3536 modules/file/imgexport.c:4163 +#: modules/file/imgexport.c:3565 modules/file/imgexport.c:4203 #: modules/file/rawfile.c:758 modules/file/xyzexport.c:311 #: modules/process/calibrate.c:607 modules/process/coerce.c:364 -#: modules/process/col_synth.c:506 modules/process/correct_affine.c:470 +#: modules/process/col_synth.c:516 modules/process/correct_affine.c:470 #: modules/process/extend.c:259 modules/process/fft_filter_1d.c:261 #: modules/process/grain_dist.c:306 modules/process/grain_edge.c:255 #: modules/process/grain_mark.c:338 modules/process/grain_wshed.c:252 @@ -4023,14 +4063,14 @@ msgstr "Тип данных OpenEXR %u неправилен или не поддерживается." #: modules/file/hdrimage.cc:1433 modules/file/hdrimage.cc:1442 -#: modules/file/imgexport.c:5207 modules/file/imgexport.c:5218 +#: modules/file/imgexport.c:5249 modules/file/imgexport.c:5260 #, c-format msgid "libpng initialization error (in %s)" msgstr "ошибка инициализации libpng (в %s)" -#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5282 -msgid "libpng error occured" -msgstr "Произошла ошибка libpng" +#: modules/file/hdrimage.cc:1451 modules/file/imgexport.c:5324 +msgid "libpng error occurred" +msgstr "Произошла ошибка в libpng" #. TRANSLATORS: Dialog title; %s is PNG, TIFF, ... #: modules/file/hdrimage.cc:2210 modules/file/pixmap.c:786 @@ -4063,7 +4103,7 @@ msgid "Pages:" msgstr "Страницы:" -#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3026 +#: modules/file/hdrimage.cc:2290 modules/file/imgexport.c:3043 #: modules/file/pixmap.c:862 modules/file/rawfile.c:649 #: modules/process/dimensions.h:467 modules/xyz/xyz_drift.c:774 #: modules/xyz/xyz_raster.c:566 @@ -4073,7 +4113,7 @@ #: modules/file/hdrimage.cc:2330 modules/file/hdrimage.cc:2395 #: modules/file/pixmap.c:894 modules/file/pixmap.c:949 #: modules/file/rawfile.c:681 modules/file/rawfile.c:737 -#: modules/process/calcoefs_new.c:389 modules/process/calcoefs_new.c:456 +#: modules/process/calcoefs_new.c:408 modules/process/calcoefs_new.c:475 #: modules/process/calcoefs_simple.c:391 modules/process/calcoefs_simple.c:458 #: modules/process/calcoefs_view.c:511 modules/process/calcoefs_view.c:549 #: modules/process/calibrate.c:466 modules/process/calibrate.c:549 @@ -4089,7 +4129,7 @@ msgid "H_eight:" msgstr "_Высота:" -#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:555 +#: modules/file/hdrimage.cc:2354 modules/file/nmmxyz.c:570 #: modules/file/pixmap.c:914 modules/file/rawfile.c:701 msgid "Identical _measures" msgstr "Одинаковый _масштаб" @@ -4100,7 +4140,7 @@ msgstr "Масштаб _Z (на единицу дискретизации):" #: modules/file/hdrimage.cc:2557 modules/file/pixmap.c:1176 -#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:800 +#: modules/file/rawfile.c:1386 modules/process/calcoefs_new.c:819 #: modules/process/calcoefs_simple.c:1197 modules/process/calcoefs_view.c:1380 #: modules/process/calibrate.c:979 modules/process/dimensions.h:195 #: modules/process/volumize_layers.c:315 modules/volume/volume_calibrate.c:1017 @@ -4108,7 +4148,7 @@ msgstr "Изменить единицы измерения" #: modules/file/hdrimage.cc:2571 modules/file/pixmap.c:1190 -#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:813 +#: modules/file/rawfile.c:1400 modules/process/calcoefs_new.c:832 #: modules/process/calcoefs_simple.c:1210 modules/process/calcoefs_view.c:1393 #: modules/process/calibrate.c:993 modules/process/dimensions.h:208 #: modules/process/volumize_layers.c:329 modules/volume/volume_calibrate.c:1031 @@ -4186,100 +4226,100 @@ msgid "Cannot read channel labels." msgstr "Не удаётся прочесть метки каналов." -#: modules/file/imgexport.c:391 modules/file/pixmap.c:178 +#: modules/file/imgexport.c:392 modules/file/pixmap.c:178 msgid "Portable Network Graphics (.png)" msgstr "Portable Network Graphics (.png)" -#: modules/file/imgexport.c:397 modules/file/pixmap.c:182 +#: modules/file/imgexport.c:398 modules/file/pixmap.c:182 msgid "JPEG (.jpeg,.jpg)" msgstr "JPEG (.jpeg,.jpg)" -#: modules/file/imgexport.c:403 modules/file/pixmap.c:186 +#: modules/file/imgexport.c:404 modules/file/pixmap.c:186 msgid "TIFF (.tiff,.tif)" msgstr "TIFF (.tiff,.tif)" -#: modules/file/imgexport.c:409 modules/file/pixmap.c:190 +#: modules/file/imgexport.c:410 modules/file/pixmap.c:190 msgid "Portable Pixmap (.ppm,.pnm)" msgstr "Portable Pixmap (.ppm,.pnm)" -#: modules/file/imgexport.c:415 modules/file/pixmap.c:194 +#: modules/file/imgexport.c:416 modules/file/pixmap.c:194 msgid "Windows or OS2 Bitmap (.bmp)" msgstr "Bitmap из Windows или OS2 (.bmp)" -#: modules/file/imgexport.c:421 modules/file/pixmap.c:198 +#: modules/file/imgexport.c:422 modules/file/pixmap.c:198 msgid "TARGA (.tga,.targa)" msgstr "TARGA (.tga,.targa)" -#: modules/file/imgexport.c:428 +#: modules/file/imgexport.c:429 msgid "WebP (.webp)" msgstr "WebP (.webp)" -#: modules/file/imgexport.c:436 +#: modules/file/imgexport.c:437 msgid "Portable document format (.pdf)" msgstr "Portable document format (.pdf)" -#: modules/file/imgexport.c:444 +#: modules/file/imgexport.c:445 msgid "Encapsulated PostScript (.eps)" msgstr "Encapsulated PostScript (.eps)" -#: modules/file/imgexport.c:452 +#: modules/file/imgexport.c:453 msgid "Scalable Vector Graphics (.svg)" msgstr "Scalable Vector Graphics (.svg)" -#: modules/file/imgexport.c:462 modules/tools/selectionmanager.c:269 +#: modules/file/imgexport.c:463 modules/tools/selectionmanager.c:269 msgid "Horiz./vert. lines" msgstr "Гориз./Верт. линии" -#: modules/file/imgexport.c:466 modules/tools/selectionmanager.c:270 +#: modules/file/imgexport.c:467 modules/tools/selectionmanager.c:270 msgid "Ellipses" msgstr "Эллипсы" -#: modules/file/imgexport.c:470 modules/tools/selectionmanager.c:272 +#: modules/file/imgexport.c:471 modules/tools/selectionmanager.c:272 msgid "Lines" msgstr "Линии" -#: modules/file/imgexport.c:478 modules/tools/selectionmanager.c:275 +#: modules/file/imgexport.c:479 modules/tools/selectionmanager.c:275 msgid "Rectangles" msgstr "Прямоугольники" -#: modules/file/imgexport.c:482 modules/process/lat_synth.c:521 -#: modules/process/lat_synth.c:593 modules/tools/selectionmanager.c:271 +#: modules/file/imgexport.c:483 modules/process/lat_synth.c:565 +#: modules/process/lat_synth.c:637 modules/tools/selectionmanager.c:271 msgid "Lattice" msgstr "Решетка" -#: modules/file/imgexport.c:486 +#: modules/file/imgexport.c:487 msgid "Path" msgstr "Путь" -#: modules/file/imgexport.c:492 modules/file/imgexport.c:498 +#: modules/file/imgexport.c:493 modules/file/imgexport.c:499 msgid "ruler|_None" msgstr "_Нет" -#: modules/file/imgexport.c:493 +#: modules/file/imgexport.c:494 msgid "_Rulers" msgstr "Направл_яющие" -#: modules/file/imgexport.c:494 +#: modules/file/imgexport.c:495 msgid "_Inset scale bar" msgstr "В_ложенный масштабный отрезок" -#: modules/file/imgexport.c:499 +#: modules/file/imgexport.c:500 msgid "_False color ruler" msgstr "_Линейка псевдоцвета" -#: modules/file/imgexport.c:503 +#: modules/file/imgexport.c:504 msgid "title|None" msgstr "Нет" -#: modules/file/imgexport.c:504 +#: modules/file/imgexport.c:505 msgid "At the top" msgstr "Сверху" -#: modules/file/imgexport.c:505 +#: modules/file/imgexport.c:506 msgid "Along the right edge" msgstr "Вдоль правой стороны" -#: modules/file/imgexport.c:511 +#: modules/file/imgexport.c:512 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 " @@ -4290,152 +4330,156 @@ "основан на GDK и других библиотеках, и, вследствие этого, может зависеть от " "варианта установки." -#: modules/file/imgexport.c:2914 +#: modules/file/imgexport.c:2931 msgid "Select Color" msgstr "Выбрать цвет" -#: modules/file/imgexport.c:2985 +#: modules/file/imgexport.c:3002 msgid "Black" msgstr "Чёрный" -#: modules/file/imgexport.c:2993 +#: modules/file/imgexport.c:3010 msgid "White" msgstr "Белый" -#: modules/file/imgexport.c:3036 +#: modules/file/imgexport.c:3053 msgid "Pi_xel size:" msgstr "Размер пи_кселя:" -#: modules/file/imgexport.c:3045 +#: modules/file/imgexport.c:3062 msgid "Pixels per _inch:" msgstr "Пикселей на _дюйм:" -#: modules/file/imgexport.c:3072 +#: modules/file/imgexport.c:3089 msgid "_Zoom:" msgstr "_Увеличение:" -#: modules/file/imgexport.c:3091 modules/process/bdep_synth.c:430 -#: modules/process/col_synth.c:476 modules/process/diff_synth.c:508 +#: modules/file/imgexport.c:3108 modules/process/bdep_synth.c:430 +#: modules/process/col_synth.c:486 modules/process/diff_synth.c:508 #: modules/process/domain_synth.c:510 modules/process/grain_mark.c:285 -#: modules/process/lat_synth.c:709 modules/process/obj_synth.c:572 +#: modules/process/lat_synth.c:753 modules/process/obj_synth.c:575 #: modules/process/pat_synth.c:852 modules/process/pat_synth.c:1154 #: modules/process/pat_synth.c:1489 modules/process/tip_blind.c:340 msgid "_Height:" msgstr "_Высота:" -#: modules/file/imgexport.c:3104 +#: modules/file/imgexport.c:3121 msgid "_Font:" msgstr "_Шрифт:" -#: modules/file/imgexport.c:3123 +#: modules/file/imgexport.c:3140 msgid "_Font size:" msgstr "_Размер шрифта:" -#: modules/file/imgexport.c:3143 +#: modules/file/imgexport.c:3160 msgid "O_utline thickness:" msgstr "То_лщина контура:" -#: modules/file/imgexport.c:3153 +#: modules/file/imgexport.c:3170 msgid "_Border width:" msgstr "Ширина _границы:" -#: modules/file/imgexport.c:3163 +#: modules/file/imgexport.c:3180 msgid "_Tick length:" msgstr "Длина _засечек:" -#: modules/file/imgexport.c:3171 +#: modules/file/imgexport.c:3188 msgid "Tie sizes to _data pixels" msgstr "Привязать размеры к _пикселям данных" -#: modules/file/imgexport.c:3181 modules/file/rawfile.c:843 +#: modules/file/imgexport.c:3198 modules/file/rawfile.c:843 msgid "_Decimal separator is comma" msgstr "_Запятая как десятичный разделитель" -#: modules/file/imgexport.c:3193 +#: modules/file/imgexport.c:3210 msgid "Colors" msgstr "Цвета" -#: modules/file/imgexport.c:3198 +#: modules/file/imgexport.c:3215 msgid "_Line and text color:" msgstr "Цвет _линий и текста:" -#: modules/file/imgexport.c:3204 +#: modules/file/imgexport.c:3221 msgid "_Transparent background" msgstr "_Прозрачный фон" -#: modules/file/imgexport.c:3215 +#: modules/file/imgexport.c:3232 msgid "_Background color:" msgstr "Цвет _фона:" -#: modules/file/imgexport.c:3445 +#: modules/file/imgexport.c:3474 msgid "Lateral scale" msgstr "Пространственный масштаб" -#: modules/file/imgexport.c:3458 modules/process/lno_synth.c:1053 +#: modules/file/imgexport.c:3487 modules/process/lno_synth.c:1053 msgid "_Length:" msgstr "_Длина:" -#: modules/file/imgexport.c:3474 +#: modules/file/imgexport.c:3503 msgid "_Auto" msgstr "_Авто" -#: modules/file/imgexport.c:3482 modules/process/pat_synth.c:469 +#: modules/file/imgexport.c:3511 modules/process/pat_synth.c:469 msgid "Placement" msgstr "Положение" -#: modules/file/imgexport.c:3486 +#: modules/file/imgexport.c:3515 msgid "left" msgstr "слева" -#: modules/file/imgexport.c:3490 +#: modules/file/imgexport.c:3519 msgid "center" msgstr "по центру" -#: modules/file/imgexport.c:3494 +#: modules/file/imgexport.c:3523 msgid "right" msgstr "справа" -#: modules/file/imgexport.c:3499 +#: modules/file/imgexport.c:3528 msgid "top" msgstr "верх" -#: modules/file/imgexport.c:3511 +#: modules/file/imgexport.c:3540 msgid "bottom" msgstr "низ" -#: modules/file/imgexport.c:3523 modules/file/imgexport.c:3834 +#: modules/file/imgexport.c:3552 modules/file/imgexport.c:3874 msgid "Hori_zontal gap:" msgstr "_Горизонтальный зазор:" -#: modules/file/imgexport.c:3529 modules/file/imgexport.c:3814 +#: modules/file/imgexport.c:3558 modules/file/imgexport.c:3854 msgid "_Vertical gap:" msgstr "В_ертикальный зазор:" -#: modules/file/imgexport.c:3542 modules/file/imgexport.c:4144 +#: modules/file/imgexport.c:3571 modules/file/imgexport.c:4184 msgid "Colo_r:" msgstr "Цве_т:" -#: modules/file/imgexport.c:3547 modules/file/imgexport.c:4149 +#: modules/file/imgexport.c:3576 modules/file/imgexport.c:4189 msgid "Out_line color:" msgstr "_Цвет контура:" -#: modules/file/imgexport.c:3551 modules/file/imgexport.c:4155 +#: modules/file/imgexport.c:3580 modules/file/imgexport.c:4195 msgid "O_pacity:" msgstr "_Непрозрачность:" -#: modules/file/imgexport.c:3560 +#: modules/file/imgexport.c:3589 msgid "Draw _ticks" msgstr "Рисовать засе_чки" -#: modules/file/imgexport.c:3570 +#: modules/file/imgexport.c:3599 msgid "Draw _label" msgstr "Рисовать подпис_ь" -#: modules/file/imgexport.c:3733 +#: modules/file/imgexport.c:3609 +msgid "Draw text _above scale bar" +msgstr "Рисовать текст с_верху отрезка" + +#: modules/file/imgexport.c:3773 msgid "Image" msgstr "Изображение" -#: modules/file/imgexport.c:3737 modules/process/calcoefs_view.c:473 +#: modules/file/imgexport.c:3777 modules/process/calcoefs_view.c:473 #: modules/process/correct_affine.c:488 modules/process/drift.c:297 #: modules/process/dwt.c:206 modules/process/dwtanisotropy.c:202 #: modules/process/fft_filter_1d.c:294 modules/process/fft_profile.c:292 @@ -4444,134 +4488,134 @@ #: modules/process/scale.c:253 modules/process/straighten_path.c:271 #: modules/process/unrotate.c:277 modules/tools/linestats.c:400 #: modules/tools/profile.c:555 modules/tools/roughness.c:864 -#: modules/tools/sfunctions.c:461 modules/xyz/xyz_raster.c:632 +#: modules/tools/sfunctions.c:468 modules/xyz/xyz_raster.c:632 msgid "_Interpolation type:" msgstr "Тип _интерполяции:" -#: modules/file/imgexport.c:3767 +#: modules/file/imgexport.c:3807 msgid "Draw _frame" msgstr "Показывать _рамку" -#: modules/file/imgexport.c:3776 +#: modules/file/imgexport.c:3816 msgid "Draw _mask" msgstr "Рисовать _маску" -#: modules/file/imgexport.c:3786 +#: modules/file/imgexport.c:3826 msgid "Draw mask _legend" msgstr "Рисовать _легенду для маски" -#: modules/file/imgexport.c:3821 +#: modules/file/imgexport.c:3861 msgid "Value Scale" msgstr "Масштаб значений" -#: modules/file/imgexport.c:3842 +#: modules/file/imgexport.c:3882 msgid "Fi_xed precision:" msgstr "Фи_ксированная точность:" -#: modules/file/imgexport.c:3858 +#: modules/file/imgexport.c:3898 msgid "Fixed _kilo threshold:" msgstr "Фиксированный порог п_рефиксов:" -#: modules/file/imgexport.c:3874 modules/file/imgexport.c:4593 +#: modules/file/imgexport.c:3914 modules/file/imgexport.c:4635 msgid "Title" msgstr "Заголовок" -#: modules/file/imgexport.c:3878 +#: modules/file/imgexport.c:3918 msgid "Posi_tion:" msgstr "Располо_жение:" -#: modules/file/imgexport.c:3894 +#: modules/file/imgexport.c:3934 msgid "_Gap:" msgstr "_Зазор:" -#: modules/file/imgexport.c:3901 +#: modules/file/imgexport.c:3941 msgid "Put _units to title" msgstr "Поместить единицы измерения в _заголовок" -#: modules/file/imgexport.c:4085 +#: modules/file/imgexport.c:4125 msgid "Draw _selection" msgstr "Рисовать в_ыделенные элементы" -#: modules/file/imgexport.c:4136 modules/tools/selectionmanager.c:361 +#: modules/file/imgexport.c:4176 modules/tools/selectionmanager.c:361 msgid "Objects" msgstr "Объекты" -#: modules/file/imgexport.c:4573 +#: modules/file/imgexport.c:4615 msgid "Lateral" msgstr "Горизонтальные" -#: modules/file/imgexport.c:4612 modules/file/rawfile.c:1040 +#: modules/file/imgexport.c:4654 modules/file/rawfile.c:1040 #: modules/process/calcoefs_load.c:230 modules/process/neural.c:693 msgid "verb|_Load" msgstr "_Загрузить" -#: modules/file/imgexport.c:4618 modules/file/rawfile.c:1046 +#: modules/file/imgexport.c:4660 modules/file/rawfile.c:1046 #: modules/process/neural.c:699 msgid "verb|_Store" msgstr "Со_хранить" -#: modules/file/imgexport.c:4624 modules/file/rawfile.c:1052 +#: modules/file/imgexport.c:4666 modules/file/rawfile.c:1052 #: modules/process/neural.c:705 msgid "_Rename" msgstr "_Переименовать" -#: modules/file/imgexport.c:4644 modules/file/rawfile.c:1071 +#: modules/file/imgexport.c:4686 modules/file/rawfile.c:1071 msgid "Preset _name:" msgstr "_Название набора настроек:" -#: modules/file/imgexport.c:4715 +#: modules/file/imgexport.c:4757 #, c-format msgid "Export %s" msgstr "Экспорт %s" -#: modules/file/imgexport.c:4736 +#: modules/file/imgexport.c:4778 msgid "Export as 1_6 bit grayscale" msgstr "Экспортировать как 1_6битное серое" -#: modules/file/imgexport.c:4759 +#: modules/file/imgexport.c:4801 msgid "Lateral Scale" msgstr "Горизонтальный масштаб" -#: modules/file/imgexport.c:4764 +#: modules/file/imgexport.c:4806 msgid "Values" msgstr "Значения" -#: modules/file/imgexport.c:4769 +#: modules/file/imgexport.c:4811 msgid "Selection" msgstr "Выделение" -#: modules/file/imgexport.c:4774 modules/file/rawfile.c:462 +#: modules/file/imgexport.c:4816 modules/file/rawfile.c:462 #: modules/process/convolution_filter.c:275 msgid "Presets" msgstr "Предустановки" -#: modules/file/imgexport.c:5534 +#: modules/file/imgexport.c:5576 #, c-format msgid "Cairo error occurred: %s" msgstr "Произошла ошибка cairo: %s" -#: modules/file/imgexport.c:5558 +#: modules/file/imgexport.c:5600 #, c-format msgid "Pixbuf save failed: %s." msgstr "Сохранение pixbuf закончилось неудачно: %s." -#: modules/file/imgexport.c:5836 +#: modules/file/imgexport.c:5878 msgid "Image is too large to be stored as TARGA." msgstr "Изображение слишком велико чтобы сохранить его в формате TARGA." -#: modules/file/imgexport.c:6415 modules/file/imgexport.c:6444 +#: modules/file/imgexport.c:6457 modules/file/imgexport.c:6486 msgid "Draw _numbers" msgstr "Рисовать _номера" -#: modules/file/imgexport.c:6427 modules/file/imgexport.c:6475 +#: modules/file/imgexport.c:6469 modules/file/imgexport.c:6517 msgid "_End marker length:" msgstr "Длина _засечек:" -#: modules/file/imgexport.c:6456 +#: modules/file/imgexport.c:6498 msgid "Marker _radius:" msgstr "_Радиус маркера:" -#: modules/file/imgexportpreset.h:169 modules/process/maskops.c:150 +#: modules/file/imgexportpreset.h:170 modules/process/maskops.c:150 msgid "Mask" msgstr "Маска" @@ -4665,42 +4709,42 @@ msgid "The type of data is unknown. Please report it to the developers." msgstr "Тип данных неизвестен. Пожалуйста сообщите о нём разработчикам." -#: modules/file/jpkscan.c:228 +#: modules/file/jpkscan.c:229 msgid "Imports JPK image scans." msgstr "Импортирует изображения сканирований JPK." -#: modules/file/jpkscan.c:241 +#: modules/file/jpkscan.c:242 msgid "JPK image scans (.jpk, .jpk-qi-image)" msgstr "Сканы изображений JPK (.jpk, .jpk-qi-image)" -#: modules/file/jpkscan.c:248 +#: modules/file/jpkscan.c:249 msgid "JPK force curves (.jpk-force, .jpk-force-map, .jpk-qi-data)" msgstr "Силовые кривые JPK (.jpk-force, .jpk-force-map, .jpk-qi-data)" -#: modules/file/jpkscan.c:314 +#: modules/file/jpkscan.c:315 msgid "File does not contain grid dimensions." msgstr "Файл не содержит размеров сетки" -#: modules/file/jpkscan.c:659 modules/file/nanoobserver.c:193 +#: modules/file/jpkscan.c:660 modules/file/nanoobserver.c:193 #: modules/file/nanoscantech.c:205 modules/file/opengps.c:209 #: modules/file/sensofarx.c:183 modules/file/spmxfile.c:166 msgid "Minizip cannot open the file as a ZIP file." msgstr "Minizip не может открыть файл как архив ZIP." -#: modules/file/jpkscan.c:738 +#: modules/file/jpkscan.c:739 msgid "Non-uniform point and/or segment numbering is not supported." msgstr "Неупорядоченная нумерация точек и/или сегментов не поддерживается." -#: modules/file/jpkscan.c:747 +#: modules/file/jpkscan.c:748 msgid "Non-uniform channel lists are not supported." msgstr "Неупорядоченные списки каналов не поддерживаются." -#: modules/file/jpkscan.c:755 +#: modules/file/jpkscan.c:756 #, c-format msgid "Data file %s was found instead of expected %s." msgstr "Файл данных %s был найден вместо ожидаемого %s." -#: modules/file/jpkscan.c:1496 +#: modules/file/jpkscan.c:1497 msgid "Cannot find any height channel." msgstr "Не получается найти ни одного канала высот." @@ -5191,79 +5235,79 @@ msgid "More than one record dimension found." msgstr "Найдена больше, чем одна запись о размерности." -#: modules/file/nmmxyz.c:186 +#: modules/file/nmmxyz.c:202 msgid "Imports Nano Measuring Machine profile files." msgstr "Импортирует файлы профилей Nano Measuring Machine." -#: modules/file/nmmxyz.c:199 +#: modules/file/nmmxyz.c:215 msgid "Nano Measuring Machine files (*.dsc)" msgstr "Файлы Nano Measuring Machine (*.dsc)" -#: modules/file/nmmxyz.c:243 +#: modules/file/nmmxyz.c:259 msgid "Nano Measuring Machine data import must be run as interactive." msgstr "" "Модуль импорта данных Nano Measuring Machine должен быть запущен в " "интерактивном режиме." -#: modules/file/nmmxyz.c:283 +#: modules/file/nmmxyz.c:299 msgid "Reading files..." msgstr "Считываются файлы..." -#: modules/file/nmmxyz.c:291 modules/process/lat_synth.c:1180 +#: modules/file/nmmxyz.c:306 modules/process/lat_synth.c:1224 msgid "Rendering surface..." msgstr "Строится поверхность..." -#: modules/file/nmmxyz.c:370 +#: modules/file/nmmxyz.c:385 msgid "Import NMM Profile Set" msgstr "Импортировать набор профилей NMM" -#: modules/file/nmmxyz.c:386 modules/file/rawfile.c:450 +#: modules/file/nmmxyz.c:401 modules/file/rawfile.c:450 msgid "Information" msgstr "Информация" -#: modules/file/nmmxyz.c:392 +#: modules/file/nmmxyz.c:407 msgid "Number of data files:" msgstr "Число файлов данных:" -#: modules/file/nmmxyz.c:394 +#: modules/file/nmmxyz.c:409 msgid "Total number of points:" msgstr "Общее количество точек:" -#: modules/file/nmmxyz.c:396 +#: modules/file/nmmxyz.c:411 msgid "Points per profile:" msgstr "Точек в профиле:" -#: modules/file/nmmxyz.c:401 +#: modules/file/nmmxyz.c:416 msgid "Imported Channels" msgstr "Импортированные каналы" -#: modules/file/nmmxyz.c:423 +#: modules/file/nmmxyz.c:438 msgid "Plot point density map" msgstr "Строить карту плотности точек" -#: modules/file/nmmxyz.c:519 modules/file/rawfile.c:626 +#: modules/file/nmmxyz.c:534 modules/file/rawfile.c:626 #: modules/process/dimensions.h:445 modules/xyz/xyz_drift.c:725 #: modules/xyz/xyz_raster.c:517 msgid "Resolution" msgstr "Разрешение" -#: modules/file/nmmxyz.c:523 modules/file/rawfile.c:631 +#: modules/file/nmmxyz.c:538 modules/file/rawfile.c:631 #: modules/process/dimensions.h:451 modules/xyz/xyz_drift.c:729 #: modules/xyz/xyz_raster.c:521 msgid "_Horizontal size:" msgstr "_Горизонтальный размер:" -#: modules/file/nmmxyz.c:539 modules/file/rawfile.c:638 +#: modules/file/nmmxyz.c:554 modules/file/rawfile.c:638 #: modules/process/dimensions.h:454 modules/xyz/xyz_drift.c:744 #: modules/xyz/xyz_raster.c:536 msgid "_Vertical size:" msgstr "Вертика_льный размер:" -#: modules/file/nmmxyz.c:778 +#: modules/file/nmmxyz.c:795 msgid "Point density map" msgstr "Карта плотности точек" -#: modules/file/nmmxyz.c:854 +#: modules/file/nmmxyz.c:871 msgid "Something is changing the data files on disk." msgstr "Что-то меняет данные на диске." @@ -5825,9 +5869,9 @@ #: modules/process/mark_disconn.c:205 modules/process/mark_with.c:195 #: modules/process/polydistort.c:205 modules/process/scars.c:295 #: modules/process/slope_dist.c:273 modules/process/straighten_path.c:198 -#: modules/process/synth.h:509 modules/process/tip_model.c:163 +#: modules/process/synth.h:509 modules/process/tip_model.c:166 #: modules/process/wpour_mark.c:273 modules/tools/linestats.c:454 -#: modules/tools/sfunctions.c:527 modules/tools/stats.c:459 +#: modules/tools/sfunctions.c:534 modules/tools/stats.c:459 #: modules/volume/volume_extract.c:328 modules/volume/volume_linestat.c:287 #: modules/xyz/xyz_drift.c:618 modules/xyz/xyz_raster.c:443 msgid "_Update" @@ -6337,39 +6381,39 @@ msgid "IonScope SICM files (.img)" msgstr "Файлы IonScope SICM (.img)" -#: modules/file/sis.c:462 +#: modules/file/sis.c:464 msgid "Imports SIS (Surface Imaging Systems) data files." msgstr "Импортирует файлы данных SIS (Surface Imaging Systems)." -#: modules/file/sis.c:475 +#: modules/file/sis.c:477 msgid "SIS files (.sis)" msgstr "Файлы SIS (.sis)" -#: modules/file/sis.c:812 +#: modules/file/sis.c:814 msgid "Block not a document block." msgstr "Блок не является блоком документа." -#: modules/file/sis.c:821 +#: modules/file/sis.c:823 msgid "Too short document info." msgstr "Слишком короткая информация о документе." -#: modules/file/sis.c:842 +#: modules/file/sis.c:844 msgid "Too short parameter info." msgstr "Слишком короткая информация о параметре." -#: modules/file/sis.c:949 +#: modules/file/sis.c:946 msgid "Unexpected image block." msgstr "Неожиданный блок изображения." -#: modules/file/sis.c:982 modules/file/sis.c:1013 +#: modules/file/sis.c:984 modules/file/sis.c:1015 msgid "End of file reached in image block." msgstr "Достигнут конец файла внутри блока изображения." -#: modules/file/sis.c:1027 +#: modules/file/sis.c:1029 msgid "End of file reached in channel block." msgstr "Достигнут конец файла внутри блока канала." -#: modules/file/sis.c:1051 +#: modules/file/sis.c:1053 msgid "End of file reached when another channel was expected." msgstr "Достигнут конец файла в то время, как ожидался другой канал." @@ -6674,11 +6718,11 @@ #: modules/file/xyzexport.c:340 modules/process/curvature.c:704 #: modules/process/entropy.c:214 modules/process/facet-level.c:207 -#: modules/process/fit-shape.c:1007 modules/process/level.c:259 +#: modules/process/fit-shape.c:743 modules/process/level.c:259 #: modules/process/linematch.c:906 modules/process/neural.c:593 #: modules/process/polylevel.c:491 modules/process/slope_dist.c:418 #: modules/tools/filter.c:300 modules/tools/linestats.c:436 -#: modules/tools/profile.c:591 modules/tools/sfunctions.c:509 +#: modules/tools/profile.c:591 modules/tools/sfunctions.c:516 #: modules/tools/stats.c:389 msgid "Masking Mode" msgstr "Режим использования маски" @@ -6742,7 +6786,7 @@ msgstr "Аппроксимировать график" #: modules/graph/graph_cd.c:212 modules/graph/graph_fdfit.c:251 -#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:668 +#: modules/graph/graph_fit.c:270 modules/process/fit-shape.c:393 #: modules/volume/volume_fdfit.c:299 msgid "verb|_Fit" msgstr "_Аппрокс." @@ -6760,12 +6804,12 @@ #: modules/graph/graph_cd.c:305 modules/graph/graph_fdfit.c:361 #: modules/graph/graph_fit.c:375 modules/process/curvature.c:745 -#: modules/process/fit-shape.c:1056 modules/volume/volume_fdfit.c:446 +#: modules/process/fit-shape.c:792 modules/volume/volume_fdfit.c:446 msgid "Parameter" msgstr "Параметр" #: modules/graph/graph_cd.c:307 modules/graph/graph_fdfit.c:363 -#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:1058 +#: modules/graph/graph_fit.c:377 modules/process/fit-shape.c:794 #: modules/volume/volume_fdfit.c:448 msgid "Error" msgstr "Ошибка" @@ -6787,7 +6831,7 @@ msgstr "_Рисовать полный круг" #: modules/graph/graph_cd.c:382 modules/graph/graph_fdfit.c:491 -#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:797 +#: modules/graph/graph_fit.c:531 modules/process/fit-shape.c:522 #: modules/volume/volume_fdfit.c:573 msgid "Save Fit Report" msgstr "Сохранить отчёт аппроксимации" @@ -6819,20 +6863,20 @@ msgstr "недоступно" #: modules/graph/graph_cd.c:993 modules/graph/graph_fdfit.c:1363 -#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:4333 +#: modules/graph/graph_fit.c:1500 modules/process/fit-shape.c:2078 #: modules/volume/volume_fdfit.c:1720 msgid "===== Fit Results =====" msgstr "===== Результаты аппроксимации =====" #: modules/graph/graph_cd.c:997 modules/graph/graph_fdfit.c:1367 -#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:4335 +#: modules/graph/graph_fit.c:1504 modules/process/fit-shape.c:2080 #: modules/volume/volume_fdfit.c:1724 #, c-format msgid "Data: %s\n" msgstr "Данные: %s\n" #: modules/graph/graph_cd.c:1000 modules/graph/graph_fdfit.c:1370 -#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:4337 +#: modules/graph/graph_fit.c:1507 modules/process/fit-shape.c:2082 #: modules/volume/volume_fdfit.c:1727 #, c-format msgid "Number of points: %d of %d\n" @@ -6845,14 +6889,14 @@ msgstr "Диапазон X: от %.*f до %.*f %s\n" #: modules/graph/graph_cd.c:1010 modules/graph/graph_fdfit.c:1380 -#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:4339 +#: modules/graph/graph_fit.c:1517 modules/process/fit-shape.c:2084 #: modules/volume/volume_fdfit.c:1737 #, c-format msgid "Fitted function: %s\n" msgstr "Аппроксимирующая функция: %s\n" #: modules/graph/graph_cd.c:1013 modules/graph/graph_fdfit.c:1383 -#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:4341 +#: modules/graph/graph_fit.c:1520 modules/process/fit-shape.c:2087 #: modules/volume/volume_fdfit.c:1740 msgid "Results\n" msgstr "Результаты\n" @@ -6899,38 +6943,38 @@ msgid "DOS Spectrum for \"%s\"" msgstr "Спектр плотности состояний для \"%s\"" -#: modules/graph/graph_export_ascii.c:55 +#: modules/graph/graph_export_ascii.c:63 +msgid "Exports graph data to text files." +msgstr "Экспортирует графические данные в текстовые файлы." + +#: modules/graph/graph_export_ascii.c:77 +msgid "/Export _Text..." +msgstr "/Экспортировать _текст..." + +#: modules/graph/graph_export_ascii.c:80 +msgid "Export graph data to a text file" +msgstr "Экспортировать графические данные в текстовый файл" + +#: modules/graph/graph_export_ascii.c:101 msgid "Plain text" msgstr "Простой текст" -#: modules/graph/graph_export_ascii.c:56 +#: modules/graph/graph_export_ascii.c:102 msgid "Gnuplot friendly" msgstr "Совместимый с gnuplot" -#: modules/graph/graph_export_ascii.c:57 +#: modules/graph/graph_export_ascii.c:103 msgid "Comma separated values" msgstr "Значения, разделённые запятыми" -#: modules/graph/graph_export_ascii.c:58 +#: modules/graph/graph_export_ascii.c:104 msgid "Origin friendly" msgstr "Совместимый с Origin" -#: modules/graph/graph_export_ascii.c:59 +#: modules/graph/graph_export_ascii.c:105 msgid "Igor Pro text wave" msgstr "Igor Pro text wave" -#: modules/graph/graph_export_ascii.c:71 -msgid "Exports graph data to text files." -msgstr "Экспортирует графические данные в текстовые файлы." - -#: modules/graph/graph_export_ascii.c:85 -msgid "/Export _Text..." -msgstr "/Экспортировать _текст..." - -#: modules/graph/graph_export_ascii.c:88 -msgid "Export graph data to a text file" -msgstr "Экспортировать графические данные в текстовый файл" - #: modules/graph/graph_export_ascii.c:127 msgid "POSIX _number format" msgstr "Формат _чисел POSIX" @@ -7004,7 +7048,7 @@ msgstr "Аппроксимировать кривую сила-расстояние" #: modules/graph/graph_fdfit.c:255 modules/graph/graph_fit.c:274 -#: modules/process/fit-shape.c:672 modules/process/measure_lattice.c:257 +#: modules/process/fit-shape.c:397 modules/process/measure_lattice.c:257 #: modules/volume/volume_fdfit.c:303 msgid "verb|_Estimate" msgstr "О_ценить" @@ -7015,7 +7059,7 @@ msgstr "_Исходный" #: modules/graph/graph_fdfit.c:359 modules/graph/graph_fit.c:373 -#: modules/process/fit-shape.c:1054 modules/volume/volume_fdfit.c:444 +#: modules/process/fit-shape.c:790 modules/volume/volume_fdfit.c:444 msgid "Fix" msgstr "Править" @@ -7030,7 +7074,7 @@ msgstr "Результирующее χ2:" #: modules/graph/graph_fdfit.c:392 modules/graph/graph_fit.c:410 -#: modules/process/fit-shape.c:744 modules/process/fit-shape.c:4386 +#: modules/process/fit-shape.c:469 modules/process/fit-shape.c:2134 #: modules/volume/volume_fdfit.c:477 msgid "Correlation Matrix" msgstr "Матрица корреляции" @@ -7113,6 +7157,62 @@ msgid "Level graph curves" msgstr "Выравнивает кривые графиков" +#: modules/graph/graph_logscale.c:79 +msgid "Physically transforms graph data to logarithmic scale." +msgstr "Физически трансформирует данные графика в логарифмическую шкалу." + +#: modules/graph/graph_logscale.c:93 +msgid "/_Logscale transform..." +msgstr "/_Логарифмический масштаб..." + +#: modules/graph/graph_logscale.c:96 +msgid "Transform graph axes to logarithmic scale" +msgstr "Преобразовать оси графика в логарифмический масштаб" + +#: modules/graph/graph_logscale.c:229 +msgid "Logscale Transform" +msgstr "Логарифмический масштаб" + +#: modules/graph/graph_logscale.c:245 +msgid "Axes to transform:" +msgstr "Преобразовать оси:" + +#: modules/graph/graph_logscale.c:253 +msgid "_X" +msgstr "_X" + +#: modules/graph/graph_logscale.c:254 +msgid "_Y" +msgstr "_Y" + +#: modules/graph/graph_logscale.c:255 modules/tools/grainremover.c:110 +msgid "_Both" +msgstr "_Оба" + +#: modules/graph/graph_logscale.c:260 +msgid "Negative value handling:" +msgstr "Обработка отрицательных чисел:" + +#: modules/graph/graph_logscale.c:268 +msgid "O_mit" +msgstr "_Пропустить" + +#: modules/graph/graph_logscale.c:269 +msgid "_Take absolute value" +msgstr "Взять по _модулю" + +#: modules/graph/graph_logscale.c:275 +msgid "Base:" +msgstr "Основание:" + +#: modules/graph/graph_logscale.c:283 +msgid "Natural (e)" +msgstr "Натуральный (e)" + +#: modules/graph/graph_logscale.c:284 +msgid "10" +msgstr "10" + #: modules/graph/graph_peaks.c:118 msgid "Finds peaks on graph curves." msgstr "Находит пики на кривых графиков." @@ -7504,13 +7604,13 @@ msgstr "Создать поверхность используя баллистическое осаждение" #: modules/process/bdep_synth.c:239 modules/process/bdep_synth.c:596 -#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:278 -#: modules/process/col_synth.c:723 modules/process/crosscor.c:820 -#: modules/process/crosscor.c:883 modules/process/deposit_synth.c:268 +#: modules/process/calcoefs_simple.c:636 modules/process/col_synth.c:282 +#: modules/process/col_synth.c:733 modules/process/crosscor.c:819 +#: modules/process/crosscor.c:882 modules/process/deposit_synth.c:268 #: modules/process/deposit_synth.c:859 modules/process/diff_synth.c:304 #: modules/process/diff_synth.c:705 modules/process/domain_synth.c:255 #: modules/process/domain_synth.c:745 modules/process/grain_wshed.c:429 -#: modules/process/lat_synth.c:453 modules/process/mark_disconn.c:148 +#: modules/process/lat_synth.c:491 modules/process/mark_disconn.c:148 #: modules/process/mark_disconn.c:373 modules/process/maskcor.c:330 #: modules/process/mcrop.c:315 modules/process/merge.c:1072 #: modules/process/nanoindent_adjust.c:323 modules/process/neural.c:1272 @@ -7522,19 +7622,19 @@ msgid "Initializing..." msgstr "Инициализация..." -#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:316 +#: modules/process/bdep_synth.c:275 modules/process/col_synth.c:320 #: modules/process/deposit_synth.c:306 modules/process/deposit_synth.c:318 #: modules/process/deposit_synth.c:531 modules/process/deposit_synth.c:544 #: modules/process/diff_synth.c:342 modules/process/domain_synth.c:319 #: modules/process/domain_synth.c:327 modules/process/fbm_synth.c:278 -#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:491 +#: modules/process/fft_synth.c:314 modules/process/lat_synth.c:529 #: modules/process/lno_synth.c:407 modules/process/noise_synth.c:311 -#: modules/process/obj_synth.c:404 modules/process/pat_synth.c:357 +#: modules/process/obj_synth.c:407 modules/process/pat_synth.c:357 #: modules/process/wave_synth.c:323 msgid "Generated" msgstr "Сгенерированное" -#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:341 +#: modules/process/bdep_synth.c:299 modules/process/col_synth.c:345 #: modules/process/diff_synth.c:366 msgid "Mean deposited thickness" msgstr "Средняя толщина осаждённого материала" @@ -7543,55 +7643,55 @@ msgid "Ballistic Deposition" msgstr "Балистическое осаждение" -#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:425 +#: modules/process/bdep_synth.c:384 modules/process/col_synth.c:435 #: modules/process/diff_synth.c:454 modules/process/domain_synth.c:407 msgid "Progressive preview" msgstr "Прогрессивное обновление" -#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:448 +#: modules/process/bdep_synth.c:407 modules/process/col_synth.c:458 #: modules/process/deposit_synth.c:412 modules/process/diff_synth.c:477 #: modules/process/domain_synth.c:430 modules/process/fbm_synth.c:360 -#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:582 +#: modules/process/fft_synth.c:398 modules/process/lat_synth.c:626 #: modules/process/lno_synth.c:490 modules/process/noise_synth.c:394 -#: modules/process/obj_synth.c:495 modules/process/pat_synth.c:442 +#: modules/process/obj_synth.c:498 modules/process/pat_synth.c:442 #: modules/process/wave_synth.c:407 msgid "Dimensions" msgstr "Размеры" -#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:457 +#: modules/process/bdep_synth.c:416 modules/process/col_synth.c:467 #: modules/process/deposit_synth.c:422 modules/process/diff_synth.c:486 #: modules/process/domain_synth.c:438 modules/process/fbm_synth.c:371 #: modules/process/fft_synth.c:409 modules/process/lno_synth.c:501 -#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:506 +#: modules/process/noise_synth.c:405 modules/process/obj_synth.c:509 #: modules/process/pat_synth.c:454 modules/process/wave_synth.c:418 msgid "Generator" msgstr "Генератор" -#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:463 +#: modules/process/bdep_synth.c:422 modules/process/col_synth.c:473 #: modules/process/diff_synth.c:492 modules/process/lno_synth.c:1041 -#: modules/process/obj_synth.c:517 +#: modules/process/obj_synth.c:520 msgid "Co_verage:" msgstr "По_крытие:" #: modules/process/bdep_synth.c:434 modules/process/diff_synth.c:512 #: modules/process/domain_synth.c:514 modules/process/fbm_synth.c:412 -#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:714 +#: modules/process/fft_synth.c:418 modules/process/lat_synth.c:758 #: modules/process/lno_synth.c:537 modules/process/noise_synth.c:437 -#: modules/process/obj_synth.c:576 modules/process/wave_synth.c:453 +#: modules/process/obj_synth.c:579 modules/process/wave_synth.c:453 msgid "_Like Current Channel" msgstr "Как _у текущего канала" -#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:531 +#: modules/process/bdep_synth.c:453 modules/process/col_synth.c:541 #: modules/process/diff_synth.c:562 msgid "Evolution" msgstr "Эволюция" -#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:534 +#: modules/process/bdep_synth.c:456 modules/process/col_synth.c:544 #: modules/process/diff_synth.c:565 msgid "Plot graphs:" msgstr "Строить графики:" -#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:829 +#: modules/process/bdep_synth.c:654 modules/process/col_synth.c:840 #: modules/process/diff_synth.c:782 msgid "Depositing particles..." msgstr "Осаждаются частицы..." @@ -7613,7 +7713,7 @@ msgid "Error loading file: %s\n" msgstr "Ошибка загрузки файла %s\n" -#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:317 +#: modules/process/calcoefs_load.c:191 modules/process/calcoefs_new.c:336 #, c-format msgid "Cannot save preset: %s" msgstr "Невозможно сохранить набор предустановок: %s" @@ -7622,7 +7722,7 @@ msgid "Load Calibration Data" msgstr "Загрузить данные калибровки" -#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:571 +#: modules/process/calcoefs_load.c:243 modules/process/calcoefs_new.c:590 #: modules/process/calcoefs_simple.c:475 msgid "Calibration name:" msgstr "Имя калибровки:" @@ -7632,18 +7732,18 @@ msgid "No data loaded" msgstr "Данные не загружены" -#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:666 +#: modules/process/calcoefs_load.c:307 modules/process/calcoefs_new.c:685 #: modules/process/calcoefs_simple.c:539 #, c-format msgid "Calibration '%s' already exists" msgstr "Калибровка `%s' уже существует" -#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:669 +#: modules/process/calcoefs_load.c:310 modules/process/calcoefs_new.c:688 #: modules/process/calcoefs_simple.c:541 msgid "Overwrite" msgstr "Перезаписать" -#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:671 +#: modules/process/calcoefs_load.c:312 modules/process/calcoefs_new.c:690 #: modules/process/calcoefs_simple.c:542 msgid "Append" msgstr "Добавить" @@ -7678,55 +7778,55 @@ msgid "Specify simple calibration data." msgstr "Задать простые данные калибровки" -#: modules/process/calcoefs_new.c:351 +#: modules/process/calcoefs_new.c:370 msgid "Simple Calibration Data" msgstr "Простые данные калибровки" -#: modules/process/calcoefs_new.c:369 +#: modules/process/calcoefs_new.c:388 msgid "_X from:" msgstr "_X от:" -#: modules/process/calcoefs_new.c:396 +#: modules/process/calcoefs_new.c:415 msgid "_X to:" msgstr "X _до:" -#: modules/process/calcoefs_new.c:409 +#: modules/process/calcoefs_new.c:428 msgid "_Y from:" msgstr "_Y от:" -#: modules/process/calcoefs_new.c:422 +#: modules/process/calcoefs_new.c:441 msgid "_Y to:" msgstr "Y до:" -#: modules/process/calcoefs_new.c:436 +#: modules/process/calcoefs_new.c:455 msgid "_Z from:" msgstr "_Z от:" -#: modules/process/calcoefs_new.c:463 +#: modules/process/calcoefs_new.c:482 msgid "_Z to:" msgstr "Z до:" -#: modules/process/calcoefs_new.c:476 +#: modules/process/calcoefs_new.c:495 msgid "_X uncertainty:" msgstr "_Погрешность по X" -#: modules/process/calcoefs_new.c:497 +#: modules/process/calcoefs_new.c:516 msgid "_Y uncertainty:" msgstr "По_грешность по Y" -#: modules/process/calcoefs_new.c:512 +#: modules/process/calcoefs_new.c:531 msgid "_Z uncertainty:" msgstr "Пог_решность по Z" -#: modules/process/calcoefs_new.c:534 +#: modules/process/calcoefs_new.c:553 msgid "_X correction factor:" msgstr "_Множитель калибровки по X:" -#: modules/process/calcoefs_new.c:546 +#: modules/process/calcoefs_new.c:565 msgid "_Y correction factor:" msgstr "М_ножитель калибровки по Y:" -#: modules/process/calcoefs_new.c:558 +#: modules/process/calcoefs_new.c:577 msgid "_Z correction factor:" msgstr "Мно_житель калибровки по Z:" @@ -7812,7 +7912,7 @@ msgid "Search canceled" msgstr "Поиск отменён" -#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:863 +#: modules/process/calcoefs_simple.c:638 modules/process/crosscor.c:862 #: modules/process/maskcor.c:332 modules/process/mcrop.c:317 #: modules/process/merge.c:1074 msgid "Correlating..." @@ -8125,65 +8225,69 @@ msgid "Data processing:" msgstr "Обработка данных:" -#: modules/process/col_synth.c:169 +#: modules/process/col_synth.c:172 msgid "Number of maxima" msgstr "Число максимумов" -#: modules/process/col_synth.c:170 modules/tools/linestats.c:178 +#: modules/process/col_synth.c:173 modules/tools/linestats.c:178 #: modules/volume/volume_linestat.c:154 msgid "Skew" msgstr "Асимметрия" -#: modules/process/col_synth.c:171 modules/tools/linestats.c:179 +#: modules/process/col_synth.c:174 modules/tools/linestats.c:179 #: modules/tools/roughness.c:386 modules/volume/volume_linestat.c:155 msgid "Kurtosis" msgstr "Эксцесс" -#: modules/process/col_synth.c:190 +#: modules/process/col_synth.c:175 +msgid "Autocorrelation length" +msgstr "Длина автокорреляции" + +#: modules/process/col_synth.c:194 msgid "Generates columnar surfaces by a simple growth algorithm." msgstr "Создаёт столбчатые поверхности простым алгоритмом роста. " -#: modules/process/col_synth.c:204 +#: modules/process/col_synth.c:208 msgid "/S_ynthetic/_Columnar..." msgstr "/Син_тез/С_толбчатая..." -#: modules/process/col_synth.c:208 +#: modules/process/col_synth.c:212 msgid "Generate columnar surface" msgstr "Создать столбчатую поверхность" -#: modules/process/col_synth.c:380 +#: modules/process/col_synth.c:390 msgid "Grow Columnar Surface" msgstr "Вырастить столбчатую поверхность" -#: modules/process/col_synth.c:470 +#: modules/process/col_synth.c:480 msgid "Particle Size" msgstr "Размер частицы" -#: modules/process/col_synth.c:488 +#: modules/process/col_synth.c:498 msgid "Incidence" msgstr "Угол падения" -#: modules/process/col_synth.c:493 +#: modules/process/col_synth.c:503 msgid "Inclination" msgstr "Наклон" -#: modules/process/col_synth.c:499 modules/process/crosscor.c:1089 +#: modules/process/col_synth.c:509 modules/process/crosscor.c:1063 msgid "Direction" msgstr "Направление" -#: modules/process/col_synth.c:511 +#: modules/process/col_synth.c:521 msgid "Relaxation type:" msgstr "Тип релаксации:" -#: modules/process/col_synth.c:518 +#: modules/process/col_synth.c:528 msgid "_Melting:" msgstr "_Плавление:" -#: modules/process/col_synth.c:602 +#: modules/process/col_synth.c:612 msgid "Weak" msgstr "Слабая" -#: modules/process/col_synth.c:603 +#: modules/process/col_synth.c:613 msgid "Strong" msgstr "Сильная" @@ -8412,12 +8516,12 @@ msgid "Y Distance" msgstr "Расстояние по Y" -#: modules/process/crosscor.c:355 modules/process/crosscor.c:1103 +#: modules/process/crosscor.c:355 modules/process/crosscor.c:1077 msgid "Score" msgstr "Степень" #: modules/process/crosscor.c:357 modules/process/fft.c:395 -#: modules/process/fit-shape.c:964 modules/process/maskcor.c:176 +#: modules/process/fit-shape.c:688 modules/process/maskcor.c:176 msgid "Output _type:" msgstr "Тип в_ывода:" @@ -8458,31 +8562,27 @@ msgid "Create corrected data from 2nd channel" msgstr "Создать исправленные данные из второго канала" -#: modules/process/crosscor.c:861 +#: modules/process/crosscor.c:860 msgid "Correlating first set..." msgstr "Корреляция первого множества..." -#: modules/process/crosscor.c:893 +#: modules/process/crosscor.c:892 msgid "Correlating second set..." msgstr "Корреляция второго множества..." -#: modules/process/crosscor.c:957 -msgid "Borders extension..." -msgstr "Расширение границ..." - -#: modules/process/crosscor.c:1025 +#: modules/process/crosscor.c:999 msgid "Corrected 2nd channel" msgstr "Исправленный второй канал" -#: modules/process/crosscor.c:1049 +#: modules/process/crosscor.c:1023 msgid "X difference" msgstr "Различие X" -#: modules/process/crosscor.c:1063 +#: modules/process/crosscor.c:1037 msgid "Y difference" msgstr "Различие Y" -#: modules/process/crosscor.c:1076 +#: modules/process/crosscor.c:1050 msgid "Absolute difference" msgstr "Разница по модулю" @@ -8547,7 +8647,7 @@ #: modules/process/grain_cross.c:253 modules/process/linematch.c:885 #: modules/process/slope_dist.c:349 modules/tools/linestats.c:418 #: modules/tools/profile.c:573 modules/tools/roughness.c:872 -#: modules/tools/sfunctions.c:479 modules/tools/spectro.c:382 +#: modules/tools/sfunctions.c:486 modules/tools/spectro.c:382 #: modules/volume/volume_slice.c:398 msgid "Target _graph:" msgstr "Добавить к _графику:" @@ -8557,7 +8657,7 @@ #: modules/process/grain_cross.c:259 modules/process/linematch.c:892 #: modules/process/slope_dist.c:355 modules/tools/linestats.c:424 #: modules/tools/profile.c:579 modules/tools/roughness.c:878 -#: modules/tools/sfunctions.c:485 modules/tools/spectro.c:388 +#: modules/tools/sfunctions.c:492 modules/tools/spectro.c:388 #: modules/volume/volume_slice.c:406 msgid "New graph" msgstr "Новый график" @@ -8855,7 +8955,7 @@ msgid "Plot drift _graph" msgstr "Строить _график дрейфа" -#: modules/process/drift.c:356 modules/process/fit-shape.c:969 +#: modules/process/drift.c:356 modules/process/fit-shape.c:693 #: modules/process/neural.c:548 modules/process/polydistort.c:275 msgid "Preview:" msgstr "Предпросмотр:" @@ -9549,9 +9649,9 @@ msgid "Filtered Data" msgstr "Отфильтрованные данные" -#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:869 -#: modules/process/fit-shape.c:918 modules/process/fit-shape.c:934 -#: modules/process/fit-shape.c:938 modules/process/neural.c:560 +#: modules/process/fft_filter_2d.c:305 modules/process/fit-shape.c:594 +#: modules/process/fit-shape.c:643 modules/process/fit-shape.c:658 +#: modules/process/fit-shape.c:662 modules/process/neural.c:560 msgid "Difference" msgstr "Разница" @@ -9674,7 +9774,7 @@ msgstr "Сечение ФСПМ" #: modules/process/fft_profile.c:266 modules/process/grain_dist.c:336 -#: modules/tools/profile.c:517 modules/tools/sfunctions.c:436 +#: modules/tools/profile.c:517 modules/tools/sfunctions.c:443 msgid "_Fix res.:" msgstr "_Фикс. разр.:" @@ -9727,109 +9827,85 @@ msgid "Enable _power multiplier" msgstr "Разрешить сте_пенной множитель" -#: modules/process/fit-shape.c:525 -msgid "Grating (simple)" -msgstr "Решетка (простая)" - -#: modules/process/fit-shape.c:526 -msgid "Grating (3-level)" -msgstr "Решетка (3х-уровневая)" - -#: modules/process/fit-shape.c:527 modules/process/pat_synth.c:215 -msgid "Holes" -msgstr "Отверстия" - -#: modules/process/fit-shape.c:528 -msgid "Ring" -msgstr "Кольцо" - -#: modules/process/fit-shape.c:529 -msgid "Sphere" -msgstr "Сфера" - -#: modules/process/fit-shape.c:530 -msgid "Cylinder (lying)" -msgstr "Цилиндр (лежащий)" - -#: modules/process/fit-shape.c:533 -msgid "Pyramid (diamond)" -msgstr "Пирамида (алмаз)" - -#: modules/process/fit-shape.c:547 +#: modules/process/fit-shape.c:270 msgid "Fits predefined geometrical shapes to data." msgstr "Аппроксимирует данные заданными геометрическими формами." -#: modules/process/fit-shape.c:561 +#: modules/process/fit-shape.c:284 msgid "/_Level/_Fit Shape..." msgstr "/_Выравнивание/Аппроксимировать _фигуру..." -#: modules/process/fit-shape.c:565 modules/process/fit-shape.c:572 +#: modules/process/fit-shape.c:288 modules/process/fit-shape.c:295 msgid "Fit geometrical shapes" msgstr "Аппрокисимровать геометрическими формами" -#: modules/process/fit-shape.c:568 +#: modules/process/fit-shape.c:291 msgid "/_Fit Shape..." msgstr "/_Аппроксимировать форму..." -#: modules/process/fit-shape.c:665 +#: modules/process/fit-shape.c:390 msgid "Fit Shape" msgstr "Аппроксимировать форму" -#: modules/process/fit-shape.c:670 +#: modules/process/fit-shape.c:395 msgid "verb|_Quick Fit" msgstr "_Быстро аппрокс." -#: modules/process/fit-shape.c:748 modules/process/fit-shape.c:4411 +#: modules/process/fit-shape.c:473 modules/process/fit-shape.c:2159 msgid "Derived Quantities" msgstr "Производные величины" -#: modules/process/fit-shape.c:753 modules/process/fit-shape.c:4381 +#: modules/process/fit-shape.c:478 modules/process/fit-shape.c:2129 msgid "Mean square difference:" msgstr "азница:" -#: modules/process/fit-shape.c:855 modules/process/fit-shape.c:901 -#: modules/process/fit-shape.c:933 modules/process/fit-shape.c:937 +#: modules/process/fit-shape.c:580 modules/process/fit-shape.c:626 +#: modules/process/fit-shape.c:657 modules/process/fit-shape.c:661 msgid "Fitted shape" msgstr "Аппроксимирующая фигура" -#: modules/process/fit-shape.c:939 modules/process/mark_disconn.c:189 +#: modules/process/fit-shape.c:663 modules/process/mark_disconn.c:189 #: modules/process/scars.c:281 msgid "Both" msgstr "Оба" -#: modules/process/fit-shape.c:956 +#: modules/process/fit-shape.c:680 msgid "_Function type:" msgstr "Тип _функции:" -#: modules/process/fit-shape.c:984 +#: modules/process/fit-shape.c:708 msgid "Show differences with _adapted color map" msgstr "Показывать различия с _адаптированной шкалой цвета" -#: modules/process/fit-shape.c:1021 +#: modules/process/fit-shape.c:720 +msgid "Full fit is _geometric" +msgstr "_Геометрическая полная аппроксимация" + +#: modules/process/fit-shape.c:757 msgid "Calculate differences for e_xcluded pixels" msgstr "Рассчитать различия для _исключенных пикселей" -#: modules/process/fit-shape.c:1068 +#: modules/process/fit-shape.c:804 msgid "_Recalculate Image" msgstr "Пе_ресчитать изображение" -#: modules/process/fit-shape.c:1075 +#: modules/process/fit-shape.c:811 msgid "Revert to _Previous Values" msgstr "Вернуться к _предыдущим значениям" -#: modules/process/fit-shape.c:2075 +#: modules/process/fit-shape.c:1850 msgid "Parameter estimation failed" msgstr "Оценка параметров закончилась ошибкой" -#: modules/process/fit-shape.c:2078 +#: modules/process/fit-shape.c:1853 msgid "Fit failed" msgstr "Аппроксимация закончилась ошибкой" -#: modules/process/fit-shape.c:2080 +#: modules/process/fit-shape.c:1855 msgid "Fit was interruped" msgstr "Аппроксимация была прервана" -#: modules/process/fit-shape.c:4367 +#: modules/process/fit-shape.c:2115 msgid "(fixed)" msgstr "(фикс.)" @@ -10099,11 +10175,11 @@ msgid "Keep grains satisfying:" msgstr "Оставлять зёрна, удовлетворяющие:" -#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:689 +#: modules/process/grain_filter.c:434 modules/process/lat_synth.c:733 msgid "Lower threshold:" msgstr "Нижний порог:" -#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:696 +#: modules/process/grain_filter.c:469 modules/process/lat_synth.c:740 msgid "Upper threshold:" msgstr "Верхний порог:" @@ -10675,108 +10751,128 @@ msgid "Interpolate data under mask by solution of Laplace equation" msgstr "Интерполировать данные под маской решением уравнения Лапласа" -#: modules/process/laplace.c:86 modules/process/level_grains.c:178 -msgid "Laplace interpolation..." -msgstr "Интерполяция Лапласа..." - -#: modules/process/lat_synth.c:335 +#: modules/process/lat_synth.c:373 msgid "Random constant" msgstr "Случайная постоянная" -#: modules/process/lat_synth.c:336 +#: modules/process/lat_synth.c:374 msgid "Random linear" msgstr "Случаная линейная" -#: modules/process/lat_synth.c:337 +#: modules/process/lat_synth.c:375 msgid "Random bumpy" msgstr "Случайная выпуклая" -#: modules/process/lat_synth.c:338 +#: modules/process/lat_synth.c:376 msgid "Radial distance" msgstr "Радиальное расстояние" -#: modules/process/lat_synth.c:339 +#: modules/process/lat_synth.c:377 msgid "Segmented distance" msgstr "Сегментированное расстояние" -#: modules/process/lat_synth.c:340 +#: modules/process/lat_synth.c:378 msgid "Segmented random" msgstr "Сегментированное случайное" -#: modules/process/lat_synth.c:341 +#: modules/process/lat_synth.c:379 msgid "Border distance" msgstr "Расстояние до границы" -#: modules/process/lat_synth.c:342 +#: modules/process/lat_synth.c:380 msgid "Border random" msgstr "Случайное до границы" -#: modules/process/lat_synth.c:343 +#: modules/process/lat_synth.c:381 msgid "Second nearest distance" msgstr "Расстояние до второго ближайшего" -#: modules/process/lat_synth.c:367 +#: modules/process/lat_synth.c:405 msgid "Generates surfaces based on regular or random lattices." msgstr "Генерирует поверхности на основе правильных или случайных решеток." -#: modules/process/lat_synth.c:381 +#: modules/process/lat_synth.c:419 msgid "/S_ynthetic/_Lattice..." msgstr "/Син_тез/_Решетка..." -#: modules/process/lat_synth.c:385 +#: modules/process/lat_synth.c:423 msgid "Generate lattice based surface" msgstr "Создать основанную на решетке поверхность" -#: modules/process/lat_synth.c:504 +#: modules/process/lat_synth.c:542 msgid "lattice|Random" msgstr "Случайная" -#: modules/process/lat_synth.c:505 +#: modules/process/lat_synth.c:543 msgid "lattice|Square" msgstr "Квадратная" -#: modules/process/lat_synth.c:506 +#: modules/process/lat_synth.c:544 msgid "lattice|Hexagonal" msgstr "Гексагональная" -#: modules/process/lat_synth.c:507 +#: modules/process/lat_synth.c:545 msgid "lattice|Triangular" msgstr "Треугольная" -#: modules/process/lat_synth.c:600 +#: modules/process/lat_synth.c:546 +msgid "lattice|Cairo" +msgstr "Пентагональная" + +#: modules/process/lat_synth.c:547 +msgid "lattice|Snub square" +msgstr "Плосконосые квадраты" + +#: modules/process/lat_synth.c:548 +msgid "lattice|Truncated square" +msgstr "Усечённые квадраты" + +#: modules/process/lat_synth.c:549 +msgid "Silicon 7x7" +msgstr "Кремний 7x7" + +#: modules/process/lat_synth.c:550 +msgid "lattice|Penrose (vertices)" +msgstr "Пенроуза (вершины)" + +#: modules/process/lat_synth.c:551 +msgid "lattice|Penrose (centers)" +msgstr "Пенроуза (центры)" + +#: modules/process/lat_synth.c:644 msgid "_Lattice:" msgstr "_Решетка:" -#: modules/process/lat_synth.c:607 modules/process/obj_synth.c:541 +#: modules/process/lat_synth.c:651 modules/process/obj_synth.c:544 #: modules/process/pat_synth.c:1457 msgid "_Size:" msgstr "Р_азмер:" -#: modules/process/lat_synth.c:618 +#: modules/process/lat_synth.c:662 msgid "Lattice rela_xation:" msgstr "Рела_ксация решетки:" -#: modules/process/lat_synth.c:630 +#: modules/process/lat_synth.c:674 msgid "_Height relaxation:" msgstr "Релаксация в_ысоты" -#: modules/process/lat_synth.c:661 +#: modules/process/lat_synth.c:705 msgid "Surface" msgstr "Поверхность" -#: modules/process/lat_synth.c:682 modules/process/local_contrast.c:154 +#: modules/process/lat_synth.c:726 modules/process/local_contrast.c:154 msgid "_Weight:" msgstr "_Вес:" -#: modules/process/lat_synth.c:1123 +#: modules/process/lat_synth.c:1167 msgid "Constructing lattice..." msgstr "Конструируется решетка..." -#: modules/process/lat_synth.c:1150 +#: modules/process/lat_synth.c:1194 msgid "Relaxing lattice..." msgstr "Производится релаксация решетки..." -#: modules/process/lat_synth.c:1165 +#: modules/process/lat_synth.c:1209 msgid "Relaxing heights..." msgstr "Производится релаксация высот..." @@ -10888,21 +10984,21 @@ "Выровнять отдельные зёрна, интерполируя сдвиги между ними используя " "интерполяцию Лапласа" -#: modules/process/level_grains.c:225 modules/process/median-bg.c:167 +#: modules/process/level_grains.c:187 modules/process/median-bg.c:167 #: modules/process/polylevel.c:293 modules/process/polylevel.c:417 #: modules/process/sphere-revolve.c:200 msgid "Background" msgstr "Фон" -#: modules/process/level_grains.c:242 +#: modules/process/level_grains.c:203 msgid "Level Grains" msgstr "Выровнять зёрна" -#: modules/process/level_grains.c:257 +#: modules/process/level_grains.c:218 msgid "Quantity to level:" msgstr "Величина:" -#: modules/process/level_grains.c:270 modules/process/linematch.c:866 +#: modules/process/level_grains.c:231 modules/process/linematch.c:866 #: modules/process/median-bg.c:217 modules/process/polylevel.c:482 #: modules/process/sphere-revolve.c:263 msgid "E_xtract background" @@ -11141,12 +11237,12 @@ msgid "Mark data disconnected from other values" msgstr "Пометить данные, не связанные с другими значениями" -#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:419 +#: modules/process/mark_disconn.c:187 modules/process/obj_synth.c:422 #: modules/process/scars.c:279 msgid "Positive" msgstr "Положительные" -#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:420 +#: modules/process/mark_disconn.c:188 modules/process/obj_synth.c:423 #: modules/process/scars.c:280 msgid "Negative" msgstr "Отрицательные" @@ -11859,95 +11955,99 @@ msgid "Random Noise" msgstr "Случайный шум" -#: modules/process/obj_synth.c:272 +#: modules/process/obj_synth.c:274 msgid "Spheres" msgstr "Сферы" -#: modules/process/obj_synth.c:273 +#: modules/process/obj_synth.c:275 msgid "Boxes" msgstr "Параллелепипеды" -#: modules/process/obj_synth.c:274 +#: modules/process/obj_synth.c:276 msgid "Cones" msgstr "Конусы" -#: modules/process/obj_synth.c:275 +#: modules/process/obj_synth.c:277 msgid "Pyramids" msgstr "Пирамиды" -#: modules/process/obj_synth.c:276 +#: modules/process/obj_synth.c:278 msgid "Diamonds" msgstr "Бриллианты" -#: modules/process/obj_synth.c:277 +#: modules/process/obj_synth.c:279 msgid "Tetrahedrons" msgstr "Тетраэдры" -#: modules/process/obj_synth.c:278 +#: modules/process/obj_synth.c:280 msgid "Nuggets" msgstr "Частицы" -#: modules/process/obj_synth.c:279 +#: modules/process/obj_synth.c:281 msgid "Thatches" msgstr "Листья камыша" -#: modules/process/obj_synth.c:280 +#: modules/process/obj_synth.c:282 msgid "Tents" msgstr "Палатки" -#: modules/process/obj_synth.c:281 +#: modules/process/obj_synth.c:283 msgid "Gaussians" msgstr "Гауссианы" -#: modules/process/obj_synth.c:282 +#: modules/process/obj_synth.c:284 msgid "Doughnuts" msgstr "Бублики" -#: modules/process/obj_synth.c:288 +#: modules/process/obj_synth.c:285 +msgid "Parabolic bumps" +msgstr "Параболические выступы" + +#: modules/process/obj_synth.c:291 msgid "Generates randomly patterned surfaces by placing objects." msgstr "Создаёт поверхности со случайным узором расставляя объекты." -#: modules/process/obj_synth.c:302 +#: modules/process/obj_synth.c:305 msgid "/S_ynthetic/_Objects..." msgstr "/Син_тез/_Объекты..." -#: modules/process/obj_synth.c:306 +#: modules/process/obj_synth.c:309 msgid "Generate surface of randomly placed objects" msgstr "Создать поверхность из случайно расположенных объектов" -#: modules/process/obj_synth.c:421 +#: modules/process/obj_synth.c:424 msgid "Both (random)" msgstr "Обе (случайно)" -#: modules/process/obj_synth.c:436 +#: modules/process/obj_synth.c:439 msgid "Random Objects" msgstr "Случайные объекты" -#: modules/process/obj_synth.c:510 +#: modules/process/obj_synth.c:513 msgid "_Shape:" msgstr "_Форма:" -#: modules/process/obj_synth.c:528 +#: modules/process/obj_synth.c:531 msgid "obj." msgstr "объект." -#: modules/process/obj_synth.c:548 +#: modules/process/obj_synth.c:551 msgid "Aspect Ratio" msgstr "Пропорции" -#: modules/process/obj_synth.c:555 +#: modules/process/obj_synth.c:558 msgid "_Aspect ratio:" msgstr "_Пропорции:" -#: modules/process/obj_synth.c:585 +#: modules/process/obj_synth.c:588 msgid "Scales _with size" msgstr "_Масштабируется с размером" -#: modules/process/obj_synth.c:609 +#: modules/process/obj_synth.c:612 msgid "_Feature type:" msgstr "Тип осо_бенности:" -#: modules/process/obj_synth.c:804 +#: modules/process/obj_synth.c:807 msgid "_Truncate:" msgstr "_Усечение:" @@ -12541,11 +12641,11 @@ msgid "Level data by arc revolution" msgstr "Выровнять данные вращением дуги" -#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:364 +#: modules/process/sphere-revolve.c:208 modules/tools/sfunctions.c:371 msgid "_Horizontal direction" msgstr "_Горизонтальное направление" -#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:365 +#: modules/process/sphere-revolve.c:209 modules/tools/sfunctions.c:372 msgid "_Vertical direction" msgstr "_Вертикальное направление" @@ -12826,47 +12926,51 @@ msgid "Tip radius evolution" msgstr "Изменение радиуса зонда" -#: modules/process/tip_model.c:111 +#: modules/process/tip_model.c:114 msgid "Models SPM tip." msgstr "Моделирует зонд СЗМ." -#: modules/process/tip_model.c:126 +#: modules/process/tip_model.c:129 msgid "/_Tip and Indentation/_Model Tip..." msgstr "/_Зонд и индентация/_Модель зонда..." -#: modules/process/tip_model.c:130 +#: modules/process/tip_model.c:133 msgid "Model AFM tip" msgstr "Модель зонда АСМ" -#: modules/process/tip_model.c:161 +#: modules/process/tip_model.c:164 msgid "Model Tip" msgstr "Модель зонда" -#: modules/process/tip_model.c:221 +#: modules/process/tip_model.c:224 msgid "Tip _type:" msgstr "Тип _зонда:" -#: modules/process/tip_model.c:226 +#: modules/process/tip_model.c:229 msgid "_Number of sides:" msgstr "_Число сторон" -#: modules/process/tip_model.c:231 +#: modules/process/tip_model.c:234 msgid "Tip _slope:" msgstr "_Угол зонда:" -#: modules/process/tip_model.c:237 +#: modules/process/tip_model.c:240 msgid "Tip _rotation:" msgstr "_Поворот зонда:" -#: modules/process/tip_model.c:247 +#: modules/process/tip_model.c:250 msgid "Tip _apex radius:" msgstr "_Радиус острия зонда:" -#: modules/process/tip_model.c:455 +#: modules/process/tip_model.c:269 +msgid "Tip _anisotropy:" +msgstr "_Анизотропия зонда:" + +#: modules/process/tip_model.c:490 msgid "Modeled tip" msgstr "Модель зонда" -#: modules/process/tip_model.c:503 +#: modules/process/tip_model.c:562 #, c-format msgid "Tip resolution: %d × %d pixels" msgstr "Разрешение зонда: %d × %d пикселей" @@ -13038,7 +13142,7 @@ msgstr "Волны" #: modules/process/wave_synth.c:422 modules/tools/linestats.c:337 -#: modules/tools/sfunctions.c:394 modules/volume/volume_linestat.c:369 +#: modules/tools/sfunctions.c:401 modules/volume/volume_linestat.c:369 msgid "_Quantity:" msgstr "_Величина:" @@ -13230,63 +13334,58 @@ msgid "Python wrapper console" msgstr "Командная строка оболочки Python" -#: modules/pygwy/pygwy-console.c:145 +#: modules/pygwy/pygwy-console.c:142 msgid ">>> Running the script above\n" msgstr ">>> Запускается вышеприведённый скрипт\n" -#: modules/pygwy/pygwy-console.c:197 +#: modules/pygwy/pygwy-console.c:194 msgid "Open Python script" msgstr "Открыть скрипт Python" -#: modules/pygwy/pygwy-console.c:278 +#: modules/pygwy/pygwy-console.c:275 msgid "Save Script as" msgstr "Сохранить скрипт как" -#: modules/pygwy/pygwy-console.c:330 +#: modules/pygwy/pygwy-console.c:327 msgid "Pygwy Console" msgstr "Консоль Pygwy" -#: modules/pygwy/pygwy-console.c:343 +#: modules/pygwy/pygwy-console.c:340 msgid "Clear Log" msgstr "Очистить лог" -#: modules/pygwy/pygwy-console.c:347 +#: modules/pygwy/pygwy-console.c:344 msgid "Open script in Python language (Ctrl-O)" msgstr "Открыть скрипт на языке Python (Ctrl-O)" -#: modules/pygwy/pygwy-console.c:349 +#: modules/pygwy/pygwy-console.c:346 msgid "Save script (Ctrl-S)" msgstr "Сохранить сценарий (Ctrl-S)" -#: modules/pygwy/pygwy-console.c:351 +#: modules/pygwy/pygwy-console.c:348 msgid "Execute script (Ctrl-E)" msgstr "Выполнить сценарий (Ctrl-E)" -#: modules/pygwy/pygwy-console.c:429 +#: modules/pygwy/pygwy-console.c:426 msgid "Command" msgstr "Команда" -#: pygwy.c:97 +#: pygwy.c:120 msgid "Pygwy, the Gwyddion Python wrapper." msgstr "Pygwy, оболочка Python в Gwyddion." -#: pygwy.c:585 pygwy.c:676 +#: pygwy.c:258 +msgid "Python Interpreter Errors" +msgstr "Ошибки интерпретатора Python" + +#: pygwy.c:384 +msgid "Python interpreter error occurred." +msgstr "Произошла ошибка интерпретатора Python." + +#: pygwy.c:459 msgid "Function written in Python" msgstr "Функция на языке Python" -#: pygwy.c:630 -msgid "Graph function written in Python" -msgstr "Графическая функция на языке Python" - -#: pygwy.c:1099 -#, c-format -msgid "" -"Pygwy plugin: %s (%s)\n" -"Export failed." -msgstr "" -"Подключаемый модуль Pygwy: %s (%s)\n" -"Экспорт закончился неудачно." - #: modules/tools/crop.c:84 msgid "Crop tool, crops data to smaller size." msgstr "Инструмент кадрирования, обрезает данные до меньшего размера." @@ -13371,10 +13470,6 @@ msgid "_Mask" msgstr "_Маска" -#: modules/tools/grainremover.c:110 -msgid "_Both" -msgstr "_Оба" - #: modules/tools/grainremover.c:114 modules/tools/spotremove.c:271 msgid "Laplace solver" msgstr "Решение уравнения Лапласа" @@ -13441,7 +13536,7 @@ msgstr "Гистограмма высот" #: modules/tools/icolorange.c:329 modules/tools/linestats.c:169 -#: modules/tools/sfunctions.c:219 modules/volume/volume_linestat.c:146 +#: modules/tools/sfunctions.c:226 modules/volume/volume_linestat.c:146 msgid "Range" msgstr "Диапазон" @@ -13546,11 +13641,11 @@ msgstr "Среднее:" #: modules/tools/linestats.c:363 modules/tools/profile.c:464 -#: modules/tools/sfunctions.c:407 modules/tools/spectro.c:343 +#: modules/tools/sfunctions.c:414 modules/tools/spectro.c:343 msgid "Options" msgstr "Параметры" -#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:423 +#: modules/tools/linestats.c:379 modules/tools/sfunctions.c:430 #: modules/tools/stats.c:408 msgid "_Instant updates" msgstr "_Обновлять сразу" @@ -14003,7 +14098,7 @@ msgid "_Copy" msgstr "_Копировать" -#: modules/tools/sfunctions.c:174 +#: modules/tools/sfunctions.c:181 msgid "" "Statistical function tool, calculates one-dimensional statistical functions " "(height distribution, correlations, PSDF, Minkowski functionals) of selected " @@ -14013,63 +14108,63 @@ "(распределение высоты, корреляции, функция спектральной плотности мощности " "(ФСПМ, PSDF), функционалы Минковского) выбранной части данных." -#: modules/tools/sfunctions.c:207 +#: modules/tools/sfunctions.c:214 msgid "Height distribution" msgstr "Распределение высоты" -#: modules/tools/sfunctions.c:208 +#: modules/tools/sfunctions.c:215 msgid "Cum. height distribution" msgstr "Интегр. распределение высоты" -#: modules/tools/sfunctions.c:209 +#: modules/tools/sfunctions.c:216 msgid "Distribution of angles" msgstr "Распределение углов" -#: modules/tools/sfunctions.c:210 +#: modules/tools/sfunctions.c:217 msgid "Cum. distribution of angles" msgstr "Интегр. распределение углов" -#: modules/tools/sfunctions.c:211 +#: modules/tools/sfunctions.c:218 msgid "ACF" msgstr "АКФ" -#: modules/tools/sfunctions.c:212 +#: modules/tools/sfunctions.c:219 msgid "HHCF" msgstr "ФКВВ" -#: modules/tools/sfunctions.c:213 +#: modules/tools/sfunctions.c:220 msgid "PSDF" msgstr "ФСПМ" -#: modules/tools/sfunctions.c:214 +#: modules/tools/sfunctions.c:221 msgid "Radial PSDF" msgstr "Радиальная ФСПМ" -#: modules/tools/sfunctions.c:215 +#: modules/tools/sfunctions.c:222 msgid "Radial ACF" msgstr "Радиальная АКФ" -#: modules/tools/sfunctions.c:216 +#: modules/tools/sfunctions.c:223 msgid "Minkowski volume" msgstr "Объём Минковского" -#: modules/tools/sfunctions.c:217 +#: modules/tools/sfunctions.c:224 msgid "Minkowski boundary" msgstr "Граница Минковского" -#: modules/tools/sfunctions.c:218 +#: modules/tools/sfunctions.c:225 msgid "Minkowski connectivity" msgstr "Связность Минковского" -#: modules/tools/sfunctions.c:244 +#: modules/tools/sfunctions.c:251 msgid "Statistical Functions" msgstr "Статистические функции" -#: modules/tools/sfunctions.c:245 +#: modules/tools/sfunctions.c:252 msgid "Calculate 1D statistical functions" msgstr "Рассчитать одномерные статистические функции" -#: modules/tools/sfunctions.c:497 +#: modules/tools/sfunctions.c:504 msgid "_Separate uncertainty" msgstr "_Разделить погрешности" @@ -14941,6 +15036,44 @@ "Регуляризация данных XYZ завершилась неудачно вследствие численной " "нестабильности или была прервана." +#~ msgid "Ellptical parabola" +#~ msgstr "Эллиптическая парабола" + +#~ msgid "Physically transforms graph data to logarihmic scale." +#~ msgstr "Физически трансформирует данные графика в логарифмическую шкалу." + +#~ msgid "Transform graph axes to logarihmic scale" +#~ msgstr "Преобразовать оси графика в логарифмический масштаб" + +#~ msgid "Python intepreter error occured." +#~ msgstr "Произошла ошибка в интерпретаторе Python" + +#~ msgid "libpng error occured" +#~ msgstr "Произошла ошибка libpng" + +#~ msgid "Draw text _above scalebar" +#~ msgstr "Текст с_верху от отрезка" + +#~ msgid "Graph function written in Python" +#~ msgstr "Графическая функция на языке Python" + +#~ msgid "" +#~ "Pygwy plugin: %s (%s)\n" +#~ "Export failed." +#~ msgstr "" +#~ "Подключаемый модуль Pygwy: %s (%s)\n" +#~ "Экспорт закончился неудачно." + +#, fuzzy +#~ msgid "/_Database" +#~ msgstr "Да_нные" + +#~ msgid "Borders extension..." +#~ msgstr "Расширение границ..." + +#~ msgid "Laplace interpolation..." +#~ msgstr "Интерполяция Лапласа..." + #~ msgid "Update X and Y of _allcompatible data" #~ msgstr "Обновить X и Y _всех совместимых данных" diff -Nru gwyddion-2.46/thumbnailer/gwyddion-thumbnailer.1 gwyddion-2.47/thumbnailer/gwyddion-thumbnailer.1 --- gwyddion-2.46/thumbnailer/gwyddion-thumbnailer.1 2015-07-29 08:28:30.000000000 +0000 +++ gwyddion-2.47/thumbnailer/gwyddion-thumbnailer.1 2016-11-09 09:17:14.000000000 +0000 @@ -137,7 +137,7 @@ .PP Do \fInot\fR -use this mode from the command line\&. It is documented for completness, however, the protocol between gwythumbcreator and gwyddion\-thumbnailer must be considered private and it can change any time\&. +use this mode from the command line\&. It is documented for completeness, however, the protocol between gwythumbcreator and gwyddion\-thumbnailer must be considered private and it can change any time\&. .SH "CHECK" .HP \w'\fBgwyddion\-thumbnailer\fR\ 'u \fBgwyddion\-thumbnailer\fR check \fIINPUT\-FILE\fR diff -Nru gwyddion-2.46/utils/user-guide-modules gwyddion-2.47/utils/user-guide-modules --- gwyddion-2.46/utils/user-guide-modules 2016-10-14 09:36:05.000000000 +0000 +++ gwyddion-2.47/utils/user-guide-modules 2016-11-15 08:56:51.000000000 +0000 @@ -92,6 +92,7 @@ graph_filter graph-processing graph_fit graph-processing graph-fit graph_level graph-processing graph-level +graph_logscale graph-processing graph-logscale graph_peaks graph-processing graph-peaks gsffile gsf gwyfile managing-files @@ -190,6 +191,7 @@ psdf_logphi fourier-transform psdf-log-phi psia managing-files pt3file managing-files +pygwy pygwy quesant managing-files rank presentations rank rawfile raw-file-import