Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons

src/libslic3r/Print.cpp

@@ -1506,7 +1506,8 @@ void Print::export_gcode(const std::string &path_template, GCodePreviewData *pre
     // The following call may die if the output_filename_format template substitution fails.
     std::string path = this->output_filepath(path_template);
     std::string message = "Exporting G-code";
-    if (! path.empty()) {
+    if (! path.empty() && preview_data == nullptr) {
+        // Only show the path if preview_data is not set -> running from command line.
         message += " to ";
         message += path;
     }

src/slic3r/GUI/GLGizmo.cpp

@@ -2211,11 +2211,12 @@ bool GLGizmoSlaSupports::mouse_event(SLAGizmoEventType action, const Vec2d& mous
         // we'll recover current look direction from the modelview matrix (in world coords)...
         Vec3f direction_to_camera(modelview_matrix[2], modelview_matrix[6], modelview_matrix[10]);
         // ...and transform it to model coords.
-        direction_to_camera = instance_matrix_no_translation.inverse().cast<float>() * direction_to_camera.eval();
+        direction_to_camera = (instance_matrix_no_translation.inverse().cast<float>() * direction_to_camera).normalized().eval();
 
         // Iterate over all points, check if they're in the rectangle and if so, check that they are not obscured by the mesh:
         for (unsigned int i=0; i<m_editing_mode_cache.size(); ++i) {
-            Vec3f pos = instance_matrix.cast<float>() * m_editing_mode_cache[i].first.pos;
+			const sla::SupportPoint &support_point = m_editing_mode_cache[i].first;
+            Vec3f pos = instance_matrix.cast<float>() * support_point.pos;
             pos(2) += z_offset;
               GLdouble out_x, out_y, out_z;
              ::gluProject((GLdouble)pos(0), (GLdouble)pos(1), (GLdouble)pos(2), modelview_matrix, projection_matrix, viewport, &out_x, &out_y, &out_z);
@@ -2225,7 +2226,8 @@ bool GLGizmoSlaSupports::mouse_event(SLAGizmoEventType action, const Vec2d& mous
                 bool is_obscured = false;
                 // Cast a ray in the direction of the camera and look for intersection with the mesh:
                 std::vector<igl::Hit> hits;
-                if (m_AABB.intersect_ray(m_V, m_F, m_editing_mode_cache[i].first.pos, direction_to_camera, hits))
+                // Offset the start of the ray to the front of the ball + EPSILON to account for numerical inaccuracies.
+                if (m_AABB.intersect_ray(m_V, m_F, support_point.pos + direction_to_camera * (support_point.head_front_radius + EPSILON), direction_to_camera, hits))
                     // FIXME: the intersection could in theory be behind the camera, but as of now we only have camera direction.
                     // Also, the threshold is in mesh coordinates, not in actual dimensions.
                     if (hits.size() > 1 || hits.front().t > 0.001f)

src/slic3r/GUI/MsgDialog.cpp

@@ -7,6 +7,9 @@
 #include <wx/statbmp.h>
 #include <wx/scrolwin.h>
 #include <wx/clipbrd.h>
+#include <wx/html/htmlwin.h>
+
+#include <boost/algorithm/string/replace.hpp>
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
@@ -50,7 +53,7 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
 		btn_sizer->Add(button);
 	}
 
-	rightsizer->Add(btn_sizer, 0, wxALIGN_CENTRE_HORIZONTAL);
+	rightsizer->Add(btn_sizer, 0, wxALIGN_RIGHT);
 
 	auto *logo = new wxStaticBitmap(this, wxID_ANY, std::move(bitmap));
 
@@ -72,32 +75,29 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg)
 		wxID_NONE)
 	, msg(msg)
 {
-	auto *panel = new wxScrolledWindow(this);
-	auto *p_sizer = new wxBoxSizer(wxVERTICAL);
-	panel->SetSizer(p_sizer);
-
-	auto *text = new wxStaticText(panel, wxID_ANY, msg);
-	text->Wrap(CONTENT_WIDTH*wxGetApp().em_unit());
-	p_sizer->Add(text, 1, wxEXPAND);
-
-    panel->SetMinSize(wxSize(CONTENT_WIDTH*wxGetApp().em_unit(), 0));
-	panel->SetScrollRate(0, 5);
-
-	content_sizer->Add(panel, 1, wxEXPAND);
-
-	auto *btn_copy = new wxButton(this, wxID_ANY, _(L("Copy to clipboard")));
-	btn_copy->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) {
-		if (wxTheClipboard->Open()) {
-			wxTheClipboard->SetData(new wxTextDataObject(this->msg));   // Note: the clipboard takes ownership of the pointer
-			wxTheClipboard->Close();
-		}
-	});
+    // Text shown as HTML, so that mouse selection and Ctrl-V to copy will work.
+    wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
+    {
+        html->SetMinSize(wxSize(40 * wxGetApp().em_unit(), -1));
+        wxFont 	  	font 			= wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+		wxColour  	text_clr  		= wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+		wxColour  	bgr_clr 		= wxSystemSettings::GetColour(wxSYS_COLOUR_FRAMEBK); // wxSYS_COLOUR_WINDOW
+		auto      	text_clr_str 	= wxString::Format(wxT("#%02X%02X%02X"), text_clr.Red(), text_clr.Green(), text_clr.Blue());
+		auto      	bgr_clr_str 	= wxString::Format(wxT("#%02X%02X%02X"), bgr_clr.Red(), bgr_clr.Green(), bgr_clr.Blue());
+		const int 	font_size       = font.GetPointSize()-1;
+        int 		size[] 			= {font_size, font_size, font_size, font_size, font_size, font_size, font_size};
+        html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
+        html->SetBorders(2);
+		std::string msg_escaped = xml_escape(msg.ToUTF8().data());
+		boost::replace_all(msg_escaped, "\r\n", "<br>");
+        boost::replace_all(msg_escaped, "\n", "<br>");
+		html->SetPage("<html><body bgcolor=\"" + bgr_clr_str + "\"><font color=\"" + text_clr_str + "\">" + wxString::FromUTF8(msg_escaped.data()) + "</font></body></html>");
+		content_sizer->Add(html, 1, wxEXPAND);
+    }
 
 	auto *btn_ok = new wxButton(this, wxID_OK);
 	btn_ok->SetFocus();
-
-	btn_sizer->Add(btn_copy, 0, wxRIGHT, HORIZ_SPACING);
-	btn_sizer->Add(btn_ok);
+	btn_sizer->Add(btn_ok, 0, wxRIGHT, HORIZ_SPACING);
 
     SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
 	Fit();

src/slic3r/GUI/Plater.cpp

@@ -2995,6 +2995,8 @@ void Plater::export_stl(bool selection_only)
     const wxString path = dialog->GetPath();
     const std::string path_u8 = into_u8(path);
 
+    wxBusyCursor wait;
+
     TriangleMesh mesh;
     if (selection_only) {
         const auto &selection = p->get_selection();