Mercurial > octave

changeset 28340:8abd3d8a9a2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 21 May 2020 12:52:36 +0200
parents 70908e5d8865 (current diff) e491e751c356 (diff)
children b95dbd889f1a
files libgui/src/settings-dialog.cc
diffstat 2 files changed, 25 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Wed May 20 17:15:34 2020 -0700
+++ b/libgui/src/settings-dialog.cc	Thu May 21 12:52:36 2020 +0200
@@ -277,7 +277,7 @@
       editor_long_line_marker_line->setChecked (true);
     editor_long_line_column->setValue (settings->value (ed_long_line_column).toInt ());
     editor_break_checkbox->setChecked (settings->value (ed_break_lines).toBool ());
-    editor_break_checkbox->setChecked (settings->value (ed_break_lines_comments).toBool ());
+    editor_break_comments_checkbox->setChecked (settings->value (ed_break_lines_comments).toBool ());
     editor_wrap_checkbox->setChecked (settings->value (ed_wrap_lines).toBool ());
     cb_edit_status_bar->setChecked (settings->value (ed_show_edit_status_bar).toBool ());
     cb_edit_tool_bar->setChecked (settings->value (ed_show_toolbar).toBool ());
--- a/scripts/plot/draw/smooth3.m	Wed May 20 17:15:34 2020 -0700
+++ b/scripts/plot/draw/smooth3.m	Thu May 21 12:52:36 2020 +0200
@@ -158,19 +158,30 @@
 
 
 %!demo
-%! clf;
-%! data = rand (10, 10, 10);
-%! subplot (1, 2, 1);
-%!  patch (isosurface (data, .5), ...
-%!         "FaceColor", "blue", "EdgeColor", "k");
-%!  title ("Original data");
-%!  view (3);
-%!  smoothed_data = smooth3 (data);
-%! subplot (1, 2, 2);
-%!  patch (isosurface (smoothed_data, .5), ...
-%!         "FaceColor", "blue", "EdgeColor", "k");
-%!  title ("Smoothed data");
-%!  view (3);
+%! hf = clf;
+%! [x, y, z] = meshgrid (-.2:0.02:.2, -.2:0.02:.2, -.2:0.02:.2);
+%! data = (x.^2 + y.^2 + z.^2) + randn (size (x)) * 0.003;
+%! hax(1) = subplot (1, 2, 1, "parent", hf);
+%! patch (hax(1), isosurface (data, .035), ...
+%!        "facecolor", "g", "edgecolor", "none");
+%! title (hax(1), "Original data (including random noise)");
+%! axis (hax(1), "vis3d");
+%! grid (hax(1), "on");
+%! light (hax(1));
+%!
+%! smoothed_data = smooth3 (data, "g");
+%! hax(2) = subplot (1, 2, 2, "parent", hf);
+%! patch (hax(2), isosurface (smoothed_data, .035), ...
+%!         "facecolor", "g", "edgecolor", "none");
+%! title (hax(2), "Smoothed data");
+%! axis (hax(2), "vis3d");
+%! grid (hax(2), "on");
+%! light (hax(2));
+%!
+%! hlink = linkprop (hax, "view");
+%! set (hax(1), "userdata", hlink);  # keep hlink until figure is closed
+%! view (hax(1), 3);
+%! rotate3d (hf, "on");
 
 ## one input argument (method: "box")
 %!test