comparison layer/LayerFactory.cpp @ 997:296ccd36f626 tony-2.0-integration

Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents b12cd1c2dad5
children b247d3ffcbb9
comparison
equal deleted inserted replaced
943:788b7623bfca 997:296ccd36f626
196 LayerFactory::getValidEmptyLayerTypes() 196 LayerFactory::getValidEmptyLayerTypes()
197 { 197 {
198 LayerTypeSet types; 198 LayerTypeSet types;
199 types.insert(TimeInstants); 199 types.insert(TimeInstants);
200 types.insert(TimeValues); 200 types.insert(TimeValues);
201 types.insert(FlexiNotes); 201 // Because this is strictly a UI function -- list the layer types
202 // to show in a menu -- it should not contain FlexiNotes; the
203 // layer isn't meaningfully editable in SV
204 // types.insert(FlexiNotes);
202 types.insert(Notes); 205 types.insert(Notes);
203 types.insert(Regions); 206 types.insert(Regions);
204 types.insert(Text); 207 types.insert(Text);
205 types.insert(Image); 208 types.insert(Image);
206 //!!! and in principle Colour3DPlot -- now that's a challenge 209 //!!! and in principle Colour3DPlot -- now that's a challenge