[med-svn] [aghermann] 68/85: fixes in rk1968 profile handling

[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 d94b560d78d726cbbe40a104a0dd14ee938b8826
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Sep 22 01:49:12 2013 +0300

    fixes in rk1968 profile handling
---
 upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc |    6 +++---
 upstream/src/aghermann/ui/sf/d/rk1968.cc             |    6 ++++++
 upstream/src/aghermann/ui/sf/d/rk1968.hh             |    1 +
 upstream/src/aghermann/ui/sf/d/rk1968_cb.cc          |    6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
index e7eb240..d56d9b9 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
@@ -72,13 +72,13 @@ void eSFRKProfileSaveName_changed_cb(
 }
 
 void
-eSFRK_any_pattern_origin_toggled_cb(
+eSFRK_any_profile_origin_toggled_cb(
         GtkRadioButton*,
-        const gpointer userdata)
+        gpointer userdata)
 {
         auto& RK = *(SScoringFacility::SRK1968Dialog*)userdata;
 
-        RK.eXProfileSaveName_changed_cb();
+        RK.eX_any_profile_origin_toggled_cb();
 }
 
 
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.cc b/upstream/src/aghermann/ui/sf/d/rk1968.cc
index fa31dad..93f4f16 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.cc
@@ -83,6 +83,12 @@ SRK1968Dialog (SScoringFacility& p_)
 
         G_CONNECT_1 (eSFRKProfileSaveName, changed);
 
+        for ( auto& W : {eSFRKProfileSaveOriginUser, eSFRKProfileSaveOriginExperiment, eSFRKProfileSaveOriginSubject} )
+                g_signal_connect(
+                        W, "toggled",
+                        (GCallback)eSFRK_any_profile_origin_toggled_cb,
+                        this);
+
       // 2. dialog
         W_V.reg( eSFRKNremThetaDeltaRatio, &Pp2.Pp.nrem3_delta_theta_ratio);
 }
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.hh b/upstream/src/aghermann/ui/sf/d/rk1968.hh
index 5aab52b..e72d18e 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.hh
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.hh
@@ -97,6 +97,7 @@ void eSFRK_any_profile_value_changed_cb( GtkSpinButton*, gpointer);
 void bSFRKTry_clicked_cb( GtkButton*, gpointer);
 void bSFRKModify_clicked_cb( GtkButton*, gpointer);
 
+void eSFRK_any_profile_origin_toggled_cb(GtkRadioButton*, gpointer);
 void eSFRKProfileSaveName_changed_cb(GtkEditable*, gpointer);
 
 }
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc b/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
index ba5e8bb..d2ec435 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
@@ -20,7 +20,7 @@ gboolean
 wSFRK_configure_event_cb(
         GtkWidget*,
         GdkEventConfigure*,
-        gpointer userdata)
+        const gpointer userdata)
 {
         auto& RK = *(SScoringFacility::SRK1968Dialog*)userdata;
 
@@ -31,7 +31,7 @@ wSFRK_configure_event_cb(
 void
 wSFRK_show_cb(
         GtkWidget*,
-        gpointer userdata)
+        const gpointer userdata)
 {
         auto& RK = *(SScoringFacility::SRK1968Dialog*)userdata;
         auto& SF = RK._p;
@@ -40,7 +40,7 @@ wSFRK_show_cb(
 
         if ( RK.profiles.empty() )
                 RK.profiles.emplace_back(
-                        *RK._p._p.ED,
+                        *SF._p.ED,
                         agh::SExpDirLevelId {SF._p.ED->group_of(SF.csubject()), SF.csubject().id, SF.session()});
 
         RK.populate_combo();

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