1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
|
diff -r e500a2602f86 src/Makefile.am
--- a/src/Makefile.am Sun Jul 20 15:44:52 2014 +0100
+++ b/src/Makefile.am Sun Jul 20 15:49:30 2014 +0100
@@ -38,7 +38,7 @@
backend/filters/compositionProfile.cpp backend/filters/spatialAnalysis.cpp \
backend/filters/clusterAnalysis.cpp backend/filters/ionInfo.cpp \
backend/filters/annotation.cpp backend/filters/geometryHelpers.cpp \
- backend/filters/algorithms/binomial.cpp
+ backend/filters/algorithms/binomial.cpp backend/filters/filterTemplate.cpp
FILTER_HEADER_FILES = backend/filters/allFilter.h backend/filters/filterCommon.h \
backend/filters/dataLoad.h backend/filters/ionDownsample.h \
@@ -48,7 +48,7 @@
backend/filters/compositionProfile.h backend/filters/spatialAnalysis.h \
backend/filters/clusterAnalysis.h backend/filters/ionInfo.h \
backend/filters/annotation.h backend/filters/geometryHelpers.h \
- backend/filters/algorithms/binomial.h
+ backend/filters/algorithms/binomial.h backend/filters/algorithms/filterTemplate.h
BACKEND_SOURCE_FILES = backend/animator.cpp backend/filtertreeAnalyse.cpp backend/filtertree.cpp \
backend/APT/ionhit.cpp backend/APT/APTFileIO.cpp backend/APT/APTRanges.cpp backend/APT/abundanceParser.cpp \
diff -r e500a2602f86 src/backend/filter.cpp
--- a/src/backend/filter.cpp Sun Jul 20 15:44:52 2014 +0100
+++ b/src/backend/filter.cpp Sun Jul 20 15:49:30 2014 +0100
@@ -63,7 +63,8 @@
"clusteranalysis",
"voxelise",
"ioninfo",
- "annotation"
+ "annotation",
+ "template"
};
size_t numElements(const vector<const FilterStreamData *> &v, unsigned int mask)
diff -r e500a2602f86 src/backend/filter.h
--- a/src/backend/filter.h Sun Jul 20 15:44:52 2014 +0100
+++ b/src/backend/filter.h Sun Jul 20 15:49:30 2014 +0100
@@ -71,6 +71,7 @@
FILTER_TYPE_VOXELS,
FILTER_TYPE_IONINFO,
FILTER_TYPE_ANNOTATION,
+ FILTER_TYPE_TEMPLATE,
FILTER_TYPE_ENUM_END // not a filter. just end of enum
};
diff -r e500a2602f86 src/backend/filters/allFilter.cpp
--- a/src/backend/filters/allFilter.cpp Sun Jul 20 15:44:52 2014 +0100
+++ b/src/backend/filters/allFilter.cpp Sun Jul 20 15:49:30 2014 +0100
@@ -104,6 +104,9 @@
case FILTER_TYPE_ANNOTATION:
f = new AnnotateFilter;
break;
+ case FILTER_TYPE_TEMPLATE:
+ f = new TemplateFilter;
+ break;
default:
ASSERT(false);
}
diff -r e500a2602f86 src/backend/filters/allFilter.h
--- a/src/backend/filters/allFilter.h Sun Jul 20 15:44:52 2014 +0100
+++ b/src/backend/filters/allFilter.h Sun Jul 20 15:49:30 2014 +0100
@@ -32,6 +32,7 @@
#include "voxelise.h"
#include "ionInfo.h"
#include "annotation.h"
+#include "filterTemplate.h"
//!Returns true if the string is a valid filter name
bool isValidFilterName(const std::string &s);
diff -r e500a2602f86 src/gui/mainFrame.cpp
--- a/src/gui/mainFrame.cpp Sun Jul 20 15:44:52 2014 +0100
+++ b/src/gui/mainFrame.cpp Sun Jul 20 15:49:30 2014 +0100
@@ -116,7 +116,7 @@
//MainFrame's constructor
//--- These settings must be modified concomitantly.
-const unsigned int FILTER_DROP_COUNT=14;
+const unsigned int FILTER_DROP_COUNT=15;
const char * comboFilters_choices[FILTER_DROP_COUNT] =
{
@@ -134,6 +134,7 @@
NTRANS("Range File"),
NTRANS("Spat. Analysis"),
NTRANS("Voxelisation"),
+ NTRANS("Template")
};
//Mapping between filter ID and combo position
@@ -152,6 +153,7 @@
FILTER_TYPE_RANGEFILE,
FILTER_TYPE_SPATIAL_ANALYSIS,
FILTER_TYPE_VOXELS,
+ FILTER_TYPE_TEMPLATE,
};
//----
diff -r 036cf664e28d docs/developers/filter-template.patch
--- a/docs/developers/filter-template.patch Sun Aug 24 14:17:50 2014 +0100
+++ b/docs/developers/filter-template.patch Sun Aug 24 14:18:26 2014 +0100
@@ -1,97 +0,0 @@
-diff -r e500a2602f86 src/Makefile.am
---- a/src/Makefile.am Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/Makefile.am Sun Jul 20 15:49:30 2014 +0100
-@@ -38,7 +38,7 @@
- backend/filters/compositionProfile.cpp backend/filters/spatialAnalysis.cpp \
- backend/filters/clusterAnalysis.cpp backend/filters/ionInfo.cpp \
- backend/filters/annotation.cpp backend/filters/geometryHelpers.cpp \
-- backend/filters/algorithms/binomial.cpp
-+ backend/filters/algorithms/binomial.cpp backend/filters/filterTemplate.cpp
-
- FILTER_HEADER_FILES = backend/filters/allFilter.h backend/filters/filterCommon.h \
- backend/filters/dataLoad.h backend/filters/ionDownsample.h \
-@@ -48,7 +48,7 @@
- backend/filters/compositionProfile.h backend/filters/spatialAnalysis.h \
- backend/filters/clusterAnalysis.h backend/filters/ionInfo.h \
- backend/filters/annotation.h backend/filters/geometryHelpers.h \
-- backend/filters/algorithms/binomial.h
-+ backend/filters/algorithms/binomial.h backend/filters/algorithms/filterTemplate.h
-
- BACKEND_SOURCE_FILES = backend/animator.cpp backend/filtertreeAnalyse.cpp backend/filtertree.cpp \
- backend/APT/ionhit.cpp backend/APT/APTFileIO.cpp backend/APT/APTRanges.cpp backend/APT/abundanceParser.cpp \
-diff -r e500a2602f86 src/backend/filter.cpp
---- a/src/backend/filter.cpp Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/backend/filter.cpp Sun Jul 20 15:49:30 2014 +0100
-@@ -63,7 +63,8 @@
- "clusteranalysis",
- "voxelise",
- "ioninfo",
-- "annotation"
-+ "annotation",
-+ "template"
- };
-
- size_t numElements(const vector<const FilterStreamData *> &v, unsigned int mask)
-diff -r e500a2602f86 src/backend/filter.h
---- a/src/backend/filter.h Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/backend/filter.h Sun Jul 20 15:49:30 2014 +0100
-@@ -71,6 +71,7 @@
- FILTER_TYPE_VOXELS,
- FILTER_TYPE_IONINFO,
- FILTER_TYPE_ANNOTATION,
-+ FILTER_TYPE_TEMPLATE,
- FILTER_TYPE_ENUM_END // not a filter. just end of enum
- };
-
-diff -r e500a2602f86 src/backend/filters/allFilter.cpp
---- a/src/backend/filters/allFilter.cpp Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/backend/filters/allFilter.cpp Sun Jul 20 15:49:30 2014 +0100
-@@ -104,6 +104,9 @@
- case FILTER_TYPE_ANNOTATION:
- f = new AnnotateFilter;
- break;
-+ case FILTER_TYPE_TEMPLATE:
-+ f = new TemplateFilter;
-+ break;
- default:
- ASSERT(false);
- }
-diff -r e500a2602f86 src/backend/filters/allFilter.h
---- a/src/backend/filters/allFilter.h Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/backend/filters/allFilter.h Sun Jul 20 15:49:30 2014 +0100
-@@ -32,6 +32,7 @@
- #include "voxelise.h"
- #include "ionInfo.h"
- #include "annotation.h"
-+#include "filterTemplate.h"
-
- //!Returns true if the string is a valid filter name
- bool isValidFilterName(const std::string &s);
-diff -r e500a2602f86 src/gui/mainFrame.cpp
---- a/src/gui/mainFrame.cpp Sun Jul 20 15:44:52 2014 +0100
-+++ b/src/gui/mainFrame.cpp Sun Jul 20 15:49:30 2014 +0100
-@@ -116,7 +116,7 @@
- //MainFrame's constructor
-
- //--- These settings must be modified concomitantly.
--const unsigned int FILTER_DROP_COUNT=14;
-+const unsigned int FILTER_DROP_COUNT=15;
-
- const char * comboFilters_choices[FILTER_DROP_COUNT] =
- {
-@@ -134,6 +134,7 @@
- NTRANS("Range File"),
- NTRANS("Spat. Analysis"),
- NTRANS("Voxelisation"),
-+ NTRANS("Template")
- };
-
- //Mapping between filter ID and combo position
-@@ -152,6 +153,7 @@
- FILTER_TYPE_RANGEFILE,
- FILTER_TYPE_SPATIAL_ANALYSIS,
- FILTER_TYPE_VOXELS,
-+ FILTER_TYPE_TEMPLATE,
- };
- //----
-
diff -r 036cf664e28d src/Makefile.am
--- a/src/Makefile.am Sun Aug 24 14:17:50 2014 +0100
+++ b/src/Makefile.am Sun Aug 24 14:18:26 2014 +0100
@@ -38,7 +38,7 @@
backend/filters/compositionProfile.cpp backend/filters/spatialAnalysis.cpp \
backend/filters/clusterAnalysis.cpp backend/filters/ionInfo.cpp \
backend/filters/annotation.cpp backend/filters/geometryHelpers.cpp \
- backend/filters/algorithms/binomial.cpp
+ backend/filters/algorithms/binomial.cpp backend/filters/filterTemplate.cpp
FILTER_HEADER_FILES = backend/filters/allFilter.h backend/filters/filterCommon.h \
backend/filters/dataLoad.h backend/filters/ionDownsample.h \
@@ -48,7 +48,7 @@
backend/filters/compositionProfile.h backend/filters/spatialAnalysis.h \
backend/filters/clusterAnalysis.h backend/filters/ionInfo.h \
backend/filters/annotation.h backend/filters/geometryHelpers.h \
- backend/filters/algorithms/binomial.h
+ backend/filters/algorithms/binomial.h backend/filters/algorithms/filterTemplate.h
BACKEND_SOURCE_FILES = backend/animator.cpp backend/filtertreeAnalyse.cpp backend/filtertree.cpp \
backend/APT/ionhit.cpp backend/APT/APTFileIO.cpp backend/APT/APTRanges.cpp backend/APT/abundanceParser.cpp \
diff -r 036cf664e28d src/backend/filter.cpp
--- a/src/backend/filter.cpp Sun Aug 24 14:17:50 2014 +0100
+++ b/src/backend/filter.cpp Sun Aug 24 14:18:26 2014 +0100
@@ -63,7 +63,8 @@
"clusteranalysis",
"voxelise",
"ioninfo",
- "annotation"
+ "annotation",
+ "template"
};
size_t numElements(const vector<const FilterStreamData *> &v, unsigned int mask)
diff -r 036cf664e28d src/backend/filter.h
--- a/src/backend/filter.h Sun Aug 24 14:17:50 2014 +0100
+++ b/src/backend/filter.h Sun Aug 24 14:18:26 2014 +0100
@@ -71,6 +71,7 @@
FILTER_TYPE_VOXELS,
FILTER_TYPE_IONINFO,
FILTER_TYPE_ANNOTATION,
+ FILTER_TYPE_TEMPLATE,
FILTER_TYPE_ENUM_END // not a filter. just end of enum
};
diff -r 036cf664e28d src/backend/filters/allFilter.cpp
--- a/src/backend/filters/allFilter.cpp Sun Aug 24 14:17:50 2014 +0100
+++ b/src/backend/filters/allFilter.cpp Sun Aug 24 14:18:26 2014 +0100
@@ -104,6 +104,9 @@
case FILTER_TYPE_ANNOTATION:
f = new AnnotateFilter;
break;
+ case FILTER_TYPE_TEMPLATE:
+ f = new TemplateFilter;
+ break;
default:
ASSERT(false);
}
diff -r 036cf664e28d src/backend/filters/allFilter.h
--- a/src/backend/filters/allFilter.h Sun Aug 24 14:17:50 2014 +0100
+++ b/src/backend/filters/allFilter.h Sun Aug 24 14:18:26 2014 +0100
@@ -32,6 +32,7 @@
#include "voxelise.h"
#include "ionInfo.h"
#include "annotation.h"
+#include "filterTemplate.h"
//!Returns true if the string is a valid filter name
bool isValidFilterName(const std::string &s);
diff -r 036cf664e28d src/gui/mainFrame.cpp
--- a/src/gui/mainFrame.cpp Sun Aug 24 14:17:50 2014 +0100
+++ b/src/gui/mainFrame.cpp Sun Aug 24 14:18:26 2014 +0100
@@ -121,7 +121,7 @@
//MainFrame's constructor
//--- These settings must be modified concomitantly.
-const unsigned int FILTER_DROP_COUNT=14;
+const unsigned int FILTER_DROP_COUNT=15;
const char * comboFilters_choices[FILTER_DROP_COUNT] =
{
@@ -139,6 +139,7 @@
NTRANS("Range File"),
NTRANS("Spat. Analysis"),
NTRANS("Voxelisation"),
+ NTRANS("Template")
};
//Mapping between filter ID and combo position
@@ -157,6 +158,7 @@
FILTER_TYPE_RANGEFILE,
FILTER_TYPE_SPATIAL_ANALYSIS,
FILTER_TYPE_VOXELS,
+ FILTER_TYPE_TEMPLATE,
};
//----
|
