Merge remote-tracking branch 'remotes/origin/master' into support_improvements

xs/xsp/GUI.xsp

@@ -104,3 +104,10 @@ void fix_model_by_win10_sdk_gui(ModelObject *model_object_src, Print *print, Mod
 
 void set_3DScene(SV *scene)
     %code%{ Slic3r::GUI::set_3DScene((_3DScene *)wxPli_sv_2_object(aTHX_ scene, "Slic3r::Model::3DScene") ); %};
+
+void register_on_request_update_callback(SV* callback)
+    %code%{ Slic3r::GUI::g_on_request_update_callback.register_callback(callback); %};
+
+void deregister_on_request_update_callback()
+    %code%{ Slic3r::GUI::g_on_request_update_callback.deregister_callback(); %};
+

xs/xsp/GUI_3DScene.xsp

@@ -65,7 +65,6 @@
              %};
     Clone<BoundingBoxf3> bounding_box() const
         %code%{ RETVAL = THIS->bounding_box; %};
-    Clone<BoundingBoxf3> transformed_bounding_box() const;
 
     bool                empty() const;
     bool                indexed() const;
@@ -89,7 +88,7 @@
 
     std::vector<int> load_object(ModelObject *object, int obj_idx, std::vector<int> instance_idxs, std::string color_by, std::string select_by, std::string drag_by, bool use_VBOs);
 
-    int load_wipe_tower_preview(int obj_idx, float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool use_VBOs);
+    int load_wipe_tower_preview(int obj_idx, float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool use_VBOs, bool size_unknown, float brim_width);
 
     void erase()
         %code{% THIS->clear(); %};
@@ -230,7 +229,7 @@ update_volumes_selection(canvas, selections)
     CODE:
         _3DScene::update_volumes_selection((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), selections);
 
-bool
+int
 check_volumes_outside_state(canvas, config)
         SV                 *canvas;
         DynamicPrintConfig *config;
@@ -430,6 +429,13 @@ enable_force_zoom_to_bed(canvas, enable)
     CODE:
         _3DScene::enable_force_zoom_to_bed((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), enable);
 
+void
+enable_dynamic_background(canvas, enable)
+        SV   *canvas;
+        bool enable;
+    CODE:
+        _3DScene::enable_dynamic_background((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), enable);
+
 void
 allow_multisample(canvas, allow)
         SV   *canvas;
@@ -657,27 +663,6 @@ reload_scene(canvas, force)
     CODE:
         _3DScene::reload_scene((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), force);
 
-void
-load_print_toolpaths(canvas)
-        SV *canvas;
-    CODE:
-        _3DScene::load_print_toolpaths((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"));
-
-void 
-load_print_object_toolpaths(canvas, print_object, tool_colors)
-        SV                       *canvas;
-        PrintObject              *print_object;
-        std::vector<std::string> tool_colors;
-    CODE:
-        _3DScene::load_print_object_toolpaths((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), print_object, tool_colors);
-
-void
-load_wipe_tower_toolpaths(canvas, tool_colors)
-        SV                       *canvas;
-        std::vector<std::string> tool_colors;
-    CODE:
-        _3DScene::load_wipe_tower_toolpaths((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), tool_colors);
-
 void 
 load_gcode_preview(canvas, preview_data, str_tool_colors)
         SV                       *canvas;
@@ -685,5 +670,12 @@ load_gcode_preview(canvas, preview_data, str_tool_colors)
         std::vector<std::string> str_tool_colors;
     CODE:
         _3DScene::load_gcode_preview((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), preview_data, str_tool_colors);
-        
+
+void
+load_preview(canvas, str_tool_colors)
+        SV                       *canvas;
+        std::vector<std::string> str_tool_colors;
+    CODE:
+        _3DScene::load_preview((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), str_tool_colors);
+
 %}

xs/xsp/Model.xsp

@@ -301,7 +301,8 @@ ModelMaterial::attributes()
     void translate(double x, double y, double z);
     void scale_xyz(Pointf3* versor)
         %code{% THIS->scale(*versor); %};
-    void rotate(float angle, Axis axis);
+    void rotate(float angle, Pointf3* axis)
+        %code{% THIS->rotate(angle, *axis); %};
     void mirror(Axis axis);
     
     Model* cut(double z)

xs/xsp/Utils_OctoPrint.xsp

@@ -1,13 +0,0 @@
-%module{Slic3r::XS};
-
-%{
-#include <xsinit.h>
-#include "slic3r/Utils/OctoPrint.hpp"
-%}
-
-%name{Slic3r::OctoPrint} class OctoPrint {
-    OctoPrint(DynamicPrintConfig *config);
-    ~OctoPrint();
-
-    bool send_gcode(std::string filename) const;
-};

xs/xsp/Utils_PrintHost.xsp

@@ -0,0 +1,12 @@
+%module{Slic3r::XS};
+
+%{
+#include <xsinit.h>
+#include "slic3r/Utils/PrintHost.hpp"
+%}
+
+%name{Slic3r::PrintHost} class PrintHost {
+	bool send_gcode(std::string filename) const;
+
+	static PrintHost* get_print_host(DynamicPrintConfig *config);
+};

xs/xsp/my.map

@@ -239,9 +239,7 @@ Ref<TabIface> 				O_OBJECT_SLIC3R_T
 PresetUpdater*              O_OBJECT_SLIC3R
 Ref<PresetUpdater>          O_OBJECT_SLIC3R_T
 
-OctoPrint*                  O_OBJECT_SLIC3R
-Ref<OctoPrint>              O_OBJECT_SLIC3R_T
-Clone<OctoPrint>            O_OBJECT_SLIC3R_T
+PrintHost*                  O_OBJECT_SLIC3R
 
 Axis                  T_UV
 ExtrusionLoopRole     T_UV

xs/xsp/typemap.xspt

@@ -270,3 +270,4 @@
 };
 %typemap{AppController*};
 %typemap{PrintController*};
+%typemap{PrintHost*};