Make clear_regions and delete_region methods private (both Print & Layer), and remove from XSP.

This commit is contained in:
Y. Sapir 2014-05-25 00:10:20 +03:00
parent 85cbbed663
commit b8b8c746d9
4 changed files with 7 additions and 7 deletions

View file

@ -82,18 +82,20 @@ class Layer {
size_t region_count(); size_t region_count();
void clear_regions();
LayerRegion* get_region(int idx); LayerRegion* get_region(int idx);
LayerRegion* add_region(PrintRegion* print_region); LayerRegion* add_region(PrintRegion* print_region);
void delete_region(int idx);
protected: protected:
int _id; // sequential number of layer, 0-based int _id; // sequential number of layer, 0-based
PrintObject *_object; PrintObject *_object;
Layer(int id, PrintObject *object, coordf_t height, coordf_t print_z, Layer(int id, PrintObject *object, coordf_t height, coordf_t print_z,
coordf_t slice_z); coordf_t slice_z);
virtual ~Layer(); virtual ~Layer();
void clear_regions();
void delete_region(int idx);
}; };

View file

@ -154,9 +154,11 @@ class Print
const BoundingBoxf3 &modobj_bbox); const BoundingBoxf3 &modobj_bbox);
void delete_object(int idx); void delete_object(int idx);
void clear_regions();
PrintRegion* get_region(int idx); PrintRegion* get_region(int idx);
PrintRegion* add_region(); PrintRegion* add_region();
private:
void clear_regions();
void delete_region(int idx); void delete_region(int idx);
}; };

View file

@ -52,7 +52,6 @@
%code%{ THIS->lower_layer = layer; %}; %code%{ THIS->lower_layer = layer; %};
size_t region_count(); size_t region_count();
void clear_regions();
Ref<LayerRegion> get_region(int idx); Ref<LayerRegion> get_region(int idx);
Ref<LayerRegion> add_region(PrintRegion* print_region); Ref<LayerRegion> add_region(PrintRegion* print_region);
@ -96,10 +95,8 @@
%code%{ THIS->lower_layer = layer; %}; %code%{ THIS->lower_layer = layer; %};
size_t region_count(); size_t region_count();
void clear_regions();
Ref<LayerRegion> get_region(int idx); Ref<LayerRegion> get_region(int idx);
Ref<LayerRegion> add_region(PrintRegion* print_region); Ref<LayerRegion> add_region(PrintRegion* print_region);
void delete_region(int idx);
Ref<ExPolygonCollection> slices() Ref<ExPolygonCollection> slices()
%code%{ RETVAL = &THIS->slices; %}; %code%{ RETVAL = &THIS->slices; %};

View file

@ -158,7 +158,6 @@ _constant()
PrintRegionPtrs* regions() PrintRegionPtrs* regions()
%code%{ RETVAL = &THIS->regions; %}; %code%{ RETVAL = &THIS->regions; %};
void clear_regions();
Ref<PrintRegion> get_region(int idx); Ref<PrintRegion> get_region(int idx);
Ref<PrintRegion> add_region(); Ref<PrintRegion> add_region();
size_t region_count() size_t region_count()