The following commit has been merged in the master branch:
commit 4e4df7ce81069e93c37315d696f83c7bd39660b5
Author: Andrei Zavada <[email protected]>
Date: Fri Jan 25 19:54:52 2013 +0200
WIP
diff --git a/src/ui/sf/d/phasic-events.cc b/src/ui/sf/phasic-events.cc
similarity index 95%
rename from src/ui/sf/d/phasic-events.cc
rename to src/ui/sf/phasic-events.cc
index 09f1572..238c509 100644
--- a/src/ui/sf/d/phasic-events.cc
+++ b/src/ui/sf/phasic-events.cc
@@ -1,6 +1,5 @@
-// ;-*-C++-*-
/*
- * File name: ui/sf/sf-phasic-events.cc
+ * File name: ui/sf/phasic-events.cc
* Project: Aghermann
* Author: Andrei Zavada <[email protected]>
* Initial version: 2013-01-04
diff --git a/src/ui/sf/sf.cc b/src/ui/sf/sf.cc
index 95267c0..59d552c 100644
--- a/src/ui/sf/sf.cc
+++ b/src/ui/sf/sf.cc
@@ -16,7 +16,10 @@
#include "common/fs.hh"
#include "ui/misc.hh"
#include "sf.hh"
-#include "sf_cb.hh"
+#include "d/artifacts.hh"
+#include "d/filters.hh"
+#include "d/phasediff.hh"
+#include "d/patterns.hh"
using namespace std;
@@ -49,8 +52,7 @@ aghui::SScoringFacility::
SScoringFacility (agh::CSubject& J,
const string& D, const string& E,
aghui::SExpDesignUI& parent)
- : SScoringFacilityWidgets (parent),
- _p (parent),
+ : _p (parent),
_csubject (J),
_session (D),
_sepisode (J.measurements.at(D)[E]),
@@ -83,7 +85,7 @@ SScoringFacility (agh::CSubject& J,
_patterns_d (nullptr),
_filters_d (nullptr),
_phasediff_d (nullptr),
- _artifact_d (nullptr),
+ _artifacts_d (nullptr),
using_channel (nullptr),
da_ht (NAN) // bad value, to be estimated unless previously saved
{
diff --git a/src/ui/sf/sf_cb.cc b/src/ui/sf/sf_cb.cc
index 908314b..0f29879 100644
--- a/src/ui/sf/sf_cb.cc
+++ b/src/ui/sf/sf_cb.cc
@@ -12,7 +12,9 @@
#include "ui/mw/mw.hh"
#include "sf.hh"
-#include "sf-widgets.hh"
+#include "widgets.hh"
+#include "d/patterns.hh"
+#include "d/phasediff.hh"
using namespace std;
using namespace aghui;
@@ -206,7 +208,6 @@ bSFShowPhaseDiffDialog_toggled_cb( GtkToggleButton
*togglebutton, gpointer userd
{
auto& SF = *(SScoringFacility*)userdata;
if ( gtk_toggle_button_get_active( togglebutton) ) {
- SF.phasediff_d().setup_controls_for_find();
gtk_widget_show( (GtkWidget*)SF.phasediff_d().wSFPD);
} else
gtk_widget_hide( (GtkWidget*)SF.phasediff_d().wSFPD);
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
