[med-svn] [aghermann] 18/34: keep {psd, swu, mc}_profile.step in sync with .pagesize

[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 477b44260b347893718372df4c9e38cac67962b2
Author: andrei zavada <hmmr at fa2>
Date:   Fri Nov 15 17:03:46 2013 +0200

    keep {psd,swu,mc}_profile.step in sync with .pagesize
---
 upstream/src/aghermann/expdesign/expdesign.cc | 3 +++
 upstream/src/aghermann/ui/mw/settings_cb.cc   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index 4ed6d89..2910137 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -112,6 +112,9 @@ CExpDesign (const string& session_dir_,
 
         // that's pretty important: scope is not itself exposed to the user
         mc_params.scope = psd_params.pagesize;
+        // also, ensure step is equal to pagesize, in all profile params
+        psd_params.step = mc_params.step = swu_params.step =
+                psd_params.pagesize;
 
 #ifdef _OPENMP
         omp_set_num_threads( (num_threads == 0) ? global::num_procs : num_threads);
diff --git a/upstream/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
index aaf5ee5..b95e3d9 100644
--- a/upstream/src/aghermann/ui/mw/settings_cb.cc
+++ b/upstream/src/aghermann/ui/mw/settings_cb.cc
@@ -43,6 +43,7 @@ tDesign_switch_page_cb(
                 ED.W_V1.down();
 
                 ED.ED->psd_params.pagesize = ED.ED->mc_params.pagesize = ED.ED->swu_params.pagesize =
+                ED.ED->psd_params.step     = ED.ED->mc_params.step     = ED.ED->swu_params.step     =
                         ED.FFTPageSizeValues[ED.pagesize_item];
                 ED.ED->psd_params.binsize  = ED.FFTBinSizeValues [ED.binsize_item];
 

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