diff --git a/resources/images/bed_cool_supertack_o.png b/resources/images/bed_cool_supertack_o.png new file mode 100644 index 0000000000..b7a143a2df Binary files /dev/null and b/resources/images/bed_cool_supertack_o.png differ diff --git a/resources/images/bed_engineering_o.png b/resources/images/bed_engineering_o.png new file mode 100644 index 0000000000..4be2320dde Binary files /dev/null and b/resources/images/bed_engineering_o.png differ diff --git a/resources/images/big_bed_cool_supertack_o.png b/resources/images/big_bed_cool_supertack_o.png new file mode 100644 index 0000000000..d2bf848979 Binary files /dev/null and b/resources/images/big_bed_cool_supertack_o.png differ diff --git a/resources/images/big_bed_engineering_o.png b/resources/images/big_bed_engineering_o.png new file mode 100644 index 0000000000..87cf402281 Binary files /dev/null and b/resources/images/big_bed_engineering_o.png differ diff --git a/resources/profiles/BBL/machine/Bambu Lab H2D Pro.json b/resources/profiles/BBL/machine/Bambu Lab H2D Pro.json index e6ac229974..1ad3487e06 100644 --- a/resources/profiles/BBL/machine/Bambu Lab H2D Pro.json +++ b/resources/profiles/BBL/machine/Bambu Lab H2D Pro.json @@ -7,7 +7,7 @@ "bed_texture": "bbl-3dp-logo.svg", "default_bed_type": "Textured PEI Plate", "image_bed_type": "o", - "not_support_bed_type":"Cool Plate;Engineering Plate;Bambu Cool Plate SuperTack", + "not_support_bed_type": "Cool Plate", "family": "BBL-3DP", "machine_tech": "FFF", "model_id": "O1E", diff --git a/resources/profiles/BBL/machine/Bambu Lab H2D.json b/resources/profiles/BBL/machine/Bambu Lab H2D.json index 80ec3ad0e3..5528761c07 100644 --- a/resources/profiles/BBL/machine/Bambu Lab H2D.json +++ b/resources/profiles/BBL/machine/Bambu Lab H2D.json @@ -8,7 +8,7 @@ "use_rect_grid": "true", "default_bed_type": "Textured PEI Plate", "image_bed_type": "o", - "not_support_bed_type": "Smooth Cool Plate;Engineering Plate;Textured Cool Plate;Cool Plate (SuperTack)", + "not_support_bed_type": "Smooth Cool Plate;Textured Cool Plate", "family": "BBL-3DP", "machine_tech": "FFF", "model_id": "O1D", diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp index b72a50f603..66abfde889 100644 --- a/src/slic3r/GUI/ImageDPIFrame.cpp +++ b/src/slic3r/GUI/ImageDPIFrame.cpp @@ -57,7 +57,9 @@ bool ImageDPIFrame::Show(bool show) } void ImageDPIFrame::set_bitmap(const wxBitmap &bit_map) { - m_bitmap->SetBitmap(bit_map); + if (&bit_map && bit_map.IsOk()) { + m_bitmap->SetBitmap(bit_map); + } } void ImageDPIFrame::on_dpi_changed(const wxRect &suggested_rect) diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp index 8062cae815..ee0608ffbe 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp @@ -10,7 +10,7 @@ static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE"); static const wxColour BUTTON_IN_BG_COL = wxColour("#CECECE"); static const wxColour bd = wxColour(0, 150, 136); -static const wxColour text_num_color = wxColour(0x898989); +static const wxColour text_num_color = wxColour("#898989"); static const wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172); static const double sqrt2 = std::sqrt(2); @@ -18,7 +18,7 @@ BEGIN_EVENT_TABLE(AxisCtrlButton, wxWindow) EVT_LEFT_DOWN(AxisCtrlButton::mouseDown) EVT_LEFT_UP(AxisCtrlButton::mouseReleased) EVT_MOTION(AxisCtrlButton::mouseMoving) -EVT_PAINT(AxisCtrlButton::paintEvent) +EVT_PAINT(AxisCtrlButton::paintEvent) END_EVENT_TABLE() #define OUTER_SIZE FromDIP(105) @@ -124,7 +124,9 @@ void AxisCtrlButton::SetInnerBackgroundColor(StateColor const& color) void AxisCtrlButton::SetBitmap(ScalableBitmap &bmp) { - m_icon = bmp; + if (&bmp && (& bmp.bmp()) && (bmp.bmp().IsOk())) { + m_icon = bmp; + } } void AxisCtrlButton::Rescale() { @@ -153,7 +155,7 @@ void AxisCtrlButton::render(wxDC& dc) gc->PushState(); gc->Translate(center.x, center.y); - + //draw the outer ring wxGraphicsPath outer_path = gc->CreatePath(); outer_path.AddCircle(0, 0, r_outer);