Mercurial > hg > svgui
comparison layer/LayerFactory.cpp @ 803:5d2966b7c201 tony_integration
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 12:55:10 +0100 |
parents | ddae586bc47b |
children | 1d526ba11a24 |
comparison
equal
deleted
inserted
replaced
770:734ee80286c3 | 803:5d2966b7c201 |
---|---|
162 | 162 |
163 if (dynamic_cast<NoteModel *>(model)) { | 163 if (dynamic_cast<NoteModel *>(model)) { |
164 types.insert(Notes); | 164 types.insert(Notes); |
165 } | 165 } |
166 | 166 |
167 // NOTE: GF: types is a set, so order of insertion does not matter | 167 // NOTE: GF: types is a set, so order of insertion does not matter |
168 if (dynamic_cast<FlexiNoteModel *>(model)) { | 168 if (dynamic_cast<FlexiNoteModel *>(model)) { |
169 types.insert(FlexiNotes); | 169 types.insert(FlexiNotes); |
170 } | 170 } |
171 | 171 |
172 if (dynamic_cast<RegionModel *>(model)) { | 172 if (dynamic_cast<RegionModel *>(model)) { |
314 return; | 314 return; |
315 | 315 |
316 if (trySetModel<NoteLayer, NoteModel>(layer, model)) | 316 if (trySetModel<NoteLayer, NoteModel>(layer, model)) |
317 return; | 317 return; |
318 | 318 |
319 // GF: added FlexiNoteLayer | 319 // GF: added FlexiNoteLayer |
320 if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(layer, model)) | 320 if (trySetModel<FlexiNoteLayer, FlexiNoteModel>(layer, model)) |
321 return; | 321 return; |
322 | 322 |
323 if (trySetModel<RegionLayer, RegionModel>(layer, model)) | 323 if (trySetModel<RegionLayer, RegionModel>(layer, model)) |
324 return; | 324 return; |