[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 7bb94b01d3bef66c9a647dca10c7b9c3468cf746
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Nov 11 20:35:51 2012 +0200

    simplify things and other ICM

diff --git a/src/ui/mw/mw-construct.cc b/src/ui/mw/mw-construct.cc
index e59900d..ccc936e 100644
--- a/src/ui/mw/mw-construct.cc
+++ b/src/ui/mw/mw-construct.cc
@@ -18,10 +18,6 @@
 using namespace std;
 using namespace aghui;
 
-const char* const
-	aghui::SExpDesignUIWidgets::mannotations_column_names[] = {
-	"Recording", "Pages", "Channel", "Label"
-};
 
 
 aghui::SExpDesignUIWidgets::
@@ -708,18 +704,21 @@ SExpDesignUIWidgets ()
 			  this);
 
 	renderer = gtk_cell_renderer_text_new();
-	for ( auto t = 0; t < mannotations_visibility_switch_col; ++t ) {
+	int c = 0;
+	for ( auto column : {"Recording", "Page(s)", "Channel", "Label"} ) {
 		renderer = gtk_cell_renderer_text_new();
 		g_object_set( (GObject*)renderer,
 			      "editable", FALSE,
 			      NULL);
-		g_object_set_data( (GObject*)renderer, "column", GINT_TO_POINTER (t));
-		col = gtk_tree_view_column_new_with_attributes( mannotations_column_names[t],
-								renderer,
-								"text", t,
-								NULL);
+		g_object_set_data( (GObject*)renderer, "column", GINT_TO_POINTER (c));
+		col = gtk_tree_view_column_new_with_attributes(
+			column,
+			renderer,
+			"text", c,
+			NULL);
 		gtk_tree_view_column_set_expand( col, TRUE);
 		gtk_tree_view_append_column( tvGlobalAnnotations, col);
+		++c;
 	}
 	gtk_tree_view_append_column( tvGlobalAnnotations,
 				     gtk_tree_view_column_new());
@@ -763,7 +762,6 @@ aghui::SExpDesignUIWidgets::
 	g_object_unref( (GObject*)mSessions);
 	g_object_unref( (GObject*)mGlobalAnnotations);
 	g_object_unref( (GObject*)mGlobalADProfiles);
-	g_object_unref( (GObject*)mGlobalFiltersNotchFilter);
 	g_object_unref( (GObject*)mSimulations);
 
 	g_object_unref( (GObject*)mScoringPageSize);
diff --git a/src/ui/mw/mw-widgets.hh b/src/ui/mw/mw-widgets.hh
index 081dfe4..1792e37 100644
--- a/src/ui/mw/mw-widgets.hh
+++ b/src/ui/mw/mw-widgets.hh
@@ -65,7 +65,6 @@ struct SExpDesignUIWidgets {
 	static const auto
 		mannotations_visibility_switch_col = 4,
 		mannotations_ref_col = mannotations_visibility_switch_col + 1;
-	static const char* const mannotations_column_names[];
 
       // misc
 	gulong 	wMainWindow_delete_event_cb_handler_id,
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 78893de..d9786d5 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -94,7 +94,7 @@ subject_presentation_by_csubject( const agh::CSubject& j)
 
 
 const char
-*const aghui::SExpDesignUI::FreqBandNames[metrics::psd::TBand::_total] = {
+	*const aghui::SExpDesignUI::FreqBandNames[metrics::psd::TBand::_total] = {
 	"Delta", "Theta", "Alpha", "Beta", "Gamma",
 };
 
@@ -125,9 +125,9 @@ SExpDesignUI (aghui::SSessionChooser *parent,
 	uc_accuracy_factor (1.),
 	pagesize_item (2),
 	binsize_item (1),
-	ext_score_codes (
-		{{{" -0"}, {"1"}, {"2"}, {"3"}, {"4"}, {"6Rr8"}, {"Ww5"}}}
-	),
+	ext_score_codes {
+		{" -0", "1", "2", "3", "4", "6Rr8", "Ww5"}
+	},
 	freq_bands {
 		{  1.5,  4.0 },
 		{  4.0,  8.0 },
diff --git a/src/ui/mw/mw_cb.cc b/src/ui/mw/mw_cb.cc
index e92dca8..57a2b62 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/ui/mw/mw_cb.cc
@@ -153,8 +153,8 @@ iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
 	gtk_label_set_markup(
 		ED.lGlobalADHint,
 		(ED.global_artifact_detection_profiles.size() < 2)
-		? "<small>You can create a custom profile in Scoring Facility,"
-		  " after tuning parameters on a real recording.</small>"
+		? "<small>You can create a custom profile in Scoring Facility,\n"
+		  "after tuning parameters on a real recording.</small>"
 		: ""); // good boy
 
 
@@ -208,7 +208,7 @@ iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
 			return R.signal_type() == sigfile::SChannel::TType::eeg;
 		};
 	    break;
-	case 1:
+	case 1: // "Clear All"
 		F =
 		[&]( CRecording& R)
 		{
@@ -221,7 +221,7 @@ iExpGloballyDetectArtifacts_activate_cb( GtkMenuItem*, gpointer userdata)
 		filter =
 		[&]( CRecording&)
 		{
-			return true;
+			return true; // clear in all channels (mark in EEG channels only)
 		};
 	    break;
 	default:
diff --git a/src/ui/sm/sm.cc b/src/ui/sm/sm.cc
index 6e620e2..94c786f 100644
--- a/src/ui/sm/sm.cc
+++ b/src/ui/sm/sm.cc
@@ -146,10 +146,11 @@ void
 aghui::SSessionChooser::
 destruct_widgets()
 {
-      // destroy toplevels
-	gtk_widget_destroy( (GtkWidget*)wSessionChooser);
-      // and models, etc
-	g_object_unref( (GObject*)mSessionChooserList);
+      // // destroy toplevels
+      // 	gtk_widget_destroy( (GtkWidget*)wSessionChooser);
+      // // and models, etc
+      // 	g_object_unref( (GObject*)mSessionChooserList);
+	// don't care
 }
 
 

-- 
Sleep experiment manager