[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461
andrei zavada
johnhommer at gmail.com
Fri Nov 16 00:50:21 UTC 2012
The following commit has been merged in the master branch:
commit c892900563d6ae0968ea7255bc8964481b8f45a4
Author: andrei zavada <johnhommer at gmail.com>
Date: Wed Oct 17 18:52:36 2012 +0300
rename files under ui/
diff --git a/src/main.cc b/src/main.cc
index 39d8f30..3b287cd 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -19,7 +19,7 @@
#include "common/globals.hh"
#include "ui/globals.hh"
#include "ui/ui.hh"
-#include "ui/session-chooser.hh"
+#include "ui/sc.hh"
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index c9b3087..bc8f970 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -12,50 +12,50 @@ libaghui_a_SOURCES = \
misc.hh \
libcommon.cc \
globals.hh \
- session-chooser.cc \
- session-chooser-construct.cc \
- session-chooser.hh \
- session-chooser_cb.cc \
- session-chooser_cb.hh \
- expdesign.hh \
- expdesign-widgets.hh \
- expdesign_cb.hh \
- expdesign.cc \
- expdesign_cb.cc \
- expdesign-construct.cc \
- expdesign-measurements.cc \
- expdesign-measurements_cb.cc \
- expdesign-loadsave.cc \
- expdesign-admit-one.cc \
- expdesign-settings_cb.cc \
- expdesign-simulations.cc \
- expdesign-simulations_cb.cc \
- scoring-facility.hh \
- scoring-facility-widgets.hh \
- scoring-facility_cb.hh \
- scoring-facility.cc \
- scoring-facility-construct.cc \
- scoring-facility-channel.cc \
- scoring-facility-artifacts.cc \
- scoring-facility-artifacts_cb.cc \
- scoring-facility-ica.cc \
- scoring-facility-ica_cb.cc \
- scoring-facility_cb.cc \
- scoring-facility-montage.cc \
- scoring-facility-montage_cb.cc \
- scoring-facility-hypnogram.cc \
- scoring-facility-hypnogram_cb.cc \
- scoring-facility-patterns.cc \
- scoring-facility-patterns_cb.cc \
- scoring-facility-filter.cc \
- scoring-facility-filter_cb.cc \
- scoring-facility-phasediff.cc \
- scoring-facility-phasediff_cb.cc \
- modelrun-facility.hh \
- modelrun-facility_cb.hh \
- modelrun-facility.cc \
- modelrun-facility-construct.cc \
- modelrun-facility_cb.cc
+ sc.cc \
+ sc-construct.cc \
+ sc.hh \
+ sc_cb.cc \
+ sc_cb.hh \
+ ed.hh \
+ ed-widgets.hh \
+ ed_cb.hh \
+ ed.cc \
+ ed_cb.cc \
+ ed-construct.cc \
+ ed-measurements.cc \
+ ed-measurements_cb.cc \
+ ed-loadsave.cc \
+ ed-admit-one.cc \
+ ed-settings_cb.cc \
+ ed-simulations.cc \
+ ed-simulations_cb.cc \
+ sf.hh \
+ sf-widgets.hh \
+ sf_cb.hh \
+ sf.cc \
+ sf-construct.cc \
+ sf-channel.cc \
+ sf-artifacts.cc \
+ sf-artifacts_cb.cc \
+ sf-ica.cc \
+ sf-ica_cb.cc \
+ sf_cb.cc \
+ sf-montage.cc \
+ sf-montage_cb.cc \
+ sf-hypnogram.cc \
+ sf-hypnogram_cb.cc \
+ sf-patterns.cc \
+ sf-patterns_cb.cc \
+ sf-filter.cc \
+ sf-filter_cb.cc \
+ sf-phasediff.cc \
+ sf-phasediff_cb.cc \
+ mf.hh \
+ mf_cb.hh \
+ mf.cc \
+ mf-construct.cc \
+ mf_cb.cc
if DO_PCH
BUILT_SOURCES = \
@@ -64,16 +64,16 @@ BUILT_SOURCES = \
misc.hh.gch \
globals.hh.gch \
forward-decls.hh.gch \
- session-chooser.hh.gch \
- session-chooser_cb.hh.gch \
- expdesign.hh.gch \
- expdesign-widgets.hh.gch \
- expdesign_cb.hh.gch \
- scoring-facility.hh.gch \
- scoring-facility-widgets.hh.gch \
- scoring-facility_cb.hh.gch \
- modelrun-facility.hh.gch \
- modelrun-facility_cb.hh.gch
+ sc.hh.gch \
+ sc_cb.hh.gch \
+ ed.hh.gch \
+ ed-widgets.hh.gch \
+ ed_cb.hh.gch \
+ sf.hh.gch \
+ sf-widgets.hh.gch \
+ sf_cb.hh.gch \
+ mf.hh.gch \
+ mf_cb.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
endif
diff --git a/src/ui/expdesign-admit-one.cc b/src/ui/ed-admit-one.cc
similarity index 99%
rename from src/ui/expdesign-admit-one.cc
rename to src/ui/ed-admit-one.cc
index d31cb00..36c0803 100644
--- a/src/ui/expdesign-admit-one.cc
+++ b/src/ui/ed-admit-one.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-admit-one.cc
+ * File name: ui/ed-admit-one.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-18
@@ -13,7 +13,7 @@
#include "../libsigfile/edf.hh"
#include "misc.hh"
-#include "expdesign.hh"
+#include "ed.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/expdesign-construct.cc b/src/ui/ed-construct.cc
similarity index 99%
rename from src/ui/expdesign-construct.cc
rename to src/ui/ed-construct.cc
index af24264..c3537ab 100644
--- a/src/ui/expdesign-construct.cc
+++ b/src/ui/ed-construct.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-construct.cc
+ * File name: ui/ed-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-02
@@ -12,8 +12,8 @@
#include "ui.hh"
-#include "expdesign-widgets.hh"
-#include "expdesign_cb.hh"
+#include "ed-widgets.hh"
+#include "ed_cb.hh"
using namespace std;
diff --git a/src/ui/expdesign-loadsave.cc b/src/ui/ed-loadsave.cc
similarity index 98%
rename from src/ui/expdesign-loadsave.cc
rename to src/ui/ed-loadsave.cc
index 4d5c254..21dfc91 100644
--- a/src/ui/expdesign-loadsave.cc
+++ b/src/ui/ed-loadsave.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-loadsave.cc
+ * File name: ui/ed-loadsave.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-04-28
@@ -15,7 +15,7 @@
#include "../common/config-validate.hh"
#include "globals.hh"
-#include "expdesign.hh"
+#include "ed.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/expdesign-measurements.cc b/src/ui/ed-measurements.cc
similarity index 99%
rename from src/ui/expdesign-measurements.cc
rename to src/ui/ed-measurements.cc
index 29f14d4..2f17ed3 100644
--- a/src/ui/expdesign-measurements.cc
+++ b/src/ui/ed-measurements.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-measurements.cc
+ * File name: ui/ed-measurements.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -18,7 +18,7 @@
#include <cairo-svg.h>
#include "misc.hh"
-#include "expdesign.hh"
+#include "ed.hh"
#include "../model/beersma.hh"
using namespace std;
diff --git a/src/ui/expdesign-measurements_cb.cc b/src/ui/ed-measurements_cb.cc
similarity index 98%
rename from src/ui/expdesign-measurements_cb.cc
rename to src/ui/ed-measurements_cb.cc
index 79aa800..4562245 100644
--- a/src/ui/expdesign-measurements_cb.cc
+++ b/src/ui/ed-measurements_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-measurements_cb.cc
+ * File name: ui/ed-measurements_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -11,8 +11,8 @@
*/
#include "misc.hh"
-#include "expdesign.hh"
-#include "scoring-facility.hh"
+#include "ed.hh"
+#include "sf.hh"
using namespace aghui;
diff --git a/src/ui/expdesign-settings_cb.cc b/src/ui/ed-settings_cb.cc
similarity index 99%
rename from src/ui/expdesign-settings_cb.cc
rename to src/ui/ed-settings_cb.cc
index 89a2a7d..bb68ac4 100644
--- a/src/ui/expdesign-settings_cb.cc
+++ b/src/ui/ed-settings_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-settings_cb.cc
+ * File name: ui/ed-settings_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -13,8 +13,8 @@
#include "../common/string.hh"
#include "misc.hh"
-#include "expdesign.hh"
-#include "scoring-facility.hh"
+#include "ed.hh"
+#include "sf.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/expdesign-simulations.cc b/src/ui/ed-simulations.cc
similarity index 98%
rename from src/ui/expdesign-simulations.cc
rename to src/ui/ed-simulations.cc
index 39b89e4..2e0ad1f 100644
--- a/src/ui/expdesign-simulations.cc
+++ b/src/ui/ed-simulations.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-simulations.cc
+ * File name: ui/ed-simulations.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -12,7 +12,7 @@
#include "misc.hh"
-#include "expdesign.hh"
+#include "ed.hh"
using namespace std;
diff --git a/src/ui/expdesign-simulations_cb.cc b/src/ui/ed-simulations_cb.cc
similarity index 98%
rename from src/ui/expdesign-simulations_cb.cc
rename to src/ui/ed-simulations_cb.cc
index 3a58cbe..bd7e54d 100644
--- a/src/ui/expdesign-simulations_cb.cc
+++ b/src/ui/ed-simulations_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-simulations_cb.cc
+ * File name: ui/ed-simulations_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -12,8 +12,8 @@
#include "misc.hh"
-#include "expdesign.hh"
-#include "modelrun-facility.hh"
+#include "ed.hh"
+#include "mf.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/expdesign-widgets.hh b/src/ui/ed-widgets.hh
similarity index 99%
rename from src/ui/expdesign-widgets.hh
rename to src/ui/ed-widgets.hh
index 870c498..a77109b 100644
--- a/src/ui/expdesign-widgets.hh
+++ b/src/ui/ed-widgets.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign-widgets.hh
+ * File name: ui/ed-widgets.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-06
diff --git a/src/ui/expdesign.cc b/src/ui/ed.cc
similarity index 99%
rename from src/ui/expdesign.cc
rename to src/ui/ed.cc
index c410a7b..2fbe498 100644
--- a/src/ui/expdesign.cc
+++ b/src/ui/ed.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign.cc
+ * File name: ui/ed.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -24,10 +24,10 @@
#include "../expdesign/primaries.hh"
#include "../model/beersma.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "modelrun-facility.hh"
-#include "expdesign.hh"
-#include "expdesign_cb.hh"
+#include "sf.hh"
+#include "mf.hh"
+#include "ed.hh"
+#include "ed_cb.hh"
using namespace std;
diff --git a/src/ui/expdesign.hh b/src/ui/ed.hh
similarity index 99%
rename from src/ui/expdesign.hh
rename to src/ui/ed.hh
index 606f494..b9e6e48 100644
--- a/src/ui/expdesign.hh
+++ b/src/ui/ed.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign.hh
+ * File name: ui/ed.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-13
@@ -28,7 +28,7 @@
#include "ui.hh"
#include "ui++.hh"
#include "forward-decls.hh"
-#include "expdesign-widgets.hh"
+#include "ed-widgets.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/expdesign_cb.cc b/src/ui/ed_cb.cc
similarity index 98%
rename from src/ui/expdesign_cb.cc
rename to src/ui/ed_cb.cc
index 55fe7cf..d820e98 100644
--- a/src/ui/expdesign_cb.cc
+++ b/src/ui/ed_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign_cb.cc
+ * File name: ui/ed_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -11,10 +11,10 @@
*/
#include "misc.hh"
-#include "session-chooser.hh"
-#include "expdesign.hh"
-#include "expdesign_cb.hh"
-#include "scoring-facility.hh"
+#include "sc.hh"
+#include "ed.hh"
+#include "ed_cb.hh"
+#include "sf.hh"
using namespace aghui;
diff --git a/src/ui/expdesign_cb.hh b/src/ui/ed_cb.hh
similarity index 98%
rename from src/ui/expdesign_cb.hh
rename to src/ui/ed_cb.hh
index 24caebd..fb04506 100644
--- a/src/ui/expdesign_cb.hh
+++ b/src/ui/ed_cb.hh
@@ -1,11 +1,11 @@
// ;-*-C++-*-
/*
- * File name: ui/expdesign_cb.hh
+ * File name: ui/ed_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
*
- * Purpose: declarations of expdesign callbacks
+ * Purpose: declarations of ed callbacks
*
* License: GPL
*/
diff --git a/src/ui/modelrun-facility-construct.cc b/src/ui/mf-construct.cc
similarity index 97%
rename from src/ui/modelrun-facility-construct.cc
rename to src/ui/mf-construct.cc
index d0f5822..1d9de89 100644
--- a/src/ui/modelrun-facility-construct.cc
+++ b/src/ui/mf-construct.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/modelrun-facility-construct.cc
+ * File name: ui/mf-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-11
@@ -10,8 +10,8 @@
* License: GPL
*/
-#include "modelrun-facility.hh"
-#include "modelrun-facility_cb.hh"
+#include "mf.hh"
+#include "mf_cb.hh"
int
diff --git a/src/ui/modelrun-facility.cc b/src/ui/mf.cc
similarity index 98%
rename from src/ui/modelrun-facility.cc
rename to src/ui/mf.cc
index 9388d4c..fb42b82 100644
--- a/src/ui/modelrun-facility.cc
+++ b/src/ui/mf.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/modelrun-facility.cc
+ * File name: ui/mf.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -13,9 +13,9 @@
#include "../model/achermann.hh"
#include "misc.hh"
-#include "expdesign.hh"
-#include "modelrun-facility.hh"
-#include "modelrun-facility_cb.hh"
+#include "ed.hh"
+#include "mf.hh"
+#include "mf_cb.hh"
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/src/ui/modelrun-facility.hh b/src/ui/mf.hh
similarity index 96%
rename from src/ui/modelrun-facility.hh
rename to src/ui/mf.hh
index 901dfbf..61a924c 100644
--- a/src/ui/modelrun-facility.hh
+++ b/src/ui/mf.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/modelrun-facility.hh
+ * File name: ui/mf.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-05-14
@@ -14,7 +14,7 @@
#define _AGH_UI_MODELRUN_FACILITY_H
#include "../model/forward-decls.hh"
-#include "expdesign.hh"
+#include "ed.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/modelrun-facility_cb.cc b/src/ui/mf_cb.cc
similarity index 99%
rename from src/ui/modelrun-facility_cb.cc
rename to src/ui/mf_cb.cc
index 11b235e..e086914 100644
--- a/src/ui/modelrun-facility_cb.cc
+++ b/src/ui/mf_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/modelrun-facility_cb.cc
+ * File name: ui/mf_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -15,7 +15,7 @@
#include "../model/beersma.hh"
#include "misc.hh"
-#include "modelrun-facility.hh"
+#include "mf.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/modelrun-facility_cb.hh b/src/ui/mf_cb.hh
similarity index 97%
rename from src/ui/modelrun-facility_cb.hh
rename to src/ui/mf_cb.hh
index 1965575..72996d0 100644
--- a/src/ui/modelrun-facility_cb.hh
+++ b/src/ui/mf_cb.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/modelrun-facility_cb.hh
+ * File name: ui/mf_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
diff --git a/src/ui/session-chooser-construct.cc b/src/ui/sc-construct.cc
similarity index 98%
rename from src/ui/session-chooser-construct.cc
rename to src/ui/sc-construct.cc
index ba5b7fd..fd8f47f 100644
--- a/src/ui/session-chooser-construct.cc
+++ b/src/ui/sc-construct.cc
@@ -13,8 +13,8 @@
#include "ui.hh"
#include "misc.hh"
-#include "session-chooser.hh"
-#include "session-chooser_cb.hh"
+#include "sc.hh"
+#include "sc_cb.hh"
using namespace std;
diff --git a/src/ui/session-chooser.cc b/src/ui/sc.cc
similarity index 98%
rename from src/ui/session-chooser.cc
rename to src/ui/sc.cc
index 04efc07..5991dfd 100644
--- a/src/ui/session-chooser.cc
+++ b/src/ui/sc.cc
@@ -18,9 +18,9 @@
#include "../common/fs.hh"
#include "../expdesign/forward-decls.hh" // for edf_file_counter
#include "misc.hh"
-#include "session-chooser.hh"
-#include "session-chooser_cb.hh"
-#include "expdesign.hh"
+#include "sc.hh"
+#include "sc_cb.hh"
+#include "ed.hh"
using namespace std;
diff --git a/src/ui/session-chooser.hh b/src/ui/sc.hh
similarity index 100%
rename from src/ui/session-chooser.hh
rename to src/ui/sc.hh
diff --git a/src/ui/session-chooser_cb.cc b/src/ui/sc_cb.cc
similarity index 98%
rename from src/ui/session-chooser_cb.cc
rename to src/ui/sc_cb.cc
index ca0383e..10c9a57 100644
--- a/src/ui/session-chooser_cb.cc
+++ b/src/ui/sc_cb.cc
@@ -14,8 +14,8 @@
#include "../common/string.hh"
#include "ui.hh"
#include "ui++.hh"
-#include "session-chooser.hh"
-#include "session-chooser_cb.hh"
+#include "sc.hh"
+#include "sc_cb.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/session-chooser_cb.hh b/src/ui/sc_cb.hh
similarity index 100%
rename from src/ui/session-chooser_cb.hh
rename to src/ui/sc_cb.hh
diff --git a/src/ui/scoring-facility-artifacts.cc b/src/ui/sf-artifacts.cc
similarity index 90%
rename from src/ui/scoring-facility-artifacts.cc
rename to src/ui/sf-artifacts.cc
index 1e71771..96030cc 100644
--- a/src/ui/scoring-facility-artifacts.cc
+++ b/src/ui/sf-artifacts.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-artifacts.cc
+ * File name: ui/sf-artifacts.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-05
@@ -11,8 +11,8 @@
*/
-#include "scoring-facility.hh"
-#include "scoring-facility-widgets.hh"
+#include "sf.hh"
+#include "sf-widgets.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-artifacts_cb.cc b/src/ui/sf-artifacts_cb.cc
similarity index 96%
rename from src/ui/scoring-facility-artifacts_cb.cc
rename to src/ui/sf-artifacts_cb.cc
index 29d770a..4aeea4a 100644
--- a/src/ui/scoring-facility-artifacts_cb.cc
+++ b/src/ui/sf-artifacts_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-artifacts_cb.cc
+ * File name: ui/sf-artifacts_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-05
@@ -10,8 +10,8 @@
* License: GPL
*/
-#include "scoring-facility.hh"
-#include "scoring-facility_cb.hh"
+#include "sf.hh"
+#include "sf_cb.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-channel.cc b/src/ui/sf-channel.cc
similarity index 99%
rename from src/ui/scoring-facility-channel.cc
rename to src/ui/sf-channel.cc
index 7eb17e7..a007608 100644
--- a/src/ui/scoring-facility-channel.cc
+++ b/src/ui/sf-channel.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-channel.cc
+ * File name: ui/sf-channel.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-05-29
@@ -17,7 +17,7 @@
#include "../common/config-validate.hh"
#include "../sigproc/exstrom.hh"
#include "globals.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-construct.cc b/src/ui/sf-construct.cc
similarity index 99%
rename from src/ui/scoring-facility-construct.cc
rename to src/ui/sf-construct.cc
index b6ca35d..70f63b0 100644
--- a/src/ui/scoring-facility-construct.cc
+++ b/src/ui/sf-construct.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-construct.cc
+ * File name: ui/sf-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-13
@@ -11,11 +11,11 @@
*/
-#include "expdesign.hh"
+#include "ed.hh"
#include <stdexcept>
#include "ui.hh"
-#include "scoring-facility-widgets.hh"
-#include "scoring-facility_cb.hh"
+#include "sf-widgets.hh"
+#include "sf_cb.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-filter.cc b/src/ui/sf-filter.cc
similarity index 83%
rename from src/ui/scoring-facility-filter.cc
rename to src/ui/sf-filter.cc
index 8712b4a..5405c95 100644
--- a/src/ui/scoring-facility-filter.cc
+++ b/src/ui/sf-filter.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-filter.cc
+ * File name: ui/sf-filter.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-30
@@ -11,7 +11,7 @@
*/
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-filter_cb.cc b/src/ui/sf-filter_cb.cc
similarity index 96%
rename from src/ui/scoring-facility-filter_cb.cc
rename to src/ui/sf-filter_cb.cc
index f15b309..1b84bea 100644
--- a/src/ui/scoring-facility-filter_cb.cc
+++ b/src/ui/sf-filter_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-filter_cb.cc
+ * File name: ui/sf-filter_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
@@ -12,8 +12,8 @@
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility_cb.hh"
+#include "sf.hh"
+#include "sf_cb.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/scoring-facility-hypnogram.cc b/src/ui/sf-hypnogram.cc
similarity index 97%
rename from src/ui/scoring-facility-hypnogram.cc
rename to src/ui/sf-hypnogram.cc
index 471d3ad..c8569a3 100644
--- a/src/ui/scoring-facility-hypnogram.cc
+++ b/src/ui/sf-hypnogram.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-hypnogram.cc
+ * File name: ui/sf-hypnogram.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-27
@@ -15,7 +15,7 @@
#include <cairo/cairo.h>
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-hypnogram_cb.cc b/src/ui/sf-hypnogram_cb.cc
similarity index 98%
rename from src/ui/scoring-facility-hypnogram_cb.cc
rename to src/ui/sf-hypnogram_cb.cc
index 644620f..e25356b 100644
--- a/src/ui/scoring-facility-hypnogram_cb.cc
+++ b/src/ui/sf-hypnogram_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-hypnogram_cb.cc
+ * File name: ui/sf-hypnogram_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-15
@@ -16,7 +16,7 @@
#include <fstream>
#include "globals.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
#include "../model/beersma.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-ica.cc b/src/ui/sf-ica.cc
similarity index 98%
rename from src/ui/scoring-facility-ica.cc
rename to src/ui/sf-ica.cc
index 6927854..83e441e 100644
--- a/src/ui/scoring-facility-ica.cc
+++ b/src/ui/sf-ica.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-ica.cc
+ * File name: ui/sf-ica.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-10-25
@@ -15,8 +15,8 @@
#include <itpp/base/algebra/inv.h>
#include "../ica/ica.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility_cb.hh"
+#include "sf.hh"
+#include "sf_cb.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-ica_cb.cc b/src/ui/sf-ica_cb.cc
similarity index 98%
rename from src/ui/scoring-facility-ica_cb.cc
rename to src/ui/sf-ica_cb.cc
index 3155c03..795f60d 100644
--- a/src/ui/scoring-facility-ica_cb.cc
+++ b/src/ui/sf-ica_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-ica_cb.cc
+ * File name: ui/sf-ica_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-10-30
@@ -12,8 +12,8 @@
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility-widgets.hh"
+#include "sf.hh"
+#include "sf-widgets.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/scoring-facility-montage.cc b/src/ui/sf-montage.cc
similarity index 99%
rename from src/ui/scoring-facility-montage.cc
rename to src/ui/sf-montage.cc
index 8bc92f7..004ad84 100644
--- a/src/ui/scoring-facility-montage.cc
+++ b/src/ui/sf-montage.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-montage.cc
+ * File name: ui/sf-montage.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-23
@@ -15,7 +15,7 @@
#include "../common/lang.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/scoring-facility-montage_cb.cc b/src/ui/sf-montage_cb.cc
similarity index 99%
rename from src/ui/scoring-facility-montage_cb.cc
rename to src/ui/sf-montage_cb.cc
index a0fdca1..3228b43 100644
--- a/src/ui/scoring-facility-montage_cb.cc
+++ b/src/ui/sf-montage_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-montage_cb.cc
+ * File name: ui/sf-montage_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-02
@@ -15,8 +15,8 @@
#include <cairo/cairo.h>
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility_cb.hh"
+#include "sf.hh"
+#include "sf_cb.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-patterns.cc b/src/ui/sf-patterns.cc
similarity index 99%
rename from src/ui/scoring-facility-patterns.cc
rename to src/ui/sf-patterns.cc
index b7db666..e28e026 100644
--- a/src/ui/scoring-facility-patterns.cc
+++ b/src/ui/sf-patterns.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-patterns.cc
+ * File name: ui/sf-patterns.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-14
@@ -17,7 +17,7 @@
#include <sys/stat.h>
#include "misc.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-patterns_cb.cc b/src/ui/sf-patterns_cb.cc
similarity index 98%
rename from src/ui/scoring-facility-patterns_cb.cc
rename to src/ui/sf-patterns_cb.cc
index 3b09487..88bc653 100644
--- a/src/ui/scoring-facility-patterns_cb.cc
+++ b/src/ui/sf-patterns_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-patterns_cb.cc
+ * File name: ui/sf-patterns_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -14,7 +14,7 @@
#include "misc.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-phasediff.cc b/src/ui/sf-phasediff.cc
similarity index 98%
rename from src/ui/scoring-facility-phasediff.cc
rename to src/ui/sf-phasediff.cc
index 1fda00b..78bc920 100644
--- a/src/ui/scoring-facility-phasediff.cc
+++ b/src/ui/sf-phasediff.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-phasediff.cc
+ * File name: ui/sf-phasediff.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-29
@@ -15,7 +15,7 @@
#include "../common/lang.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-phasediff_cb.cc b/src/ui/sf-phasediff_cb.cc
similarity index 97%
rename from src/ui/scoring-facility-phasediff_cb.cc
rename to src/ui/sf-phasediff_cb.cc
index 956657b..e584051 100644
--- a/src/ui/scoring-facility-phasediff_cb.cc
+++ b/src/ui/sf-phasediff_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-phasediff_cb.cc
+ * File name: ui/sf-phasediff_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-18
@@ -15,7 +15,7 @@
#include "../common/lang.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
+#include "sf.hh"
using namespace std;
diff --git a/src/ui/scoring-facility-widgets.hh b/src/ui/sf-widgets.hh
similarity index 99%
rename from src/ui/scoring-facility-widgets.hh
rename to src/ui/sf-widgets.hh
index 64993b3..fa39072 100644
--- a/src/ui/scoring-facility-widgets.hh
+++ b/src/ui/sf-widgets.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility-widgets.hh
+ * File name: ui/sf-widgets.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-06
diff --git a/src/ui/scoring-facility.cc b/src/ui/sf.cc
similarity index 99%
rename from src/ui/scoring-facility.cc
rename to src/ui/sf.cc
index ef6b001..ba3f7e3 100644
--- a/src/ui/scoring-facility.cc
+++ b/src/ui/sf.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility.cc
+ * File name: ui/sf.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -18,8 +18,8 @@
#include "../common/config-validate.hh"
#include "../common/fs.hh"
#include "misc.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility_cb.hh"
+#include "sf.hh"
+#include "sf_cb.hh"
using namespace std;
diff --git a/src/ui/scoring-facility.hh b/src/ui/sf.hh
similarity index 99%
rename from src/ui/scoring-facility.hh
rename to src/ui/sf.hh
index 1393e7c..9d5e450 100644
--- a/src/ui/scoring-facility.hh
+++ b/src/ui/sf.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility.hh
+ * File name: ui/sf.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-14
@@ -24,8 +24,8 @@
#include "../ica/ica.hh"
#include "globals.hh"
#include "ui++.hh"
-#include "expdesign.hh"
-#include "scoring-facility-widgets.hh"
+#include "ed.hh"
+#include "sf-widgets.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/scoring-facility_cb.cc b/src/ui/sf_cb.cc
similarity index 98%
rename from src/ui/scoring-facility_cb.cc
rename to src/ui/sf_cb.cc
index db78c9e..a953165 100644
--- a/src/ui/scoring-facility_cb.cc
+++ b/src/ui/sf_cb.cc
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility_cb.cc
+ * File name: ui/sf_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -11,9 +11,9 @@
*/
-#include "expdesign.hh"
-#include "scoring-facility.hh"
-#include "scoring-facility-widgets.hh"
+#include "ed.hh"
+#include "sf.hh"
+#include "sf-widgets.hh"
using namespace std;
diff --git a/src/ui/scoring-facility_cb.hh b/src/ui/sf_cb.hh
similarity index 99%
rename from src/ui/scoring-facility_cb.hh
rename to src/ui/sf_cb.hh
index 5789c84..1838a61 100644
--- a/src/ui/scoring-facility_cb.hh
+++ b/src/ui/sf_cb.hh
@@ -1,6 +1,6 @@
// ;-*-C++-*-
/*
- * File name: ui/scoring-facility_cb.hh
+ * File name: ui/sf_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
--
Sleep experiment manager
More information about the debian-med-commit
mailing list