[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad
Andrei Zavada
johnhommer at gmail.com
Sun Jul 7 23:03:41 UTC 2013
The following commit has been merged in the master branch:
commit d0b7e4ee36abc0b6233c0fd331e2c86839f8c2d2
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Fri May 24 01:25:29 2013 +0300
separate tools and aghermann proper under src
diff --git a/configure.ac b/configure.ac
index cece477..fc9bb6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <johnhommer at gmail.com>])
AC_INIT([Aghermann], [1.0_rc], [johnhommer at gmail.com])
-AC_CONFIG_SRCDIR([src/main.cc])
+AC_CONFIG_SRCDIR([src/aghermann/main.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ(2.61)
@@ -187,36 +187,38 @@ AC_SUBST(user, [`whoami`@`hostname`])
AC_SUBST(build_date, [`date +"%F"`])
AC_SUBST(build_datetime, [`date`])
-dnl fafa is a powerful debugging tool
-AC_DEFINE( [FAFA], [printf( __FILE__ ":%d (%s): fafa\n", __LINE__, __FUNCTION__);], [FAFA])
-AC_DEFINE( [FABUF], [printf( __FILE__ ":%d (%s): %s\n", __LINE__, __FUNCTION__, __buf__);], [FABUF])
-
AC_OUTPUT([
Makefile
src/Makefile
+ src/common/Makefile
src/sigproc/Makefile
src/libsigfile/Makefile
- src/patterns/Makefile
- src/metrics/Makefile
- src/ica/Makefile
- src/common/Makefile
- src/expdesign/Makefile
- src/rk1968/Makefile
- src/model/Makefile
- src/ui/Makefile
- src/ui/sm/Makefile
- src/ui/mw/Makefile
- src/ui/sf/Makefile
- src/ui/sf/d/Makefile
- src/ui/mf/Makefile
+
+ src/aghermann/Makefile
+ src/aghermann/patterns/Makefile
+ src/aghermann/metrics/Makefile
+ src/aghermann/ica/Makefile
+ src/aghermann/expdesign/Makefile
+ src/aghermann/rk1968/Makefile
+ src/aghermann/model/Makefile
+ src/aghermann/ui/Makefile
+ src/aghermann/ui/sm/Makefile
+ src/aghermann/ui/mw/Makefile
+ src/aghermann/ui/sf/Makefile
+ src/aghermann/ui/sf/d/Makefile
+ src/aghermann/ui/mf/Makefile
+
src/tools/Makefile
+
data/Makefile
data/aghermann.desktop
data/edfhed-gtk.desktop
+
doc/Makefile
doc/org/Makefile
doc/org/aghermann.org
+
man/aghermann.1
man/edfhed-gtk.1
man/edfhed.1
diff --git a/src/Makefile.am b/src/Makefile.am
index cb2d08e..936d0cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,49 +1,4 @@
SUBDIRS := \
- common sigproc ica libsigfile \
- metrics \
- expdesign \
- patterns \
- rk1968 model \
- ui \
+ common sigproc libsigfile \
+ aghermann \
tools
-
-AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
- $(OPENMP_CXXFLAGS) \
- -DBUILT_BY=\"@user@\"
-
-bin_PROGRAMS := aghermann
-
-aghermann_SOURCES := \
- main.cc \
- ui/sm/sm.hh
-
-aghermann_LDADD := \
- ui/sm/liba.a \
- ui/mw/liba.a \
- ui/sf/liba.a \
- ui/sf/d/liba.a \
- ui/mf/liba.a \
- ui/liba.a \
- model/liba.a \
- rk1968/liba.a \
- patterns/liba.a \
- metrics/liba.a \
- libsigfile/liba.a \
- sigproc/liba.a \
- common/liba.a \
- expdesign/liba.a \
- $(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
- $(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
- $(LIBCONFIGXX_LIBS) \
- $(LIBFFTW3_LDADD) $(OPENMP_CXXFLAGS)
-
-CLEANFILES := \
- */*.la */*.gch
-
-install-exec-hook:
- rm -f $(DESTDIR)/$(pkglibdir)/*.la
-uninstall-hook:
- rm -f $(DESTDIR)/$(pkglibdir)/*.so
-
diff --git a/src/.gitignore b/src/aghermann/.gitignore
similarity index 100%
rename from src/.gitignore
rename to src/aghermann/.gitignore
diff --git a/src/Makefile.am b/src/aghermann/Makefile.am
similarity index 84%
copy from src/Makefile.am
copy to src/aghermann/Makefile.am
index cb2d08e..114fb83 100644
--- a/src/Makefile.am
+++ b/src/aghermann/Makefile.am
@@ -1,16 +1,16 @@
SUBDIRS := \
- common sigproc ica libsigfile \
+ ica \
metrics \
expdesign \
patterns \
rk1968 model \
- ui \
- tools
+ ui
AM_CXXFLAGS := \
-Wall -std=c++0x -fno-rtti \
$(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
$(OPENMP_CXXFLAGS) \
+ -I$(top_srcdir)/src \
-DBUILT_BY=\"@user@\"
bin_PROGRAMS := aghermann
@@ -30,18 +30,15 @@ aghermann_LDADD := \
rk1968/liba.a \
patterns/liba.a \
metrics/liba.a \
- libsigfile/liba.a \
- sigproc/liba.a \
- common/liba.a \
+ ../libsigfile/liba.a \
+ ../sigproc/liba.a \
+ ../common/liba.a \
expdesign/liba.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
$(LIBCONFIGXX_LIBS) \
$(LIBFFTW3_LDADD) $(OPENMP_CXXFLAGS)
-CLEANFILES := \
- */*.la */*.gch
-
install-exec-hook:
rm -f $(DESTDIR)/$(pkglibdir)/*.la
uninstall-hook:
diff --git a/src/expdesign/Makefile.am b/src/aghermann/expdesign/Makefile.am
similarity index 94%
rename from src/expdesign/Makefile.am
rename to src/aghermann/expdesign/Makefile.am
index 869636b..989f62b 100644
--- a/src/expdesign/Makefile.am
+++ b/src/aghermann/expdesign/Makefile.am
@@ -15,6 +15,9 @@ liba_a_SOURCES := \
recording.hh \
profile.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
forward-decls.hh.gch \
@@ -23,6 +26,6 @@ BUILT_SOURCES := \
primaries.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/expdesign/forward-decls.hh b/src/aghermann/expdesign/forward-decls.hh
similarity index 90%
rename from src/expdesign/forward-decls.hh
rename to src/aghermann/expdesign/forward-decls.hh
index b982f32..c5a8a96 100644
--- a/src/expdesign/forward-decls.hh
+++ b/src/aghermann/expdesign/forward-decls.hh
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/forward-decls.hh
+ * File name: aghermann/expdesign/forward-decls.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-11-08
diff --git a/src/expdesign/loadsave.cc b/src/aghermann/expdesign/loadsave.cc
similarity index 96%
rename from src/expdesign/loadsave.cc
rename to src/aghermann/expdesign/loadsave.cc
index a836321..f55165e 100644
--- a/src/expdesign/loadsave.cc
+++ b/src/aghermann/expdesign/loadsave.cc
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/loadsave.cc
+ * File name: aghermann/expdesign/loadsave.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-04-28
@@ -16,8 +16,8 @@
#include <memory>
#include "common/config-validate.hh"
+#include "aghermann/model/achermann.hh"
#include "primaries.hh"
-#include "model/achermann.hh"
using namespace std;
diff --git a/src/expdesign/primaries.cc b/src/aghermann/expdesign/primaries.cc
similarity index 99%
rename from src/expdesign/primaries.cc
rename to src/aghermann/expdesign/primaries.cc
index bd1e701..8ddb29c 100644
--- a/src/expdesign/primaries.cc
+++ b/src/aghermann/expdesign/primaries.cc
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/primaries.cc
+ * File name: aghermann/expdesign/primaries.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-04-28
diff --git a/src/expdesign/primaries.hh b/src/aghermann/expdesign/primaries.hh
similarity index 97%
rename from src/expdesign/primaries.hh
rename to src/aghermann/expdesign/primaries.hh
index 63ae0b5..a6b3ddc 100644
--- a/src/expdesign/primaries.hh
+++ b/src/aghermann/expdesign/primaries.hh
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/primaries.hh
+ * File name: aghermann/expdesign/primaries.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-05-01
@@ -25,7 +25,7 @@
#include "common/config-validate.hh"
#include "common/subject_id.hh"
#include "sigproc/winfun.hh"
-#include "model/achermann.hh"
+#include "aghermann/model/achermann.hh"
#include "recording.hh"
#include "forward-decls.hh"
@@ -39,7 +39,7 @@ namespace agh {
using namespace std;
-typedef size_t sid_type;
+typedef size_t sid_t;
class CSubject : public SSubjectId {
@@ -55,7 +55,7 @@ class CSubject : public SSubjectId {
_dir (rv._dir)
{}
- CSubject (const string& dir, sid_type id)
+ CSubject (const string& dir, sid_t id)
: agh::SSubjectId (dir.substr( dir.rfind('/')+1)),
_status (0),
_id (id),
@@ -93,7 +93,7 @@ class CSubject : public SSubjectId {
{
return SSubjectId::id == n;
}
- bool operator==( sid_type id) const
+ bool operator==( sid_t id) const
{
return _id == id;
}
@@ -256,8 +256,7 @@ class CSubject : public SSubjectId {
private:
int _status;
- sid_type
- _id; // eventually to allow distinctly identifiable namesakes in different groups
+ sid_t _id; // eventually to allow distinctly identifiable namesakes in different groups
string _dir;
};
@@ -479,8 +478,7 @@ class CExpDesign {
string _session_dir;
string _error_log;
- sid_type
- _id_pool;
+ sid_t _id_pool;
// load/save
forward_list<confval::SValidator<double>> config_keys_g;
forward_list<confval::SValidator<int>> config_keys_d;
diff --git a/src/expdesign/profile.hh b/src/aghermann/expdesign/profile.hh
similarity index 98%
rename from src/expdesign/profile.hh
rename to src/aghermann/expdesign/profile.hh
index 0771e9d..89d08cf 100644
--- a/src/expdesign/profile.hh
+++ b/src/aghermann/expdesign/profile.hh
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/profile.hh
+ * File name: aghermann/expdesign/profile.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-11-24
diff --git a/src/expdesign/recording.cc b/src/aghermann/expdesign/recording.cc
similarity index 99%
rename from src/expdesign/recording.cc
rename to src/aghermann/expdesign/recording.cc
index 3027ac1..56d3632 100644
--- a/src/expdesign/recording.cc
+++ b/src/aghermann/expdesign/recording.cc
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/recording.cc
+ * File name: aghermann/expdesign/recording.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-02
@@ -12,9 +12,10 @@
#include <list>
#include <valarray>
+#include "aghermann/model/beersma.hh"
+
#include "recording.hh"
#include "primaries.hh"
-#include "model/beersma.hh"
using namespace std;
diff --git a/src/expdesign/recording.hh b/src/aghermann/expdesign/recording.hh
similarity index 97%
rename from src/expdesign/recording.hh
rename to src/aghermann/expdesign/recording.hh
index fe08eea..bc5a839 100644
--- a/src/expdesign/recording.hh
+++ b/src/aghermann/expdesign/recording.hh
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/recording.hh
+ * File name: aghermann/expdesign/recording.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-08-26
@@ -14,11 +14,10 @@
#define _AGH_EXPDESIGN_RECORDING_H
#include <cstdarg>
+
#include "libsigfile/source.hh"
-#include "metrics/psd.hh"
-#include "metrics/swu.hh"
-#include "metrics/mc.hh"
-#include "model/forward-decls.hh"
+#include "aghermann/metrics/all.hh"
+#include "aghermann/model/forward-decls.hh"
#include "forward-decls.hh"
namespace agh {
diff --git a/src/expdesign/tree-scanner.cc b/src/aghermann/expdesign/tree-scanner.cc
similarity index 97%
rename from src/expdesign/tree-scanner.cc
rename to src/aghermann/expdesign/tree-scanner.cc
index b9ba463..b1994b8 100644
--- a/src/expdesign/tree-scanner.cc
+++ b/src/aghermann/expdesign/tree-scanner.cc
@@ -1,5 +1,5 @@
/*
- * File name: expdesign/tree-scanner.cc
+ * File name: aghermann/expdesign/tree-scanner.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-19
@@ -157,16 +157,16 @@ register_intree_source( sigfile::CTypedSource&& F,
}
// refuse to register sources of wrong subjects
- if ( j_name != F()._subject.id ) {
+ if ( j_name != F().subject().id ) {
log_message( "%s: file belongs to subject %s (\"%s\"), is misplaced here under subject \"%s\"\n",
- F().filename(), F()._subject.id.c_str(), F()._subject.name.c_str(), j_name.c_str());
+ F().filename(), F().subject().id.c_str(), F().subject().name.c_str(), j_name.c_str());
return -1;
}
try {
- auto existing_group = group_of( F()._subject.id.c_str());
+ auto existing_group = group_of( F().subject().id.c_str());
if ( g_name != existing_group ) {
log_message( "%s: subject %s (\"%s\") belongs to a different group (\"%s\")\n",
- F().filename(), F()._subject.id.c_str(), F()._subject.name.c_str(), existing_group);
+ F().filename(), F().subject().id.c_str(), F().subject().name.c_str(), existing_group);
return -1;
}
} catch (invalid_argument) {
diff --git a/src/ica/Makefile.am b/src/aghermann/ica/Makefile.am
similarity index 100%
rename from src/ica/Makefile.am
rename to src/aghermann/ica/Makefile.am
diff --git a/src/ica/ica.hh b/src/aghermann/ica/ica.hh
similarity index 98%
rename from src/ica/ica.hh
rename to src/aghermann/ica/ica.hh
index f752459..1c4eb5d 100644
--- a/src/ica/ica.hh
+++ b/src/aghermann/ica/ica.hh
@@ -1,5 +1,5 @@
/*
- * File name: ica/ica.hh
+ * File name: aghermann/ica/ica.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-10-13
diff --git a/src/main.cc b/src/aghermann/main.cc
similarity index 94%
rename from src/main.cc
rename to src/aghermann/main.cc
index cd66110..0bf940e 100644
--- a/src/main.cc
+++ b/src/aghermann/main.cc
@@ -1,5 +1,5 @@
/*
- * File name: main.cc
+ * File name: aghermann/main.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-05-03
@@ -19,9 +19,9 @@
#include <unique/unique.h>
#include "common/globals.hh"
-#include "ui/globals.hh"
-#include "ui/ui.hh"
-#include "ui/sm/sm.hh"
+#include "aghermann/ui/globals.hh"
+#include "aghermann/ui/ui.hh"
+#include "aghermann/ui/sm/sm.hh"
diff --git a/src/metrics/Makefile.am b/src/aghermann/metrics/Makefile.am
similarity index 79%
rename from src/metrics/Makefile.am
rename to src/aghermann/metrics/Makefile.am
index 4e2cfff..9ff6e62 100644
--- a/src/metrics/Makefile.am
+++ b/src/aghermann/metrics/Makefile.am
@@ -17,7 +17,11 @@ liba_a_SOURCES := \
mc.hh \
mc-artifacts.cc \
mc-artifacts.hh \
- mc-artifacts.ii
+ mc-artifacts.ii \
+ all.hh
+
+CLEANFILES := \
+ liba.la
if DO_PCH
BUILT_SOURCES := \
@@ -26,9 +30,10 @@ BUILT_SOURCES := \
psd.hh.gch \
swu.hh.gch \
mc.hh.gch \
- mc-artifacts.hh.gch
+ mc-artifacts.hh.gch \
+ all.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES = \
- *.gch
+CLEANFILES += \
+ $(BUILT_SOURCES)
endif
diff --git a/src/aghermann/metrics/all.hh b/src/aghermann/metrics/all.hh
new file mode 100644
index 0000000..fc26de7
--- /dev/null
+++ b/src/aghermann/metrics/all.hh
@@ -0,0 +1,25 @@
+/*
+ * File name: aghermann/metrics/all.hh
+ * Project: Aghermann
+ * Author: Andrei Zavada <johnhommer at gmail.com>
+ *
+ * Initial version: 2013-05-23
+ *
+ * Purpose:
+ *
+ * License: GPL
+ */
+
+#ifndef _METRICS_ALL_H
+#define _METRICS_ALL_H
+
+#include "psd.hh"
+#include "mc.hh"
+#include "swu.hh"
+
+#endif // _METRICS_ALL_H
+
+// Local Variables:
+// Mode: c++
+// indent-tabs-mode: 8
+// End:
diff --git a/src/metrics/forward-decls.hh b/src/aghermann/metrics/forward-decls.hh
similarity index 100%
rename from src/metrics/forward-decls.hh
rename to src/aghermann/metrics/forward-decls.hh
diff --git a/src/metrics/mc-artifacts.cc b/src/aghermann/metrics/mc-artifacts.cc
similarity index 96%
rename from src/metrics/mc-artifacts.cc
rename to src/aghermann/metrics/mc-artifacts.cc
index f39c7c8..8d31a3c 100644
--- a/src/metrics/mc-artifacts.cc
+++ b/src/aghermann/metrics/mc-artifacts.cc
@@ -1,5 +1,5 @@
/*
- * File name: metrics/mc-artifacts.cc
+ * File name: aghermann/metrics/mc-artifacts.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/mc-artifacts.hh b/src/aghermann/metrics/mc-artifacts.hh
similarity index 96%
rename from src/metrics/mc-artifacts.hh
rename to src/aghermann/metrics/mc-artifacts.hh
index 89ab522..820acaa 100644
--- a/src/metrics/mc-artifacts.hh
+++ b/src/aghermann/metrics/mc-artifacts.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/mc-artifacts.hh
+ * File name: aghermann/metrics/mc-artifacts.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/mc-artifacts.ii b/src/aghermann/metrics/mc-artifacts.ii
similarity index 95%
rename from src/metrics/mc-artifacts.ii
rename to src/aghermann/metrics/mc-artifacts.ii
index e77cd77..70ea76d 100644
--- a/src/metrics/mc-artifacts.ii
+++ b/src/aghermann/metrics/mc-artifacts.ii
@@ -1,5 +1,5 @@
/*
- * File name: metrics/mc-artifacts.ii
+ * File name: aghermann/metrics/mc-artifacts.ii
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/mc.cc b/src/aghermann/metrics/mc.cc
similarity index 99%
rename from src/metrics/mc.cc
rename to src/aghermann/metrics/mc.cc
index 7e0e55d..c641c46 100644
--- a/src/metrics/mc.cc
+++ b/src/aghermann/metrics/mc.cc
@@ -1,5 +1,5 @@
/*
- * File name: metrics/mc.cc
+ * File name: aghermann/metrics/mc.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/mc.hh b/src/aghermann/metrics/mc.hh
similarity index 100%
rename from src/metrics/mc.hh
rename to src/aghermann/metrics/mc.hh
diff --git a/src/metrics/page-metrics-base.cc b/src/aghermann/metrics/page-metrics-base.cc
similarity index 98%
rename from src/metrics/page-metrics-base.cc
rename to src/aghermann/metrics/page-metrics-base.cc
index 770c15a..2a06816 100644
--- a/src/metrics/page-metrics-base.cc
+++ b/src/aghermann/metrics/page-metrics-base.cc
@@ -1,5 +1,5 @@
/*
- * File name: metrics/page-metrics-base.cc
+ * File name: aghermann/metrics/page-metrics-base.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/page-metrics-base.hh b/src/aghermann/metrics/page-metrics-base.hh
similarity index 98%
rename from src/metrics/page-metrics-base.hh
rename to src/aghermann/metrics/page-metrics-base.hh
index c63341f..446d54e 100644
--- a/src/metrics/page-metrics-base.hh
+++ b/src/aghermann/metrics/page-metrics-base.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/page-metrics-base.hh
+ * File name: aghermann/metrics/page-metrics-base.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/psd.cc b/src/aghermann/metrics/psd.cc
similarity index 99%
rename from src/metrics/psd.cc
rename to src/aghermann/metrics/psd.cc
index fa58057..a54bf25 100644
--- a/src/metrics/psd.cc
+++ b/src/aghermann/metrics/psd.cc
@@ -1,5 +1,5 @@
/*
- * File name: metrics/psd.cc
+ * File name: aghermann/metrics/psd.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Parts from PhysioToolKit (http://www.physionet.org/physiotools,
diff --git a/src/metrics/psd.hh b/src/aghermann/metrics/psd.hh
similarity index 98%
rename from src/metrics/psd.hh
rename to src/aghermann/metrics/psd.hh
index 0aff861..deb11f2 100644
--- a/src/metrics/psd.hh
+++ b/src/aghermann/metrics/psd.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/psd.hh
+ * File name: aghermann/metrics/psd.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/swu.cc b/src/aghermann/metrics/swu.cc
similarity index 98%
rename from src/metrics/swu.cc
rename to src/aghermann/metrics/swu.cc
index 14eeb07..0e94b04 100644
--- a/src/metrics/swu.cc
+++ b/src/aghermann/metrics/swu.cc
@@ -1,5 +1,5 @@
/*
- * File name: metrics/swu.cc
+ * File name: aghermann/metrics/swu.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/metrics/swu.hh b/src/aghermann/metrics/swu.hh
similarity index 97%
rename from src/metrics/swu.hh
rename to src/aghermann/metrics/swu.hh
index c708a61..8bd8e4c 100644
--- a/src/metrics/swu.hh
+++ b/src/aghermann/metrics/swu.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/swu.hh
+ * File name: aghermann/metrics/swu.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/model/Makefile.am b/src/aghermann/model/Makefile.am
similarity index 94%
rename from src/model/Makefile.am
rename to src/aghermann/model/Makefile.am
index 1e18f18..7bd351e 100644
--- a/src/model/Makefile.am
+++ b/src/aghermann/model/Makefile.am
@@ -15,6 +15,9 @@ liba_a_SOURCES := \
beersma.hh \
forward-decls.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
achermann.hh.gch \
@@ -23,6 +26,6 @@ BUILT_SOURCES := \
forward-decls.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/model/achermann-siman.cc b/src/aghermann/model/achermann-siman.cc
similarity index 97%
rename from src/model/achermann-siman.cc
rename to src/aghermann/model/achermann-siman.cc
index d642a33..aab096a 100644
--- a/src/model/achermann-siman.cc
+++ b/src/aghermann/model/achermann-siman.cc
@@ -1,5 +1,5 @@
/*
- * File name: model/achermann-siman.cc
+ * File name: aghermann/model/achermann-siman.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-05-03
@@ -15,7 +15,7 @@
#include <gsl/gsl_siman.h>
#include "common/globals.hh"
-#include "expdesign/recording.hh"
+#include "aghermann/expdesign/recording.hh"
#include "achermann.hh"
using namespace std;
diff --git a/src/model/achermann-tunable.cc b/src/aghermann/model/achermann-tunable.cc
similarity index 98%
rename from src/model/achermann-tunable.cc
rename to src/aghermann/model/achermann-tunable.cc
index 169a872..ba4f6b0 100644
--- a/src/model/achermann-tunable.cc
+++ b/src/aghermann/model/achermann-tunable.cc
@@ -1,5 +1,5 @@
/*
- * File name: model/achermann-tunable.cc
+ * File name: aghermann/model/achermann-tunable.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-04-28
@@ -13,7 +13,7 @@
#include <cassert>
#include <gsl/gsl_rng.h>
-#include "../common/globals.hh"
+#include "common/globals.hh"
#include "achermann-tunable.hh"
diff --git a/src/model/achermann-tunable.hh b/src/aghermann/model/achermann-tunable.hh
similarity index 98%
rename from src/model/achermann-tunable.hh
rename to src/aghermann/model/achermann-tunable.hh
index 7a1324b..6b0e75c 100644
--- a/src/model/achermann-tunable.hh
+++ b/src/aghermann/model/achermann-tunable.hh
@@ -1,5 +1,5 @@
/*
- * File name: model/achermann-tunable.hh
+ * File name: aghermann/model/achermann-tunable.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-04-29
diff --git a/src/model/achermann.cc b/src/aghermann/model/achermann.cc
similarity index 98%
rename from src/model/achermann.cc
rename to src/aghermann/model/achermann.cc
index c2eb6e9..f284c03 100644
--- a/src/model/achermann.cc
+++ b/src/aghermann/model/achermann.cc
@@ -1,5 +1,5 @@
/*
- * File name: model/achermann.cc
+ * File name: aghermann/model/achermann.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-05-01
@@ -11,8 +11,8 @@
#include <list>
-#include "expdesign/profile.hh"
-#include "expdesign/primaries.hh"
+#include "aghermann/expdesign/profile.hh"
+#include "aghermann/expdesign/primaries.hh"
#include "achermann-tunable.hh"
#include "achermann.hh"
diff --git a/src/model/achermann.hh b/src/aghermann/model/achermann.hh
similarity index 95%
rename from src/model/achermann.hh
rename to src/aghermann/model/achermann.hh
index 0d56212..5dd3a6e 100644
--- a/src/model/achermann.hh
+++ b/src/aghermann/model/achermann.hh
@@ -1,5 +1,5 @@
/*
- * File name: model/achermann.hh
+ * File name: aghermann/model/achermann.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-04-28
@@ -20,8 +20,8 @@
#include "libsigfile/forward-decls.hh"
#include "libsigfile/page.hh"
-#include "metrics/page-metrics-base.hh"
-#include "expdesign/profile.hh"
+#include "aghermann/metrics/page-metrics-base.hh"
+#include "aghermann/expdesign/profile.hh"
#include "achermann-tunable.hh"
diff --git a/src/model/beersma.hh b/src/aghermann/model/beersma.hh
similarity index 95%
rename from src/model/beersma.hh
rename to src/aghermann/model/beersma.hh
index a83ff67..60173d2 100644
--- a/src/model/beersma.hh
+++ b/src/aghermann/model/beersma.hh
@@ -1,5 +1,5 @@
/*
- * File name: model/beersma.hh
+ * File name: aghermann/model/beersma.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-08-25
@@ -14,10 +14,12 @@
#include <list>
+
#include <gsl/gsl_math.h>
#include <gsl/gsl_siman.h>
-#include "metrics/page-metrics-base.hh"
-#include "expdesign/profile.hh"
+
+#include "aghermann/metrics/page-metrics-base.hh"
+#include "aghermann/expdesign/profile.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/model/borbely.cc b/src/aghermann/model/borbely.cc
similarity index 96%
rename from src/model/borbely.cc
rename to src/aghermann/model/borbely.cc
index f7e2e73..37e62d8 100644
--- a/src/model/borbely.cc
+++ b/src/aghermann/model/borbely.cc
@@ -1,5 +1,5 @@
/*
- * File name: model/borbely.cc
+ * File name: aghermann/model/borbely.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-08-20
@@ -15,9 +15,10 @@
#include <gsl/gsl_blas.h>
#include "common/alg.hh"
-#include "metrics/psd.hh"
-#include "metrics/mc.hh"
-#include "expdesign/recording.hh"
+#include "aghermann/metrics/psd.hh"
+#include "aghermann/metrics/mc.hh"
+#include "aghermann/expdesign/recording.hh"
+
#include "beersma.hh"
using namespace std;
diff --git a/src/model/forward-decls.hh b/src/aghermann/model/forward-decls.hh
similarity index 100%
rename from src/model/forward-decls.hh
rename to src/aghermann/model/forward-decls.hh
diff --git a/src/model/ultradian-cycle.cc b/src/aghermann/model/ultradian-cycle.cc
similarity index 98%
rename from src/model/ultradian-cycle.cc
rename to src/aghermann/model/ultradian-cycle.cc
index 37453c3..243b32b 100644
--- a/src/model/ultradian-cycle.cc
+++ b/src/aghermann/model/ultradian-cycle.cc
@@ -1,5 +1,5 @@
/*
- * File name: model/ultradian-cycle.cc
+ * File name: aghermann/model/ultradian-cycle.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-08
@@ -14,7 +14,7 @@
#include <gsl/gsl_blas.h>
#include "common/globals.hh"
-#include "expdesign/recording.hh"
+#include "aghermann/expdesign/recording.hh"
#include "beersma.hh"
using namespace std;
diff --git a/src/patterns/Makefile.am b/src/aghermann/patterns/Makefile.am
similarity index 92%
rename from src/patterns/Makefile.am
rename to src/aghermann/patterns/Makefile.am
index e4fef5f..f5ac1e1 100644
--- a/src/patterns/Makefile.am
+++ b/src/aghermann/patterns/Makefile.am
@@ -7,12 +7,15 @@ noinst_LIBRARIES := liba.a
liba_a_SOURCES := \
patterns.cc patterns.hh patterns.ii
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
patterns.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/patterns/patterns.cc b/src/aghermann/patterns/patterns.cc
similarity index 98%
rename from src/patterns/patterns.cc
rename to src/aghermann/patterns/patterns.cc
index c88cdfc..f8101c5 100644
--- a/src/patterns/patterns.cc
+++ b/src/aghermann/patterns/patterns.cc
@@ -1,5 +1,5 @@
/*
- * File name: patterns/patterns.cc
+ * File name: aghermann/patterns/patterns.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-09
@@ -13,6 +13,7 @@
#include <cstring>
#include <dirent.h>
#include <sys/stat.h>
+
#include "common/fs.hh"
#include "patterns.hh"
diff --git a/src/patterns/patterns.hh b/src/aghermann/patterns/patterns.hh
similarity index 98%
rename from src/patterns/patterns.hh
rename to src/aghermann/patterns/patterns.hh
index ef08894..cc24886 100644
--- a/src/patterns/patterns.hh
+++ b/src/aghermann/patterns/patterns.hh
@@ -1,5 +1,5 @@
/*
- * File name: sigproc/patterns.hh
+ * File name: aghermann/patterns/patterns.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-09
diff --git a/src/patterns/patterns.ii b/src/aghermann/patterns/patterns.ii
similarity index 98%
rename from src/patterns/patterns.ii
rename to src/aghermann/patterns/patterns.ii
index 130fd11..806882a 100644
--- a/src/patterns/patterns.ii
+++ b/src/aghermann/patterns/patterns.ii
@@ -1,5 +1,5 @@
/*
- * File name: patterns/patterns.ii
+ * File name: aghermann/patterns/patterns.ii
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-09
diff --git a/src/rk1968/Makefile.am b/src/aghermann/rk1968/Makefile.am
similarity index 90%
rename from src/rk1968/Makefile.am
rename to src/aghermann/rk1968/Makefile.am
index 368879e..3d9d3e8 100644
--- a/src/rk1968/Makefile.am
+++ b/src/aghermann/rk1968/Makefile.am
@@ -8,11 +8,14 @@ liba_a_SOURCES := \
rk1968.cc \
rk1968.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
rk1968.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/rk1968/rk1968.cc b/src/aghermann/rk1968/rk1968.cc
similarity index 93%
rename from src/rk1968/rk1968.cc
rename to src/aghermann/rk1968/rk1968.cc
index 40d3be3..9e73fa7 100644
--- a/src/rk1968/rk1968.cc
+++ b/src/aghermann/rk1968/rk1968.cc
@@ -1,5 +1,5 @@
/*
- * File name: rk1968/rk1968.cc
+ * File name: aghermann/rk1968/rk1968.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2010-11-09
@@ -14,7 +14,8 @@
#include "libsigfile/page.hh"
#include "libsigfile/source.hh"
-#include "expdesign/recording.hh"
+#include "aghermann/expdesign/recording.hh"
+
#include "rk1968.hh"
diff --git a/src/rk1968/rk1968.hh b/src/aghermann/rk1968/rk1968.hh
similarity index 82%
rename from src/rk1968/rk1968.hh
rename to src/aghermann/rk1968/rk1968.hh
index d2e1e59..ee772e3 100644
--- a/src/rk1968/rk1968.hh
+++ b/src/aghermann/rk1968/rk1968.hh
@@ -1,5 +1,5 @@
/*
- * File name: rk1968/rk1968.hh
+ * File name: aghermann/rk1968/rk1968.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-05-16
@@ -12,7 +12,7 @@
#ifndef _AGH_RK1968_H
#define _AGH_RK1968_H
-#include "expdesign/primaries.hh"
+#include "aghermann/expdesign/primaries.hh"
namespace agh {
namespace rk1968 {
diff --git a/src/ui/Makefile.am b/src/aghermann/ui/Makefile.am
similarity index 95%
rename from src/ui/Makefile.am
rename to src/aghermann/ui/Makefile.am
index 5df8192..3ab57b6 100644
--- a/src/ui/Makefile.am
+++ b/src/aghermann/ui/Makefile.am
@@ -16,6 +16,9 @@ liba_a_SOURCES := \
ui++.hh \
ui.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
forward-decls.hh.gch \
@@ -25,6 +28,6 @@ BUILT_SOURCES := \
ui.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/forward-decls.hh b/src/aghermann/ui/forward-decls.hh
similarity index 100%
rename from src/ui/forward-decls.hh
rename to src/aghermann/ui/forward-decls.hh
diff --git a/src/ui/globals.hh b/src/aghermann/ui/globals.hh
similarity index 95%
rename from src/ui/globals.hh
rename to src/aghermann/ui/globals.hh
index f487318..3c36c9d 100644
--- a/src/ui/globals.hh
+++ b/src/aghermann/ui/globals.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/globals.hh
+ * File name: aghermann/ui/globals.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-22
diff --git a/src/ui/libcommon.cc b/src/aghermann/ui/libcommon.cc
similarity index 100%
rename from src/ui/libcommon.cc
rename to src/aghermann/ui/libcommon.cc
diff --git a/src/ui/mf/Makefile.am b/src/aghermann/ui/mf/Makefile.am
similarity index 94%
rename from src/ui/mf/Makefile.am
rename to src/aghermann/ui/mf/Makefile.am
index fd5302e..83cb2e0 100644
--- a/src/ui/mf/Makefile.am
+++ b/src/aghermann/ui/mf/Makefile.am
@@ -14,12 +14,15 @@ liba_a_SOURCES := \
mf_cb.cc \
mf_cb.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES := \
mf.hh.gch \
mf_cb.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/mf/mf-construct.cc b/src/aghermann/ui/mf/mf-construct.cc
similarity index 99%
rename from src/ui/mf/mf-construct.cc
rename to src/aghermann/ui/mf/mf-construct.cc
index 8663ec8..f68c572 100644
--- a/src/ui/mf/mf-construct.cc
+++ b/src/aghermann/ui/mf/mf-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/construct.cc
+ * File name: aghermann/ui/mf/construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-11
diff --git a/src/ui/mf/mf.cc b/src/aghermann/ui/mf/mf.cc
similarity index 98%
rename from src/ui/mf/mf.cc
rename to src/aghermann/ui/mf/mf.cc
index 1dcf8fb..6a9f9d8 100644
--- a/src/ui/mf/mf.cc
+++ b/src/aghermann/ui/mf/mf.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/mf.cc
+ * File name: aghermann/ui/mf/mf.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -9,9 +9,9 @@
* License: GPL
*/
-#include "model/achermann.hh"
-#include "ui/misc.hh"
-#include "ui/mw/mw.hh"
+#include "aghermann/model/achermann.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/mw/mw.hh"
#include "mf.hh"
#include "mf_cb.hh"
diff --git a/src/ui/mf/mf.hh b/src/aghermann/ui/mf/mf.hh
similarity index 94%
rename from src/ui/mf/mf.hh
rename to src/aghermann/ui/mf/mf.hh
index 3fe4e34..8f51a60 100644
--- a/src/ui/mf/mf.hh
+++ b/src/aghermann/ui/mf/mf.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/mf.hh
+ * File name: aghermann/ui/mf/mf.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-05-14
@@ -12,8 +12,8 @@
#ifndef _AGH_UI_MODELRUN_FACILITY_H
#define _AGH_UI_MODELRUN_FACILITY_H
-#include "model/forward-decls.hh"
-#include "ui/mw/mw.hh"
+#include "aghermann/model/forward-decls.hh"
+#include "aghermann/ui/mw/mw.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/mf/mf_cb.cc b/src/aghermann/ui/mf/mf_cb.cc
similarity index 98%
rename from src/ui/mf/mf_cb.cc
rename to src/aghermann/ui/mf/mf_cb.cc
index 801129d..69018c6 100644
--- a/src/ui/mf/mf_cb.cc
+++ b/src/aghermann/ui/mf/mf_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/mf_cb.cc
+ * File name: aghermann/ui/mf/mf_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -11,8 +11,8 @@
#include <cairo-svg.h>
-#include "model/beersma.hh"
-#include "ui/misc.hh"
+#include "aghermann/model/beersma.hh"
+#include "aghermann/ui/misc.hh"
#include "mf.hh"
using namespace std;
diff --git a/src/ui/mf/mf_cb.hh b/src/aghermann/ui/mf/mf_cb.hh
similarity index 97%
rename from src/ui/mf/mf_cb.hh
rename to src/aghermann/ui/mf/mf_cb.hh
index 511cc52..93a63b6 100644
--- a/src/ui/mf/mf_cb.hh
+++ b/src/aghermann/ui/mf/mf_cb.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/mf/mf_cb.hh
+ * File name: aghermann/ui/mf/mf_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
diff --git a/src/ui/misc.hh b/src/aghermann/ui/misc.hh
similarity index 100%
rename from src/ui/misc.hh
rename to src/aghermann/ui/misc.hh
diff --git a/src/ui/mw/Makefile.am b/src/aghermann/ui/mw/Makefile.am
similarity index 96%
rename from src/ui/mw/Makefile.am
rename to src/aghermann/ui/mw/Makefile.am
index 2ca8d48..8f2d1b8 100644
--- a/src/ui/mw/Makefile.am
+++ b/src/aghermann/ui/mw/Makefile.am
@@ -25,6 +25,9 @@ liba_a_SOURCES = \
mw_cb.cc \
mw_cb.hh
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES = \
mw.hh.gch \
@@ -32,6 +35,6 @@ BUILT_SOURCES = \
mw_cb.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/mw/admit-one.cc b/src/aghermann/ui/mw/admit-one.cc
similarity index 99%
rename from src/ui/mw/admit-one.cc
rename to src/aghermann/ui/mw/admit-one.cc
index bb7ef16..a889d2c 100644
--- a/src/ui/mw/admit-one.cc
+++ b/src/aghermann/ui/mw/admit-one.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/admit-one.cc
+ * File name: aghermann/ui/mw/admit-one.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-18
@@ -11,7 +11,7 @@
#include "libsigfile/edf.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/construct.cc b/src/aghermann/ui/mw/construct.cc
similarity index 99%
rename from src/ui/mw/construct.cc
rename to src/aghermann/ui/mw/construct.cc
index 2e5fd80..468642a 100644
--- a/src/ui/mw/construct.cc
+++ b/src/aghermann/ui/mw/construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/construct.cc
+ * File name: aghermann/ui/mw/construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-02
@@ -10,7 +10,7 @@
*/
-#include "ui/ui.hh"
+#include "aghermann/ui/ui.hh"
#include "widgets.hh"
#include "mw_cb.hh"
diff --git a/src/ui/mw/loadsave.cc b/src/aghermann/ui/mw/loadsave.cc
similarity index 98%
rename from src/ui/mw/loadsave.cc
rename to src/aghermann/ui/mw/loadsave.cc
index 1e0416e..265271d 100644
--- a/src/ui/mw/loadsave.cc
+++ b/src/aghermann/ui/mw/loadsave.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/loadsave.cc
+ * File name: aghermann/ui/mw/loadsave.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-04-28
@@ -12,7 +12,7 @@
#include <forward_list>
#include "common/config-validate.hh"
-#include "ui/globals.hh"
+#include "aghermann/ui/globals.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/mainmenu_cb.cc b/src/aghermann/ui/mw/mainmenu_cb.cc
similarity index 98%
rename from src/ui/mw/mainmenu_cb.cc
rename to src/aghermann/ui/mw/mainmenu_cb.cc
index 5e0ba6f..16bfa75 100644
--- a/src/ui/mw/mainmenu_cb.cc
+++ b/src/aghermann/ui/mw/mainmenu_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mainmenu_cb.cc
+ * File name: aghermann/ui/mw/mainmenu_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-11-12
@@ -9,11 +9,11 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/sm/sm.hh"
+#include "aghermann/ui/sf/sf.hh"
#include "mw.hh"
#include "mw_cb.hh"
-#include "ui/sm/sm.hh"
-#include "ui/sf/sf.hh"
using namespace std;
using namespace aghui;
diff --git a/src/ui/mw/measurements.cc b/src/aghermann/ui/mw/measurements.cc
similarity index 98%
rename from src/ui/mw/measurements.cc
rename to src/aghermann/ui/mw/measurements.cc
index 137212c..45ef5de 100644
--- a/src/ui/mw/measurements.cc
+++ b/src/aghermann/ui/mw/measurements.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/measurements.cc
+ * File name: aghermann/ui/mw/measurements.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -16,8 +16,8 @@
#include <cairo.h>
#include <cairo-svg.h>
-#include "model/beersma.hh"
-#include "ui/misc.hh"
+#include "aghermann/model/beersma.hh"
+#include "aghermann/ui/misc.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/measurements_cb.cc b/src/aghermann/ui/mw/measurements_cb.cc
similarity index 98%
rename from src/ui/mw/measurements_cb.cc
rename to src/aghermann/ui/mw/measurements_cb.cc
index a07fcc5..8045e06 100644
--- a/src/ui/mw/measurements_cb.cc
+++ b/src/aghermann/ui/mw/measurements_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw-measurements_cb.cc
+ * File name: aghermann/ui/mw/mw-measurements_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -9,8 +9,8 @@
* License: GPL
*/
-#include "ui/misc.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/sf/sf.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/mw.cc b/src/aghermann/ui/mw/mw.cc
similarity index 98%
rename from src/ui/mw/mw.cc
rename to src/aghermann/ui/mw/mw.cc
index 793fea8..70b7d9d 100644
--- a/src/ui/mw/mw.cc
+++ b/src/aghermann/ui/mw/mw.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw.cc
+ * File name: aghermann/ui/mw/mw.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -15,13 +15,13 @@
#include <signal.h>
#include "common/config-validate.hh"
-#include "metrics/page-metrics-base.hh"
-#include "metrics/mc-artifacts.hh"
-#include "expdesign/primaries.hh"
-#include "model/beersma.hh"
-#include "ui/misc.hh"
-#include "ui/sf/sf.hh"
-#include "ui/mf/mf.hh"
+#include "aghermann/metrics/page-metrics-base.hh"
+#include "aghermann/metrics/mc-artifacts.hh"
+#include "aghermann/expdesign/primaries.hh"
+#include "aghermann/model/beersma.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/sf/sf.hh"
+#include "aghermann/ui/mf/mf.hh"
#include "mw.hh"
#include "mw_cb.hh"
diff --git a/src/ui/mw/mw.hh b/src/aghermann/ui/mw/mw.hh
similarity index 97%
rename from src/ui/mw/mw.hh
rename to src/aghermann/ui/mw/mw.hh
index ca7d08b..b688349 100644
--- a/src/ui/mw/mw.hh
+++ b/src/aghermann/ui/mw/mw.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw.hh
+ * File name: aghermann/ui/mw/mw.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-13
@@ -22,12 +22,12 @@
#include "common/lang.hh"
#include "common/config-validate.hh"
-#include "metrics/mc-artifacts.hh"
-#include "model/forward-decls.hh"
-#include "expdesign/primaries.hh"
-#include "ui/ui.hh"
-#include "ui/ui++.hh"
-#include "ui/forward-decls.hh"
+#include "aghermann/metrics/mc-artifacts.hh"
+#include "aghermann/model/forward-decls.hh"
+#include "aghermann/expdesign/primaries.hh"
+#include "aghermann/ui/ui.hh"
+#include "aghermann/ui/ui++.hh"
+#include "aghermann/ui/forward-decls.hh"
#include "widgets.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/ui/mw/mw_cb.cc b/src/aghermann/ui/mw/mw_cb.cc
similarity index 98%
rename from src/ui/mw/mw_cb.cc
rename to src/aghermann/ui/mw/mw_cb.cc
index 2867678..14d7fbb 100644
--- a/src/ui/mw/mw_cb.cc
+++ b/src/aghermann/ui/mw/mw_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw_cb.cc
+ * File name: aghermann/ui/mw/mw_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -11,8 +11,8 @@
#include <gdk/gdkkeysyms.h>
-#include "ui/misc.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/sf/sf.hh"
#include "mw.hh"
#include "mw_cb.hh"
diff --git a/src/ui/mw/mw_cb.hh b/src/aghermann/ui/mw/mw_cb.hh
similarity index 99%
rename from src/ui/mw/mw_cb.hh
rename to src/aghermann/ui/mw/mw_cb.hh
index 8f21c06..de352f1 100644
--- a/src/ui/mw/mw_cb.hh
+++ b/src/aghermann/ui/mw/mw_cb.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw_cb.hh
+ * File name: aghermann/ui/mw/mw_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
diff --git a/src/ui/mw/populate.cc b/src/aghermann/ui/mw/populate.cc
similarity index 99%
rename from src/ui/mw/populate.cc
rename to src/aghermann/ui/mw/populate.cc
index 43acff7..09a9895 100644
--- a/src/ui/mw/populate.cc
+++ b/src/aghermann/ui/mw/populate.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/populate.cc
+ * File name: aghermann/ui/mw/populate.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-19
@@ -12,9 +12,9 @@
#include <cstring>
-#include "expdesign/primaries.hh"
-#include "model/beersma.hh"
-#include "ui/misc.hh"
+#include "aghermann/expdesign/primaries.hh"
+#include "aghermann/model/beersma.hh"
+#include "aghermann/ui/misc.hh"
#include "mw.hh"
#include "mw_cb.hh"
diff --git a/src/ui/mw/settings_cb.cc b/src/aghermann/ui/mw/settings_cb.cc
similarity index 98%
rename from src/ui/mw/settings_cb.cc
rename to src/aghermann/ui/mw/settings_cb.cc
index adc9aed..a4e6249 100644
--- a/src/ui/mw/settings_cb.cc
+++ b/src/aghermann/ui/mw/settings_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/settings_cb.cc
+ * File name: aghermann/ui/mw/settings_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -15,8 +15,8 @@
#include "common/globals.hh"
#include "common/string.hh"
-#include "ui/misc.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/sf/sf.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/simulations.cc b/src/aghermann/ui/mw/simulations.cc
similarity index 97%
rename from src/ui/mw/simulations.cc
rename to src/aghermann/ui/mw/simulations.cc
index 31de88b..5ef3d22 100644
--- a/src/ui/mw/simulations.cc
+++ b/src/aghermann/ui/mw/simulations.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/simulations.cc
+ * File name: aghermann/ui/mw/simulations.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -9,7 +9,7 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/simulations_cb.cc b/src/aghermann/ui/mw/simulations_cb.cc
similarity index 98%
rename from src/ui/mw/simulations_cb.cc
rename to src/aghermann/ui/mw/simulations_cb.cc
index 2e23e2b..2193973 100644
--- a/src/ui/mw/simulations_cb.cc
+++ b/src/aghermann/ui/mw/simulations_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/simulations_cb.cc
+ * File name: aghermann/ui/mw/simulations_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -10,8 +10,8 @@
*/
-#include "ui/misc.hh"
-#include "ui/mf/mf.hh"
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/mf/mf.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/splash.cc b/src/aghermann/ui/mw/splash.cc
similarity index 98%
rename from src/ui/mw/splash.cc
rename to src/aghermann/ui/mw/splash.cc
index acfa656..a5691f1 100644
--- a/src/ui/mw/splash.cc
+++ b/src/aghermann/ui/mw/splash.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw-splash.cc
+ * File name: aghermann/ui/mw/splash.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-11-05
@@ -14,7 +14,7 @@
#include <vte/vte.h>
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
#include "mw.hh"
using namespace std;
diff --git a/src/ui/mw/widgets.hh b/src/aghermann/ui/mw/widgets.hh
similarity index 97%
rename from src/ui/mw/widgets.hh
rename to src/aghermann/ui/mw/widgets.hh
index aaebd26..dd07522 100644
--- a/src/ui/mw/widgets.hh
+++ b/src/aghermann/ui/mw/widgets.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/mw/mw-widgets.hh
+ * File name: aghermann/ui/mw/widgets.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-06
@@ -15,9 +15,9 @@
#include <map>
#include <gtk/gtk.h>
#include "libsigfile/page.hh" // for various enums
-#include "metrics/psd.hh"
-#include "model/achermann-tunable.hh"
-#include "ui/ui.hh" // for SManagedColor
+#include "aghermann/metrics/psd.hh"
+#include "aghermann/model/achermann-tunable.hh"
+#include "aghermann/ui/ui.hh" // for SManagedColor
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sf/Makefile.am b/src/aghermann/ui/sf/Makefile.am
similarity index 96%
rename from src/ui/sf/Makefile.am
rename to src/aghermann/ui/sf/Makefile.am
index 298c6e8..3ce22bb 100644
--- a/src/ui/sf/Makefile.am
+++ b/src/aghermann/ui/sf/Makefile.am
@@ -26,6 +26,9 @@ liba_a_SOURCES := \
sf_cb.hh \
sf_cb.cc
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES = \
sf.hh.gch \
@@ -33,6 +36,6 @@ BUILT_SOURCES = \
widgets.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/sf/channel.cc b/src/aghermann/ui/sf/channel.cc
similarity index 99%
rename from src/ui/sf/channel.cc
rename to src/aghermann/ui/sf/channel.cc
index a8ea52f..ab44dc6 100644
--- a/src/ui/sf/channel.cc
+++ b/src/aghermann/ui/sf/channel.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/channel.cc
+ * File name: aghermann/ui/sf/channel.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-05-29
@@ -11,10 +11,12 @@
#include <type_traits>
+
#include "common/lang.hh"
#include "common/config-validate.hh"
#include "sigproc/exstrom.hh"
-#include "ui/globals.hh"
+#include "aghermann/ui/globals.hh"
+
#include "sf.hh"
#include "d/artifacts.hh"
#include "d/patterns.hh"
diff --git a/src/ui/sf/construct.cc b/src/aghermann/ui/sf/construct.cc
similarity index 99%
rename from src/ui/sf/construct.cc
rename to src/aghermann/ui/sf/construct.cc
index 1f61201..62c1a82 100644
--- a/src/ui/sf/construct.cc
+++ b/src/aghermann/ui/sf/construct.cc
@@ -1,6 +1,5 @@
-// ;-*-C++-*-
/*
- * File name: ui/sf/construct.cc
+ * File name: aghermann/ui/sf/construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-13
@@ -12,8 +11,8 @@
#include <stdexcept>
-#include "ui/mw/mw.hh"
-#include "ui/ui.hh"
+#include "aghermann/ui/mw/mw.hh"
+#include "aghermann/ui/ui.hh"
#include "sf.hh"
#include "sf_cb.hh"
diff --git a/src/ui/sf/d/Makefile.am b/src/aghermann/ui/sf/d/Makefile.am
similarity index 91%
rename from src/ui/sf/d/Makefile.am
rename to src/aghermann/ui/sf/d/Makefile.am
index 9c96ef9..ae78f9d 100644
--- a/src/ui/sf/d/Makefile.am
+++ b/src/aghermann/ui/sf/d/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS := \
-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
@@ -31,6 +31,9 @@ liba_a_SOURCES := \
phasediff-construct.cc \
phasediff_cb.cc
+CLEANFILES := \
+ liba.la
+
if DO_PCH
BUILT_SOURCES = \
artifacts.hh.gch \
@@ -39,6 +42,6 @@ BUILT_SOURCES = \
phasediff.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/sf/d/artifacts-construct.cc b/src/aghermann/ui/sf/d/artifacts-construct.cc
similarity index 97%
rename from src/ui/sf/d/artifacts-construct.cc
rename to src/aghermann/ui/sf/d/artifacts-construct.cc
index 6537180..def36c8 100644
--- a/src/ui/sf/d/artifacts-construct.cc
+++ b/src/aghermann/ui/sf/d/artifacts-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts-construct.cc
+ * File name: aghermann/ui/sf/d/artifacts-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-10-24
@@ -11,7 +11,8 @@
#include <stdexcept>
-#include "ui/ui.hh"
+#include "aghermann/ui/ui.hh"
+
#include "artifacts.hh"
using namespace std;
diff --git a/src/ui/sf/d/artifacts-simple-construct.cc b/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
similarity index 91%
rename from src/ui/sf/d/artifacts-simple-construct.cc
rename to src/aghermann/ui/sf/d/artifacts-simple-construct.cc
index c38a2aa..d4dc99b 100644
--- a/src/ui/sf/d/artifacts-simple-construct.cc
+++ b/src/aghermann/ui/sf/d/artifacts-simple-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts-simple-construct.cc
+ * File name: aghermann/ui/sf/d/artifacts-simple-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-10-25
@@ -11,7 +11,8 @@
#include <stdexcept>
-#include "ui/ui.hh"
+#include "aghermann/ui/ui.hh"
+
#include "artifacts-simple.hh"
using namespace std;
diff --git a/src/ui/sf/d/artifacts-simple.cc b/src/aghermann/ui/sf/d/artifacts-simple.cc
similarity index 93%
rename from src/ui/sf/d/artifacts-simple.cc
rename to src/aghermann/ui/sf/d/artifacts-simple.cc
index 440c6b8..a0c6e64 100644
--- a/src/ui/sf/d/artifacts-simple.cc
+++ b/src/aghermann/ui/sf/d/artifacts-simple.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts-simple.cc
+ * File name: aghermann/ui/sf/d/artifacts-simple.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-25
diff --git a/src/ui/sf/d/artifacts-simple.hh b/src/aghermann/ui/sf/d/artifacts-simple.hh
similarity index 89%
rename from src/ui/sf/d/artifacts-simple.hh
rename to src/aghermann/ui/sf/d/artifacts-simple.hh
index f30dad1..a4618b7 100644
--- a/src/ui/sf/d/artifacts-simple.hh
+++ b/src/aghermann/ui/sf/d/artifacts-simple.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts-simple.hh
+ * File name: aghermann/ui/sf/d/artifacts-simple.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -14,8 +14,8 @@
#include <gtk/gtk.h>
-#include "ui/ui++.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/ui++.hh"
+#include "aghermann/ui/sf/sf.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
@@ -58,9 +58,6 @@ struct SScoringFacility::SArtifactsSimpleDialog
} // namespace aghui
-extern "C" {
-}
-
#endif // _AGH_UI_SF_FILTERS_H
// Local Variables:
diff --git a/src/ui/sf/d/artifacts.cc b/src/aghermann/ui/sf/d/artifacts.cc
similarity index 97%
rename from src/ui/sf/d/artifacts.cc
rename to src/aghermann/ui/sf/d/artifacts.cc
index 70cbf3e..cb36b87 100644
--- a/src/ui/sf/d/artifacts.cc
+++ b/src/aghermann/ui/sf/d/artifacts.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts.cc
+ * File name: aghermann/ui/sf/d/artifacts.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-05
diff --git a/src/ui/sf/d/artifacts.hh b/src/aghermann/ui/sf/d/artifacts.hh
similarity index 94%
rename from src/ui/sf/d/artifacts.hh
rename to src/aghermann/ui/sf/d/artifacts.hh
index 4af01e3..2452f41 100644
--- a/src/ui/sf/d/artifacts.hh
+++ b/src/aghermann/ui/sf/d/artifacts.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts.hh
+ * File name: aghermann/ui/sf/d/artifacts.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -16,10 +16,10 @@
#include <gtk/gtk.h>
-#include "metrics/mc-artifacts.hh"
+#include "aghermann/metrics/mc-artifacts.hh"
#include "libsigfile/source-base.hh"
-#include "ui/ui++.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/ui++.hh"
+#include "aghermann/ui/sf/sf.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sf/d/artifacts_cb.cc b/src/aghermann/ui/sf/d/artifacts_cb.cc
similarity index 98%
rename from src/ui/sf/d/artifacts_cb.cc
rename to src/aghermann/ui/sf/d/artifacts_cb.cc
index 027d13a..759e228 100644
--- a/src/ui/sf/d/artifacts_cb.cc
+++ b/src/aghermann/ui/sf/d/artifacts_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/artifacts_cb.cc
+ * File name: aghermann/ui/sf/d/artifacts_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-05
@@ -9,7 +9,8 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "artifacts.hh"
using namespace std;
diff --git a/src/ui/sf/d/filters-construct.cc b/src/aghermann/ui/sf/d/filters-construct.cc
similarity index 94%
rename from src/ui/sf/d/filters-construct.cc
rename to src/aghermann/ui/sf/d/filters-construct.cc
index 301b078..56a4761 100644
--- a/src/ui/sf/d/filters-construct.cc
+++ b/src/aghermann/ui/sf/d/filters-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/filters-construct.cc
+ * File name: aghermann/ui/sf/d/filters-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-10-24
@@ -11,7 +11,8 @@
#include <stdexcept>
-#include "ui/ui.hh"
+#include "aghermann/ui/ui.hh"
+
#include "filters.hh"
using namespace std;
diff --git a/src/ui/sf/d/filters.cc b/src/aghermann/ui/sf/d/filters.cc
similarity index 94%
rename from src/ui/sf/d/filters.cc
rename to src/aghermann/ui/sf/d/filters.cc
index d26dfd0..ef80f4b 100644
--- a/src/ui/sf/d/filters.cc
+++ b/src/aghermann/ui/sf/d/filters.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/filters.cc
+ * File name: aghermann/ui/sf/d/filters.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-30
diff --git a/src/ui/sf/d/filters.hh b/src/aghermann/ui/sf/d/filters.hh
similarity index 91%
rename from src/ui/sf/d/filters.hh
rename to src/aghermann/ui/sf/d/filters.hh
index 2f5dfb3..42c4151 100644
--- a/src/ui/sf/d/filters.hh
+++ b/src/aghermann/ui/sf/d/filters.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/filters.hh
+ * File name: aghermann/ui/sf/d/filters.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -14,8 +14,8 @@
#include <gtk/gtk.h>
-#include "ui/ui++.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/ui++.hh"
+#include "aghermann/ui/sf/sf.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sf/d/filters_cb.cc b/src/aghermann/ui/sf/d/filters_cb.cc
similarity index 93%
rename from src/ui/sf/d/filters_cb.cc
rename to src/aghermann/ui/sf/d/filters_cb.cc
index 2e4ad34..85d4f43 100644
--- a/src/ui/sf/d/filters_cb.cc
+++ b/src/aghermann/ui/sf/d/filters_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/filters_cb.cc
+ * File name: aghermann/ui/sf/d/filters_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-25
@@ -10,7 +10,8 @@
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "filters.hh"
using namespace std;
diff --git a/src/ui/sf/d/patterns-construct.cc b/src/aghermann/ui/sf/d/patterns-construct.cc
similarity index 99%
rename from src/ui/sf/d/patterns-construct.cc
rename to src/aghermann/ui/sf/d/patterns-construct.cc
index b32bb8a..baa90cb 100644
--- a/src/ui/sf/d/patterns-construct.cc
+++ b/src/aghermann/ui/sf/d/patterns-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns-construct.cc
+ * File name: aghermann/ui/sf/d/patterns-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -10,6 +10,7 @@
*/
#include <stdexcept>
+
#include "patterns.hh"
using namespace std;
diff --git a/src/ui/sf/d/patterns-draw.cc b/src/aghermann/ui/sf/d/patterns-draw.cc
similarity index 98%
rename from src/ui/sf/d/patterns-draw.cc
rename to src/aghermann/ui/sf/d/patterns-draw.cc
index 530c483..de471fe 100644
--- a/src/ui/sf/d/patterns-draw.cc
+++ b/src/aghermann/ui/sf/d/patterns-draw.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns-draw.cc
+ * File name: aghermann/ui/sf/d/patterns-draw.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-16
@@ -9,7 +9,8 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "patterns.hh"
using namespace std;
diff --git a/src/ui/sf/d/patterns-profiles.cc b/src/aghermann/ui/sf/d/patterns-profiles.cc
similarity index 98%
rename from src/ui/sf/d/patterns-profiles.cc
rename to src/aghermann/ui/sf/d/patterns-profiles.cc
index 0131e0e..7d2036d 100644
--- a/src/ui/sf/d/patterns-profiles.cc
+++ b/src/aghermann/ui/sf/d/patterns-profiles.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns-profiles.cc
+ * File name: aghermann/ui/sf/d/patterns-profiles.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-16
@@ -10,7 +10,9 @@
*/
#include <tuple>
-#include "ui/misc.hh"
+
+#include "aghermann/ui/misc.hh"
+
#include "patterns.hh"
using namespace std;
diff --git a/src/ui/sf/d/patterns-profiles_cb.cc b/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
similarity index 97%
rename from src/ui/sf/d/patterns-profiles_cb.cc
rename to src/aghermann/ui/sf/d/patterns-profiles_cb.cc
index 77d3919..ead2705 100644
--- a/src/ui/sf/d/patterns-profiles_cb.cc
+++ b/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns-profiles_cb.cc
+ * File name: aghermann/ui/sf/d/patterns-profiles_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -11,7 +11,8 @@
#include <sys/time.h>
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "patterns.hh"
diff --git a/src/ui/sf/d/patterns.cc b/src/aghermann/ui/sf/d/patterns.cc
similarity index 98%
rename from src/ui/sf/d/patterns.cc
rename to src/aghermann/ui/sf/d/patterns.cc
index f0b5993..139a9b4 100644
--- a/src/ui/sf/d/patterns.cc
+++ b/src/aghermann/ui/sf/d/patterns.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns.cc
+ * File name: aghermann/ui/sf/d/patterns.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-14
@@ -9,7 +9,8 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "patterns.hh"
using namespace std;
diff --git a/src/ui/sf/d/patterns.hh b/src/aghermann/ui/sf/d/patterns.hh
similarity index 97%
rename from src/ui/sf/d/patterns.hh
rename to src/aghermann/ui/sf/d/patterns.hh
index d7669bf..c5bab7b 100644
--- a/src/ui/sf/d/patterns.hh
+++ b/src/aghermann/ui/sf/d/patterns.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns.hh
+ * File name: aghermann/ui/sf/d/patterns.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -12,8 +12,8 @@
#ifndef _AGH_UI_SF_D_PATTERNS_H
#define _AGH_UI_SF_D_PATTERNS_H
-#include "patterns/patterns.hh"
-#include "ui/sf/sf.hh"
+#include "aghermann/patterns/patterns.hh"
+#include "aghermann/ui/sf/sf.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sf/d/patterns_cb.cc b/src/aghermann/ui/sf/d/patterns_cb.cc
similarity index 99%
rename from src/ui/sf/d/patterns_cb.cc
rename to src/aghermann/ui/sf/d/patterns_cb.cc
index 1028ec7..e8cd6ba 100644
--- a/src/ui/sf/d/patterns_cb.cc
+++ b/src/aghermann/ui/sf/d/patterns_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/patterns_cb.cc
+ * File name: aghermann/ui/sf/d/patterns_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-03
@@ -11,7 +11,8 @@
#include <sys/time.h>
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "patterns.hh"
using namespace std;
diff --git a/src/ui/sf/d/phasediff-construct.cc b/src/aghermann/ui/sf/d/phasediff-construct.cc
similarity index 97%
rename from src/ui/sf/d/phasediff-construct.cc
rename to src/aghermann/ui/sf/d/phasediff-construct.cc
index e90dd68..b0144b9 100644
--- a/src/ui/sf/d/phasediff-construct.cc
+++ b/src/aghermann/ui/sf/d/phasediff-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/phasediff-construct.cc
+ * File name: aghermann/ui/sf/d/phasediff-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-25
@@ -10,6 +10,7 @@
*/
#include <stdexcept>
+
#include "phasediff.hh"
using namespace std;
diff --git a/src/ui/sf/d/phasediff.cc b/src/aghermann/ui/sf/d/phasediff.cc
similarity index 98%
rename from src/ui/sf/d/phasediff.cc
rename to src/aghermann/ui/sf/d/phasediff.cc
index 5512038..e2a8b5f 100644
--- a/src/ui/sf/d/phasediff.cc
+++ b/src/aghermann/ui/sf/d/phasediff.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/phasediff.cc
+ * File name: aghermann/ui/sf/d/phasediff.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-29
@@ -10,7 +10,8 @@
*/
#include "common/lang.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "phasediff.hh"
using namespace std;
diff --git a/src/ui/sf/d/phasediff.hh b/src/aghermann/ui/sf/d/phasediff.hh
similarity index 96%
rename from src/ui/sf/d/phasediff.hh
rename to src/aghermann/ui/sf/d/phasediff.hh
index 526044b..1448ea1 100644
--- a/src/ui/sf/d/phasediff.hh
+++ b/src/aghermann/ui/sf/d/phasediff.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/phasediff.hh
+ * File name: aghermann/ui/sf/d/phasediff.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-24
@@ -12,7 +12,7 @@
#ifndef _AGH_UI_SF_D_PHASEDIFF_H
#define _AGH_UI_SF_D_PHASEDIFF_H
-#include "ui/sf/sf.hh"
+#include "aghermann/ui/sf/sf.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sf/d/phasediff_cb.cc b/src/aghermann/ui/sf/d/phasediff_cb.cc
similarity index 97%
rename from src/ui/sf/d/phasediff_cb.cc
rename to src/aghermann/ui/sf/d/phasediff_cb.cc
index b3448eb..bf03f05 100644
--- a/src/ui/sf/d/phasediff_cb.cc
+++ b/src/aghermann/ui/sf/d/phasediff_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/d/phasediff_cb.cc
+ * File name: aghermann/ui/sf/d/phasediff_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-18
@@ -10,7 +10,8 @@
*/
#include "common/lang.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "phasediff.hh"
using namespace std;
diff --git a/src/ui/sf/hypnogram.cc b/src/aghermann/ui/sf/hypnogram.cc
similarity index 98%
rename from src/ui/sf/hypnogram.cc
rename to src/aghermann/ui/sf/hypnogram.cc
index 47ff34a..248be19 100644
--- a/src/ui/sf/hypnogram.cc
+++ b/src/aghermann/ui/sf/hypnogram.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/hypnogram.cc
+ * File name: aghermann/ui/sf/hypnogram.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-27
diff --git a/src/ui/sf/hypnogram_cb.cc b/src/aghermann/ui/sf/hypnogram_cb.cc
similarity index 97%
rename from src/ui/sf/hypnogram_cb.cc
rename to src/aghermann/ui/sf/hypnogram_cb.cc
index ad97019..6b5fc57 100644
--- a/src/ui/sf/hypnogram_cb.cc
+++ b/src/aghermann/ui/sf/hypnogram_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf-hypnogram_cb.cc
+ * File name: aghermann/ui/sf/hypnogram_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-06-15
@@ -11,8 +11,8 @@
#include <fstream>
-#include "rk1968/rk1968.hh"
-#include "ui/globals.hh"
+#include "aghermann/rk1968/rk1968.hh"
+#include "aghermann/ui/globals.hh"
#include "sf.hh"
using namespace std;
diff --git a/src/ui/sf/ica.cc b/src/aghermann/ui/sf/ica.cc
similarity index 98%
rename from src/ui/sf/ica.cc
rename to src/aghermann/ui/sf/ica.cc
index f11baed..3870742 100644
--- a/src/ui/sf/ica.cc
+++ b/src/aghermann/ui/sf/ica.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf-ica.cc
+ * File name: aghermann/ui/sf/ica.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-10-25
@@ -12,8 +12,9 @@
#include <unistd.h>
#include <itpp/base/algebra/inv.h>
-#include "ica/ica.hh"
-#include "ui/misc.hh"
+#include "aghermann/ica/ica.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
#include "sf_cb.hh"
diff --git a/src/ui/sf/ica_cb.cc b/src/aghermann/ui/sf/ica_cb.cc
similarity index 98%
rename from src/ui/sf/ica_cb.cc
rename to src/aghermann/ui/sf/ica_cb.cc
index a46fb22..0a1b3b3 100644
--- a/src/ui/sf/ica_cb.cc
+++ b/src/aghermann/ui/sf/ica_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf-ica_cb.cc
+ * File name: aghermann/ui/sf/ica_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-10-30
@@ -9,7 +9,8 @@
* License: GPL
*/
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
#include "widgets.hh"
diff --git a/src/ui/sf/montage-overlays.cc b/src/aghermann/ui/sf/montage-overlays.cc
similarity index 99%
rename from src/ui/sf/montage-overlays.cc
rename to src/aghermann/ui/sf/montage-overlays.cc
index 0174827..d887bba 100644
--- a/src/ui/sf/montage-overlays.cc
+++ b/src/aghermann/ui/sf/montage-overlays.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf-montage-overlays.cc
+ * File name: aghermann/ui/sf/montage-overlays.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-01-04
@@ -12,7 +12,8 @@
#include <cairo/cairo-svg.h>
#include "common/lang.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
using namespace std;
diff --git a/src/ui/sf/montage.cc b/src/aghermann/ui/sf/montage.cc
similarity index 99%
rename from src/ui/sf/montage.cc
rename to src/aghermann/ui/sf/montage.cc
index e465a00..ec20e6a 100644
--- a/src/ui/sf/montage.cc
+++ b/src/aghermann/ui/sf/montage.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/montage.cc
+ * File name: aghermann/ui/sf/montage.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-23
@@ -12,7 +12,8 @@
#include <cairo/cairo-svg.h>
#include "common/lang.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
#include "d/patterns.hh"
diff --git a/src/ui/sf/montage_cb.cc b/src/aghermann/ui/sf/montage_cb.cc
similarity index 99%
rename from src/ui/sf/montage_cb.cc
rename to src/aghermann/ui/sf/montage_cb.cc
index 7b5f055..35b4164 100644
--- a/src/ui/sf/montage_cb.cc
+++ b/src/aghermann/ui/sf/montage_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/montage_cb.cc
+ * File name: aghermann/ui/sf/montage_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-07-02
@@ -12,7 +12,8 @@
#include <sys/time.h>
#include <cairo/cairo.h>
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
#include "sf_cb.hh"
#include "d/artifacts.hh"
diff --git a/src/ui/sf/sf.cc b/src/aghermann/ui/sf/sf.cc
similarity index 99%
rename from src/ui/sf/sf.cc
rename to src/aghermann/ui/sf/sf.cc
index c3a44af..1deb8d9 100644
--- a/src/ui/sf/sf.cc
+++ b/src/aghermann/ui/sf/sf.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf.cc
+ * File name: aghermann/ui/sf/sf.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2008-07-01
@@ -13,7 +13,8 @@
#include "common/config-validate.hh"
#include "common/fs.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sf.hh"
#include "sf_cb.hh"
#include "d/artifacts.hh"
diff --git a/src/ui/sf/sf.hh b/src/aghermann/ui/sf/sf.hh
similarity index 98%
rename from src/ui/sf/sf.hh
rename to src/aghermann/ui/sf/sf.hh
index 51f1b44..a93bc48 100644
--- a/src/ui/sf/sf.hh
+++ b/src/aghermann/ui/sf/sf.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf.hh
+ * File name: aghermann/ui/sf/sf.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-01-14
@@ -22,13 +22,14 @@
#include "common/config-validate.hh"
#include "sigproc/winfun.hh"
#include "sigproc/sigproc.hh"
-#include "patterns/patterns.hh"
-#include "metrics/mc-artifacts.hh"
-#include "expdesign/primaries.hh"
-#include "ica/ica.hh"
-#include "ui/globals.hh"
-#include "ui/ui++.hh"
-#include "ui/mw/mw.hh"
+#include "aghermann/patterns/patterns.hh"
+#include "aghermann/metrics/mc-artifacts.hh"
+#include "aghermann/expdesign/primaries.hh"
+#include "aghermann/ica/ica.hh"
+#include "aghermann/ui/globals.hh"
+#include "aghermann/ui/ui++.hh"
+#include "aghermann/ui/mw/mw.hh"
+
#include "widgets.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/ui/sf/sf_cb.cc b/src/aghermann/ui/sf/sf_cb.cc
similarity index 99%
rename from src/ui/sf/sf_cb.cc
rename to src/aghermann/ui/sf/sf_cb.cc
index 8fa8d76..9bcc6de 100644
--- a/src/ui/sf/sf_cb.cc
+++ b/src/aghermann/ui/sf/sf_cb.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf_cb.cc
+ * File name: aghermann/ui/sf/sf_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-06-29
@@ -9,7 +9,8 @@
* License: GPL
*/
-#include "ui/mw/mw.hh"
+#include "aghermann/ui/mw/mw.hh"
+
#include "sf.hh"
#include "widgets.hh"
#include "d/patterns.hh"
diff --git a/src/ui/sf/sf_cb.hh b/src/aghermann/ui/sf/sf_cb.hh
similarity index 99%
rename from src/ui/sf/sf_cb.hh
rename to src/aghermann/ui/sf/sf_cb.hh
index bd8b59a..cc00963 100644
--- a/src/ui/sf/sf_cb.hh
+++ b/src/aghermann/ui/sf/sf_cb.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/sf_cb.hh
+ * File name: aghermann/ui/sf/sf_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2013-04-27
diff --git a/src/ui/sf/widgets.hh b/src/aghermann/ui/sf/widgets.hh
similarity index 98%
rename from src/ui/sf/widgets.hh
rename to src/aghermann/ui/sf/widgets.hh
index be41d04..9da4300 100644
--- a/src/ui/sf/widgets.hh
+++ b/src/aghermann/ui/sf/widgets.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sf/widgets.hh
+ * File name: aghermann/ui/sf/widgets.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-10-06
diff --git a/src/ui/sm/Makefile.am b/src/aghermann/ui/sm/Makefile.am
similarity index 86%
rename from src/ui/sm/Makefile.am
rename to src/aghermann/ui/sm/Makefile.am
index a135a84..bc3641e 100644
--- a/src/ui/sm/Makefile.am
+++ b/src/aghermann/ui/sm/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS := \
-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
+ $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
@@ -14,12 +14,14 @@ liba_a_SOURCES := \
sm_cb.cc \
sm_cb.hh
+CLEANFILES := \
+ liba.la
if DO_PCH
BUILT_SOURCES := \
sm.hh.gch \
sm_cb.hh.gch
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/ui/sm/sm-construct.cc b/src/aghermann/ui/sm/sm-construct.cc
similarity index 95%
rename from src/ui/sm/sm-construct.cc
rename to src/aghermann/ui/sm/sm-construct.cc
index 42cf3de..859aecc 100644
--- a/src/ui/sm/sm-construct.cc
+++ b/src/aghermann/ui/sm/sm-construct.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sm/sm-construct.cc
+ * File name: aghermann/ui/sm/sm-construct.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-10
@@ -10,8 +10,9 @@
*/
-#include "ui/ui.hh"
-#include "ui/misc.hh"
+#include "aghermann/ui/ui.hh"
+#include "aghermann/ui/misc.hh"
+
#include "sm.hh"
#include "sm_cb.hh"
diff --git a/src/ui/sm/sm.cc b/src/aghermann/ui/sm/sm.cc
similarity index 97%
rename from src/ui/sm/sm.cc
rename to src/aghermann/ui/sm/sm.cc
index 2f9b297..4645058 100644
--- a/src/ui/sm/sm.cc
+++ b/src/aghermann/ui/sm/sm.cc
@@ -1,5 +1,5 @@
/*
- * File name: ui/sm/sm.cc
+ * File name: aghermann/ui/sm/sm.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-05-15
@@ -12,12 +12,14 @@
#include <cassert>
#include <ftw.h>
+
#include <libconfig.h++>
#include "common/fs.hh"
-#include "expdesign/forward-decls.hh" // for edf_file_counter
-#include "ui/misc.hh"
-#include "ui/mw/mw.hh"
+#include "aghermann/expdesign/forward-decls.hh" // for edf_file_counter
+#include "aghermann/ui/misc.hh"
+#include "aghermann/ui/mw/mw.hh"
+
#include "sm.hh"
#include "sm_cb.hh"
diff --git a/src/ui/sm/sm.hh b/src/aghermann/ui/sm/sm.hh
similarity index 95%
rename from src/ui/sm/sm.hh
rename to src/aghermann/ui/sm/sm.hh
index a301d82..fbe503d 100644
--- a/src/ui/sm/sm.hh
+++ b/src/aghermann/ui/sm/sm.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sm/sm.hh
+ * File name: aghermann/ui/sm/sm.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2011-04-13
@@ -14,9 +14,11 @@
#include <string>
#include <list>
+
#include <gtk/gtk.h>
+
#include "common/lang.hh"
-#include "ui/forward-decls.hh"
+#include "aghermann/ui/forward-decls.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
diff --git a/src/ui/sm/sm_cb.cc b/src/aghermann/ui/sm/sm_cb.cc
similarity index 97%
rename from src/ui/sm/sm_cb.cc
rename to src/aghermann/ui/sm/sm_cb.cc
index 8c8455f..c8c6742 100644
--- a/src/ui/sm/sm_cb.cc
+++ b/src/aghermann/ui/sm/sm_cb.cc
@@ -1,6 +1,5 @@
-// ;-*-C++-*-
/*
- * File name: ui/sm/sm_cb.cc
+ * File name: aghermann/ui/sm/sm_cb.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-09
@@ -12,8 +11,9 @@
#include "common/string.hh"
-#include "ui/ui.hh"
-#include "ui/ui++.hh"
+#include "aghermann/ui/ui.hh"
+#include "aghermann/ui/ui++.hh"
+
#include "sm.hh"
#include "sm_cb.hh"
diff --git a/src/ui/sm/sm_cb.hh b/src/aghermann/ui/sm/sm_cb.hh
similarity index 96%
rename from src/ui/sm/sm_cb.hh
rename to src/aghermann/ui/sm/sm_cb.hh
index 2996d49..ab2cf86 100644
--- a/src/ui/sm/sm_cb.hh
+++ b/src/aghermann/ui/sm/sm_cb.hh
@@ -1,5 +1,5 @@
/*
- * File name: ui/sm/sm_cb.hh
+ * File name: aghermann/ui/sm/sm_cb.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-09-09
diff --git a/src/ui/ui++.hh b/src/aghermann/ui/ui++.hh
similarity index 100%
rename from src/ui/ui++.hh
rename to src/aghermann/ui/ui++.hh
diff --git a/src/ui/ui.hh b/src/aghermann/ui/ui.hh
similarity index 100%
rename from src/ui/ui.hh
rename to src/aghermann/ui/ui.hh
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 729016d..8954946 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -16,6 +16,9 @@ liba_a_SOURCES := \
lang.hh \
subject_id.hh
+CLEANFILES := \
+ *.la
+
if DO_PCH
BUILT_SOURCES := \
config-validate.hh.gch \
@@ -28,6 +31,6 @@ BUILT_SOURCES := \
%.hh.gch: %.hh
$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES += \
$(BUILT_SOURCES)
endif
diff --git a/src/common/lang.hh b/src/common/lang.hh
index 42e9880..748f84e 100644
--- a/src/common/lang.hh
+++ b/src/common/lang.hh
@@ -49,6 +49,12 @@ using namespace std;
typedef unsigned long hash_t;
+
+
+#define FABUF printf( __FILE__ ":%d (%s): %s\n", __LINE__, __FUNCTION__, __buf__);
+#define FAFA printf( __FILE__ ":%d (%s): fafa\n", __LINE__, __FUNCTION__);
+
+
#endif
// Local Variables:
diff --git a/src/libsigfile/source-base.hh b/src/libsigfile/source-base.hh
index f913f6a..6ee29f0 100644
--- a/src/libsigfile/source-base.hh
+++ b/src/libsigfile/source-base.hh
@@ -16,7 +16,6 @@
#include "common/alg.hh"
#include "common/subject_id.hh"
#include "sigproc/winfun.hh"
-#include "expdesign/forward-decls.hh"
#include "channel.hh"
#if HAVE_CONFIG_H && !defined(VERSION)
@@ -189,8 +188,6 @@ struct SFilterPack {
class CSource {
friend class CTypedSource;
- friend class agh::CSubject;
- friend class agh::CExpDesign;
protected:
string _filename;
int _status;
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index fa2869a..66509d3 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -33,7 +33,6 @@ edfhed_gtk_LDADD := \
../libsigfile/liba.a \
../sigproc/liba.a \
../common/liba.a \
- ../ui/liba.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(GTK_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
diff --git a/src/ui/sf/d/artifacts-simple_cb.cc b/src/ui/sf/d/artifacts-simple_cb.cc
deleted file mode 100644
index f8339d6..0000000
--- a/src/ui/sf/d/artifacts-simple_cb.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * File name: ui/sf/d/artifacts-simple_cb.cc
- * Project: Aghermann
- * Author: Andrei Zavada <johnhommer at gmail.com>
- * Initial version: 2013-01-26
- *
- * Purpose: scoring facility: simple artifact detection dialog callbacks
- *
- * License: GPL
- */
-
-#include "ui/misc.hh"
-#include "artifacts-simple.hh"
-
-using namespace std;
-using namespace aghui;
-
-
-
-// Local Variables:
-// indent-tabs-mode: 8
-// End:
--
Sleep experiment manager
More information about the debian-med-commit
mailing list