juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into amf_activate_existing_presets

Browse Source
This commit is contained in:
bubnikv
2018-06-27 10:33:14 +02:00
parent 22463343a7 645cc65d2b
commit 68e82a7348
30 changed files with 931 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xs/xsp/BoundingBox.xsp
View File

@@ -29,6 +29,10 @@
int x_max() %code{% RETVAL = THIS->max.x; %};
int y_min() %code{% RETVAL = THIS->min.y; %};
int y_max() %code{% RETVAL = THIS->max.y; %};
void set_x_min(double val) %code{% THIS->min.x = val; %};
void set_x_max(double val) %code{% THIS->max.x = val; %};
void set_y_min(double val) %code{% THIS->min.y = val; %};
void set_y_max(double val) %code{% THIS->max.y = val; %};
std::string serialize() %code{% char buf[2048]; sprintf(buf, "%ld,%ld;%ld,%ld", THIS->min.x, THIS->min.y, THIS->max.x, THIS->max.y); RETVAL = buf; %};
bool defined() %code{% RETVAL = THIS->defined; %};

11
xs/xsp/GUI_3DScene.xsp
View File

@@ -190,6 +190,11 @@ remove_all_canvases()
CODE:
_3DScene::remove_all_canvases();
void
reset_current_canvas()
CODE:
_3DScene::reset_current_canvas();
void
set_active(canvas, active)
SV *canvas;
@@ -197,6 +202,12 @@ set_active(canvas, active)
CODE:
_3DScene::set_active((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), active);
void
set_as_dirty(canvas)
SV *canvas;
CODE:
_3DScene::set_as_dirty((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"));
unsigned int
get_volumes_count(canvas)
SV *canvas;

2
xs/xsp/Utils_OctoPrint.xsp
View File

@@ -9,5 +9,5 @@
OctoPrint(DynamicPrintConfig *config);
~OctoPrint();
bool send_gcode(std::string filename, bool print = false) const;
bool send_gcode(std::string filename) const;
};