Merge branch 'master' into wipe_tower_improvements

xs/xsp/GUI.xsp

@@ -35,14 +35,8 @@ void set_tab_panel(SV *ui)
 void add_debug_menu(SV *ui, int event_language_change)
     %code%{ Slic3r::GUI::add_debug_menu((wxMenuBar*)wxPli_sv_2_object(aTHX_ ui, "Wx::MenuBar"), event_language_change); %};
 
-void create_preset_tabs(PresetBundle *preset_bundle, bool no_controller, 
-                        bool is_disabled_button_browse, bool is_user_agent,
-                        int event_value_change, int event_presets_changed,
-                        int event_button_browse, int event_button_test)
-    %code%{ Slic3r::GUI::create_preset_tabs(preset_bundle, no_controller, 
-                                            is_disabled_button_browse, is_user_agent,
-                                            event_value_change, event_presets_changed, 
-                                            event_button_browse, event_button_test); %};
+void create_preset_tabs(bool no_controller, int event_value_change, int event_presets_changed)
+    %code%{ Slic3r::GUI::create_preset_tabs(no_controller, event_value_change, event_presets_changed); %};
 
 Ref<TabIface> get_preset_tab(char *name)
     %code%{ RETVAL=Slic3r::GUI::get_preset_tab_iface(name); %};
@@ -61,3 +55,11 @@ void set_app_config(AppConfig *app_config)
 
 void open_preferences_dialog(int preferences_event)
     %code%{ Slic3r::GUI::open_preferences_dialog(preferences_event); %};
+
+void set_preset_bundle(PresetBundle *preset_bundle)
+    %code%{ Slic3r::GUI::set_preset_bundle(preset_bundle); %};
+
+void add_frequently_changed_parameters(SV *ui_parent, SV *ui_sizer, SV *ui_p_sizer)
+    %code%{ Slic3r::GUI::add_frequently_changed_parameters((wxWindow*)wxPli_sv_2_object(aTHX_ ui_parent, "Wx::Window"),
+                                                           (wxBoxSizer*)wxPli_sv_2_object(aTHX_ ui_sizer, "Wx::BoxSizer"),
+                                                           (wxFlexGridSizer*)wxPli_sv_2_object(aTHX_ ui_p_sizer, "Wx::FlexGridSizer")); %};

xs/xsp/GUI_3DScene.xsp

@@ -19,6 +19,9 @@
     void enable() const;
     void disable() const;
 
+    int shader_program_id() const
+        %code%{ RETVAL = THIS->shader_program_id; %};
+
     std::string last_error() const
         %code%{ RETVAL = THIS->last_error; %};
 };
@@ -45,6 +48,9 @@
     int                 zoom_to_volumes()
         %code%{ RETVAL = THIS->zoom_to_volumes; %};
 
+    void set_layer_height_texture_data(unsigned int texture_id, unsigned int shader_id, PrintObject* print_object, float z_cursor_relative, float edit_band_width);
+    void reset_layer_height_texture_data();
+
     int                 object_idx() const;
     int                 volume_idx() const;
     int                 instance_idx() const;
@@ -97,6 +103,9 @@
     void finalize_geometry(bool use_VBOs);
     void release_geometry();
 
+    void set_print_box(float min_x, float min_y, float min_z, float max_x, float max_y, float max_z);
+    void update_outside_state(DynamicPrintConfig* config, bool all_inside);
+
     bool move_volume_up(int idx)
         %code%{ 
             if (idx > 0 && idx < int(THIS->volumes.size())) {
@@ -154,13 +163,6 @@ finalize_legend_texture()
     OUTPUT:
         RETVAL
 
-unsigned int
-get_legend_texture_id()
-    CODE:
-        RETVAL = _3DScene::get_legend_texture_id();
-    OUTPUT:
-        RETVAL
-
 unsigned int
 get_legend_texture_width()
     CODE:
@@ -179,7 +181,38 @@ void
 reset_legend_texture()
     CODE:
         _3DScene::reset_legend_texture();
-             
+
+void
+generate_warning_texture(std::string msg)
+    CODE:
+        _3DScene::generate_warning_texture(msg);
+
+unsigned int
+finalize_warning_texture()
+    CODE:
+        RETVAL = _3DScene::finalize_warning_texture();
+    OUTPUT:
+        RETVAL
+
+unsigned int
+get_warning_texture_width()
+    CODE:
+        RETVAL = _3DScene::get_warning_texture_width();
+    OUTPUT:
+        RETVAL
+
+unsigned int
+get_warning_texture_height()
+    CODE:
+        RETVAL = _3DScene::get_warning_texture_height();
+    OUTPUT:
+        RETVAL
+
+void
+reset_warning_texture()
+    CODE:
+        _3DScene::reset_warning_texture();
+
 void
 _load_print_toolpaths(print, volumes, tool_colors, use_VBOs)
         Print               *print;

xs/xsp/Model.xsp

@@ -99,6 +99,9 @@
 
     void print_info() const;
 
+    bool fits_print_volume(DynamicPrintConfig* config) const
+        %code%{ RETVAL = THIS->fits_print_volume(config); %};
+
     bool store_stl(char *path, bool binary)
         %code%{ TriangleMesh mesh = THIS->mesh(); RETVAL = Slic3r::store_stl(path, &mesh, binary); %};
     bool store_amf(char *path, Print* print)
@@ -361,9 +364,9 @@ ModelMaterial::attributes()
         %code%{ RETVAL = &THIS->offset; %};
 
     void set_rotation(double val)
-        %code%{ THIS->rotation = val; %};
+        %code%{ THIS->rotation = val; THIS->get_object()->invalidate_bounding_box(); %};
     void set_scaling_factor(double val)
-        %code%{ THIS->scaling_factor = val; %};
+        %code%{ THIS->scaling_factor = val; THIS->get_object()->invalidate_bounding_box(); %};
     void set_offset(Pointf *offset)
         %code%{ THIS->offset = *offset; %};
     

xs/xsp/Utils_OctoPrint.xsp

@@ -9,6 +9,5 @@
     OctoPrint(DynamicPrintConfig *config);
     ~OctoPrint();
 
-    std::string test() const;
     void send_gcode(int windowId, int completeEvt, int errorEvt, std::string filename, bool print = false) const;
 };