[med-svn] [aghermann] 16/34: M-x align-regexp

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 71f5fce6fd715780fe0a2975047b45ed5f683a65
Author: Andrei Zavada <hmmr at ra>
Date:   Thu Nov 14 22:46:31 2013 +0200

    M-x align-regexp
---
 upstream/src/aghermann/ui/mw/settings_cb.cc | 49 +++++++++++++++--------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/upstream/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
index 2d2e8a0..2df3ea7 100644
--- a/upstream/src/aghermann/ui/mw/settings_cb.cc
+++ b/upstream/src/aghermann/ui/mw/settings_cb.cc
@@ -47,15 +47,18 @@ tDesign_switch_page_cb(
 
                 try { ED.ED->fft_params.check(); }
                 catch (invalid_argument ex) {
-                        pop_ok_message( ED.wMainWindow,
-                                        "Invalid FFT parameters", "Resetting to defaults.");
+                        pop_ok_message(
+                                ED.wMainWindow,
+                                "Invalid FFT parameters", "Resetting to defaults.");
                         ED.ED->fft_params.reset();
                 }
 
                 try {
                         ED.ED->mc_params.check();
                 } catch (invalid_argument ex) {
-                        pop_ok_message( ED.wMainWindow, "Invalid uC parameters", "Resetting to defaults.");
+                        pop_ok_message(
+                                ED.wMainWindow,
+                                "Invalid uC parameters", "Resetting to defaults.");
                         ED.ED->mc_params.reset();
                 }
 
@@ -68,33 +71,33 @@ tDesign_switch_page_cb(
                         : ED.ED->num_threads);
 #endif
               // scan as necessary
-                if ( ED.pagesize_item_saved                          != ED.pagesize_item ||
-                     ED.binsize_item_saved                          != ED.binsize_item ||
-                     ED.fft_params_plan_type_saved                  != ED.ED->fft_params.plan_type ||
-                     ED.fft_params_welch_window_type_saved          != ED.ED->fft_params.welch_window_type ||
-                     ED.af_dampen_window_type_saved                  != ED.ED->af_dampen_window_type ||
-                     ED.af_dampen_factor_saved                          != ED.ED->af_dampen_factor ||
+                if ( ED.pagesize_item_saved                != ED.pagesize_item ||
+                     ED.binsize_item_saved                 != ED.binsize_item ||
+                     ED.fft_params_plan_type_saved         != ED.ED->fft_params.plan_type ||
+                     ED.fft_params_welch_window_type_saved != ED.ED->fft_params.welch_window_type ||
+                     ED.af_dampen_window_type_saved        != ED.ED->af_dampen_window_type ||
+                     ED.af_dampen_factor_saved             != ED.ED->af_dampen_factor ||
                      !ED.ED->mc_params.same_as( ED.mc_params_saved) ) {
                       // rescan tree
                         ED.do_rescan_tree(); // with populate
-                } else if ( ED.tl_height_saved                        != ED.tl_height ||
+                } else if ( ED.tl_height_saved != ED.tl_height ||
                             // recalculte mesurements layout as necessary
-                            ED.tl_pph_saved                        != ED.tl_pph )
+                            ED.tl_pph_saved    != ED.tl_pph )
                         ED.populate_1();
 
         } else {
-                ED.tl_pph_saved                                = ED.tl_pph;
-                ED.tl_height_saved                        = ED.tl_height;
-                ED.pagesize_item_saved                        = ED.pagesize_item;
-                ED.binsize_item_saved                        = ED.binsize_item;
-                ED.fft_params_welch_window_type_saved        = ED.ED->fft_params.welch_window_type;
-                ED.fft_params_plan_type_saved                = ED.ED->fft_params.plan_type;
-                ED.af_dampen_window_type_saved                = ED.ED->af_dampen_window_type;
-                ED.af_dampen_factor_saved                = ED.ED->af_dampen_factor;
-                ED.mc_params_saved                        = ED.ED->mc_params;
-
-                ED.pagesize_item = ED.figure_pagesize_item();
-                ED.binsize_item = ED.figure_binsize_item();
+                ED.tl_pph_saved                       = ED.tl_pph;
+                ED.tl_height_saved                    = ED.tl_height;
+                ED.pagesize_item_saved                = ED.pagesize_item;
+                ED.binsize_item_saved                 = ED.binsize_item;
+                ED.fft_params_welch_window_type_saved = ED.ED->fft_params.welch_window_type;
+                ED.fft_params_plan_type_saved         = ED.ED->fft_params.plan_type;
+                ED.af_dampen_window_type_saved        = ED.ED->af_dampen_window_type;
+                ED.af_dampen_factor_saved             = ED.ED->af_dampen_factor;
+                ED.mc_params_saved                    = ED.ED->mc_params;
+
+                ED.pagesize_item                      = ED.figure_pagesize_item();
+                ED.binsize_item                       = ED.figure_binsize_item();
 
                 ED.W_V1.up();
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git