Mercurial > hg > svgui
comparison layer/LayerFactory.h @ 963:fa96108d552d osx-retina
Merge from default branch
| author | Chris Cannam | 
|---|---|
| date | Thu, 14 May 2015 15:39:47 +0100 | 
| parents | b12cd1c2dad5 | 
| children | a34a2a25907c | 
   comparison
  equal
  deleted
  inserted
  replaced
| 956:092de22db207 | 963:fa96108d552d | 
|---|---|
| 55 | 55 | 
| 56 virtual ~LayerFactory(); | 56 virtual ~LayerFactory(); | 
| 57 | 57 | 
| 58 typedef std::set<LayerType> LayerTypeSet; | 58 typedef std::set<LayerType> LayerTypeSet; | 
| 59 LayerTypeSet getValidLayerTypes(Model *model); | 59 LayerTypeSet getValidLayerTypes(Model *model); | 
| 60 | |
| 61 /** | |
| 62 * Return the set of layer types that an end user should be | |
| 63 * allowed to create, empty, for subsequent editing. | |
| 64 */ | |
| 60 LayerTypeSet getValidEmptyLayerTypes(); | 65 LayerTypeSet getValidEmptyLayerTypes(); | 
| 61 | 66 | 
| 62 LayerType getLayerType(const Layer *); | 67 LayerType getLayerType(const Layer *); | 
| 63 | 68 | 
| 64 Layer *createLayer(LayerType type); | 69 Layer *createLayer(LayerType type); | 
