From f5b1729af3e09ffc5ac64d2540227a0286cdb465 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Thu, 30 Aug 2018 12:11:52 +0200
Subject: [PATCH] fixing build issues

---
 xs/src/slic3r/AppController.cpp | 36 ++++-----------------------------
 xs/src/slic3r/GUI/GUI.cpp       |  2 ++
 xs/src/slic3r/GUI/GUI.hpp       |  1 +
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/xs/src/slic3r/AppController.cpp b/xs/src/slic3r/AppController.cpp
index cee6d3394..a93ee63f0 100644
--- a/xs/src/slic3r/AppController.cpp
+++ b/xs/src/slic3r/AppController.cpp
@@ -256,7 +256,7 @@ void PrintController::slice()
     slice(pri);
 }
 
-void IProgressIndicator::message_fmt(
+void ProgressIndicator::message_fmt(
         const string &fmtstr, ...) {
     std::stringstream ss;
     va_list args;
@@ -311,35 +311,7 @@ void AppController::arrange_model()
 
     }
 
-        auto dist = print_ctl()->config().min_object_distance();
-
-        // Create the arranger config
-        auto min_obj_distance = static_cast<Coord>(dist/SCALING_FACTOR);
-
-        auto& bedpoints = print_ctl()->config().bed_shape.values;
-        Polyline bed; bed.points.reserve(bedpoints.size());
-        for(auto& v : bedpoints)
-            bed.append(Point::new_scale(v.x, v.y));
-
-        if(pind) pind->update(0, _(L("Arranging objects...")));
-
-        try {
-            arr::arrange(*model_,
-                         min_obj_distance,
-                         bed,
-                         arr::BOX,
-                         false, // create many piles not just one pile
-                         [pind, count](unsigned rem) {
-                if(pind)
-                    pind->update(count - rem, _(L("Arranging objects...")));
-            });
-        } catch(std::exception& e) {
-            std::cerr << e.what() << std::endl;
-            report_issue(IssueType::ERR,
-                         _(L("Could not arrange model objects! "
-                         "Some geometries may be invalid.")),
-                         _(L("Exception occurred")));
-        }
+    auto dist = print_ctl()->config().min_object_distance();
 
     // Create the arranger config
     auto min_obj_distance = static_cast<Coord>(dist/SCALING_FACTOR);
@@ -347,7 +319,7 @@ void AppController::arrange_model()
     auto& bedpoints = print_ctl()->config().bed_shape.values;
     Polyline bed; bed.points.reserve(bedpoints.size());
     for(auto& v : bedpoints)
-        bed.append(Point::new_scale(v(0), v(1)));
+        bed.append(Point::new_scale(v.x, v.y));
 
     if(pind) pind->update(0, _(L("Arranging objects...")));
 
@@ -357,7 +329,7 @@ void AppController::arrange_model()
                      bed,
                      arr::BOX,
                      false, // create many piles not just one pile
-                     [this, pind, count](unsigned rem) {
+                     [pind, count](unsigned rem) {
             if(pind)
                 pind->update(count - rem, _(L("Arranging objects...")));
         });
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index 8555f0b92..a96ad2da3 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -181,6 +181,8 @@ void set_main_frame(wxFrame *main_frame)
     g_wxMainFrame = main_frame;
 }
 
+wxFrame* get_main_frame() { return g_wxMainFrame; }
+
 void set_tab_panel(wxNotebook *tab_panel)
 {
     g_wxTabPanel = tab_panel;
diff --git a/xs/src/slic3r/GUI/GUI.hpp b/xs/src/slic3r/GUI/GUI.hpp
index 165288819..20e6de667 100644
--- a/xs/src/slic3r/GUI/GUI.hpp
+++ b/xs/src/slic3r/GUI/GUI.hpp
@@ -97,6 +97,7 @@ void set_3DScene(_3DScene *scene);
 AppConfig*	get_app_config();
 wxApp*		get_app();
 PresetBundle* get_preset_bundle();
+wxFrame* get_main_frame();
 
 const wxColour& get_label_clr_modified();
 const wxColour& get_label_clr_sys();