3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ConfigWizard: Don't blow up if a printer bitmap is missing

Browse source
This commit is contained in:
Vojtech Kral 2019-04-24 16:02:49 +02:00
parent cfa7802a8a
commit 98c8cef657
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/ConfigWizard.cpp
View file

@ -18,6 +18,7 @@
#include <wx/dataview.h> #include <wx/dataview.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/display.h> #include <wx/display.h>
#include <wx/filefn.h>
#include <wx/debug.h> #include <wx/debug.h>
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
@ -81,11 +82,17 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
for (const auto &model : models) { for (const auto &model : models) {
if (! filter(model)) { continue; } if (! filter(model)) { continue; }
wxBitmap bitmap(GUI::from_u8(Slic3r::var((boost::format("printers/%1%_%2%.png") % vendor.id % model.id).str())), wxBITMAP_TYPE_PNG); wxBitmap bitmap;
int bitmap_width = 0;
const wxString bitmap_file = GUI::from_u8(Slic3r::var((boost::format("printers/%1%_%2%.png") % vendor.id % model.id).str()));
if (wxFileExists(bitmap_file)) {
bitmap.LoadFile(bitmap_file, wxBITMAP_TYPE_PNG);
bitmap_width = bitmap.GetWidth();
}
auto *title = new wxStaticText(this, wxID_ANY, model.name, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); auto *title = new wxStaticText(this, wxID_ANY, model.name, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
title->SetFont(font_name); title->SetFont(font_name);
const int wrap_width = std::max((int)MODEL_MIN_WRAP, bitmap.GetWidth()); const int wrap_width = std::max((int)MODEL_MIN_WRAP, bitmap_width);
title->Wrap(wrap_width); title->Wrap(wrap_width);
current_row_width += wrap_width; current_row_width += wrap_width;