juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:modidy bed type

Browse Source 
jira: STUDIO-13919 STUDIO-13920
Change-Id: I8e9e6bda972d294b91add1eeaf15061188bcdb2d
(cherry picked from commit a436da8930d631e094eef3b7829d270a027a9ac4)
(cherry picked from commit 5468697ff4ac4546111afdfd1f7eb43bd899f1de)
This commit is contained in:
zhou.xu
2025-08-14 12:28:40 +08:00
committed by Noisyfox
parent dfa59a5c00
commit 4e63907f72
8 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/bed_cool_supertack_o.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
resources/images/bed_engineering_o.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
resources/images/big_bed_cool_supertack_o.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
resources/images/big_bed_engineering_o.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

2
resources/profiles/BBL/machine/Bambu Lab H2D Pro.json
View File

@@ -7,7 +7,7 @@
"bed_texture": "bbl-3dp-logo.svg", "bed_texture": "bbl-3dp-logo.svg",
"default_bed_type": "Textured PEI Plate", "default_bed_type": "Textured PEI Plate",
"image_bed_type": "o", "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", "family": "BBL-3DP",
"machine_tech": "FFF", "machine_tech": "FFF",
"model_id": "O1E", "model_id": "O1E",

2
resources/profiles/BBL/machine/Bambu Lab H2D.json
View File

@@ -8,7 +8,7 @@
"use_rect_grid": "true", "use_rect_grid": "true",
"default_bed_type": "Textured PEI Plate", "default_bed_type": "Textured PEI Plate",
"image_bed_type": "o", "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", "family": "BBL-3DP",
"machine_tech": "FFF", "machine_tech": "FFF",
"model_id": "O1D", "model_id": "O1D",

4
src/slic3r/GUI/ImageDPIFrame.cpp
View File

@@ -57,7 +57,9 @@ bool ImageDPIFrame::Show(bool show)
} }
void ImageDPIFrame::set_bitmap(const wxBitmap &bit_map) { 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) void ImageDPIFrame::on_dpi_changed(const wxRect &suggested_rect)

10
src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
View File

@@ -10,7 +10,7 @@ static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE");
static const wxColour BUTTON_IN_BG_COL = wxColour("#CECECE"); static const wxColour BUTTON_IN_BG_COL = wxColour("#CECECE");
static const wxColour bd = wxColour(0, 150, 136); 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 wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172);
static const double sqrt2 = std::sqrt(2); static const double sqrt2 = std::sqrt(2);
@@ -18,7 +18,7 @@ BEGIN_EVENT_TABLE(AxisCtrlButton, wxWindow)
EVT_LEFT_DOWN(AxisCtrlButton::mouseDown) EVT_LEFT_DOWN(AxisCtrlButton::mouseDown)
EVT_LEFT_UP(AxisCtrlButton::mouseReleased) EVT_LEFT_UP(AxisCtrlButton::mouseReleased)
EVT_MOTION(AxisCtrlButton::mouseMoving) EVT_MOTION(AxisCtrlButton::mouseMoving)
EVT_PAINT(AxisCtrlButton::paintEvent) EVT_PAINT(AxisCtrlButton::paintEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
#define OUTER_SIZE FromDIP(105) #define OUTER_SIZE FromDIP(105)
@@ -124,7 +124,9 @@ void AxisCtrlButton::SetInnerBackgroundColor(StateColor const& color)
void AxisCtrlButton::SetBitmap(ScalableBitmap &bmp) void AxisCtrlButton::SetBitmap(ScalableBitmap &bmp)
{ {
m_icon = bmp; if (&bmp && (& bmp.bmp()) && (bmp.bmp().IsOk())) {
m_icon = bmp;
}
} }
void AxisCtrlButton::Rescale() { void AxisCtrlButton::Rescale() {
@@ -153,7 +155,7 @@ void AxisCtrlButton::render(wxDC& dc)
gc->PushState(); gc->PushState();
gc->Translate(center.x, center.y); gc->Translate(center.x, center.y);
//draw the outer ring //draw the outer ring
wxGraphicsPath outer_path = gc->CreatePath(); wxGraphicsPath outer_path = gc->CreatePath();
outer_path.AddCircle(0, 0, r_outer); outer_path.AddCircle(0, 0, r_outer);