Chris@147
|
1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
|
Chris@147
|
2
|
Chris@147
|
3 /*
|
Chris@147
|
4 Sonic Visualiser
|
Chris@147
|
5 An audio file viewer and annotation editor.
|
Chris@147
|
6 Centre for Digital Music, Queen Mary, University of London.
|
Chris@147
|
7 This file copyright 2006 Chris Cannam.
|
Chris@147
|
8
|
Chris@147
|
9 This program is free software; you can redistribute it and/or
|
Chris@147
|
10 modify it under the terms of the GNU General Public License as
|
Chris@147
|
11 published by the Free Software Foundation; either version 2 of the
|
Chris@147
|
12 License, or (at your option) any later version. See the file
|
Chris@147
|
13 COPYING included with this distribution for more information.
|
Chris@147
|
14 */
|
Chris@147
|
15
|
Chris@147
|
16 #ifndef _SPARSE_MODEL_H_
|
Chris@147
|
17 #define _SPARSE_MODEL_H_
|
Chris@147
|
18
|
Chris@150
|
19 #include "Model.h"
|
Chris@420
|
20 #include "TabularModel.h"
|
Chris@147
|
21 #include "base/Command.h"
|
Chris@425
|
22 #include "base/RealTime.h"
|
Chris@147
|
23
|
Chris@147
|
24 #include <iostream>
|
Chris@147
|
25
|
Chris@147
|
26 #include <set>
|
Chris@420
|
27 #include <vector>
|
Chris@420
|
28 #include <algorithm>
|
Chris@608
|
29 #include <iterator>
|
Chris@420
|
30
|
Chris@425
|
31 #include <cmath>
|
Chris@425
|
32
|
Chris@147
|
33 #include <QMutex>
|
Chris@147
|
34 #include <QTextStream>
|
Chris@147
|
35
|
Chris@147
|
36 /**
|
Chris@147
|
37 * Model containing sparse data (points with some properties). The
|
Chris@147
|
38 * properties depend on the point type.
|
Chris@147
|
39 */
|
Chris@147
|
40
|
Chris@147
|
41 template <typename PointType>
|
Chris@420
|
42 class SparseModel : public Model,
|
Chris@420
|
43 public TabularModel
|
Chris@147
|
44 {
|
Chris@147
|
45 public:
|
Chris@1040
|
46 SparseModel(sv_samplerate_t sampleRate, int resolution,
|
Chris@147
|
47 bool notifyOnAdd = true);
|
Chris@147
|
48 virtual ~SparseModel() { }
|
Chris@147
|
49
|
Chris@147
|
50 virtual bool isOK() const { return true; }
|
Chris@1038
|
51 virtual sv_frame_t getStartFrame() const;
|
Chris@1038
|
52 virtual sv_frame_t getEndFrame() const;
|
Chris@1040
|
53 virtual sv_samplerate_t getSampleRate() const { return m_sampleRate; }
|
Chris@147
|
54
|
Chris@147
|
55 // Number of frames of the underlying sample rate that this model
|
Chris@147
|
56 // is capable of resolving to. For example, if m_resolution == 10
|
Chris@147
|
57 // then every point in this model will be at a multiple of 10
|
Chris@147
|
58 // sample frames and should be considered to cover a window ending
|
Chris@147
|
59 // 10 sample frames later.
|
Chris@929
|
60 virtual int getResolution() const {
|
Chris@147
|
61 return m_resolution ? m_resolution : 1;
|
Chris@147
|
62 }
|
Chris@929
|
63 virtual void setResolution(int resolution);
|
Chris@147
|
64
|
Chris@1066
|
65 // Extend the end of the model. If this is set to something beyond
|
Chris@1066
|
66 // the end of the final point in the model, then getEndFrame()
|
Chris@1066
|
67 // will return this value. Otherwise getEndFrame() will return the
|
Chris@1066
|
68 // end of the final point.
|
Chris@1066
|
69 virtual void extendEndFrame(sv_frame_t to) { m_extendTo = to; }
|
Chris@1066
|
70
|
Chris@147
|
71 typedef PointType Point;
|
Chris@147
|
72 typedef std::multiset<PointType,
|
Chris@147
|
73 typename PointType::OrderComparator> PointList;
|
Chris@147
|
74 typedef typename PointList::iterator PointListIterator;
|
Chris@606
|
75 typedef typename PointList::const_iterator PointListConstIterator;
|
Chris@147
|
76
|
Chris@147
|
77 /**
|
Chris@147
|
78 * Return whether the model is empty or not.
|
Chris@147
|
79 */
|
Chris@147
|
80 virtual bool isEmpty() const;
|
Chris@147
|
81
|
Chris@147
|
82 /**
|
Chris@147
|
83 * Get the total number of points in the model.
|
Chris@147
|
84 */
|
Chris@929
|
85 virtual int getPointCount() const;
|
Chris@147
|
86
|
Chris@147
|
87 /**
|
Chris@459
|
88 * Get all points.
|
Chris@459
|
89 */
|
Chris@459
|
90 virtual const PointList &getPoints() const;
|
Chris@459
|
91
|
Chris@459
|
92 /**
|
Chris@147
|
93 * Get all of the points in this model between the given
|
Chris@147
|
94 * boundaries (in frames), as well as up to two points before and
|
Chris@147
|
95 * after the boundaries. If you need exact boundaries, check the
|
Chris@147
|
96 * point coordinates in the returned list.
|
Chris@147
|
97 */
|
Chris@1038
|
98 virtual PointList getPoints(sv_frame_t start, sv_frame_t end) const;
|
Chris@147
|
99
|
Chris@147
|
100 /**
|
Chris@147
|
101 * Get all points that cover the given frame number, taking the
|
Chris@147
|
102 * resolution of the model into account.
|
Chris@147
|
103 */
|
Chris@1038
|
104 virtual PointList getPoints(sv_frame_t frame) const;
|
Chris@147
|
105
|
Chris@147
|
106 /**
|
Chris@147
|
107 * Return all points that share the nearest frame number prior to
|
Chris@147
|
108 * the given one at which there are any points.
|
Chris@147
|
109 */
|
Chris@1038
|
110 virtual PointList getPreviousPoints(sv_frame_t frame) const;
|
Chris@147
|
111
|
Chris@147
|
112 /**
|
Chris@147
|
113 * Return all points that share the nearest frame number
|
Chris@147
|
114 * subsequent to the given one at which there are any points.
|
Chris@147
|
115 */
|
Chris@1038
|
116 virtual PointList getNextPoints(sv_frame_t frame) const;
|
Chris@147
|
117
|
Chris@147
|
118 /**
|
Chris@147
|
119 * Remove all points.
|
Chris@147
|
120 */
|
Chris@147
|
121 virtual void clear();
|
Chris@147
|
122
|
Chris@147
|
123 /**
|
Chris@147
|
124 * Add a point.
|
Chris@147
|
125 */
|
Chris@147
|
126 virtual void addPoint(const PointType &point);
|
Chris@147
|
127
|
Chris@147
|
128 /**
|
Chris@147
|
129 * Remove a point. Points are not necessarily unique, so this
|
Chris@147
|
130 * function will remove the first point that compares equal to the
|
Chris@147
|
131 * supplied one using Point::Comparator. Other identical points
|
Chris@147
|
132 * may remain in the model.
|
Chris@147
|
133 */
|
Chris@147
|
134 virtual void deletePoint(const PointType &point);
|
Chris@147
|
135
|
Chris@297
|
136 virtual bool isReady(int *completion = 0) const {
|
Chris@297
|
137 bool ready = isOK() && (m_completion == 100);
|
Chris@297
|
138 if (completion) *completion = m_completion;
|
Chris@297
|
139 return ready;
|
Chris@297
|
140 }
|
Chris@297
|
141
|
Chris@333
|
142 virtual void setCompletion(int completion, bool update = true);
|
Chris@147
|
143 virtual int getCompletion() const { return m_completion; }
|
Chris@147
|
144
|
Chris@147
|
145 virtual bool hasTextLabels() const { return m_hasTextLabels; }
|
Chris@147
|
146
|
Chris@345
|
147 QString getTypeName() const { return tr("Sparse"); }
|
Chris@345
|
148
|
Chris@407
|
149 virtual QString getXmlOutputType() const { return "sparse"; }
|
Chris@407
|
150
|
Chris@147
|
151 virtual void toXml(QTextStream &out,
|
Chris@147
|
152 QString indent = "",
|
Chris@147
|
153 QString extraAttributes = "") const;
|
Chris@147
|
154
|
Chris@1060
|
155 virtual QString toDelimitedDataString(QString delimiter) const {
|
Chris@1072
|
156 return toDelimitedDataStringWithOptions
|
Chris@1072
|
157 (delimiter, DataExportDefaults);
|
Chris@1060
|
158 }
|
Chris@1060
|
159
|
Chris@1060
|
160 virtual QString toDelimitedDataStringWithOptions(QString delimiter,
|
Chris@1064
|
161 DataExportOptions opts) const {
|
Chris@1064
|
162 return toDelimitedDataStringSubsetWithOptions
|
Chris@1064
|
163 (delimiter, opts,
|
Chris@1072
|
164 std::min(getStartFrame(), sv_frame_t(0)), getEndFrame() + 1);
|
Chris@147
|
165 }
|
Chris@147
|
166
|
Chris@1060
|
167 virtual QString toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const {
|
Chris@1072
|
168 return toDelimitedDataStringSubsetWithOptions
|
Chris@1072
|
169 (delimiter, DataExportDefaults, f0, f1);
|
Chris@1060
|
170 }
|
Chris@1060
|
171
|
Chris@1064
|
172 virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions opts, sv_frame_t f0, sv_frame_t f1) const {
|
Chris@1064
|
173 if (opts & DataExportFillGaps) {
|
Chris@1064
|
174 return toDelimitedDataStringSubsetFilled(delimiter, opts, f0, f1);
|
Chris@1064
|
175 } else {
|
Chris@1064
|
176 QString s;
|
Chris@1064
|
177 for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) {
|
Chris@1064
|
178 if (i->frame >= f0 && i->frame < f1) {
|
Chris@1064
|
179 s += i->toDelimitedDataString(delimiter, opts, m_sampleRate) + "\n";
|
Chris@1064
|
180 }
|
Chris@838
|
181 }
|
Chris@1064
|
182 return s;
|
Chris@838
|
183 }
|
Chris@838
|
184 }
|
Chris@838
|
185
|
Chris@147
|
186 /**
|
Chris@147
|
187 * Command to add a point, with undo.
|
Chris@147
|
188 */
|
Chris@147
|
189 class AddPointCommand : public Command
|
Chris@147
|
190 {
|
Chris@147
|
191 public:
|
Chris@147
|
192 AddPointCommand(SparseModel<PointType> *model,
|
Chris@147
|
193 const PointType &point,
|
Chris@147
|
194 QString name = "") :
|
Chris@147
|
195 m_model(model), m_point(point), m_name(name) { }
|
Chris@147
|
196
|
Chris@147
|
197 virtual QString getName() const {
|
Chris@147
|
198 return (m_name == "" ? tr("Add Point") : m_name);
|
Chris@147
|
199 }
|
Chris@147
|
200
|
Chris@147
|
201 virtual void execute() { m_model->addPoint(m_point); }
|
Chris@147
|
202 virtual void unexecute() { m_model->deletePoint(m_point); }
|
Chris@147
|
203
|
Chris@147
|
204 const PointType &getPoint() const { return m_point; }
|
Chris@147
|
205
|
Chris@147
|
206 private:
|
Chris@147
|
207 SparseModel<PointType> *m_model;
|
Chris@147
|
208 PointType m_point;
|
Chris@147
|
209 QString m_name;
|
Chris@147
|
210 };
|
Chris@147
|
211
|
Chris@147
|
212
|
Chris@147
|
213 /**
|
Chris@147
|
214 * Command to remove a point, with undo.
|
Chris@147
|
215 */
|
Chris@147
|
216 class DeletePointCommand : public Command
|
Chris@147
|
217 {
|
Chris@147
|
218 public:
|
Chris@147
|
219 DeletePointCommand(SparseModel<PointType> *model,
|
Chris@147
|
220 const PointType &point) :
|
Chris@147
|
221 m_model(model), m_point(point) { }
|
Chris@147
|
222
|
Chris@147
|
223 virtual QString getName() const { return tr("Delete Point"); }
|
Chris@147
|
224
|
Chris@147
|
225 virtual void execute() { m_model->deletePoint(m_point); }
|
Chris@147
|
226 virtual void unexecute() { m_model->addPoint(m_point); }
|
Chris@147
|
227
|
Chris@147
|
228 const PointType &getPoint() const { return m_point; }
|
Chris@147
|
229
|
Chris@147
|
230 private:
|
Chris@147
|
231 SparseModel<PointType> *m_model;
|
Chris@147
|
232 PointType m_point;
|
Chris@147
|
233 };
|
Chris@147
|
234
|
Chris@147
|
235
|
Chris@147
|
236 /**
|
Chris@147
|
237 * Command to add or remove a series of points, with undo.
|
Chris@147
|
238 * Consecutive add/remove pairs for the same point are collapsed.
|
Chris@147
|
239 */
|
Chris@147
|
240 class EditCommand : public MacroCommand
|
Chris@147
|
241 {
|
Chris@147
|
242 public:
|
Chris@147
|
243 EditCommand(SparseModel<PointType> *model, QString commandName);
|
Chris@147
|
244
|
Chris@147
|
245 virtual void addPoint(const PointType &point);
|
Chris@147
|
246 virtual void deletePoint(const PointType &point);
|
Chris@147
|
247
|
Chris@147
|
248 /**
|
Chris@147
|
249 * Stack an arbitrary other command in the same sequence.
|
Chris@147
|
250 */
|
Chris@147
|
251 virtual void addCommand(Command *command) { addCommand(command, true); }
|
Chris@147
|
252
|
Chris@147
|
253 /**
|
Chris@387
|
254 * If any points have been added or deleted, return this
|
Chris@387
|
255 * command (so the caller can add it to the command history).
|
Chris@416
|
256 * Otherwise delete the command and return NULL.
|
Chris@147
|
257 */
|
Chris@416
|
258 virtual EditCommand *finish();
|
Chris@147
|
259
|
Chris@147
|
260 protected:
|
Chris@147
|
261 virtual void addCommand(Command *command, bool executeFirst);
|
Chris@147
|
262
|
Chris@147
|
263 SparseModel<PointType> *m_model;
|
Chris@147
|
264 };
|
Chris@147
|
265
|
Chris@147
|
266
|
Chris@147
|
267 /**
|
Chris@147
|
268 * Command to relabel a point.
|
Chris@147
|
269 */
|
Chris@147
|
270 class RelabelCommand : public Command
|
Chris@147
|
271 {
|
Chris@147
|
272 public:
|
Chris@147
|
273 RelabelCommand(SparseModel<PointType> *model,
|
Chris@147
|
274 const PointType &point,
|
Chris@147
|
275 QString newLabel) :
|
Chris@147
|
276 m_model(model), m_oldPoint(point), m_newPoint(point) {
|
Chris@147
|
277 m_newPoint.label = newLabel;
|
Chris@147
|
278 }
|
Chris@147
|
279
|
Chris@147
|
280 virtual QString getName() const { return tr("Re-Label Point"); }
|
Chris@147
|
281
|
Chris@147
|
282 virtual void execute() {
|
Chris@147
|
283 m_model->deletePoint(m_oldPoint);
|
Chris@147
|
284 m_model->addPoint(m_newPoint);
|
Chris@147
|
285 std::swap(m_oldPoint, m_newPoint);
|
Chris@147
|
286 }
|
Chris@147
|
287
|
Chris@147
|
288 virtual void unexecute() { execute(); }
|
Chris@147
|
289
|
Chris@147
|
290 private:
|
Chris@147
|
291 SparseModel<PointType> *m_model;
|
Chris@147
|
292 PointType m_oldPoint;
|
Chris@147
|
293 PointType m_newPoint;
|
Chris@147
|
294 };
|
Chris@147
|
295
|
Chris@420
|
296 /**
|
Chris@420
|
297 * TabularModel methods.
|
Chris@420
|
298 */
|
Chris@420
|
299
|
Chris@420
|
300 virtual int getRowCount() const
|
Chris@420
|
301 {
|
Chris@1038
|
302 return int(m_points.size());
|
Chris@420
|
303 }
|
Chris@420
|
304
|
Chris@1038
|
305 virtual sv_frame_t getFrameForRow(int row) const
|
Chris@420
|
306 {
|
Chris@606
|
307 PointListConstIterator i = getPointListIteratorForRow(row);
|
Chris@420
|
308 if (i == m_points.end()) return 0;
|
Chris@420
|
309 return i->frame;
|
Chris@420
|
310 }
|
Chris@420
|
311
|
Chris@1038
|
312 virtual int getRowForFrame(sv_frame_t frame) const
|
Chris@420
|
313 {
|
Chris@420
|
314 if (m_rows.empty()) rebuildRowVector();
|
Chris@1038
|
315 std::vector<sv_frame_t>::iterator i =
|
Chris@420
|
316 std::lower_bound(m_rows.begin(), m_rows.end(), frame);
|
Chris@1038
|
317 ssize_t row = std::distance(m_rows.begin(), i);
|
Chris@432
|
318 if (i != m_rows.begin() && (i == m_rows.end() || *i != frame)) {
|
Chris@432
|
319 --row;
|
Chris@432
|
320 }
|
Chris@1038
|
321 return int(row);
|
Chris@420
|
322 }
|
Chris@420
|
323
|
Chris@420
|
324 virtual int getColumnCount() const { return 1; }
|
Chris@425
|
325 virtual QVariant getData(int row, int column, int role) const
|
Chris@425
|
326 {
|
Chris@606
|
327 PointListConstIterator i = getPointListIteratorForRow(row);
|
Chris@425
|
328 if (i == m_points.end()) return QVariant();
|
Chris@425
|
329
|
Chris@425
|
330 switch (column) {
|
Chris@425
|
331 case 0: {
|
Chris@425
|
332 if (role == SortRole) return int(i->frame);
|
Chris@425
|
333 RealTime rt = RealTime::frame2RealTime(i->frame, getSampleRate());
|
Chris@425
|
334 if (role == Qt::EditRole) return rt.toString().c_str();
|
Chris@425
|
335 else return rt.toText().c_str();
|
Chris@425
|
336 }
|
Chris@425
|
337 case 1: return int(i->frame);
|
Chris@425
|
338 }
|
Chris@425
|
339
|
Chris@420
|
340 return QVariant();
|
Chris@420
|
341 }
|
Chris@427
|
342
|
Chris@425
|
343 virtual Command *getSetDataCommand(int row, int column,
|
Chris@425
|
344 const QVariant &value, int role)
|
Chris@425
|
345 {
|
Chris@740
|
346 if (role != Qt::EditRole) return 0;
|
Chris@425
|
347 PointListIterator i = getPointListIteratorForRow(row);
|
Chris@740
|
348 if (i == m_points.end()) return 0;
|
Chris@425
|
349 EditCommand *command = new EditCommand(this, tr("Edit Data"));
|
Chris@425
|
350
|
Chris@425
|
351 Point point(*i);
|
Chris@425
|
352 command->deletePoint(point);
|
Chris@425
|
353
|
Chris@425
|
354 switch (column) {
|
Chris@425
|
355 case 0: point.frame = lrint(value.toDouble() * getSampleRate()); break;
|
Chris@425
|
356 case 1: point.frame = value.toInt(); break;
|
Chris@425
|
357 }
|
Chris@425
|
358
|
Chris@425
|
359 command->addPoint(point);
|
Chris@425
|
360 return command->finish();
|
Chris@425
|
361 }
|
Chris@425
|
362
|
Chris@427
|
363 virtual Command *getInsertRowCommand(int row)
|
Chris@427
|
364 {
|
Chris@427
|
365 EditCommand *command = new EditCommand(this, tr("Insert Data Point"));
|
Chris@427
|
366 Point point(0);
|
Chris@427
|
367 PointListIterator i = getPointListIteratorForRow(row);
|
Chris@427
|
368 if (i == m_points.end() && i != m_points.begin()) --i;
|
Chris@427
|
369 if (i != m_points.end()) point = *i;
|
Chris@427
|
370 command->addPoint(point);
|
Chris@427
|
371 return command->finish();
|
Chris@427
|
372 }
|
Chris@427
|
373
|
Chris@427
|
374 virtual Command *getRemoveRowCommand(int row)
|
Chris@427
|
375 {
|
Chris@427
|
376 PointListIterator i = getPointListIteratorForRow(row);
|
Chris@427
|
377 if (i == m_points.end()) return 0;
|
Chris@978
|
378 EditCommand *command = new EditCommand(this, tr("Delete Data Point"));
|
Chris@427
|
379 command->deletePoint(*i);
|
Chris@427
|
380 return command->finish();
|
Chris@427
|
381 }
|
Chris@427
|
382
|
Chris@147
|
383 protected:
|
Chris@1040
|
384 sv_samplerate_t m_sampleRate;
|
Chris@929
|
385 int m_resolution;
|
Chris@1066
|
386 sv_frame_t m_extendTo;
|
Chris@147
|
387 bool m_notifyOnAdd;
|
Chris@1038
|
388 sv_frame_t m_sinceLastNotifyMin;
|
Chris@1038
|
389 sv_frame_t m_sinceLastNotifyMax;
|
Chris@147
|
390 bool m_hasTextLabels;
|
Chris@147
|
391
|
Chris@147
|
392 PointList m_points;
|
Chris@929
|
393 int m_pointCount;
|
Chris@147
|
394 mutable QMutex m_mutex;
|
Chris@147
|
395 int m_completion;
|
Chris@420
|
396
|
Chris@1038
|
397 void getPointIterators(sv_frame_t frame,
|
Chris@420
|
398 PointListIterator &startItr,
|
Chris@608
|
399 PointListIterator &endItr);
|
Chris@1038
|
400 void getPointIterators(sv_frame_t frame,
|
Chris@608
|
401 PointListConstIterator &startItr,
|
Chris@608
|
402 PointListConstIterator &endItr) const;
|
Chris@420
|
403
|
Chris@420
|
404 // This is only used if the model is called on to act in
|
Chris@420
|
405 // TabularModel mode
|
Chris@1038
|
406 mutable std::vector<sv_frame_t> m_rows; // map from row number to frame
|
Chris@420
|
407 void rebuildRowVector() const
|
Chris@420
|
408 {
|
Chris@420
|
409 m_rows.clear();
|
Chris@608
|
410 for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) {
|
Chris@777
|
411 // std::cerr << "rebuildRowVector: row " << m_rows.size() << " -> " << i->frame << std::endl;
|
Chris@420
|
412 m_rows.push_back(i->frame);
|
Chris@420
|
413 }
|
Chris@420
|
414 }
|
Chris@420
|
415
|
Chris@608
|
416 PointListIterator getPointListIteratorForRow(int row)
|
Chris@420
|
417 {
|
Chris@420
|
418 if (m_rows.empty()) rebuildRowVector();
|
Chris@425
|
419 if (row < 0 || row + 1 > int(m_rows.size())) return m_points.end();
|
Chris@420
|
420
|
Chris@1038
|
421 sv_frame_t frame = m_rows[row];
|
Chris@420
|
422 int indexAtFrame = 0;
|
Chris@420
|
423 int ri = row;
|
Chris@420
|
424 while (ri > 0 && m_rows[ri-1] == m_rows[row]) { --ri; ++indexAtFrame; }
|
Chris@420
|
425 int initialIndexAtFrame = indexAtFrame;
|
Chris@420
|
426
|
Chris@420
|
427 PointListIterator i0, i1;
|
Chris@420
|
428 getPointIterators(frame, i0, i1);
|
Chris@420
|
429 PointListIterator i = i0;
|
Chris@420
|
430
|
Chris@420
|
431 for (i = i0; i != i1; ++i) {
|
Chris@778
|
432 if (i->frame < (int)frame) { continue; }
|
Chris@420
|
433 if (indexAtFrame > 0) { --indexAtFrame; continue; }
|
Chris@420
|
434 return i;
|
Chris@420
|
435 }
|
Chris@420
|
436
|
Chris@420
|
437 if (indexAtFrame > 0) {
|
Chris@420
|
438 std::cerr << "WARNING: SparseModel::getPointListIteratorForRow: No iterator available for row " << row << " (frame = " << frame << ", index at frame = " << initialIndexAtFrame << ", leftover index " << indexAtFrame << ")" << std::endl;
|
Chris@420
|
439 }
|
Chris@420
|
440 return i;
|
Chris@420
|
441 }
|
Chris@608
|
442
|
Chris@608
|
443 PointListConstIterator getPointListIteratorForRow(int row) const
|
Chris@608
|
444 {
|
Chris@608
|
445 if (m_rows.empty()) rebuildRowVector();
|
Chris@608
|
446 if (row < 0 || row + 1 > int(m_rows.size())) return m_points.end();
|
Chris@608
|
447
|
Chris@1038
|
448 sv_frame_t frame = m_rows[row];
|
Chris@608
|
449 int indexAtFrame = 0;
|
Chris@608
|
450 int ri = row;
|
Chris@608
|
451 while (ri > 0 && m_rows[ri-1] == m_rows[row]) { --ri; ++indexAtFrame; }
|
Chris@608
|
452 int initialIndexAtFrame = indexAtFrame;
|
Chris@608
|
453
|
Chris@777
|
454 // std::cerr << "getPointListIteratorForRow " << row << ": initialIndexAtFrame = " << initialIndexAtFrame << std::endl;
|
Chris@777
|
455
|
Chris@608
|
456 PointListConstIterator i0, i1;
|
Chris@608
|
457 getPointIterators(frame, i0, i1);
|
Chris@608
|
458 PointListConstIterator i = i0;
|
Chris@608
|
459
|
Chris@608
|
460 for (i = i0; i != i1; ++i) {
|
Chris@785
|
461 // std::cerr << "i->frame is " << i->frame << ", wanting " << frame << std::endl;
|
Chris@785
|
462
|
Chris@778
|
463 if (i->frame < (int)frame) { continue; }
|
Chris@608
|
464 if (indexAtFrame > 0) { --indexAtFrame; continue; }
|
Chris@608
|
465 return i;
|
Chris@608
|
466 }
|
Chris@608
|
467
|
Chris@785
|
468 // std::cerr << "returning i with i->frame = " << i->frame << std::endl;
|
Chris@785
|
469
|
Chris@608
|
470 if (indexAtFrame > 0) {
|
Chris@608
|
471 std::cerr << "WARNING: SparseModel::getPointListIteratorForRow: No iterator available for row " << row << " (frame = " << frame << ", index at frame = " << initialIndexAtFrame << ", leftover index " << indexAtFrame << ")" << std::endl;
|
Chris@608
|
472 }
|
Chris@608
|
473 return i;
|
Chris@608
|
474 }
|
Chris@1064
|
475
|
Chris@1064
|
476 QString toDelimitedDataStringSubsetFilled(QString delimiter,
|
Chris@1064
|
477 DataExportOptions opts,
|
Chris@1064
|
478 sv_frame_t f0,
|
Chris@1064
|
479 sv_frame_t f1) const {
|
Chris@1064
|
480
|
Chris@1064
|
481 QString s;
|
Chris@1064
|
482 opts &= ~DataExportFillGaps;
|
Chris@1064
|
483
|
Chris@1064
|
484 // find frame time of first point in range (if any)
|
Chris@1064
|
485 sv_frame_t first = f0;
|
Chris@1064
|
486 for (auto &p: m_points) {
|
Chris@1064
|
487 if (p.frame >= f0) {
|
Chris@1064
|
488 first = p.frame;
|
Chris@1064
|
489 break;
|
Chris@1064
|
490 }
|
Chris@1064
|
491 }
|
Chris@1064
|
492
|
Chris@1064
|
493 // project back to first frame time in range according to
|
Chris@1064
|
494 // resolution. e.g. if f0 = 2, first = 9, resolution = 4 then
|
Chris@1064
|
495 // we start at 5 (because 1 is too early and we need to arrive
|
Chris@1064
|
496 // at 9 to match the first actual point). This method is
|
Chris@1064
|
497 // stupid but easy to understand:
|
Chris@1064
|
498 sv_frame_t f = first;
|
Chris@1064
|
499 while (f >= f0 + m_resolution) f -= m_resolution;
|
Chris@1064
|
500
|
Chris@1064
|
501 // now progress, either writing the next point (if within
|
Chris@1064
|
502 // distance) or a default point
|
Chris@1064
|
503 PointListConstIterator itr = m_points.begin();
|
Chris@1064
|
504
|
Chris@1064
|
505 while (f < f1) {
|
Chris@1064
|
506 if (itr != m_points.end() && itr->frame <= f) {
|
Chris@1064
|
507 s += itr->toDelimitedDataString(delimiter, opts, m_sampleRate);
|
Chris@1064
|
508 ++itr;
|
Chris@1064
|
509 } else {
|
Chris@1064
|
510 s += Point(f).toDelimitedDataString(delimiter, opts, m_sampleRate);
|
Chris@1064
|
511 }
|
Chris@1064
|
512 s += "\n";
|
Chris@1064
|
513 f += m_resolution;
|
Chris@1064
|
514 }
|
Chris@1064
|
515
|
Chris@1064
|
516 return s;
|
Chris@1064
|
517 }
|
Chris@147
|
518 };
|
Chris@147
|
519
|
Chris@147
|
520
|
Chris@147
|
521 template <typename PointType>
|
Chris@1040
|
522 SparseModel<PointType>::SparseModel(sv_samplerate_t sampleRate,
|
Chris@929
|
523 int resolution,
|
Chris@147
|
524 bool notifyOnAdd) :
|
Chris@147
|
525 m_sampleRate(sampleRate),
|
Chris@147
|
526 m_resolution(resolution),
|
Chris@1066
|
527 m_extendTo(0),
|
Chris@147
|
528 m_notifyOnAdd(notifyOnAdd),
|
Chris@147
|
529 m_sinceLastNotifyMin(-1),
|
Chris@147
|
530 m_sinceLastNotifyMax(-1),
|
Chris@147
|
531 m_hasTextLabels(false),
|
Chris@147
|
532 m_pointCount(0),
|
Chris@147
|
533 m_completion(100)
|
Chris@147
|
534 {
|
Chris@147
|
535 }
|
Chris@147
|
536
|
Chris@147
|
537 template <typename PointType>
|
Chris@1038
|
538 sv_frame_t
|
Chris@147
|
539 SparseModel<PointType>::getStartFrame() const
|
Chris@147
|
540 {
|
Chris@147
|
541 QMutexLocker locker(&m_mutex);
|
Chris@1038
|
542 sv_frame_t f = 0;
|
Chris@147
|
543 if (!m_points.empty()) {
|
Chris@147
|
544 f = m_points.begin()->frame;
|
Chris@147
|
545 }
|
Chris@147
|
546 return f;
|
Chris@147
|
547 }
|
Chris@147
|
548
|
Chris@147
|
549 template <typename PointType>
|
Chris@1038
|
550 sv_frame_t
|
Chris@147
|
551 SparseModel<PointType>::getEndFrame() const
|
Chris@147
|
552 {
|
Chris@147
|
553 QMutexLocker locker(&m_mutex);
|
Chris@1038
|
554 sv_frame_t f = 0;
|
Chris@147
|
555 if (!m_points.empty()) {
|
Chris@608
|
556 PointListConstIterator i(m_points.end());
|
Chris@147
|
557 f = (--i)->frame;
|
Chris@147
|
558 }
|
Chris@1066
|
559 if (m_extendTo > f) return m_extendTo;
|
Chris@1066
|
560 else return f;
|
Chris@147
|
561 }
|
Chris@147
|
562
|
Chris@147
|
563 template <typename PointType>
|
Chris@147
|
564 bool
|
Chris@147
|
565 SparseModel<PointType>::isEmpty() const
|
Chris@147
|
566 {
|
Chris@147
|
567 return m_pointCount == 0;
|
Chris@147
|
568 }
|
Chris@147
|
569
|
Chris@147
|
570 template <typename PointType>
|
Chris@929
|
571 int
|
Chris@147
|
572 SparseModel<PointType>::getPointCount() const
|
Chris@147
|
573 {
|
Chris@147
|
574 return m_pointCount;
|
Chris@147
|
575 }
|
Chris@147
|
576
|
Chris@147
|
577 template <typename PointType>
|
Chris@459
|
578 const typename SparseModel<PointType>::PointList &
|
Chris@459
|
579 SparseModel<PointType>::getPoints() const
|
Chris@459
|
580 {
|
Chris@459
|
581 return m_points;
|
Chris@459
|
582 }
|
Chris@459
|
583
|
Chris@459
|
584 template <typename PointType>
|
Chris@147
|
585 typename SparseModel<PointType>::PointList
|
Chris@1038
|
586 SparseModel<PointType>::getPoints(sv_frame_t start, sv_frame_t end) const
|
Chris@147
|
587 {
|
Chris@147
|
588 if (start > end) return PointList();
|
Chris@147
|
589 QMutexLocker locker(&m_mutex);
|
Chris@147
|
590
|
Chris@147
|
591 PointType startPoint(start), endPoint(end);
|
Chris@147
|
592
|
Chris@608
|
593 PointListConstIterator startItr = m_points.lower_bound(startPoint);
|
Chris@608
|
594 PointListConstIterator endItr = m_points.upper_bound(endPoint);
|
Chris@147
|
595
|
Chris@147
|
596 if (startItr != m_points.begin()) --startItr;
|
Chris@147
|
597 if (startItr != m_points.begin()) --startItr;
|
Chris@147
|
598 if (endItr != m_points.end()) ++endItr;
|
Chris@147
|
599 if (endItr != m_points.end()) ++endItr;
|
Chris@147
|
600
|
Chris@147
|
601 PointList rv;
|
Chris@147
|
602
|
Chris@608
|
603 for (PointListConstIterator i = startItr; i != endItr; ++i) {
|
Chris@147
|
604 rv.insert(*i);
|
Chris@147
|
605 }
|
Chris@147
|
606
|
Chris@147
|
607 return rv;
|
Chris@147
|
608 }
|
Chris@147
|
609
|
Chris@147
|
610 template <typename PointType>
|
Chris@147
|
611 typename SparseModel<PointType>::PointList
|
Chris@1038
|
612 SparseModel<PointType>::getPoints(sv_frame_t frame) const
|
Chris@147
|
613 {
|
Chris@608
|
614 PointListConstIterator startItr, endItr;
|
Chris@420
|
615 getPointIterators(frame, startItr, endItr);
|
Chris@147
|
616
|
Chris@147
|
617 PointList rv;
|
Chris@147
|
618
|
Chris@608
|
619 for (PointListConstIterator i = startItr; i != endItr; ++i) {
|
Chris@147
|
620 rv.insert(*i);
|
Chris@147
|
621 }
|
Chris@147
|
622
|
Chris@147
|
623 return rv;
|
Chris@147
|
624 }
|
Chris@147
|
625
|
Chris@147
|
626 template <typename PointType>
|
Chris@420
|
627 void
|
Chris@1038
|
628 SparseModel<PointType>::getPointIterators(sv_frame_t frame,
|
Chris@420
|
629 PointListIterator &startItr,
|
Chris@608
|
630 PointListIterator &endItr)
|
Chris@608
|
631 {
|
Chris@608
|
632 QMutexLocker locker(&m_mutex);
|
Chris@608
|
633
|
Chris@608
|
634 if (m_resolution == 0) {
|
Chris@608
|
635 startItr = m_points.end();
|
Chris@608
|
636 endItr = m_points.end();
|
Chris@608
|
637 return;
|
Chris@608
|
638 }
|
Chris@608
|
639
|
Chris@1038
|
640 sv_frame_t start = (frame / m_resolution) * m_resolution;
|
Chris@1038
|
641 sv_frame_t end = start + m_resolution;
|
Chris@608
|
642
|
Chris@608
|
643 PointType startPoint(start), endPoint(end);
|
Chris@777
|
644
|
Chris@608
|
645 startItr = m_points.lower_bound(startPoint);
|
Chris@608
|
646 endItr = m_points.upper_bound(endPoint);
|
Chris@608
|
647 }
|
Chris@608
|
648
|
Chris@608
|
649 template <typename PointType>
|
Chris@608
|
650 void
|
Chris@1038
|
651 SparseModel<PointType>::getPointIterators(sv_frame_t frame,
|
Chris@608
|
652 PointListConstIterator &startItr,
|
Chris@608
|
653 PointListConstIterator &endItr) const
|
Chris@420
|
654 {
|
Chris@420
|
655 QMutexLocker locker(&m_mutex);
|
Chris@420
|
656
|
Chris@420
|
657 if (m_resolution == 0) {
|
Chris@785
|
658 // std::cerr << "getPointIterators: resolution == 0, returning end()" << std::endl;
|
Chris@420
|
659 startItr = m_points.end();
|
Chris@420
|
660 endItr = m_points.end();
|
Chris@420
|
661 return;
|
Chris@420
|
662 }
|
Chris@420
|
663
|
Chris@1038
|
664 sv_frame_t start = (frame / m_resolution) * m_resolution;
|
Chris@1038
|
665 sv_frame_t end = start + m_resolution;
|
Chris@420
|
666
|
Chris@420
|
667 PointType startPoint(start), endPoint(end);
|
Chris@420
|
668
|
Chris@777
|
669 // std::cerr << "getPointIterators: start frame " << start << ", end frame " << end << ", m_resolution " << m_resolution << std::endl;
|
Chris@785
|
670
|
Chris@420
|
671 startItr = m_points.lower_bound(startPoint);
|
Chris@420
|
672 endItr = m_points.upper_bound(endPoint);
|
Chris@420
|
673 }
|
Chris@420
|
674
|
Chris@420
|
675 template <typename PointType>
|
Chris@147
|
676 typename SparseModel<PointType>::PointList
|
Chris@1038
|
677 SparseModel<PointType>::getPreviousPoints(sv_frame_t originFrame) const
|
Chris@147
|
678 {
|
Chris@147
|
679 QMutexLocker locker(&m_mutex);
|
Chris@147
|
680
|
Chris@147
|
681 PointType lookupPoint(originFrame);
|
Chris@147
|
682 PointList rv;
|
Chris@147
|
683
|
Chris@608
|
684 PointListConstIterator i = m_points.lower_bound(lookupPoint);
|
Chris@147
|
685 if (i == m_points.begin()) return rv;
|
Chris@147
|
686
|
Chris@147
|
687 --i;
|
Chris@1038
|
688 sv_frame_t frame = i->frame;
|
Chris@147
|
689 while (i->frame == frame) {
|
Chris@147
|
690 rv.insert(*i);
|
Chris@147
|
691 if (i == m_points.begin()) break;
|
Chris@147
|
692 --i;
|
Chris@147
|
693 }
|
Chris@147
|
694
|
Chris@147
|
695 return rv;
|
Chris@147
|
696 }
|
Chris@147
|
697
|
Chris@147
|
698 template <typename PointType>
|
Chris@147
|
699 typename SparseModel<PointType>::PointList
|
Chris@1038
|
700 SparseModel<PointType>::getNextPoints(sv_frame_t originFrame) const
|
Chris@147
|
701 {
|
Chris@147
|
702 QMutexLocker locker(&m_mutex);
|
Chris@147
|
703
|
Chris@147
|
704 PointType lookupPoint(originFrame);
|
Chris@147
|
705 PointList rv;
|
Chris@147
|
706
|
Chris@608
|
707 PointListConstIterator i = m_points.upper_bound(lookupPoint);
|
Chris@147
|
708 if (i == m_points.end()) return rv;
|
Chris@147
|
709
|
Chris@1038
|
710 sv_frame_t frame = i->frame;
|
Chris@147
|
711 while (i != m_points.end() && i->frame == frame) {
|
Chris@147
|
712 rv.insert(*i);
|
Chris@147
|
713 ++i;
|
Chris@147
|
714 }
|
Chris@147
|
715
|
Chris@147
|
716 return rv;
|
Chris@147
|
717 }
|
Chris@147
|
718
|
Chris@147
|
719 template <typename PointType>
|
Chris@147
|
720 void
|
Chris@929
|
721 SparseModel<PointType>::setResolution(int resolution)
|
Chris@147
|
722 {
|
Chris@147
|
723 {
|
Chris@147
|
724 QMutexLocker locker(&m_mutex);
|
Chris@147
|
725 m_resolution = resolution;
|
Chris@147
|
726 }
|
Chris@420
|
727 m_rows.clear();
|
Chris@147
|
728 emit modelChanged();
|
Chris@147
|
729 }
|
Chris@147
|
730
|
Chris@147
|
731 template <typename PointType>
|
Chris@147
|
732 void
|
Chris@147
|
733 SparseModel<PointType>::clear()
|
Chris@147
|
734 {
|
Chris@147
|
735 {
|
Chris@147
|
736 QMutexLocker locker(&m_mutex);
|
Chris@147
|
737 m_points.clear();
|
Chris@147
|
738 m_pointCount = 0;
|
Chris@147
|
739 }
|
Chris@420
|
740 m_rows.clear();
|
Chris@147
|
741 emit modelChanged();
|
Chris@147
|
742 }
|
Chris@147
|
743
|
Chris@147
|
744 template <typename PointType>
|
Chris@147
|
745 void
|
Chris@147
|
746 SparseModel<PointType>::addPoint(const PointType &point)
|
Chris@147
|
747 {
|
Chris@147
|
748 {
|
Chris@147
|
749 QMutexLocker locker(&m_mutex);
|
Chris@147
|
750 m_points.insert(point);
|
Chris@147
|
751 m_pointCount++;
|
Chris@338
|
752 if (point.getLabel() != "") m_hasTextLabels = true;
|
Chris@147
|
753 }
|
Chris@147
|
754
|
Chris@147
|
755 // Even though this model is nominally sparse, there may still be
|
Chris@147
|
756 // too many signals going on here (especially as they'll probably
|
Chris@147
|
757 // be queued from one thread to another), which is why we need the
|
Chris@147
|
758 // notifyOnAdd as an option rather than a necessity (the
|
Chris@147
|
759 // alternative is to notify on setCompletion).
|
Chris@147
|
760
|
Chris@147
|
761 if (m_notifyOnAdd) {
|
Chris@420
|
762 m_rows.clear(); //!!! inefficient
|
Chris@931
|
763 emit modelChangedWithin(point.frame, point.frame + m_resolution);
|
Chris@147
|
764 } else {
|
Chris@147
|
765 if (m_sinceLastNotifyMin == -1 ||
|
Chris@147
|
766 point.frame < m_sinceLastNotifyMin) {
|
Chris@147
|
767 m_sinceLastNotifyMin = point.frame;
|
Chris@147
|
768 }
|
Chris@147
|
769 if (m_sinceLastNotifyMax == -1 ||
|
Chris@147
|
770 point.frame > m_sinceLastNotifyMax) {
|
Chris@147
|
771 m_sinceLastNotifyMax = point.frame;
|
Chris@147
|
772 }
|
Chris@147
|
773 }
|
Chris@147
|
774 }
|
Chris@147
|
775
|
Chris@147
|
776 template <typename PointType>
|
Chris@147
|
777 void
|
Chris@147
|
778 SparseModel<PointType>::deletePoint(const PointType &point)
|
Chris@147
|
779 {
|
Chris@147
|
780 {
|
Chris@147
|
781 QMutexLocker locker(&m_mutex);
|
Chris@147
|
782
|
Chris@147
|
783 PointListIterator i = m_points.lower_bound(point);
|
Chris@147
|
784 typename PointType::Comparator comparator;
|
Chris@147
|
785 while (i != m_points.end()) {
|
Chris@147
|
786 if (i->frame > point.frame) break;
|
Chris@147
|
787 if (!comparator(*i, point) && !comparator(point, *i)) {
|
Chris@147
|
788 m_points.erase(i);
|
Chris@147
|
789 m_pointCount--;
|
Chris@147
|
790 break;
|
Chris@147
|
791 }
|
Chris@147
|
792 ++i;
|
Chris@147
|
793 }
|
Chris@147
|
794 }
|
Chris@147
|
795 // std::cout << "SparseOneDimensionalModel: emit modelChanged("
|
Chris@147
|
796 // << point.frame << ")" << std::endl;
|
Chris@420
|
797 m_rows.clear(); //!!! inefficient
|
Chris@931
|
798 emit modelChangedWithin(point.frame, point.frame + m_resolution);
|
Chris@147
|
799 }
|
Chris@147
|
800
|
Chris@147
|
801 template <typename PointType>
|
Chris@147
|
802 void
|
Chris@333
|
803 SparseModel<PointType>::setCompletion(int completion, bool update)
|
Chris@147
|
804 {
|
Chris@301
|
805 // std::cerr << "SparseModel::setCompletion(" << completion << ")" << std::endl;
|
Chris@191
|
806
|
Chris@147
|
807 if (m_completion != completion) {
|
Chris@147
|
808 m_completion = completion;
|
Chris@147
|
809
|
Chris@147
|
810 if (completion == 100) {
|
Chris@147
|
811
|
Chris@297
|
812 if (!m_notifyOnAdd) {
|
Chris@297
|
813 emit completionChanged();
|
Chris@297
|
814 }
|
Chris@297
|
815
|
Chris@147
|
816 m_notifyOnAdd = true; // henceforth
|
Chris@420
|
817 m_rows.clear(); //!!! inefficient
|
Chris@147
|
818 emit modelChanged();
|
Chris@147
|
819
|
Chris@147
|
820 } else if (!m_notifyOnAdd) {
|
Chris@147
|
821
|
Chris@333
|
822 if (update &&
|
Chris@333
|
823 m_sinceLastNotifyMin >= 0 &&
|
Chris@147
|
824 m_sinceLastNotifyMax >= 0) {
|
Chris@420
|
825 m_rows.clear(); //!!! inefficient
|
Chris@931
|
826 emit modelChangedWithin(m_sinceLastNotifyMin, m_sinceLastNotifyMax);
|
Chris@147
|
827 m_sinceLastNotifyMin = m_sinceLastNotifyMax = -1;
|
Chris@147
|
828 } else {
|
Chris@147
|
829 emit completionChanged();
|
Chris@147
|
830 }
|
Chris@147
|
831 } else {
|
Chris@147
|
832 emit completionChanged();
|
Chris@147
|
833 }
|
Chris@147
|
834 }
|
Chris@147
|
835 }
|
Chris@147
|
836
|
Chris@147
|
837 template <typename PointType>
|
Chris@147
|
838 void
|
Chris@147
|
839 SparseModel<PointType>::toXml(QTextStream &out,
|
Chris@147
|
840 QString indent,
|
Chris@147
|
841 QString extraAttributes) const
|
Chris@147
|
842 {
|
Chris@777
|
843 // std::cerr << "SparseModel::toXml: extraAttributes = \""
|
Chris@777
|
844 // << extraAttributes.toStdString() << std::endl;
|
Chris@318
|
845
|
Chris@407
|
846 QString type = getXmlOutputType();
|
Chris@407
|
847
|
Chris@147
|
848 Model::toXml
|
Chris@147
|
849 (out,
|
Chris@147
|
850 indent,
|
Chris@407
|
851 QString("type=\"%1\" dimensions=\"%2\" resolution=\"%3\" notifyOnAdd=\"%4\" dataset=\"%5\" %6")
|
Chris@407
|
852 .arg(type)
|
Chris@147
|
853 .arg(PointType(0).getDimensions())
|
Chris@147
|
854 .arg(m_resolution)
|
Chris@147
|
855 .arg(m_notifyOnAdd ? "true" : "false")
|
Chris@147
|
856 .arg(getObjectExportId(&m_points))
|
Chris@147
|
857 .arg(extraAttributes));
|
Chris@147
|
858
|
Chris@147
|
859 out << indent;
|
Chris@147
|
860 out << QString("<dataset id=\"%1\" dimensions=\"%2\">\n")
|
Chris@147
|
861 .arg(getObjectExportId(&m_points))
|
Chris@147
|
862 .arg(PointType(0).getDimensions());
|
Chris@147
|
863
|
Chris@608
|
864 for (PointListConstIterator i = m_points.begin(); i != m_points.end(); ++i) {
|
Chris@314
|
865 i->toXml(out, indent + " ");
|
Chris@147
|
866 }
|
Chris@147
|
867
|
Chris@147
|
868 out << indent;
|
Chris@147
|
869 out << "</dataset>\n";
|
Chris@147
|
870 }
|
Chris@147
|
871
|
Chris@147
|
872 template <typename PointType>
|
Chris@147
|
873 SparseModel<PointType>::EditCommand::EditCommand(SparseModel *model,
|
Chris@147
|
874 QString commandName) :
|
Chris@147
|
875 MacroCommand(commandName),
|
Chris@147
|
876 m_model(model)
|
Chris@147
|
877 {
|
Chris@147
|
878 }
|
Chris@147
|
879
|
Chris@147
|
880 template <typename PointType>
|
Chris@147
|
881 void
|
Chris@147
|
882 SparseModel<PointType>::EditCommand::addPoint(const PointType &point)
|
Chris@147
|
883 {
|
Chris@147
|
884 addCommand(new AddPointCommand(m_model, point), true);
|
Chris@147
|
885 }
|
Chris@147
|
886
|
Chris@147
|
887 template <typename PointType>
|
Chris@147
|
888 void
|
Chris@147
|
889 SparseModel<PointType>::EditCommand::deletePoint(const PointType &point)
|
Chris@147
|
890 {
|
Chris@147
|
891 addCommand(new DeletePointCommand(m_model, point), true);
|
Chris@147
|
892 }
|
Chris@147
|
893
|
Chris@147
|
894 template <typename PointType>
|
Chris@416
|
895 typename SparseModel<PointType>::EditCommand *
|
Chris@147
|
896 SparseModel<PointType>::EditCommand::finish()
|
Chris@147
|
897 {
|
Chris@147
|
898 if (!m_commands.empty()) {
|
Chris@387
|
899 return this;
|
Chris@147
|
900 } else {
|
Chris@147
|
901 delete this;
|
Chris@389
|
902 return 0;
|
Chris@147
|
903 }
|
Chris@147
|
904 }
|
Chris@147
|
905
|
Chris@147
|
906 template <typename PointType>
|
Chris@147
|
907 void
|
Chris@147
|
908 SparseModel<PointType>::EditCommand::addCommand(Command *command,
|
Chris@147
|
909 bool executeFirst)
|
Chris@147
|
910 {
|
Chris@147
|
911 if (executeFirst) command->execute();
|
Chris@147
|
912
|
Chris@147
|
913 if (!m_commands.empty()) {
|
Chris@147
|
914 DeletePointCommand *dpc = dynamic_cast<DeletePointCommand *>(command);
|
Chris@147
|
915 if (dpc) {
|
Chris@147
|
916 AddPointCommand *apc = dynamic_cast<AddPointCommand *>
|
Chris@147
|
917 (m_commands[m_commands.size() - 1]);
|
Chris@147
|
918 typename PointType::Comparator comparator;
|
Chris@147
|
919 if (apc) {
|
Chris@147
|
920 if (!comparator(apc->getPoint(), dpc->getPoint()) &&
|
Chris@147
|
921 !comparator(dpc->getPoint(), apc->getPoint())) {
|
Chris@147
|
922 deleteCommand(apc);
|
Chris@147
|
923 return;
|
Chris@147
|
924 }
|
Chris@147
|
925 }
|
Chris@147
|
926 }
|
Chris@147
|
927 }
|
Chris@147
|
928
|
Chris@147
|
929 MacroCommand::addCommand(command);
|
Chris@147
|
930 }
|
Chris@147
|
931
|
Chris@147
|
932
|
Chris@147
|
933 #endif
|
Chris@147
|
934
|
Chris@147
|
935
|
Chris@147
|
936
|